From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/abbrev/abbrevconfigwidget.cpp | 4 +- parts/abbrev/abbrevconfigwidget.h | 3 +- parts/abbrev/abbrevconfigwidgetbase.ui | 30 ++-- parts/abbrev/abbrevpart.cpp | 36 ++--- parts/abbrev/abbrevpart.h | 3 +- parts/abbrev/addtemplatedlg.cpp | 4 +- parts/abbrev/addtemplatedlg.h | 3 +- parts/abbrev/addtemplatedlgbase.ui | 24 +-- parts/abbrev/cpp_keywords | 6 +- parts/appwizard/appwizarddlg.cpp | 66 ++++---- parts/appwizard/appwizarddlg.h | 5 +- parts/appwizard/appwizarddlgbase.ui | 130 ++++++++-------- parts/appwizard/appwizardpart.cpp | 6 +- parts/appwizard/appwizardpart.h | 3 +- parts/appwizard/common/COPYING.LIB | 4 +- parts/appwizard/common/gnome/macros/autogen.sh | 2 +- parts/appwizard/common/gnome/macros/curses.m4 | 2 +- .../common/gnome/macros/gnome-fileutils.m4 | 2 +- parts/appwizard/common/gnome2/macros/autogen.sh | 2 +- parts/appwizard/common/gnome2/macros/curses.m4 | 2 +- parts/appwizard/common/incadmin/config.guess | 4 +- parts/appwizard/common/incadmin/install-sh | 2 +- parts/appwizard/common/incadmin/ltmain.sh | 20 +-- parts/appwizard/common/incadmin/missing | 2 +- parts/appwizard/common/kde-index.docbook | 44 +++--- parts/appwizard/common/scons/admin/kde.py | 112 +++++++------- parts/appwizard/filepropspage.cpp | 8 +- parts/appwizard/filepropspage.h | 3 +- parts/appwizard/filepropspagebase.ui | 28 ++-- parts/appwizard/importdlg.cpp | 32 ++-- parts/appwizard/importdlg.h | 3 +- parts/appwizard/importdlgbase.ui | 42 +++--- parts/appwizard/kdevlicense.cpp | 30 ++-- parts/appwizard/profilesupport.cpp | 6 +- parts/appwizard/profilesupport.h | 2 +- parts/appwizard/vcs_form.ui | 18 +-- parts/astyle/astyle_part.cpp | 34 ++--- parts/astyle/astyle_part.h | 3 +- parts/astyle/astyle_widget.cpp | 4 +- parts/astyle/astyle_widget.h | 3 +- parts/astyle/astyleconfig.ui | 168 ++++++++++----------- parts/bookmarks/bookmarks_part.cpp | 36 ++--- parts/bookmarks/bookmarks_part.h | 5 +- parts/bookmarks/bookmarks_settings.cpp | 4 +- parts/bookmarks/bookmarks_settings.h | 3 +- parts/bookmarks/bookmarks_settings_base.ui | 34 ++--- parts/bookmarks/bookmarks_widget.cpp | 18 +-- parts/bookmarks/bookmarks_widget.h | 3 +- parts/classview/classtooldlg.cpp | 70 ++++----- parts/classview/classtooldlg.h | 15 +- parts/classview/classtoolwidget.cpp | 36 ++--- parts/classview/classtoolwidget.h | 5 +- parts/classview/classtreebase.cpp | 46 +++--- parts/classview/classtreebase.h | 43 +++--- parts/classview/classviewpart.cpp | 20 +-- parts/classview/classviewpart.h | 3 +- parts/classview/classviewwidget.cpp | 82 +++++----- parts/classview/classviewwidget.h | 59 ++++---- parts/classview/digraphview.cpp | 16 +- parts/classview/digraphview.h | 7 +- parts/classview/hierarchydlg.cpp | 20 +-- parts/classview/hierarchydlg.h | 3 +- parts/classview/navigator.cpp | 24 +-- parts/classview/navigator.h | 5 +- parts/classview/viewcombos.cpp | 24 +-- parts/classview/viewcombos.h | 18 +-- parts/ctags2/ctags2_createtagfile.cpp | 4 +- parts/ctags2/ctags2_createtagfile.h | 3 +- parts/ctags2/ctags2_createtagfilebase.ui | 24 +-- parts/ctags2/ctags2_part.cpp | 14 +- parts/ctags2/ctags2_part.h | 3 +- parts/ctags2/ctags2_selecttagfile.cpp | 4 +- parts/ctags2/ctags2_selecttagfile.h | 3 +- parts/ctags2/ctags2_selecttagfilebase.ui | 22 +-- parts/ctags2/ctags2_settingswidget.cpp | 6 +- parts/ctags2/ctags2_settingswidget.h | 9 +- parts/ctags2/ctags2_settingswidgetbase.ui | 54 +++---- parts/ctags2/ctags2_widget.cpp | 8 +- parts/ctags2/ctags2_widget.h | 1 + parts/ctags2/ctags2_widgetbase.ui | 22 +-- parts/ctags2/ctagskinds.cpp | 4 +- parts/ctags2/readtags.c | 4 +- parts/ctags2/tagitem.h | 2 +- parts/ctags2/tags.cpp | 2 +- parts/ctags2/tags.h | 2 +- parts/diff/diffdlg.cpp | 8 +- parts/diff/diffdlg.h | 3 +- parts/diff/diffpart.cpp | 16 +- parts/diff/diffpart.h | 3 +- parts/diff/diffwidget.cpp | 18 +-- parts/diff/diffwidget.h | 10 +- parts/distpart/distpart_part.cpp | 4 +- parts/distpart/distpart_part.h | 3 +- parts/distpart/distpart_ui.ui | 156 +++++++++---------- parts/distpart/distpart_widget.cpp | 18 +-- parts/distpart/distpart_widget.h | 3 +- parts/distpart/specsupport.cpp | 36 ++--- parts/documentation/KDevDocumentationIface.h | 1 + parts/documentation/addcatalogdlg.cpp | 4 +- parts/documentation/addcatalogdlg.h | 3 +- parts/documentation/addcatalogdlgbase.ui | 30 ++-- parts/documentation/bookmarkview.cpp | 20 +-- parts/documentation/bookmarkview.h | 5 +- parts/documentation/contentsview.cpp | 4 +- parts/documentation/contentsview.h | 5 +- parts/documentation/docconfiglistview.cpp | 6 +- parts/documentation/docconfiglistview.h | 3 +- parts/documentation/docglobalconfigwidget.cpp | 8 +- parts/documentation/docglobalconfigwidget.h | 3 +- parts/documentation/docglobalconfigwidgetbase.ui | 74 ++++----- parts/documentation/docprojectconfigwidget.cpp | 4 +- parts/documentation/docprojectconfigwidget.h | 3 +- parts/documentation/docprojectconfigwidgetbase.ui | 22 +-- parts/documentation/documentation_part.cpp | 40 ++--- parts/documentation/documentation_part.h | 3 +- parts/documentation/documentation_widget.h | 3 +- parts/documentation/docutils.cpp | 2 +- parts/documentation/editbookmarkdlg.ui | 18 +-- parts/documentation/editcatalogdlg.cpp | 4 +- parts/documentation/editcatalogdlg.h | 3 +- parts/documentation/editcatalogdlgbase.ui | 26 ++-- parts/documentation/find_documentation.cpp | 30 ++-- parts/documentation/find_documentation.h | 3 +- parts/documentation/find_documentation_options.cpp | 4 +- parts/documentation/find_documentation_options.h | 3 +- .../find_documentation_optionsbase.ui | 32 ++-- parts/documentation/find_documentationbase.ui | 32 ++-- parts/documentation/indexview.cpp | 8 +- parts/documentation/indexview.h | 5 +- .../interfaces/kdevdocumentationplugin.cpp | 58 +++---- .../interfaces/kdevdocumentationplugin.h | 28 ++-- parts/documentation/plugins/chm/docchmplugin.cpp | 30 ++-- parts/documentation/plugins/chm/docchmplugin.h | 5 +- .../plugins/custom/doccustomplugin.cpp | 10 +- .../documentation/plugins/custom/doccustomplugin.h | 4 +- .../plugins/devhelp/docdevhelpplugin.cpp | 40 ++--- .../plugins/devhelp/docdevhelpplugin.h | 7 +- parts/documentation/plugins/djvu/docdjvuplugin.cpp | 10 +- parts/documentation/plugins/djvu/docdjvuplugin.h | 4 +- .../plugins/doxygen/docdoxygenplugin.cpp | 36 ++--- .../plugins/doxygen/docdoxygenplugin.h | 13 +- .../plugins/kdevtoc/dockdevtocplugin.cpp | 36 ++--- .../plugins/kdevtoc/dockdevtocplugin.h | 7 +- parts/documentation/plugins/pdb/docpdbplugin.cpp | 10 +- parts/documentation/plugins/pdb/docpdbplugin.h | 4 +- parts/documentation/plugins/pdf/docpdfplugin.cpp | 10 +- parts/documentation/plugins/pdf/docpdfplugin.h | 4 +- parts/documentation/plugins/qt/docqtplugin.cpp | 86 +++++------ parts/documentation/plugins/qt/docqtplugin.h | 13 +- parts/documentation/protocols/chm/chm.cpp | 38 ++--- parts/documentation/protocols/chm/chmfile.cpp | 8 +- parts/documentation/protocols/chm/decompress.cpp | 32 ++-- parts/documentation/protocols/chm/kchmpart.cpp | 10 +- parts/documentation/protocols/chm/kchmpart.h | 8 +- parts/documentation/searchview.cpp | 22 +-- parts/documentation/searchview.h | 5 +- parts/documentation/selecttopic.cpp | 4 +- parts/documentation/selecttopic.h | 3 +- parts/documentation/selecttopicbase.ui | 20 +-- parts/documentation/tools/htdig/htdigindex.cpp | 14 +- parts/documentation/tools/htdig/htdigindex.h | 3 +- parts/doxygen/config.cpp | 160 ++++++++++---------- parts/doxygen/config.h | 4 +- parts/doxygen/doxygenconfigwidget.cpp | 22 +-- parts/doxygen/doxygenconfigwidget.h | 7 +- parts/doxygen/doxygenpart.cpp | 10 +- parts/doxygen/doxygenpart.h | 3 +- parts/doxygen/input.cpp | 76 +++++----- parts/doxygen/input.h | 20 ++- parts/doxygen/messages.cpp | 4 +- parts/filecreate/addglobaldlg.cpp | 14 +- parts/filecreate/addglobaldlg.h | 5 +- parts/filecreate/fcconfigwidget.cpp | 62 ++++---- parts/filecreate/fcconfigwidget.h | 3 +- parts/filecreate/fcconfigwidgetbase.ui | 62 ++++---- parts/filecreate/fctemplateedit.cpp | 4 +- parts/filecreate/fctemplateedit.h | 3 +- parts/filecreate/fctemplateeditbase.ui | 38 ++--- parts/filecreate/fctemplateeditbase.ui.h | 4 +- parts/filecreate/fctypeedit.cpp | 4 +- parts/filecreate/fctypeedit.h | 3 +- parts/filecreate/fctypeeditbase.ui | 62 ++++---- parts/filecreate/fctypeeditbase.ui.h | 4 +- parts/filecreate/file-templates/ui | 4 +- parts/filecreate/file-templates/ui-confdialog | 22 +-- parts/filecreate/file-templates/ui-dialog | 4 +- parts/filecreate/file-templates/ui-dialog-qt4 | 2 +- parts/filecreate/file-templates/ui-dialogb | 14 +- parts/filecreate/file-templates/ui-dialogb-qt4 | 14 +- parts/filecreate/file-templates/ui-dialogr | 14 +- parts/filecreate/file-templates/ui-dialogr-qt4 | 14 +- parts/filecreate/file-templates/ui-mainwin | 8 +- parts/filecreate/file-templates/ui-mainwin-qt4 | 6 +- parts/filecreate/file-templates/ui-tabdialog | 20 +-- parts/filecreate/file-templates/ui-widget | 4 +- parts/filecreate/file-templates/ui-widget-qt4 | 2 +- parts/filecreate/file-templates/ui-wizard | 6 +- parts/filecreate/filecreate_filedialog.cpp | 4 +- parts/filecreate/filecreate_filedialog.h | 3 +- parts/filecreate/filecreate_listitem.cpp | 2 +- parts/filecreate/filecreate_newfile.cpp | 4 +- parts/filecreate/filecreate_newfile.h | 3 +- parts/filecreate/filecreate_part.cpp | 30 ++-- parts/filecreate/filecreate_part.h | 17 ++- parts/filecreate/filecreate_typechoosersig.h | 1 + parts/filecreate/filecreate_widget2.cpp | 10 +- parts/filecreate/filecreate_widget2.h | 5 +- parts/filecreate/filecreate_widget3.cpp | 2 +- parts/filecreate/filecreate_widget3.h | 1 + parts/filelist/filelist_item.cpp | 6 +- parts/filelist/filelist_item.h | 4 +- parts/filelist/filelist_widget.cpp | 10 +- parts/filelist/filelist_widget.h | 5 +- parts/filelist/projectviewconfig.cpp | 4 +- parts/filelist/projectviewconfig.h | 3 +- parts/filelist/projectviewconfigbase.ui | 12 +- parts/filelist/projectviewpart.cpp | 16 +- parts/filelist/projectviewpart.h | 3 +- parts/filelist/projectviewprojectconfig.cpp | 4 +- parts/filelist/projectviewprojectconfig.h | 3 +- parts/filelist/projectviewprojectconfigbase.ui | 10 +- parts/filelist/toolbarguibuilder.cpp | 12 +- parts/filelist/toolbarguibuilder.h | 6 +- parts/fileselector/fileselector_part.cpp | 4 +- parts/fileselector/fileselector_part.h | 3 +- parts/fileselector/fileselector_widget.cpp | 64 ++++---- parts/fileselector/fileselector_widget.h | 23 +-- parts/fileselector/kactionselector.cpp | 8 +- parts/fileselector/kactionselector.h | 19 +-- parts/fileselector/kbookmarkhandler.cpp | 8 +- parts/fileselector/kbookmarkhandler.h | 3 +- parts/fileview/addfilegroupdlg.cpp | 14 +- parts/fileview/addfilegroupdlg.h | 5 +- parts/fileview/filegroupsconfigwidget.cpp | 4 +- parts/fileview/filegroupsconfigwidget.h | 3 +- parts/fileview/filegroupsconfigwidgetbase.ui | 34 ++--- parts/fileview/filegroupspart.cpp | 4 +- parts/fileview/filegroupspart.h | 3 +- parts/fileview/filegroupswidget.cpp | 34 ++--- parts/fileview/filegroupswidget.h | 1 + parts/fileview/fileitemfactory.cpp | 10 +- parts/fileview/fileitemfactory.h | 10 +- parts/fileview/filetreeviewwidgetimpl.cpp | 10 +- parts/fileview/filetreeviewwidgetimpl.h | 5 +- parts/fileview/filetreewidget.cpp | 14 +- parts/fileview/filetreewidget.h | 3 +- parts/fileview/fileviewpart.cpp | 4 +- parts/fileview/fileviewpart.h | 3 +- parts/fileview/partwidget.cpp | 16 +- parts/fileview/partwidget.h | 5 +- parts/fileview/stdfiletreewidgetimpl.cpp | 24 +-- parts/fileview/stdfiletreewidgetimpl.h | 3 +- parts/fileview/vcscolorsconfigwidget.cpp | 4 +- parts/fileview/vcscolorsconfigwidget.h | 3 +- parts/fileview/vcscolorsconfigwidgetbase.ui | 24 +-- parts/fileview/vcsfiletreewidgetimpl.cpp | 50 +++--- parts/fileview/vcsfiletreewidgetimpl.h | 3 +- parts/filter/filterpart.cpp | 4 +- parts/filter/filterpart.h | 3 +- parts/filter/kdevfilterIface.h | 1 + parts/filter/shellfilterdlg.cpp | 10 +- parts/filter/shellfilterdlg.h | 3 +- parts/filter/shellinsertdlg.cpp | 10 +- parts/filter/shellinsertdlg.h | 3 +- parts/fullscreen/fullscreen_part.cpp | 4 +- parts/fullscreen/fullscreen_part.h | 3 +- parts/grepview/README.dox | 2 +- parts/grepview/grepdlg.cpp | 54 +++---- parts/grepview/grepdlg.h | 5 +- parts/grepview/grepviewpart.cpp | 8 +- parts/grepview/grepviewpart.h | 3 +- parts/grepview/grepviewwidget.cpp | 38 ++--- parts/grepview/grepviewwidget.h | 6 +- parts/konsole/konsoleviewpart.cpp | 4 +- parts/konsole/konsoleviewpart.h | 3 +- parts/konsole/konsoleviewwidget.cpp | 2 +- parts/konsole/konsoleviewwidget.h | 3 +- parts/openwith/openwithpart.cpp | 12 +- parts/openwith/openwithpart.h | 3 +- parts/outputviews/appoutputviewpart.cpp | 6 +- parts/outputviews/appoutputviewpart.h | 3 +- parts/outputviews/appoutputwidget.cpp | 8 +- parts/outputviews/appoutputwidget.h | 1 + parts/outputviews/compileerrorfilter.cpp | 10 +- parts/outputviews/compileerrorfilter.h | 1 + parts/outputviews/directorystatusmessagefilter.cpp | 60 ++++---- parts/outputviews/directorystatusmessagefilter.h | 1 + parts/outputviews/filterdlg.ui | 20 +-- parts/outputviews/makeactionfilter.cpp | 28 ++-- parts/outputviews/makeactionfilter.h | 1 + parts/outputviews/makeitem.cpp | 12 +- parts/outputviews/makeviewpart.cpp | 8 +- parts/outputviews/makeviewpart.h | 3 +- parts/outputviews/makewidget.cpp | 70 ++++----- parts/outputviews/makewidget.h | 3 +- parts/outputviews/otherfilter.h | 1 + parts/partexplorer/partexplorer_plugin.cpp | 4 +- parts/partexplorer/partexplorer_plugin.h | 3 +- parts/partexplorer/partexplorerform.cpp | 32 ++-- parts/partexplorer/partexplorerform.h | 3 +- parts/partexplorer/partexplorerformbase.ui | 14 +- parts/quickopen/quickopen_part.cpp | 4 +- parts/quickopen/quickopen_part.h | 7 +- parts/quickopen/quickopenbase.ui | 30 ++-- parts/quickopen/quickopenclassdialog.cpp | 8 +- parts/quickopen/quickopenclassdialog.h | 7 +- parts/quickopen/quickopendialog.cpp | 12 +- parts/quickopen/quickopendialog.h | 9 +- parts/quickopen/quickopenfiledialog.cpp | 10 +- parts/quickopen/quickopenfiledialog.h | 9 +- parts/quickopen/quickopenfunctionchooseform.cpp | 6 +- parts/quickopen/quickopenfunctionchooseform.h | 7 +- parts/quickopen/quickopenfunctionchooseformbase.ui | 26 ++-- parts/quickopen/quickopenfunctiondialog.cpp | 8 +- parts/quickopen/quickopenfunctiondialog.h | 7 +- parts/regexptest/regexptestdlg.cpp | 14 +- parts/regexptest/regexptestdlg.h | 3 +- parts/regexptest/regexptestdlgbase.ui | 46 +++--- parts/regexptest/regexptestpart.cpp | 4 +- parts/regexptest/regexptestpart.h | 3 +- parts/replace/replace_part.cpp | 20 +-- parts/replace/replace_part.h | 3 +- parts/replace/replace_widget.cpp | 38 ++--- parts/replace/replace_widget.h | 9 +- parts/replace/replacedlg.ui | 54 +++---- parts/replace/replacedlgimpl.cpp | 6 +- parts/replace/replacedlgimpl.h | 3 +- parts/replace/replaceitem.cpp | 24 +-- parts/replace/replaceitem.h | 14 +- parts/replace/replaceview.cpp | 12 +- parts/replace/replaceview.h | 1 + parts/scripting/scriptingglobalconfig.cpp | 4 +- parts/scripting/scriptingglobalconfig.h | 3 +- parts/scripting/scriptingglobalconfigbase.ui | 6 +- parts/scripting/scriptingpart.cpp | 8 +- parts/scripting/scriptingpart.h | 3 +- parts/snippet/snippet_part.cpp | 10 +- parts/snippet/snippet_part.h | 3 +- parts/snippet/snippet_widget.cpp | 154 +++++++++---------- parts/snippet/snippet_widget.h | 3 +- parts/snippet/snippetdlg.ui | 30 ++-- parts/snippet/snippetdlg.ui.h | 2 +- parts/snippet/snippetitem.cpp | 16 +- parts/snippet/snippetitem.h | 6 +- parts/snippet/snippetsettings.cpp | 8 +- parts/snippet/snippetsettings.h | 5 +- parts/snippet/snippetsettingsbase.ui | 34 ++--- parts/texttools/texttoolspart.cpp | 4 +- parts/texttools/texttoolspart.h | 3 +- parts/texttools/texttoolswidget.cpp | 50 +++--- parts/texttools/texttoolswidget.h | 3 +- parts/tipofday/tipofday_part.cpp | 4 +- parts/tipofday/tipofday_part.h | 3 +- parts/tools/addtooldlg.ui | 32 ++-- parts/tools/addtooldlg.ui.h | 2 +- parts/tools/kapplicationtree.cpp | 24 +-- parts/tools/kapplicationtree.h | 9 +- parts/tools/tools_part.cpp | 28 ++-- parts/tools/tools_part.h | 3 +- parts/tools/toolsconfig.cpp | 8 +- parts/tools/toolsconfig.h | 5 +- parts/tools/toolsconfigwidget.cpp | 6 +- parts/tools/toolsconfigwidget.h | 3 +- parts/tools/toolsconfigwidgetbase.ui | 60 ++++---- parts/uimode/uichooser.ui | 50 +++--- parts/uimode/uichooser_part.cpp | 4 +- parts/uimode/uichooser_part.h | 3 +- parts/uimode/uichooser_widget.cpp | 4 +- parts/uimode/uichooser_widget.h | 3 +- parts/valgrind/dialog_widget.ui | 68 ++++----- parts/valgrind/dialog_widget.ui.h | 2 +- parts/valgrind/valgrind_dialog.cpp | 32 ++-- parts/valgrind/valgrind_dialog.h | 3 +- parts/valgrind/valgrind_part.cpp | 24 +-- parts/valgrind/valgrind_part.h | 3 +- parts/valgrind/valgrind_widget.cpp | 12 +- parts/valgrind/valgrind_widget.h | 3 +- parts/valgrind/valgrinditem.h | 2 +- parts/vcsmanager/vcsmanagerpart.cpp | 6 +- parts/vcsmanager/vcsmanagerpart.h | 3 +- parts/vcsmanager/vcsmanagerprojectconfig.cpp | 6 +- parts/vcsmanager/vcsmanagerprojectconfig.h | 3 +- parts/vcsmanager/vcsmanagerprojectconfigbase.ui | 12 +- 383 files changed, 3029 insertions(+), 2915 deletions(-) (limited to 'parts') diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp index 6e174603..675145b5 100644 --- a/parts/abbrev/abbrevconfigwidget.cpp +++ b/parts/abbrev/abbrevconfigwidget.cpp @@ -25,8 +25,8 @@ #include "addtemplatedlg.h" #include "abbrevpart.h" -AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const char *name) - : AbbrevConfigWidgetBase(parent, name) +AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *tqparent, const char *name) + : AbbrevConfigWidgetBase(tqparent, name) { m_part = part; diff --git a/parts/abbrev/abbrevconfigwidget.h b/parts/abbrev/abbrevconfigwidget.h index 818aa3ba..514c53c4 100644 --- a/parts/abbrev/abbrevconfigwidget.h +++ b/parts/abbrev/abbrevconfigwidget.h @@ -23,9 +23,10 @@ class AbbrevConfigWidget : public AbbrevConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent=0, const char *name=0); + AbbrevConfigWidget(AbbrevPart *part, TQWidget *tqparent=0, const char *name=0); ~AbbrevConfigWidget(); public slots: diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui index fd432a3e..15bf9940 100644 --- a/parts/abbrev/abbrevconfigwidgetbase.ui +++ b/parts/abbrev/abbrevconfigwidgetbase.ui @@ -1,6 +1,6 @@ AbbrevConfigWidgetBase - + abbrev_config_widget @@ -19,7 +19,7 @@ unnamed - + TextLabel2 @@ -30,12 +30,12 @@ editCode - + editCode - + checkWordCompletion @@ -43,15 +43,15 @@ &Enable automatic word completion - + - layout2 + tqlayout2 unnamed - + buttonRemoveTemplate @@ -59,7 +59,7 @@ &Remove - + Template @@ -103,7 +103,7 @@ AllColumns - + buttonAddTemplate @@ -111,7 +111,7 @@ &Add... - + TextLabel1 @@ -132,7 +132,7 @@ Expanding - + 20 30 @@ -179,12 +179,12 @@ kdialog.h - + addTemplate() codeChanged() removeTemplate() selectionChanged() - - - + + + diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index a86d98f8..33660069 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -65,8 +65,8 @@ public: K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory ) -AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "AbbrevPart") +AbbrevPart::AbbrevPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "AbbrevPart") { setInstance(AbbrevFactory::instance()); setXMLFile("kdevabbrev.rc"); @@ -158,17 +158,17 @@ void AbbrevPart::load() if (TQFileInfo(localTemplatesFile).exists()) files << localTemplatesFile; else - files = dirs->findAllResources("codetemplates", TQString::null, false, true); + files = dirs->findAllResources("codetemplates", TQString(), false, true); TQString localSourcesFile = locateLocal("sources", "sources", AbbrevFactory::instance()); TQStringList sourceFiles; if (TQFileInfo(localSourcesFile).exists()) sourceFiles << localSourcesFile; else - sourceFiles = dirs->findAllResources("sources", TQString::null, false, true); + sourceFiles = dirs->findAllResources("sources", TQString(), false, true); kdDebug(9028) << "=========> sourceFiles: " << sourceFiles.join(" ") << endl; - this->m_completionFile = TQString::null; + this->m_completionFile = TQString(); for( TQStringList::Iterator it=sourceFiles.begin(); it!=sourceFiles.end(); ++it ) { TQString fn = *it; kdDebug(9028) << "===> load file: " << fn << endl; @@ -284,7 +284,7 @@ TQValueList AbbrevPart::findAllWords(const TQStrin } TQString suffix = part->url().url(); - int pos = suffix.findRev('.'); + int pos = suffix.tqfindRev('.'); if (pos != -1) suffix.remove(0, pos+1); kdDebug(9028) << "AbbrevPart::findAllWords with suffix " << suffix << endl; @@ -298,7 +298,7 @@ TQValueList AbbrevPart::findAllWords(const TQStrin while ( (pos = rx.search(text, idx)) != -1 ) { len = rx.matchedLength(); TQString word = text.mid(pos, len); - if (map.find(word) == map.end()) { + if (map.tqfind(word) == map.end()) { KTextEditor::CompletionEntry e; e.text = word; entries << e; @@ -313,7 +313,7 @@ TQValueList AbbrevPart::findAllWords(const TQStrin while ( (pos = rx.search(m_completionFile, idx)) != -1 ) { len = rx.matchedLength(); TQString word = m_completionFile.mid(pos, len); - if (map.find(word) == map.end()) { + if (map.tqfind(word) == map.end()) { KTextEditor::CompletionEntry e; e.text = word; entries << e; @@ -345,7 +345,7 @@ void AbbrevPart::slotExpandAbbrev() } TQString suffix = part->url().url(); - int pos = suffix.findRev('.'); + int pos = suffix.tqfindRev('.'); if (pos != -1) suffix.remove(0, pos+1); @@ -374,7 +374,7 @@ void AbbrevPart::slotExpandAbbrev() cursoriface->cursorPositionReal(&line, &col); TQString linestr = editIface->textLine(line); - int startPos = QMAX( QMIN( (int)col, (int)linestr.length()-1 ), 0 ); + int startPos = TQMAX( TQMIN( (int)col, (int)linestr.length()-1 ), 0 ); int endPos = startPos; startPos--; while (startPos >= 0 && ( linestr[startPos].isLetterOrNumber() || linestr[startPos] == '_' || linestr[startPos] == '~') ) @@ -417,7 +417,7 @@ void AbbrevPart::insertChars( const TQString &chars ) currentCol += spaces.length(); } - int idx = lineText.find( '|' ); + int idx = lineText.tqfind( '|' ); if( idx != -1 ){ stream << lineText.left( idx ) << lineText.mid( idx+1 ); if( !foundPipe ){ @@ -562,7 +562,7 @@ void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, TQ } TQString suffix = part->url().url(); - int pos = suffix.findRev('.'); + int pos = suffix.tqfindRev('.'); if (pos != -1) suffix.remove(0, pos+1); kdDebug(9028) << "AbbrevPart::slotFilterInsertString with suffix " << suffix << endl; @@ -621,9 +621,9 @@ TQMap< TQString, CodeTemplate * > CodeTemplateList::operator [ ]( TQString suffi for (TQMap >::const_iterator it = templates.begin(); it != templates.end(); ++it) { kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << endl; - if (TQStringList::split(",", it.key()).contains(suffix)) + if (TQStringList::split(",", it.key()).tqcontains(suffix)) { - kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " contains " << suffix << endl; + kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " tqcontains " << suffix << endl; TQMap m = it.data(); for (TQMap::const_iterator itt = m.begin(); itt != m.end(); ++itt) @@ -640,18 +640,18 @@ void CodeTemplateList::insert( TQString name, TQString description, TQString cod { TQString origSuffixes = suffixes; // TQStringList suffixList; - int pos = suffixes.find('('); + int pos = suffixes.tqfind('('); if (pos == -1) return; suffixes.remove(0, pos+1); - pos = suffixes.find(')'); + pos = suffixes.tqfind(')'); if (pos == -1) return; suffixes.remove(pos, suffixes.length()-pos); // suffixList = TQStringList::split(",", suffixes); CodeTemplate *t; - if (templates.contains(suffixes) && templates[suffixes].contains(name)) + if (templates.tqcontains(suffixes) && templates[suffixes].tqcontains(name)) { kdDebug(9028) << "found template for suffixes " << suffixes << " and name " << name << endl; t = templates[suffixes][name]; @@ -667,7 +667,7 @@ void CodeTemplateList::insert( TQString name, TQString description, TQString cod t->description = description; t->code = code; t->suffixes = origSuffixes; - if (!m_suffixes.contains(origSuffixes)) + if (!m_suffixes.tqcontains(origSuffixes)) m_suffixes.append(origSuffixes); } diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h index d1c1bc7c..566e7896 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -63,9 +63,10 @@ private: class AbbrevPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - AbbrevPart( TQObject *parent, const char *name, const TQStringList & ); + AbbrevPart( TQObject *tqparent, const char *name, const TQStringList & ); ~AbbrevPart(); bool autoWordCompletionEnabled() const; diff --git a/parts/abbrev/addtemplatedlg.cpp b/parts/abbrev/addtemplatedlg.cpp index a837c08a..6be8c703 100644 --- a/parts/abbrev/addtemplatedlg.cpp +++ b/parts/abbrev/addtemplatedlg.cpp @@ -22,8 +22,8 @@ #include #include -AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *parent, const char *name ) - : AddTemplateDialogBase( parent, name ) +AddTemplateDialog::AddTemplateDialog( TQStringList suffixesList, TQWidget *tqparent, const char *name ) + : AddTemplateDialogBase( tqparent, name ) { setFocusProxy( editTemplate ); comboSuffixes->insertStringList(suffixesList); diff --git a/parts/abbrev/addtemplatedlg.h b/parts/abbrev/addtemplatedlg.h index 64bcc24e..04298214 100644 --- a/parts/abbrev/addtemplatedlg.h +++ b/parts/abbrev/addtemplatedlg.h @@ -26,9 +26,10 @@ class AddTemplateDialog: public AddTemplateDialogBase { Q_OBJECT + TQ_OBJECT public: - AddTemplateDialog( TQStringList suffixesList, TQWidget *parent=0, const char *name=0 ); + AddTemplateDialog( TQStringList suffixesList, TQWidget *tqparent=0, const char *name=0 ); virtual ~AddTemplateDialog(); TQString templ() const; diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui index bfe5f0bb..93e72d4b 100644 --- a/parts/abbrev/addtemplatedlgbase.ui +++ b/parts/abbrev/addtemplatedlgbase.ui @@ -1,6 +1,6 @@ AddTemplateDialogBase - + AddTemplateDialog @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -43,14 +43,14 @@ Expanding - + 20 20 - + buttonOk @@ -64,7 +64,7 @@ true - + buttonCancel @@ -77,7 +77,7 @@ - + TextLabel3 @@ -88,7 +88,7 @@ editTemplate - + TextLabel4 @@ -119,19 +119,19 @@ MinimumExpanding - + 20 10 - + comboSuffixes - + labelSuffixes @@ -168,8 +168,8 @@ kdialog.h - - + + klineedit.h diff --git a/parts/abbrev/cpp_keywords b/parts/abbrev/cpp_keywords index 72d96901..e84d0cf1 100644 --- a/parts/abbrev/cpp_keywords +++ b/parts/abbrev/cpp_keywords @@ -1,9 +1,9 @@ K_DCOP k_dcop -k_dcop_signals +k_dcop_Q_SIGNALS Q_OBJECT -signals -slots +Q_SIGNALS +Q_SLOTS emit __int64 __asm__ diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 3d854ba0..4a54d195 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -90,8 +90,8 @@ #include "propeditor/propertylist.h" #include "propeditor/propertyeditor.h" -AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const char *name) - : AppWizardDialogBase(parent, name,true), m_pCurrentAppInfo(0), +AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *tqparent, const char *name) + : AppWizardDialogBase(tqparent, name,true), m_pCurrentAppInfo(0), m_profileSupport(new ProfileSupport(part)) { kdDebug( 9010 ) << " ** AppWizardDialog::AppWizardDialog()" << endl; @@ -125,7 +125,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); KStandardDirs *dirs = AppWizardFactory::instance()->dirs(); - TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString::null, false, true); + TQStringList m_templateNames = dirs->findAllResources("apptemplates", TQString(), false, true); kdDebug(9010) << "Templates: " << endl; TQStringList categories; @@ -148,7 +148,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch info->fileTemplates = templateConfig.readEntry("FileTemplates"); info->openFilesAfterGeneration = templateConfig.readListEntry("ShowFilesAfterGeneration"); TQString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir); - destDir.replace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); + destDir.tqreplace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); info->defaultDestDir = destDir; TQString category = templateConfig.readEntry("Category"); // format category to a unique status @@ -266,7 +266,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch // Insert items into list view TQPtrListIterator ait(m_appsInfo); for (; ait.current(); ++ait) { - TQListViewItem *item = m_categoryMap.find(ait.current()->category); + TQListViewItem *item = m_categoryMap.tqfind(ait.current()->category); if (item) { item = new KListViewItem(item, ait.current()->name); @@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch // How about names like "__" or "123" for project name? Are they legal? TQRegExpValidator *appname_edit_validator; appname_edit_validator = new TQRegExpValidator (appname_regexp, - appname_edit, + TQT_TQOBJECT(appname_edit), "AppNameValidator"); appname_edit->setValidator(appname_edit_validator); @@ -415,7 +415,7 @@ void AppWizardDialog::licenseChanged() for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) { TQMultiLineEdit *edit = (*it).edit; - edit->setText( TQString::null ); + edit->setText( TQString() ); } } else { KDevLicense* lic = licenses()[ license_combo->currentText() ]; @@ -486,7 +486,7 @@ void AppWizardDialog::accept() } else { - KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); + KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) ); templateArchive.close(); return; } @@ -509,7 +509,7 @@ void AppWizardDialog::accept() m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() ); m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text()); m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" ); - m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) ); + m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().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. @@ -517,7 +517,7 @@ void AppWizardDialog::accept() 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" ) + license == "TQPL" || license == "TQPL_V1_0" ) { m_pCurrentAppInfo->subMap.insert("LICENSE", license ); } @@ -543,7 +543,7 @@ void AppWizardDialog::accept() // This is too silly for words, but it's either this or reimplementing FileTemplate TQString tempProjectDomSource = "%1%2%3"; - tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() ); + tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() ); TQDomDocument tempProjectDom; tempProjectDom.setContent( tempProjectDomSource ); @@ -559,13 +559,13 @@ void AppWizardDialog::accept() temps.setEncoding(TQTextStream::UnicodeUTF8); temps << templateText; f.flush(); - TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() ); + TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() ); cleanUpSubstMap << templateName; m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) ); installFile file; file.source = tempFile->name(); - file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix ); + file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -585,8 +585,8 @@ void AppWizardDialog::accept() for( ; it != files.end(); ++it ) { installFile file; - file.source = TQString( "%{kdevelop}/template-common/%1" ).arg( *it ); - file.dest = TQString("%{dest}/%1").arg( *it ); + file.source = TQString( "%{kdevelop}/template-common/%1" ).tqarg( *it ); + file.dest = TQString("%{dest}/%1").tqarg( *it ); file.process = true; file.isXML = false; m_pCurrentAppInfo->fileList.append( file ); @@ -630,9 +630,9 @@ void AppWizardDialog::accept() for( ; mapIt != m_pCurrentAppInfo->subMap.end(); ++mapIt ) { TQString escaped( mapIt.data() ); - escaped.replace( "&", "&" ); - escaped.replace( "<", "<" ); - escaped.replace( ">", ">" ); + escaped.tqreplace( "&", "&" ); + escaped.tqreplace( "<", "<" ); + escaped.tqreplace( ">", ">" ); m_pCurrentAppInfo->subMapXML.insert( mapIt.key(), escaped ); } @@ -645,7 +645,7 @@ void AppWizardDialog::accept() { if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) ) { - KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) ); + KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) ); return; } } @@ -664,7 +664,7 @@ void AppWizardDialog::accept() } else { - KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) ); + KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) ); archive.close(); return; } @@ -682,7 +682,7 @@ void AppWizardDialog::accept() { if( !copyFile( *fileIt ) ) { - KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) ); + KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) ); return; } setPermissions(*fileIt); @@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin // ( where should we currently get that info from? ) 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) ); + KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) ); return; } setPermissions(file, dest + "/" + file->name()); @@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item) if (it == l.end()) m_lastPage = edit; fileTemplate.edit = edit; - addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix)); + addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix)); m_fileTemplates.append(fileTemplate); } licenseChanged(); // to populate the template views @@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir) 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() ), + if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ), i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes) { config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/"); @@ -968,7 +968,7 @@ void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategor TQStringList::ConstIterator it; for (it = categories.begin(); it != categories.end(); ++it) { category = category + "/" + *it; - TQListViewItem *item = m_categoryMap.find(category); + TQListViewItem *item = m_categoryMap.tqfind(category); if (!item) { // not found, create it if (!pParentItem) pParentItem = new KListViewItem(templates_listview,*it); @@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration() { KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .arg(errorLine).arg(errorCol).arg(errorMsg)); + .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); return; } @@ -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", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText())); + KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText())); if (offers.count() == 1) { KService::Ptr service = offers.first(); @@ -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/" ); - TQStringList licNames = dirs->findAllResources( "licenses", TQString::null, false, true ); + TQStringList licNames = dirs->findAllResources( "licenses", TQString(), false, true ); TQStringList::Iterator it; for (it = licNames.begin(); it != licNames.end(); ++it) { TQString licPath( dirs->findResource( "licenses", *it ) ); kdDebug(9010) << "Loading license file: " << licPath << endl; - TQString licName = licPath.mid( licPath.findRev('/') + 1 ); + TQString licName = licPath.mid( licPath.tqfindRev('/') + 1 ); KDevLicense* lic = new KDevLicense( licName, licPath ); m_licenses.insert( licName, lic ); } @@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all) TQDictIterator dit(m_categoryMap); for (; dit.current(); ++dit) { - //checking whether all children are not visible + //checking whether all tqchildren are not visible kdDebug(9010) << "check: " << dit.current()->text(0) << endl; bool visible = false; TQListViewItemIterator it(dit.current()); @@ -1342,7 +1342,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view) TQListViewItem *item = view->firstChild(); while (item) { - if (!m_categoryItems.contains(item)) + if (!m_categoryItems.tqcontains(item)) continue; checkAndHideItems(item); item = item->nextSibling(); @@ -1351,7 +1351,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view) bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) { - if (!m_categoryItems.contains(item)) + if (!m_categoryItems.tqcontains(item)) return !item->isVisible(); TQListViewItem *child = item->firstChild(); bool hide = true; @@ -1371,4 +1371,4 @@ bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) #include "appwizarddlg.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index a08206da..c63f66e1 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -121,9 +121,10 @@ struct AppWizardFileTemplate class AppWizardDialog : public AppWizardDialogBase { Q_OBJECT + TQ_OBJECT public: - AppWizardDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); + AppWizardDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 ); ~AppWizardDialog(); TQString getProjectName() { return appname_edit->text(); } TQString getProjectLocation() { return finalLoc_label->text(); } @@ -206,4 +207,4 @@ public slots: #endif -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index f6d1fa49..ab8f7af0 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -1,6 +1,6 @@ AppWizardDialogBase - + AppWizardDialogBase @@ -15,7 +15,7 @@ Create New Project - + generalPage @@ -26,11 +26,11 @@ unnamed - + templates_tabwidget - + m_allProjectsPage @@ -86,7 +86,7 @@ - + showAll_box @@ -99,7 +99,7 @@ - + m_favouritesPage @@ -127,7 +127,7 @@ - + icon_label @@ -139,13 +139,13 @@ 0 - + 250 180 - + 250 180 @@ -160,13 +160,13 @@ true - + AlignCenter - + GroupBox1 @@ -177,15 +177,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + appname_label @@ -196,7 +196,7 @@ appname_edit - + location_label @@ -207,7 +207,7 @@ dest_edit - + TextLabel3 @@ -217,9 +217,9 @@ - + - layout1 + tqlayout1 @@ -251,7 +251,7 @@ - + finalLoc_label @@ -271,7 +271,7 @@ - + desc_textview @@ -286,13 +286,13 @@ 0 - + 250 0 - + 250 32767 @@ -313,7 +313,7 @@ - + WizardPage @@ -324,7 +324,7 @@ unnamed - + projectOptions @@ -343,15 +343,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + author_label @@ -362,7 +362,7 @@ author_edit - + email_label @@ -373,7 +373,7 @@ email_edit - + version_label @@ -386,9 +386,9 @@ - + - layout8 + tqlayout8 @@ -420,9 +420,9 @@ - + - layout7 + tqlayout7 @@ -444,7 +444,7 @@ 0.1 - + license_label @@ -455,7 +455,7 @@ license_combo - + Custom @@ -479,7 +479,7 @@ - + optionsGroup @@ -491,7 +491,7 @@ 1 - + 550 270 @@ -510,7 +510,7 @@ 0 - + custom_options @@ -542,69 +542,69 @@ templates_listview - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) AppWizardDialogBase - templatesTreeViewClicked(QListViewItem*) + templatesTreeViewClicked(TQListViewItem*) author_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase textChanged() version_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase textChanged() appname_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase textChanged() appname_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase projectLocationChanged() dest_edit - urlSelected(const QString&) + urlSelected(const TQString&) AppWizardDialogBase - destButtonClicked(const QString&) + destButtonClicked(const TQString&) dest_edit - textChanged(const QString&) + textChanged(const TQString&) AppWizardDialogBase projectLocationChanged() favourites_iconview - selectionChanged(QIconViewItem*) + selectionChanged(TQIconViewItem*) AppWizardDialogBase - favouritesIconViewClicked(QIconViewItem*) + favouritesIconViewClicked(TQIconViewItem*) templates_listview - contextMenuRequested(QListViewItem*,const QPoint&,int) + contextMenuRequested(TQListViewItem*,const TQPoint&,int) AppWizardDialogBase - templatesContextMenu(QListViewItem*,const QPoint&,int) + templatesContextMenu(TQListViewItem*,const TQPoint&,int) favourites_iconview - contextMenuRequested(QIconViewItem*,const QPoint&) + contextMenuRequested(TQIconViewItem*,const TQPoint&) AppWizardDialogBase - favouritesContextMenu(QIconViewItem*,const QPoint&) + favouritesContextMenu(TQIconViewItem*,const TQPoint&) favourites_iconview - contextMenuRequested(QIconViewItem*,const QPoint&) + contextMenuRequested(TQIconViewItem*,const TQPoint&) AppWizardDialogBase - favouritesContextMenu(QIconViewItem*,const QPoint&) + favouritesContextMenu(TQIconViewItem*,const TQPoint&) showAll_box @@ -614,7 +614,7 @@ dest_edit - returnPressed(const QString&) + returnPressed(const TQString&) AppWizardDialogBase projectLocationChanged() @@ -636,20 +636,20 @@ kiconview.h kurlrequester.h - + licenseChanged() - destButtonClicked( const QString & ) + destButtonClicked( const TQString & ) projectLocationChanged() projectNameChanged() textChanged() - templatesTreeViewClicked( QListViewItem * ) - favouritesIconViewClicked( QIconViewItem * ) - templatesContextMenu( QListViewItem *, const QPoint &, int ) - favouritesContextMenu( QIconViewItem *, const QPoint & ) + templatesTreeViewClicked( TQListViewItem * ) + favouritesIconViewClicked( TQIconViewItem * ) + templatesContextMenu( TQListViewItem *, const TQPoint &, int ) + favouritesContextMenu( TQIconViewItem *, const TQPoint & ) showTemplates(bool) - - - + + + klistview.h kiconview.h diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index 6b57b320..5e324b8a 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -34,8 +34,8 @@ #include #include -AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart") +AppWizardPart::AppWizardPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(AppWizardFactory::info(), tqparent, name ? name : "AppWizardPart") { setInstance(AppWizardFactory::instance()); setXMLFile("kdevappwizard.rc"); @@ -95,4 +95,4 @@ void AppWizardPart::openFilesAfterGeneration() #include "appwizardpart.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h index 5b434ebf..66894790 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -24,9 +24,10 @@ class AppWizardDialog; class AppWizardPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - AppWizardPart( TQObject *parent, const char *name, const TQStringList & ); + AppWizardPart( TQObject *tqparent, const char *name, const TQStringList & ); ~AppWizardPart(); void openFilesAfterGeneration(const KURL::List urlsToOpen); diff --git a/parts/appwizard/common/COPYING.LIB b/parts/appwizard/common/COPYING.LIB index 789c31ee..271a81c9 100644 --- a/parts/appwizard/common/COPYING.LIB +++ b/parts/appwizard/common/COPYING.LIB @@ -123,7 +123,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/parts/appwizard/common/gnome/macros/autogen.sh b/parts/appwizard/common/gnome/macros/autogen.sh index 70273913..33acff24 100644 --- a/parts/appwizard/common/gnome/macros/autogen.sh +++ b/parts/appwizard/common/gnome/macros/autogen.sh @@ -79,7 +79,7 @@ xlc ) am_opt=--include-deps;; esac -for coin in `find $srcdir -name configure.in -print` +for coin in `tqfind $srcdir -name configure.in -print` do dr=`dirname $coin` if test -f $dr/NO-AUTO-GEN; then diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4 index 3dd4ffaa..21d90b01 100644 --- a/parts/appwizard/common/gnome/macros/curses.m4 +++ b/parts/appwizard/common/gnome/macros/curses.m4 @@ -11,7 +11,7 @@ dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 index 7c11a785..5c9f976f 100644 --- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 @@ -38,7 +38,7 @@ fi list_mounted_fs= # If the getmntent function is available but not in the standard library, -# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). +# make sure LIBS tqcontains -lsun (on Irix4) or -lseq (on PTX). AC_FUNC_GETMNTENT # This test must precede the ones for getmntent because Unicos-9 is diff --git a/parts/appwizard/common/gnome2/macros/autogen.sh b/parts/appwizard/common/gnome2/macros/autogen.sh index ac9e0b68..9cd3c7fe 100755 --- a/parts/appwizard/common/gnome2/macros/autogen.sh +++ b/parts/appwizard/common/gnome2/macros/autogen.sh @@ -216,7 +216,7 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false -configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`" +configure_files="`tqfind $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`" for configure_ac in $configure_files; do if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null; then want_libtool=true diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4 index 5307e13d..d7beb9bf 100644 --- a/parts/appwizard/common/gnome2/macros/curses.m4 +++ b/parts/appwizard/common/gnome2/macros/curses.m4 @@ -11,7 +11,7 @@ dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index 1d9f4294..494d04c6 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -247,7 +247,7 @@ main: .prologue 1 .long 0x47e03d80 # implver \$0 lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 + .long 0x47e20c21 # atqmask \$2,\$1 lda \$16,\$Lformat mov \$0,\$17 not \$1,\$18 @@ -1135,7 +1135,7 @@ EOF echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to tqfind `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx exit 0 ;; diff --git a/parts/appwizard/common/incadmin/install-sh b/parts/appwizard/common/incadmin/install-sh index 36f96f3e..f811e309 100755 --- a/parts/appwizard/common/incadmin/install-sh +++ b/parts/appwizard/common/incadmin/install-sh @@ -126,7 +126,7 @@ else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. +# if $src (and thus $dsttmp) tqcontains '*'. if [ -f "$src" ] || [ -d "$src" ] then diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 3506ead3..8f29b4b9 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -1306,7 +1306,7 @@ func_mode_compile () elif test "$need_locks" = warn; then if test -f "$lockfile"; then $ECHO "\ -*** ERROR, $lockfile exists and contains: +*** ERROR, $lockfile exists and tqcontains: `cat $lockfile 2>/dev/null` This indicates that another process is trying to use the same @@ -1358,7 +1358,7 @@ compiler." if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ -*** ERROR, $lockfile contains: +*** ERROR, $lockfile tqcontains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1407,7 +1407,7 @@ compiler." if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ -*** ERROR, $lockfile contains: +*** ERROR, $lockfile tqcontains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1674,7 +1674,7 @@ func_mode_execute () dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'" fi fi ;; @@ -2062,7 +2062,7 @@ func_mode_install () if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, + # the symlink we tqreplace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname do @@ -2684,7 +2684,7 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`tqfind $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" @@ -3400,7 +3400,7 @@ EOF newargz = XMALLOC (char *, argc + 1); tmp_pathspec = find_executable (argv[0]); if (tmp_pathspec == NULL) - lt_fatal ("Couldn't find %s", argv[0]); + lt_fatal ("Couldn't tqfind %s", argv[0]); LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", tmp_pathspec)); @@ -4565,7 +4565,7 @@ func_mode_link () continue ;; - # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. -model|-arch|-isysroot) @@ -7843,7 +7843,7 @@ EOF func_emit_cwrapperexe_src > $cwrappersource # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- + # because it tqcontains $host paths and files. If cross- # compiling, it, like the target executable, must be # executed on the $host or under an emulation environment. $opt_dry_run || { @@ -8339,7 +8339,7 @@ func_mode_uninstall () func_source $dir/$noexename fi - # note $name still contains .exe if it was in $file originally + # note $name still tqcontains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then diff --git a/parts/appwizard/common/incadmin/missing b/parts/appwizard/common/incadmin/missing index 2c025eb6..a311c33a 100755 --- a/parts/appwizard/common/incadmin/missing +++ b/parts/appwizard/common/incadmin/missing @@ -150,7 +150,7 @@ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | + tqfind . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | while read f; do touch "$f"; done ;; diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook index 036d8dba..b84a9430 100644 --- a/parts/appwizard/common/kde-index.docbook +++ b/parts/appwizard/common/kde-index.docbook @@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex should consult the docbook reference for further details. The example below was taken from that reference and shortened a bit for readability. --> - + XtUnmanageChildren Xt - Geometry Management @@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. --> XtUnmanageChildren -remove a list of children from a parent widget's managed +remove a list of tqchildren from a tqparent widget's managed list. -widgetsremoving -XtUnmanageChildren +widgetsremoving +XtUnmanageChildren @@ -277,16 +277,16 @@ list. 4 March 1996 -void XtUnmanageChildren(children, num_children) - WidgetList children; - Cardinal num_children; +void XtUnmanageChildren(tqchildren, num_tqchildren) + WidgetList tqchildren; + Cardinal num_tqchildren; - + Inputs -children +tqchildren Specifies an array of child widgets. Each child must be of @@ -295,40 +295,40 @@ class RectObj or any subclass thereof. -num_children +num_tqchildren -Specifies the number of elements in children. +Specifies the number of elements in tqchildren. - + Description XtUnmanageChildren() unmaps the specified widgets -and removes them from their parent's geometry management. +and removes them from their tqparent's tqgeometry management. The widgets will disappear from the screen, and (depending -on its parent) may no longer have screen space allocated for +on its tqparent) may no longer have screen space allocated for them. -Each of the widgets in the children array must have -the same parent. +Each of the widgets in the tqchildren array must have +the same tqparent. See the “Algorithm” section below for full details of the widget unmanagement procedure. - + Usage Unmanaging widgets is the usual method for temporarily making them invisible. They can be re-managed with XtManageChildren(). -You can unmap a widget, but leave it under geometry +You can unmap a widget, but leave it under tqgeometry management by calling XtUnmapWidget(). You can destroy a widget's window without destroying the widget by calling XtUnrealizeWidget(). You can destroy a @@ -340,12 +340,12 @@ often more convenient to call XtUnmanageChild() several times than it is to declare and initialize an array of widgets to pass to XtUnmanageChildren(). Calling XtUnmanageChildren() is more efficient, however, -because it only calls the parent's change_managed() +because it only calls the tqparent's change_managed() method once. - + Algorithm XtUnmanageChildren() performs the following: @@ -374,11 +374,11 @@ by unmapping it. - + Structures The WidgetList type is simply an array of widgets: -typedef Widget *WidgetList; +typedef Widget *WidgetList; diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index bea63d4e..b0e51997 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -81,7 +81,7 @@ def detect_kde(env): env.Exit(1) env['QTDIR'] = qtdir.strip() - ## Find the necessary programs uic and moc + ## Find the necessary programs uic and tqmoc print "Checking for uic : ", uic = qtdir + "/bin/uic" if os.path.isfile(uic): @@ -99,33 +99,33 @@ def detect_kde(env): env.Exit(1) env['QT_UIC'] = uic - print "Checking for moc : ", - moc = qtdir + "/bin/moc" - if os.path.isfile(moc): - print GREEN + "moc was found as " + moc + NORMAL + print "Checking for tqmoc : ", + tqmoc = qtdir + "/bin/tqmoc" + if os.path.isfile(tqmoc): + print GREEN + "tqmoc was found as " + tqmoc + NORMAL else: - moc = os.popen("which moc 2>/dev/null").read().strip() - if len(moc): - print YELLOW + "moc was found as " + moc + NORMAL - elif os.path.isfile("/usr/share/qt3/bin/moc"): - moc = "/usr/share/qt3/bin/moc" - print YELLOW + "moc was found as " + moc + NORMAL + tqmoc = os.popen("which tqmoc 2>/dev/null").read().strip() + if len(tqmoc): + print YELLOW + "tqmoc was found as " + tqmoc + NORMAL + elif os.path.isfile("/usr/share/qt3/bin/tqmoc"): + tqmoc = "/usr/share/qt3/bin/tqmoc" + print YELLOW + "tqmoc was found as " + tqmoc + NORMAL else: - print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL + print RED + "tqmoc was not found - set QTDIR or put it in your PATH ?" + NORMAL env.Exit(1) - env['QT_MOC'] = moc + env['QT_TQMOC'] = tqmoc ## check for the qt and kde includes print "Checking for the qt includes : ", - if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"): + if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"): # The user told where to look for and it looks valid print GREEN + "ok " + qtincludes + NORMAL else: - if os.path.isfile(qtdir + "/include/qlayout.h"): + if os.path.isfile(qtdir + "/include/qtqlayout.h"): # Automatic detection print GREEN + "ok " + qtdir + "/include/ " + NORMAL qtincludes = qtdir + "/include/" - elif os.path.isfile("/usr/include/qt3/qlayout.h"): + elif os.path.isfile("/usr/include/qt3/qtqlayout.h"): # Debian probably print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL qtincludes = "/usr/include/qt3" @@ -157,8 +157,8 @@ def detect_kde(env): if not libdir: libdir=execprefix+"/lib"+libsuffix - subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir) - debian_fix = lambda x: x.replace('/usr/share', '${datadir}') + subst_vars = lambda x: x.tqreplace('${exec_prefix}', execprefix).tqreplace('${datadir}',datadir).tqreplace('${libdir}', libdir) + debian_fix = lambda x: x.tqreplace('/usr/share', '${datadir}') env['KDEBIN'] = subst_vars(os.popen('kde-config --install exe').read().strip()) env['KDEAPPS'] = subst_vars(os.popen('kde-config --install apps').read().strip()) env['KDEDATA'] = subst_vars(os.popen('kde-config --install data').read().strip()) @@ -204,7 +204,7 @@ def detect_kde(env): env['QTLIBPATH']=qtlibs def generate(env): - """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ + """"Set up the qt and kde environment and builders - the tqmoc part is difficult to understand """ if env['HELP']: print """ """+BOLD+"""*** KDE options *** @@ -270,7 +270,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt # The following is kind of hacky to get builders working properly (FIXME) ?? objBuilderEnv = objBuilder.env objBuilder.env = env - mocBuilderEnv = env.Moc.env + tqmocBuilderEnv = env.Moc.env env.Moc.env = env # make a deep copy for the result; MocH objects will be appended @@ -323,22 +323,22 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if not h and qtdebug: print "scons: qt: no header for '%s'." % (str(cpp)) if h and q_object_search.search(h_contents): - # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file - moc_cpp = None + # h file with the Q_OBJECT macro found -> add .tqmoc or _tqmoc.cpp file + tqmoc_cpp = None - if env.has_key('NOMOCSCAN'): - moc_cpp = env.Moc(h) + if env.has_key('NOTQMOCSCAN'): + tqmoc_cpp = env.Moc(h) else: - reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)' + reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.tqmoc("|>)' meta_object_search = re.compile(reg) if meta_object_search.search(cpp_contents): - moc_cpp = env.Moc(h) + tqmoc_cpp = env.Moc(h) else: - moc_cpp = env.Moccpp(h) - moc_o = objBuilder(moc_cpp) - out_sources.append(moc_o) + tqmoc_cpp = env.Moccpp(h) + tqmoc_o = objBuilder(tqmoc_cpp) + out_sources.append(tqmoc_o) if qtdebug: - print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])) + print "scons: qt: found Q_OBJECT macro in '%s', tqmoc'ing to '%s'" % (str(h), str(tqmoc_cpp[0])) if cpp and q_object_search.search(cpp_contents): print "error, bksys cannot handle cpp files with Q_OBJECT classes" @@ -347,7 +347,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt # restore the original env attributes (FIXME) objBuilder.env = objBuilderEnv - env.Moc.env = mocBuilderEnv + env.Moc.env = tqmocBuilderEnv return (target, out_sources) @@ -368,8 +368,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ('QTDIR', 'root of qt directory'), ('QTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), - ('QT_UIC', 'moc directory'), - ('QT_MOC', 'moc executable command'), + ('QT_UIC', 'tqmoc directory'), + ('QT_TQMOC', 'tqmoc executable command'), ('QTPLUGINS', 'uic executable command'), ('KDEDIR', 'root of kde directory'), ('KDELIBPATH', 'path to the kde libs'), @@ -412,8 +412,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLSUFFIX'] = '.cpp' - env['QT_MOCHPREFIX'] = '' - env['QT_MOCHSUFFIX'] = '.moc' + env['QT_TQMOCHPREFIX'] = '' + env['QT_TQMOCHSUFFIX'] = '.tqmoc' env['KDE_KCFG_IMPLPREFIX'] = '' env['KDE_KCFG_IMPL_HSUFFIX'] = '.h' env['KDE_KCFG_IMPL_CSUFFIX'] = '.cpp' @@ -424,10 +424,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## ui file processing def uic_processing(target, source, env): inc_kde = '#include \n#include \n' - inc_moc = '#include "%s"\n' % target[2].name + inc_tqmoc = '#include "%s"\n' % target[2].name comp_h = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path) comp_c = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path) - comp_moc = '$QT_MOC -o %s %s' % (target[2].path, target[0].path) + comp_tqmoc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path) ret = env.Execute(comp_h) if ret: @@ -442,10 +442,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return ret dest = open( target[1].path, "a" ) - dest.write(inc_moc) + dest.write(inc_tqmoc) dest.close() - ret = env.Execute( comp_moc ) + ret = env.Execute( comp_tqmoc ) return ret def uicEmitter(target, source, env): @@ -459,10 +459,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env.subst('$QT_UICIMPLPREFIX'), env.subst('$QT_UICIMPLSUFFIX'))) if len(target) < 3: - # third target is .moc file + # third target is .tqmoc file target.append(adjustixes(bs, - env.subst('$QT_MOCHPREFIX'), - env.subst('$QT_MOCHSUFFIX'))) + env.subst('$QT_TQMOCHPREFIX'), + env.subst('$QT_TQMOCHSUFFIX'))) return target, source UIC_BUILDER = Builder( @@ -471,17 +471,17 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt suffix = '.h', src_suffix = '.ui') - ## moc file processing - env['QT_MOCCOM'] = ('$QT_MOC -o ${TARGETS[0]} $SOURCE') + ## tqmoc file processing + env['QT_TQMOCCOM'] = ('$QT_TQMOC -o ${TARGETS[0]} $SOURCE') - MOC_BUILDER = Builder( - action = '$QT_MOCCOM', - suffix = '.moc', + TQMOC_BUILDER = Builder( + action = '$QT_TQMOCCOM', + suffix = '.tqmoc', src_suffix = '.h') - MOCCPP_BUILDER = Builder( - action = '$QT_MOCCOM', - suffix = '_moc.cpp', + TQMOCCPP_BUILDER = Builder( + action = '$QT_TQMOCCOM', + suffix = '_tqmoc.cpp', src_suffix = '.h') ## kcfg file processing @@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt def dcopGenerator(target, source, env, for_signature): act=[] act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)') - act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path) + act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path) return act def dcopEmitter(target, source, env): @@ -576,8 +576,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## register the builders env['BUILDERS']['Uic'] = UIC_BUILDER - env['BUILDERS']['Moc'] = MOC_BUILDER - env['BUILDERS']['Moccpp'] = MOCCPP_BUILDER + env['BUILDERS']['Moc'] = TQMOC_BUILDER + env['BUILDERS']['Moccpp'] = TQMOCCPP_BUILDER env['BUILDERS']['Dcop'] = DCOP_BUILDER env['BUILDERS']['Kcfg'] = KCFG_BUILDER env['BUILDERS']['LaFile'] = LA_BUILDER @@ -596,7 +596,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt static_obj.src_builder.append('Transfiles') shared_obj.src_builder.append('Transfiles') - ## Find the files to moc, dcop, and link against kde and qt + ## Find the files to tqmoc, dcop, and link against kde and qt env.AppendUnique(PROGEMITTER = [MetasourcesStatic], SHLIBEMITTER=[MetasourcesShared], LIBEMITTER =[MetasourcesStatic]) ## Handy helpers for building kde programs @@ -631,9 +631,9 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if ext in skel_ext: lenv.Dcop(bs+'.h') src.append(bs+'_skel.cpp') - elif ext == ".moch": + elif ext == ".tqmoch": lenv.Moccpp(bs+'.h') - src.append(bs+'_moc.cpp') + src.append(bs+'_tqmoc.cpp') else: src.append(file) diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp index e7436d04..1ec0b6df 100644 --- a/parts/appwizard/filepropspage.cpp +++ b/parts/appwizard/filepropspage.cpp @@ -7,11 +7,11 @@ #include /* - * Constructs a FilePropsPage which is a child of 'parent', with the + * Constructs a FilePropsPage which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -FilePropsPage::FilePropsPage( TQWidget* parent, const char* name, WFlags fl ) - : FilePropsPageBase( parent, name, fl ){ +FilePropsPage::FilePropsPage( TQWidget* tqparent, const char* name, WFlags fl ) + : FilePropsPageBase( tqparent, name, fl ){ m_props = new TQPtrList; m_current_class = 9999; // no current } @@ -21,7 +21,7 @@ FilePropsPage::FilePropsPage( TQWidget* parent, const char* name, WFlags fl ) */ FilePropsPage::~FilePropsPage() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h index a0c923ed..adb8f758 100644 --- a/parts/appwizard/filepropspage.h +++ b/parts/appwizard/filepropspage.h @@ -20,9 +20,10 @@ class ClassFileProp { class FilePropsPage : public FilePropsPageBase { Q_OBJECT + TQ_OBJECT public: - FilePropsPage( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + FilePropsPage( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~FilePropsPage(); void setClassFileProps(TQPtrList props,bool different_header_impl=true); TQPtrList getClassFileProps(); diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui index 2137d685..844e889f 100644 --- a/parts/appwizard/filepropspagebase.ui +++ b/parts/appwizard/filepropspagebase.ui @@ -1,6 +1,6 @@ FilePropsPageBase - + Form1 @@ -16,7 +16,7 @@ unnamed - + GroupBox7 @@ -27,7 +27,7 @@ unnamed - + TextLabel1_2 @@ -40,7 +40,7 @@ classname_edit - + TextLabel2_2 @@ -58,7 +58,7 @@ headerfile_edit - + implfile_label @@ -66,7 +66,7 @@ Implementation file: - + headerfile_label @@ -81,7 +81,7 @@ - + TextLabel5 @@ -89,7 +89,7 @@ Classes: - + TextLabel6 @@ -97,7 +97,7 @@ Description: - + classes_listbox @@ -110,7 +110,7 @@ - + desc_textview @@ -153,12 +153,12 @@ kdialog.h - + slotSelectionChanged() slotClassnameChanged(const QString&) - - - + + + klineedit.h klineedit.h diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 9cb9838a..b2beb660 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -51,8 +51,8 @@ #include "misc.h" -ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *name) - : ImportDialogBase(parent, name, true), m_part(part) +ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *tqparent, const char *name) + : ImportDialogBase(tqparent, name, true), m_part(part) { TQString author, email; AppWizardUtil::guessAuthorAndEmail(&author, &email); @@ -62,7 +62,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na urlinput_edit->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly); KStandardDirs *dirs = AppWizardFactory::instance()->dirs(); - importNames = dirs->findAllResources("appimports", TQString::null, false, true); + importNames = dirs->findAllResources("appimports", TQString(), false, true); importNames.sort(); TQStringList::ConstIterator it; @@ -101,7 +101,7 @@ ImportDialog::~ImportDialog() void ImportDialog::slotProjectNameChanged( const TQString &_text ) { - ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( TQRegExp("\\s") ) ); + ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().tqcontains( TQRegExp("\\s") ) ); } void ImportDialog::accept() @@ -151,7 +151,7 @@ void ImportDialog::accept() { KMessageBox::sorry( 0, i18n("This is not a valid project file.\n" "XML error in line %1, column %2:\n%3") - .arg(errorLine).arg(errorCol).arg(errorMsg)); + .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg)); return; } @@ -204,9 +204,9 @@ void ImportDialog::accept() // // while (!srcstream.atEnd()) { // TQString line = srcstream.readLine(); -// line.replace(TQRegExp("\\$APPNAMELC\\$"), projectName); -// line.replace(TQRegExp("\\$AUTHOR\\$"), author); -// line.replace(TQRegExp("\\$EMAIL\\$"), email); +// line.tqreplace(TQRegExp("\\$APPNAMELC\\$"), projectName); +// line.tqreplace(TQRegExp("\\$AUTHOR\\$"), author); +// line.tqreplace(TQRegExp("\\$EMAIL\\$"), email); // deststream << line << endl; // } // @@ -260,7 +260,7 @@ void ImportDialog::dirChanged() if (!dir.exists()) return; - if ( dirName.contains( TQRegExp("\\s") ) ) + if ( dirName.tqcontains( TQRegExp("\\s") ) ) { ok_button->setEnabled( false ); return; @@ -290,12 +290,12 @@ void ImportDialog::dirChanged() } // Remove any characters from the dirName that would be invalid in a project name - TQString projectName(dir.dirName().replace(TQRegExp("[^a-zA-Z0-9_]"), "_")); + TQString projectName(dir.dirName().tqreplace(TQRegExp("[^a-zA-Z0-9_]"), "_")); // Set the project name name_edit->setText(projectName); - // QMake based? + // TQMake based? files = dir.entryList("*.pro"); if (!files.isEmpty()) { setProjectType("qtqmake"); @@ -339,7 +339,7 @@ void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName) name_edit->setText(config.readEntry("project_name")); TQString legacyType = config.readEntry("project_type"); - if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType)) + if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").tqcontains(legacyType)) setProjectType("kde"); else if (legacyType == "normal_gnome") setProjectType("gnome"); @@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) TQFile configIn(dirName+"/configure.in"); TQFile configAc(dirName+"/configure.ac"); if (configInIn.open(IO_ReadOnly)){ - cstream.setDevice(&configInIn); + cstream.setDevice(TQT_TQIODEVICE(&configInIn)); while (!cstream.atEnd()) { TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ @@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) } if (configIn.open(IO_ReadOnly)){ - cstream.setDevice(&configIn); + cstream.setDevice(TQT_TQIODEVICE(&configIn)); } else{ if (configAc.open(IO_ReadOnly)){ - cstream.setDevice(&configAc); + cstream.setDevice(TQT_TQIODEVICE(&configAc)); } else{ return; @@ -564,7 +564,7 @@ void ImportDialog::createProjectInfrastructure( ) 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?"), TQString::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(), i18n("Generate"), i18n("Do Not Generate")) == KMessageBox::No) return; } diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h index 35772133..aa7721e3 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -28,9 +28,10 @@ struct InfrastructureCmd{ class ImportDialog : public ImportDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportDialog( AppWizardPart *part, TQWidget *parent=0, const char *name=0 ); + ImportDialog( AppWizardPart *part, TQWidget *tqparent=0, const char *name=0 ); ~ImportDialog(); protected: diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index 101c8c58..134d7c51 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -1,6 +1,6 @@ ImportDialogBase - + import_dialog @@ -19,7 +19,7 @@ unnamed - + dir_label @@ -30,7 +30,7 @@ urlinput_edit - + vcsCombo @@ -46,7 +46,7 @@ - + fetchModuleButton @@ -68,7 +68,7 @@ false - + textLabel1 @@ -82,7 +82,7 @@ vcsCombo - + name_label @@ -106,7 +106,7 @@ - + Layout1 @@ -127,14 +127,14 @@ Expanding - + 20 20 - + ok_button @@ -145,7 +145,7 @@ true - + cancel_button @@ -155,7 +155,7 @@ - + project_combo @@ -168,7 +168,7 @@ - + project_label @@ -208,14 +208,14 @@ Expanding - + 20 20 - + TextLabel5 @@ -276,14 +276,14 @@ will be the author, everything between Minimum - + 20 20 - + author_label @@ -294,7 +294,7 @@ will be the author, everything between author_edit - + infrastructureBox @@ -349,14 +349,14 @@ will be the author, everything between kdialog.h - + dirButtonClicked() dirChanged() projectTypeChanged(const QString &) projectTypeChanged(int) - - - + + + kurlrequester.h klineedit.h diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp index 5e189422..688c3177 100644 --- a/parts/appwizard/kdevlicense.cpp +++ b/parts/appwizard/kdevlicense.cpp @@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const strFill + " * $EMAIL$ *\n" + strFill + " * *\n"; -// str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67); +// str = str.tqarg(TQDate::tqcurrentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67); TQStringList::Iterator it; for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it ) { - str += TQString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 ); + str += TQString( "%1 * %2 *\n").tqarg( strFill ).tqarg( *it, -69 ); } str += strFill + " ***************************************************************************/\n"; @@ -87,28 +87,28 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const return str; case KDevFile::PascalStyle: - str.replace(TQRegExp("/\\**\n \\*"), "{\n "); - str.replace(TQRegExp("\\*\n \\*"), " \n "); - str.replace(TQRegExp(" *\\**/\n"), "}\n"); + str.tqreplace(TQRegExp("/\\**\n \\*"), "{\n "); + str.tqreplace(TQRegExp("\\*\n \\*"), " \n "); + str.tqreplace(TQRegExp(" *\\**/\n"), "}\n"); return str; case KDevFile::AdaStyle: - str.replace(TQRegExp("/\\*"), "--"); - str.replace(TQRegExp(" \\*"), "--"); - str.replace(TQRegExp("\\*/"), "*"); + str.tqreplace(TQRegExp("/\\*"), "--"); + str.tqreplace(TQRegExp(" \\*"), "--"); + str.tqreplace(TQRegExp("\\*/"), "*"); return str; case KDevFile::BashStyle: - str.replace(TQRegExp("\\*|/"), "#"); - str.replace(TQRegExp("\n ##"), "\n##"); - str.replace(TQRegExp("\n #"), "\n# "); + str.tqreplace(TQRegExp("\\*|/"), "#"); + str.tqreplace(TQRegExp("\n ##"), "\n##"); + str.tqreplace(TQRegExp("\n #"), "\n# "); return str; case KDevFile::XMLStyle: - str.replace(TQRegExp("/\\*"), "\n"); - str.replace(TQRegExp("\\*"), "_"); + str.tqreplace(TQRegExp("/\\*"), "\n"); + str.tqreplace(TQRegExp("\\*"), "_"); return str; } diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 084156f5..8ae4d85e 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -26,9 +26,9 @@ #include -ProfileSupport::ProfileSupport(KDevPlugin *parent) +ProfileSupport::ProfileSupport(KDevPlugin *tqparent) { - KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard"); + KURL::List resources = tqparent->pluginController()->profileResourcesRecursive("*.appwizard"); for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it) { @@ -40,5 +40,5 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent) bool ProfileSupport::isInTemplateList(const TQString &templateUrl) { - return m_templateList.contains(TQFileInfo(templateUrl).baseName()); + return m_templateList.tqcontains(TQFileInfo(templateUrl).baseName()); } diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h index b18a9620..bc98d981 100644 --- a/parts/appwizard/profilesupport.h +++ b/parts/appwizard/profilesupport.h @@ -24,7 +24,7 @@ class ProfileSupport{ public: - ProfileSupport(KDevPlugin *parent); + ProfileSupport(KDevPlugin *tqparent); bool isInTemplateList(const TQString &templateUrl); private: diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui index 27075a88..a8433bbf 100644 --- a/parts/appwizard/vcs_form.ui +++ b/parts/appwizard/vcs_form.ui @@ -1,6 +1,6 @@ VcsForm - + VcsForm @@ -19,11 +19,11 @@ unnamed - + stack - + page @@ -32,7 +32,7 @@ - + textLabel1 @@ -43,7 +43,7 @@ combo - + combo @@ -58,7 +58,7 @@ Expanding - + 110 20 @@ -76,9 +76,9 @@ - qwidgetstack.h + tqwidgetstack.h kdialog.h - - + + diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index f89c2b95..de7153c1 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -36,15 +36,15 @@ static const KDevPluginInfo data("kdevastyle"); namespace { - const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; + const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.tqmoc,*.patch,*.tlh,*.xpm"; } typedef KDevGenericFactory AStyleFactory; K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) -AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) - : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") +AStylePart::AStylePart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevSourceFormatter(&data, tqparent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); @@ -193,21 +193,21 @@ void AStylePart::beautifySource() if (m_project["Fill"].toString() == "Tabs") { // tabs and wsCount spaces to be a tab - TQString replace; + TQString tqreplace; for (int i =0;iurl().path(); - int pos = extension.findRev ( '.' ); + int pos = extension.tqfindRev ( '.' ); if ( pos >= 0 ) { extension = extension.mid ( pos ); - enabled = ( m_searchExtensions.find ( extension ) != m_searchExtensions.end() ); + enabled = ( m_searchExtensions.tqfind ( extension ) != m_searchExtensions.end() ); } } else @@ -400,7 +400,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) { popup->insertSeparator(); int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) ); - popup->setWhatsThis(id, i18n("Format

Formats the current selection, if possible")); + popup->TQMenuData::setWhatsThis(id, i18n("Format

Formats the current selection, if possible")); } else if ( context->hasType( Context::FileContext )){ const FileContext *ctx = static_cast(context); @@ -408,7 +408,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) ); - popup->setWhatsThis(id, i18n("Format files

Formats selected files if possible")); + popup->TQMenuData::setWhatsThis(id, i18n("Format files

Formats selected files if possible")); } } @@ -436,7 +436,7 @@ void AStylePart::restorePartialProjectSession(const TQDomElement * el) if ( ext.isEmpty()){ ext=defaultFormatExtensions; } - setExtensions(ext.replace(TQChar(','), TQChar('\n')),false); + setExtensions(ext.tqreplace(TQChar(','), TQChar('\n')),false); } } @@ -464,7 +464,7 @@ void AStylePart::savePartialProjectSession(TQDomElement * el) void AStylePart::formatFilesSelect(){ m_urls.clear(); - TQStringList filenames = KFileDialog::getOpenFileNames ( TQString::null, getProjectExtensions(),0,"Select files to format" ); + TQStringList filenames = KFileDialog::getOpenFileNames ( TQString(), getProjectExtensions(),0,"Select files to format" ); for(TQStringList::Iterator it = filenames.begin(); it != filenames.end();it++){ m_urls << *it; @@ -531,7 +531,7 @@ void AStylePart::formatFiles() } if ( processed != 0 ) { - KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).arg ( processed ).arg(getProjectExtensions().stripWhiteSpace()) ); + KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).tqarg ( processed ).tqarg(getProjectExtensions().stripWhiteSpace()) ); } m_urls.clear(); diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index 0711a338..b805b0b2 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -23,10 +23,11 @@ class ConfigWidgetProxy; class AStylePart : public KDevSourceFormatter { Q_OBJECT + TQ_OBJECT public: - AStylePart(TQObject *parent, const char *name, const TQStringList &); + AStylePart(TQObject *tqparent, const char *name, const TQStringList &); ~AStylePart(); TQString formatSource(const TQString text, AStyleWidget * widget, const TQMap& options); diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index 0cb26abb..49177eb2 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -13,8 +13,8 @@ #include -AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name) - : AStyleConfig(parent, name), m_part(part), isGlobalWidget(global) +AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *tqparent, const char *name) + : AStyleConfig(tqparent, name), m_part(part), isGlobalWidget(global) { // which style changed - disable the other pages. connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged())); diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index 0d379fc0..2a6bf85e 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -10,10 +10,11 @@ class KDevPart; class AStyleWidget : public AStyleConfig { Q_OBJECT + TQ_OBJECT public: - AStyleWidget( AStylePart * part, bool global, TQWidget *parent=0, const char *name=0 ); + AStyleWidget( AStylePart * part, bool global, TQWidget *tqparent=0, const char *name=0 ); ~AStyleWidget(); diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui index 38063bb6..64788d4a 100644 --- a/parts/astyle/astyleconfig.ui +++ b/parts/astyle/astyleconfig.ui @@ -1,6 +1,6 @@ AStyleConfig - + AStyleConfig @@ -27,7 +27,7 @@ unnamed - + ConfigTabs @@ -39,7 +39,7 @@ 0 - + tab @@ -50,7 +50,7 @@ unnamed - + StyleGroup @@ -62,13 +62,13 @@ 0 - + 350 0 - + 400 32767 @@ -81,7 +81,7 @@ unnamed - + Style_UserDefined @@ -98,7 +98,7 @@ Select options from other tabs. - + Style_ANSI @@ -118,7 +118,7 @@ Indent Switch=false Indent NameSpace=false - + Style_KR @@ -138,7 +138,7 @@ Indent Namespaces=false - + Style_Linux @@ -158,7 +158,7 @@ Indent Switch=false Indent NameSpace=false - + Style_GNU @@ -179,7 +179,7 @@ Indent Switch=false Indent NameSpace=false - + Style_JAVA @@ -198,7 +198,7 @@ Indent Bracket=false Indent Switch=false - + Style_Global @@ -215,7 +215,7 @@ Settings/Configure Kdevelop/Formatting. - + FrameFilesFormat @@ -234,7 +234,7 @@ Settings/Configure Kdevelop/Formatting. unnamed - + GeneralExtension @@ -254,7 +254,7 @@ Settings/Configure Kdevelop/Formatting. *.cc *.hh *.c++ *.h++ *.inl *.tlh -*.moc *.xpm +*.tqmoc *.xpm *.diff *.patch *.java @@ -278,7 +278,7 @@ Can use * on its own for any file. - + tab @@ -289,11 +289,11 @@ Can use * on its own for any file. unnamed - + FillingGroup - + 400 32767 @@ -309,7 +309,7 @@ Can use * on its own for any file. 20 - + Fill_EmptyLines @@ -320,15 +320,15 @@ Can use * on its own for any file. Fill empty lines with the white space of their previous lines. - + - layout2 + tqlayout2 unnamed - + Fill_Tabs @@ -339,7 +339,7 @@ Can use * on its own for any file. true - + Fill_SpaceCount @@ -356,7 +356,7 @@ Can use * on its own for any file. Number of spaces to use per indent. - + Fill_ConvertTabs @@ -380,14 +380,14 @@ Can use * on its own for any file. Expanding - + 34 21 - + Fill_Spaces @@ -398,7 +398,7 @@ Can use * on its own for any file. &Use spaces: - + Fill_TabCount @@ -416,7 +416,7 @@ Can use * on its own for any file. The number of spaces per tab is controled by the editor. - + Fill_ForceTabs @@ -440,7 +440,7 @@ The number of spaces per tab is controled by the editor. Expanding - + 21 21 @@ -451,11 +451,11 @@ The number of spaces per tab is controled by the editor. - + BracketGroup - + 400 32767 @@ -471,15 +471,15 @@ The number of spaces per tab is controled by the editor. 20 - + - layout2 + tqlayout2 unnamed - + Brackets_None @@ -493,7 +493,7 @@ The number of spaces per tab is controled by the editor. The brackets will not be changed. - + Brackets_Break @@ -507,7 +507,7 @@ The number of spaces per tab is controled by the editor. Break brackets from pre-block code (i.e. ANSI C/C++ style). - + Brackets_Attach @@ -519,7 +519,7 @@ The number of spaces per tab is controled by the editor. See also Formatting/Blocks/Break if-else - + Brackets_Linux @@ -533,7 +533,7 @@ but attach brackets to pre-block command statements. - + Brackets_CloseHeaders @@ -552,7 +552,7 @@ from their immediately preceding closing brackets. - + tab @@ -563,11 +563,11 @@ from their immediately preceding closing brackets. unnamed - + ContinueationGroup - + 400 32767 @@ -580,7 +580,7 @@ from their immediately preceding closing brackets. unnamed - + Continue_MaxStatement @@ -592,7 +592,7 @@ from their immediately preceding closing brackets. relative to the previous line. - + TextLabel2 @@ -604,7 +604,7 @@ relative to the previous line. relative to the previous line. - + TextLabel3 @@ -616,7 +616,7 @@ relative to the previous line. belonging to a conditional header. - + Continue_MinConditional @@ -636,11 +636,11 @@ belonging to a conditional header. - + IndentGroup - + 400 32767 @@ -653,7 +653,7 @@ belonging to a conditional header. unnamed - + Indent_Switches @@ -665,7 +665,7 @@ belonging to a conditional header. headers are indented in relation to the switch block. - + Indent_Cases @@ -677,7 +677,7 @@ headers are indented in relation to the switch block. Case statements not enclosed in blocks are NOT indented. - + Indent_Classes @@ -690,7 +690,7 @@ Case statements not enclosed in blocks are NOT indented. relation to the class block. - + Indent_Brackets @@ -701,7 +701,7 @@ relation to the class block. Add extra indentation to '{' and '}' block brackets. - + Indent_Namespaces @@ -712,7 +712,7 @@ relation to the class block. Indent the contents of namespace blocks. - + Indent_Labels @@ -728,7 +728,7 @@ the current indentation level, rather than being flushed completely to the left (which is the default). - + Indent_Blocks @@ -739,7 +739,7 @@ flushed completely to the left (which is the default). Add extra indentation entire blocks (including brackets). - + Indent_Preprocessors @@ -757,7 +757,7 @@ flushed completely to the left (which is the default). - + tab @@ -768,11 +768,11 @@ flushed completely to the left (which is the default). unnamed - + BlockGroup - + 400 32767 @@ -785,7 +785,7 @@ flushed completely to the left (which is the default). unnamed - + Block_Break @@ -805,7 +805,7 @@ correctly. - + Block_BreakAll @@ -827,7 +827,7 @@ correctly. - + Block_IfElse @@ -840,11 +840,11 @@ correctly. - + PaddingGroup - + 400 32767 @@ -857,40 +857,40 @@ correctly. unnamed - + Pad_ParenthesesIn - Add spa&ces inside parentheses + Add spa&ces inside tqparentheses - Insert space padding around parenthesis on the inside only. + Insert space padding around tqparenthesis on the inside only. - + Pad_ParenthesesOut - A&dd spaces outside parentheses + A&dd spaces outside tqparentheses - Insert space padding around parenthesis on the outside only. + Insert space padding around tqparenthesis on the outside only. - + Pad_ParenthesesUn - Remove &unnecessary spaces around parentheses + Remove &unnecessary spaces around tqparentheses - Remove unnecessary space padding around parenthesis. + Remove unnecessary space padding around tqparenthesis. - + Pad_Operators @@ -905,11 +905,11 @@ There is no unpad operator option. - + OneLinersGroup - + 400 32767 @@ -922,7 +922,7 @@ There is no unpad operator option. unnamed - + Keep_Statements @@ -934,7 +934,7 @@ There is no unpad operator option. multiple single-statement lines. - + Keep_Blocks @@ -950,7 +950,7 @@ multiple single-statement lines. - + GroupBox4 @@ -969,7 +969,7 @@ multiple single-statement lines. unnamed - + StyleExample @@ -1324,9 +1324,9 @@ multiple single-statement lines. kdialog.h - + allFiles() - - - + + + diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 50830723..7646cc76 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -44,8 +44,8 @@ typedef KDevGenericFactory BookmarksFactory; static const KDevPluginInfo data("kdevbookmarks"); K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) -BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) +BookmarksPart::BookmarksPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevPlugin(&data, tqparent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); @@ -105,7 +105,7 @@ void BookmarksPart::partAdded( KParts::Part * part ) if ( setBookmarksForURL( ro_part ) ) { updateContextStringForURL( ro_part ); - if ( EditorData * data = _editorMap.find( ro_part->url().path() ) ) + if ( EditorData * data = _editorMap.tqfind( ro_part->url().path() ) ) { _widget->updateURL( data ); } @@ -124,7 +124,7 @@ void BookmarksPart::reload() { //kdDebug(0) << "BookmarksPart::reload()" << endl; - TQObject * senderobj = const_cast( sender() ); + TQObject * senderobj = TQT_TQOBJECT(const_cast( sender() )); if ( KParts::ReadOnlyPart * ro_part = dynamic_cast( senderobj ) ) { if ( partIsSane( ro_part ) ) @@ -140,10 +140,10 @@ void BookmarksPart::marksEvent() if ( ! _settingMarks ) { - TQObject * senderobj = const_cast( sender() ); + TQObject * senderobj = TQT_TQOBJECT(const_cast( sender() )); KParts::ReadOnlyPart * ro_part = dynamic_cast( senderobj ); - if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) ) + if ( partIsSane( ro_part ) && !_dirtyParts.tqcontains( ro_part ) ) { _dirtyParts.push_back( ro_part ); _marksChangeTimer->start( 1000, true ); @@ -192,7 +192,7 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el ) while ( ! bookmark.isNull() ) { TQString path = bookmark.attribute( "url" ); - if ( path != TQString::null ) + if ( path != TQString() ) { EditorData * data = new EditorData; data->url.setPath( path ); @@ -201,9 +201,9 @@ void BookmarksPart::restorePartialProjectSession( const TQDomElement * el ) while ( ! mark.isNull() ) { TQString line = mark.attribute( "line" ); - if ( line != TQString::null ) + if ( line != TQString() ) { - data->marks.append( qMakePair( line.toInt(), TQString() ) ); + data->marks.append( tqMakePair( line.toInt(), TQString() ) ); } mark = mark.nextSibling().toElement(); } @@ -242,7 +242,7 @@ void BookmarksPart::savePartialProjectSession( TQDomElement * el ) bookmark.setAttribute( "url", it.current()->url.path() ); bookmarksList.appendChild( bookmark ); - TQValueListIterator< QPair > it2 = it.current()->marks.begin(); + TQValueListIterator< TQPair > it2 = it.current()->marks.begin(); while ( it2 != it.current()->marks.end() ) { TQDomElement line = domDoc.createElement( "mark" ); @@ -273,9 +273,9 @@ void BookmarksPart::removeBookmarkForURL( KURL const & url, int line ) { //kdDebug(0) << "BookmarksPart::removeBookmarkForURL()" << endl; - if ( EditorData * data = _editorMap.find( url.path() ) ) + if ( EditorData * data = _editorMap.tqfind( url.path() ) ) { - TQValueListIterator< QPair > it = data->marks.begin(); + TQValueListIterator< TQPair > it = data->marks.begin(); while ( it != data->marks.end() ) { if ( (*it).first == line ) @@ -305,11 +305,11 @@ void BookmarksPart::updateContextStringForURL( KParts::ReadOnlyPart * ro_part ) KTextEditor::EditInterface * ed = dynamic_cast( ro_part ); - EditorData * data = _editorMap.find( ro_part->url().path() ); + EditorData * data = _editorMap.tqfind( ro_part->url().path() ); if ( ! ( data && ed ) ) return; - TQValueListIterator< QPair > it = data->marks.begin(); + TQValueListIterator< TQPair > it = data->marks.begin(); while ( it != data->marks.end() ) { (*it).second = ed->textLine( (*it).first ); @@ -343,11 +343,11 @@ bool BookmarksPart::setBookmarksForURL( KParts::ReadOnlyPart * ro_part ) _settingMarks = true; - if ( EditorData * data = _editorMap.find( ro_part->url().path() ) ) + if ( EditorData * data = _editorMap.tqfind( ro_part->url().path() ) ) { // we've seen this one before, apply stored bookmarks - TQValueListIterator< QPair > it = data->marks.begin(); + TQValueListIterator< TQPair > it = data->marks.begin(); while ( it != data->marks.end() ) { mi->addMark( (*it).first, KTextEditor::MarkInterface::markType01 ); @@ -409,7 +409,7 @@ EditorData * BookmarksPart::storeBookmarksForURL( KParts::ReadOnlyPart * ro_part if ( it.current()->type & KTextEditor::MarkInterface::markType01 ) { int line = it.current()->line; - data->marks.append( qMakePair( line, TQString() ) ); + data->marks.append( tqMakePair( line, TQString() ) ); } ++it; } @@ -479,7 +479,7 @@ KParts::ReadOnlyPart * BookmarksPart::partForURL( KURL const & url ) bool BookmarksPart::partIsSane( KParts::ReadOnlyPart * ro_part ) { return ( ro_part != 0 ) && - partController()->parts()->contains( ro_part) && + partController()->parts()->tqcontains( ro_part) && !ro_part->url().path().isEmpty(); } diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index 3f1973ca..850e1aef 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -32,7 +32,7 @@ class ConfigWidgetProxy; struct EditorData { KURL url; - TQValueList< QPair > marks; + TQValueList< TQPair > marks; }; class BookmarksWidget; @@ -41,10 +41,11 @@ class TQDomElement; class BookmarksPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - BookmarksPart(TQObject *parent, const char *name, const TQStringList &); + BookmarksPart(TQObject *tqparent, const char *name, const TQStringList &); ~BookmarksPart(); // reimplemented from KDevPlugin diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp index 58369d92..5fecbc4e 100644 --- a/parts/bookmarks/bookmarks_settings.cpp +++ b/parts/bookmarks/bookmarks_settings.cpp @@ -19,8 +19,8 @@ #include "bookmarks_settings.h" -BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* parent, const char* name, WFlags fl ) -: BookmarkSettingsBase( parent, name, fl ), m_part( part ) +BookmarkSettings::BookmarkSettings( BookmarksPart * part, TQWidget* tqparent, const char* name, WFlags fl ) +: BookmarkSettingsBase( tqparent, name, fl ), m_part( part ) { m_part->config()->readConfig(); diff --git a/parts/bookmarks/bookmarks_settings.h b/parts/bookmarks/bookmarks_settings.h index 699941ca..aa517db1 100644 --- a/parts/bookmarks/bookmarks_settings.h +++ b/parts/bookmarks/bookmarks_settings.h @@ -19,9 +19,10 @@ class BookmarksPart; class BookmarkSettings : public BookmarkSettingsBase { Q_OBJECT + TQ_OBJECT public: - BookmarkSettings( BookmarksPart * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + BookmarkSettings( BookmarksPart * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~BookmarkSettings(); public slots: diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui index 2d7ab1a2..3e3c1cad 100644 --- a/parts/bookmarks/bookmarks_settings_base.ui +++ b/parts/bookmarks/bookmarks_settings_base.ui @@ -1,6 +1,6 @@ BookmarkSettingsBase - + BookmarkSettingsBase @@ -16,7 +16,7 @@ unnamed - + groupBox1 @@ -30,7 +30,7 @@ unnamed - + checkBox1 @@ -47,15 +47,15 @@ - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -69,7 +69,7 @@ - + spinBox1 @@ -96,7 +96,7 @@ Expanding - + 121 20 @@ -107,7 +107,7 @@ - + buttonGroup1 @@ -121,7 +121,7 @@ unnamed - + radioButton1 @@ -135,15 +135,15 @@ - + - layout3 + tqlayout3 unnamed - + radioButton2 @@ -172,7 +172,7 @@ Expanding - + 71 20 @@ -181,7 +181,7 @@ - + radioButton3 @@ -204,7 +204,7 @@ Expanding - + 20 240 @@ -233,7 +233,7 @@ setEnabled(bool) - + klineedit.h diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index 20ab2cd9..9ae51f19 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -56,16 +56,16 @@ static const char* const bookmark_xpm[]={ } -class BookmarkItem : public QListViewItem +class BookmarkItem : public TQListViewItem { public: - BookmarkItem( TQListView * parent, KURL const & url ) - : TQListViewItem( parent, url.fileName() ), + BookmarkItem( TQListView * tqparent, KURL const & url ) + : TQListViewItem( tqparent, url.fileName() ), _url( url ), _line( -1 ), _isBookmark( false ) {} - BookmarkItem( TQListViewItem * parent, KURL const & url, QPair mark ) - : TQListViewItem( parent, TQString::number( mark.first +1 ).rightJustify( 5 ) ), + BookmarkItem( TQListViewItem * tqparent, KURL const & url, TQPair mark ) + : TQListViewItem( tqparent, TQString::number( mark.first +1 ).rightJustify( 5 ) ), _url( url ), _line( mark.first ), _isBookmark( true ) { BookmarksWidget * lv = static_cast( listView() ); @@ -143,7 +143,7 @@ BookmarksWidget::BookmarksWidget(BookmarksPart *part) _part( part ) { - addColumn( TQString::null ); + addColumn( TQString() ); header()->hide(); setRootIsDecorated( true ); setResizeMode( TQListView::LastColumn ); @@ -167,7 +167,7 @@ void BookmarksWidget::maybeTip(const TQPoint &p) if ( ! _part->config()->toolTip() ) return; BookmarkItem * item = dynamic_cast( itemAt( p ) ); - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if ( item && r.isValid() ) { @@ -196,7 +196,7 @@ void BookmarksWidget::updateURL( EditorData * data ) { // kdDebug(0) << "BookmarksWidget::updateURL()" << endl; - // remove the node that contains 'data' + // remove the node that tqcontains 'data' removeURL( data->url ); // create it again with new data @@ -213,7 +213,7 @@ void BookmarksWidget::createURL( EditorData * data ) file->setOpen( true ); file->setPixmap( 0, SmallIcon( "document" ) ); - TQValueListIterator< QPair > it = data->marks.begin(); + TQValueListIterator< TQPair > it = data->marks.begin(); while ( it != data->marks.end() ) { TQListViewItem * item = new BookmarkItem( file, data->url, *it ); diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index 6af0b563..43752d1a 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -26,9 +26,10 @@ class BookmarksPart; class BookmarkItem; class BookmarksConfig; -class BookmarksWidget : public KListView, public QToolTip +class BookmarksWidget : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT public: BookmarksWidget( BookmarksPart * ); diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index df51f6f4..70e26439 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -38,40 +38,40 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), 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()); - TQToolTip::add(parents_button, i18n("Show parents")); - - children_button = new TQToolButton(this); - children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); - children_button->setToggleButton(true); - children_button->setFixedSize(children_button->sizeHint()); - TQToolTip::add(children_button, i18n("Show children")); + tqparents_button = new TQToolButton(this); + tqparents_button->setPixmap( UserIcon("CTtqparents", KIcon::DefaultState, ClassViewFactory::instance()) ); + tqparents_button->setToggleButton(true); + tqparents_button->setFixedSize(tqparents_button->tqsizeHint()); + TQToolTip::add(tqparents_button, i18n("Show tqparents")); + + tqchildren_button = new TQToolButton(this); + tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); + tqchildren_button->setToggleButton(true); + tqchildren_button->setFixedSize(tqchildren_button->tqsizeHint()); + TQToolTip::add(tqchildren_button, i18n("Show tqchildren")); clients_button = new TQToolButton(this); clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) ); clients_button->setToggleButton(true); - clients_button->setFixedSize(clients_button->sizeHint()); + clients_button->setFixedSize(clients_button->tqsizeHint()); TQToolTip::add(clients_button, i18n("Show clients")); suppliers_button = new TQToolButton(this); suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) ); suppliers_button->setToggleButton(true); - suppliers_button->setFixedSize(suppliers_button->sizeHint()); + suppliers_button->setFixedSize(suppliers_button->tqsizeHint()); TQToolTip::add(suppliers_button, i18n("Show suppliers")); methods_button = new TQToolButton(this); methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) ); methods_button->setToggleButton(true); - methods_button->setFixedSize(methods_button->sizeHint()); + methods_button->setFixedSize(methods_button->tqsizeHint()); TQToolTip::add(methods_button, i18n("Show methods")); attributes_button = new TQToolButton(this); attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) ); attributes_button->setToggleButton(true); - attributes_button->setFixedSize(attributes_button->sizeHint()); + attributes_button->setFixedSize(attributes_button->tqsizeHint()); TQToolTip::add(attributes_button, i18n("Show attributes")); access_combo = new TQComboBox(false, this, "access combo"); @@ -86,17 +86,17 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) class_tree = new ClassToolWidget(part, this); // classTree->setMinimumSize( 500, 400 ); - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQHBoxLayout *firstrowLayout = new TQHBoxLayout(); TQHBoxLayout *secondrowLayout = new TQHBoxLayout(); - layout->addLayout(firstrowLayout); - layout->addLayout(secondrowLayout); + tqlayout->addLayout(firstrowLayout); + tqlayout->addLayout(secondrowLayout); firstrowLayout->addWidget(class_combo, 1); firstrowLayout->addWidget(close_button, 0); - secondrowLayout->addWidget(parents_button); - secondrowLayout->addWidget(children_button); + secondrowLayout->addWidget(tqparents_button); + secondrowLayout->addWidget(tqchildren_button); secondrowLayout->addWidget(clients_button); secondrowLayout->addWidget(suppliers_button); secondrowLayout->addStretch(); @@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) secondrowLayout->addWidget(attributes_button); secondrowLayout->addWidget(access_combo); - layout->addWidget(class_tree, 10); + tqlayout->addWidget(class_tree, 10); connect( class_combo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); @@ -112,8 +112,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) 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( tqparents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); + connect( tqchildren_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())); @@ -170,7 +170,7 @@ void ClassToolDialog::viewNone() } -/** View the parents of the current class. */ +/** View the tqparents of the current class. */ void ClassToolDialog::viewParents() { currentOperation = ViewParents; @@ -178,7 +178,7 @@ void ClassToolDialog::viewParents() } -/** View the children of the current class. */ +/** View the tqchildren of the current class. */ void ClassToolDialog::viewChildren() { currentOperation = ViewChildren; @@ -202,7 +202,7 @@ void ClassToolDialog::viewSuppliers() } -/** View methods in this class and parents. */ +/** View methods in this class and tqparents. */ void ClassToolDialog::viewMethods() { currentOperation = ViewMethods; @@ -210,7 +210,7 @@ void ClassToolDialog::viewMethods() } -/** View attributes in this class and parents. */ +/** View attributes in this class and tqparents. */ void ClassToolDialog::viewAttributes() { currentOperation = ViewAttributes; @@ -283,11 +283,11 @@ void ClassToolDialog::updateCaptionAndButtons() switch (currentOperation) { case ViewParents: - button = parents_button; + button = tqparents_button; caption = i18n("Parents"); break; case ViewChildren: - button = children_button; + button = tqchildren_button; caption = i18n("Children"); break; case ViewClients: @@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons() break; case ViewMethods: button = methods_button; - caption = i18n("%1 Methods").arg(access_combo->currentText()); + caption = i18n("%1 Methods").tqarg(access_combo->currentText()); break; case ViewAttributes: button = attributes_button; - caption = i18n("%1 Attributes").arg(access_combo->currentText()); + caption = i18n("%1 Attributes").tqarg(access_combo->currentText()); break; default: button = 0; @@ -312,8 +312,8 @@ void ClassToolDialog::updateCaptionAndButtons() break; } - parents_button->setOn(false); - children_button->setOn(false); + tqparents_button->setOn(false); + tqchildren_button->setOn(false); clients_button->setOn(false); suppliers_button->setOn(false); methods_button->setOn(false); @@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons() if (button) { button->setOn(true); - setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name())); + setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name())); } else setCaption(caption); } @@ -339,7 +339,7 @@ void ClassToolDialog::buildTree() switch (currentOperation) { case ViewParents: - class_tree->insertClassAndClasses(currentClass, currentClass->parents); + class_tree->insertClassAndClasses(currentClass, currentClass->tqparents); break; case ViewChildren: { diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h index 01c86f3b..a33c7f2b 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -27,9 +27,10 @@ class ClassStore; class ParsedClass; -class ClassToolDialog : public QWidget +class ClassToolDialog : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum Operations { ViewParents, ViewChildren, ViewClients, ViewSuppliers, @@ -44,17 +45,17 @@ public slots: /** View nothing. */ void viewNone(); - /** View the parents of the current class. */ + /** View the tqparents of the current class. */ void viewParents(); - /** View the children of the current class. */ + /** View the tqchildren of the current class. */ void viewChildren(); /** View all classes that has this class as an attribute. */ void viewClients(); /** View all classes that this class has as attributes. */ void viewSuppliers(); - /** View methods in this class and parents. */ + /** View methods in this class and tqparents. */ void viewMethods(); - /** View attributes in this class and parents. */ + /** View attributes in this class and tqparents. */ void viewAttributes(); private slots: @@ -74,8 +75,8 @@ private: ClassToolWidget *class_tree; TQComboBox *class_combo; - TQToolButton *parents_button; - TQToolButton *children_button; + TQToolButton *tqparents_button; + TQToolButton *tqchildren_button; TQToolButton *clients_button; TQToolButton *suppliers_button; TQToolButton *methods_button; diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp index 5aefe6e5..59e744f1 100644 --- a/parts/classview/classtoolwidget.cpp +++ b/parts/classview/classtoolwidget.cpp @@ -20,8 +20,8 @@ #include "classstore.h" -ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *parent) - : ClassTreeBase(part, parent, "class tool widget") +ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *tqparent) + : ClassTreeBase(part, tqparent, "class tool widget") {} @@ -60,16 +60,16 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueLis } -void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &parentList) +void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &tqparentList) { ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass); ClassTreeItem *lastItem = 0; - TQPtrListIterator it(parentList); + TQPtrListIterator it(tqparentList); for (; it.current(); ++it) { - ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name()); - lastItem = new ClassTreeClassItem(root, lastItem, parentClass); + ParsedClass *tqparentClass = m_part->classStore()->getClassByName((*it)->name()); + lastItem = new ClassTreeClassItem(root, lastItem, tqparentClass); lastItem->setExpandable(false); } @@ -124,14 +124,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f { ClassTreeItem *lastItem = 0; - // First treat all parents. - for ( ParsedParent *pParent = parsedClass->parents.first(); + // First treat all tqparents. + for ( ParsedParent *pParent = parsedClass->tqparents.first(); pParent != 0; - pParent = parsedClass->parents.next() ) + pParent = parsedClass->tqparents.next() ) { - ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name()); - if (parentClass) - addClassAndMethods(parentClass, filter, &lastItem); + ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name()); + if (tqparentClass) + addClassAndMethods(tqparentClass, filter, &lastItem); } // Add the current class @@ -142,14 +142,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f void ClassToolWidget::insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter) { ClassTreeItem *lastItem = 0; - // First treat all parents. - for ( ParsedParent *pParent = parsedClass->parents.first(); + // First treat all tqparents. + for ( ParsedParent *pParent = parsedClass->tqparents.first(); pParent != 0; - pParent = parsedClass->parents.next() ) + pParent = parsedClass->tqparents.next() ) { - ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name()); - if (parentClass) - addClassAndAttributes(parentClass, filter, &lastItem); + ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name()); + if (tqparentClass) + addClassAndAttributes(tqparentClass, filter, &lastItem); } // Add the current class diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 4d7d8036..740d5545 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -20,13 +20,14 @@ class ClassToolWidget : public ClassTreeBase { Q_OBJECT + TQ_OBJECT public: - ClassToolWidget(ClassViewPart *part, TQWidget *parent=0); + ClassToolWidget(ClassViewPart *part, TQWidget *tqparent=0); ~ClassToolWidget(); void insertClassAndClasses(ParsedClass *parsedClass, TQValueList classList); - void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &parentList); + void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &tqparentList); 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 c6d2770e..00a5a87a 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -95,7 +95,7 @@ TQString ClassTreeItem::scopedText() const if (m_item) return m_item->path(); - return TQString::null; + return TQString(); } @@ -121,7 +121,7 @@ TQString ClassTreeItem::text( int ) const { if (m_item) return m_item->asString(); - return TQString::null; + return TQString(); } @@ -149,7 +149,7 @@ void ClassTreeScopeItem::init() TQString ClassTreeScopeItem::text( int col ) const { if (!m_item) - return TQString::null; + return TQString(); if (m_item->name().isEmpty()) return i18n("Global"); return ClassTreeItem::text( col ); @@ -272,9 +272,9 @@ void ClassTreeClassItem::setOpen(bool o) ClassTreeItem::setOpen(o); } -ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, +ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedMethod *parsedMethod) - : ClassTreeItem(parent, lastSibling, parsedMethod) + : ClassTreeItem(tqparent, lastSibling, parsedMethod) { TQString icon; @@ -310,7 +310,7 @@ TQString ClassTreeMethodItem::text( int ) const TQString str; if ( !m_item ) - return TQString::null; + return TQString(); ParsedMethod* method = static_cast(m_item); @@ -336,9 +336,9 @@ TQString ClassTreeMethodItem::text( int ) const } -ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, +ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedAttribute *parsedAttr) - : ClassTreeItem(parent, lastSibling, parsedAttr) + : ClassTreeItem(tqparent, lastSibling, parsedAttr) { TQString icon; @@ -363,13 +363,13 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS TQString ClassTreeAttrItem::text( int ) const { if ( !m_item ) - return TQString::null; + return TQString(); return m_item->name(); } -ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, +ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedScript *parsedScript) - : ClassTreeItem(parent, lastSibling, parsedScript) + : ClassTreeItem(tqparent, lastSibling, parsedScript) { TQString icon; @@ -387,7 +387,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l TQString ClassTreeScriptItem::text( int ) const { if ( !m_item ) - return TQString::null; + return TQString(); return m_item->name(); } @@ -419,11 +419,11 @@ void ClassTreeScriptItem::setOpen(bool o) } -class ClassToolTip : public QToolTip +class ClassToolTip : public TQToolTip { public: - ClassToolTip( TQWidget *parent ) - : TQToolTip(parent) + ClassToolTip( TQWidget *tqparent ) + : TQToolTip(tqparent) {} protected: @@ -433,10 +433,10 @@ protected: void ClassToolTip::maybeTip(const TQPoint &p) { - ClassTreeBase *ctw = static_cast(parentWidget()); + ClassTreeBase *ctw = static_cast(tqparentWidget()); TQListViewItem *item = ctw->itemAt(p); - TQRect r = ctw->itemRect(item); + TQRect r = ctw->tqitemRect(item); if (item && r.isValid()) { ClassTreeItem *ctitem = static_cast(item); @@ -447,15 +447,15 @@ void ClassToolTip::maybeTip(const TQPoint &p) } -ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name) - : KListView(parent, name) +ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { setFocusPolicy(ClickFocus); setRootIsDecorated(true); setResizeMode(TQListView::LastColumn); setSorting(-1); header()->hide(); - addColumn(TQString::null); + addColumn(TQString()); (void) new ClassToolTip(this); @@ -488,7 +488,7 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); - item = item->parent(); + item = item->tqparent(); } state.append(path); } @@ -507,7 +507,7 @@ void ClassTreeBase::setTreeState(TreeState state) TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); - item = item->parent(); + item = item->tqparent(); } if (*tsit == path) { it.current()->setOpen(true); @@ -525,7 +525,7 @@ void ClassTreeBase::slotItemExecuted( TQListViewItem* item ) if (!item) return; - // toggle open state for parents + // toggle open state for tqparents if (item->childCount() > 0) setOpen(item, !isOpen(item)); diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h index 91ac8054..5274d9e8 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -30,9 +30,10 @@ class KPopupMenu; class ClassTreeBase : public KListView { Q_OBJECT + TQ_OBJECT public: - ClassTreeBase( ClassViewPart *part, TQWidget *parent=0, const char *name=0 ); + ClassTreeBase( ClassViewPart *part, TQWidget *tqparent=0, const char *name=0 ); ~ClassTreeBase(); protected: @@ -66,18 +67,18 @@ protected: class ClassTreeItem : public TQListViewItem, public NotifyClient { public: - ClassTreeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) + ClassTreeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) + : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } - ClassTreeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) + ClassTreeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) + : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } ClassTreeItem( const ClassTreeItem& other ) - : TQListViewItem( other.parent(), other.nextSibling()), NotifyClient() + : TQListViewItem( other.tqparent(), other.nextSibling()), NotifyClient() { m_item = other.m_item; init(); @@ -122,14 +123,14 @@ protected: class ClassTreeOrganizerItem : public ClassTreeItem { public: - ClassTreeOrganizerItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, + ClassTreeOrganizerItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, const TQString &text ) - : ClassTreeItem(parent, lastSibling, 0 ) + : ClassTreeItem(tqparent, lastSibling, 0 ) , m_text( text ) { init(); } - ClassTreeOrganizerItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeOrganizerItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, const TQString &text ) - : ClassTreeItem(parent, lastSibling, 0 ) + : ClassTreeItem(tqparent, lastSibling, 0 ) , m_text( text ) { init(); } ~ClassTreeOrganizerItem() @@ -147,15 +148,15 @@ private: class ClassTreeScopeItem : public ClassTreeItem { public: - ClassTreeScopeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, + ClassTreeScopeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedScopeContainer *parsedScope ) - : ClassTreeItem(parent, lastSibling, parsedScope) + : ClassTreeItem(tqparent, lastSibling, parsedScope) { init(); } - ClassTreeScopeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeScopeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedScopeContainer *parsedScope ) - : ClassTreeItem(parent, lastSibling, parsedScope) + : ClassTreeItem(tqparent, lastSibling, parsedScope) { init(); } @@ -174,15 +175,15 @@ private: class ClassTreeClassItem : public ClassTreeItem { public: - ClassTreeClassItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, + ClassTreeClassItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedClass *parsedClass, bool isStruct=false ) - : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct ) + : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct ) { init(); } - ClassTreeClassItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeClassItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedClass *parsedClass, bool isStruct=false ) - : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct ) + : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct ) { init(); } @@ -203,7 +204,7 @@ private: class ClassTreeMethodItem : public ClassTreeItem { public: - ClassTreeMethodItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeMethodItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedMethod *parsedMethod ); ~ClassTreeMethodItem() { @@ -216,7 +217,7 @@ public: class ClassTreeAttrItem : public ClassTreeItem { public: - ClassTreeAttrItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeAttrItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedAttribute *parsedAttr ); ~ClassTreeAttrItem() { @@ -228,7 +229,7 @@ public: class ClassTreeScriptItem : public ClassTreeItem { public: - ClassTreeScriptItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeScriptItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedScript *parsedScript ); ~ClassTreeScriptItem() { diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 24163bf4..eceb656f 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -72,13 +72,13 @@ class FunctionCompletion : public CustomCompleter { TQString fScope; int cutpos; - if((cutpos = function.find('(')) != -1) { + if((cutpos = function.tqfind('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { return function; } - if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { + if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } @@ -103,7 +103,7 @@ class FunctionCompletion : public CustomCompleter { } virtual void removeItem ( const TQString &item ) { - FuncMap::iterator it = nameMap.find( item ); + FuncMap::iterator it = nameMap.tqfind( item ); if( it != nameMap.end() ) { KCompletion::removeItem( *it ); revNameMap.remove( *it ); @@ -118,7 +118,7 @@ class FunctionCompletion : public CustomCompleter { } virtual void postProcessMatch ( TQString *match ) const { - FuncMap::const_iterator it = revNameMap.find( *match ); + FuncMap::const_iterator it = revNameMap.tqfind( *match ); if( it != revNameMap.end() ) { *match = *it; } @@ -142,9 +142,9 @@ typedef KDevGenericFactory ClassViewFactory; static const KDevPluginInfo data("kdevclassview"); K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) -ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) - :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), - KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), +ClassViewPart::ClassViewPart(TQObject *tqparent, const char *name, const TQStringList& ) + :/// KDevPlugin( &data, tqparent, name ? name : "ClassViewPart" ), + KDevCodeBrowserFrontend( &data, tqparent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) { setInstance(ClassViewFactory::instance()); @@ -254,16 +254,16 @@ void ClassViewPart::activePartChanged( KParts::Part * part) m_activeSelection = dynamic_cast( part ); m_activeViewCursor = part ? dynamic_cast( m_activeView ) : 0; - m_activeFileName = TQString::null; + m_activeFileName = TQString(); if (m_activeDocument) { m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); navigator->refreshNavBars(m_activeFileName); navigator->syncFunctionNavDelayed(200); -/* if ( languageSupport()->mimeTypes().find( +/* if ( languageSupport()->mimeTypes().tqfind( KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() ) - m_activeFileName = TQString::null;*/ + m_activeFileName = TQString();*/ } if( m_activeViewCursor ) { diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index bbad40e6..65044346 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -55,8 +55,9 @@ class HierarchyDialog; class ClassViewPart : public Extensions::KDevCodeBrowserFrontend { Q_OBJECT + TQ_OBJECT public: - ClassViewPart(TQObject *parent, const char *name, const TQStringList &); + ClassViewPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ClassViewPart(); bool langHasFeature(KDevLanguageSupport::Features feature); diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 64079546..1eccf136 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) 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, TQT_SLOT(slotNewClass()), + m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), TQT_TQOBJECT(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, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, TQT_SLOT(slotAddMethod()), + m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), TQT_TQOBJECT(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, TQT_SLOT(slotAddAttribute()), + m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), TQT_TQOBJECT(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, TQT_SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), TQT_TQOBJECT(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, TQT_SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), TQT_TQOBJECT(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, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); KConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -116,7 +116,7 @@ template if( c ) { KSharedPtr d( c ); - typename TQMap, ListItemType*>::ConstIterator it = map.find(d); + typename TQMap, ListItemType*>::ConstIterator it = map.tqfind(d); if( it != map.end() ) { ( *it )->select(); return true; @@ -482,13 +482,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo TQString current = path.front(); path.pop_front(); - FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0; + FolderBrowserItem* item = m_folders.tqcontains( current ) ? m_folders[ current ] : 0; if( !item ){ if( remove ) return; item = new FolderBrowserItem( m_widget, this, current ); - if( listView()->removedText.contains(current) ) + if( listView()->removedText.tqcontains(current) ) item->setOpen( true ); m_folders.insert( current, item ); } @@ -507,13 +507,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove ) { - NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; + NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; if( !item ){ if( remove ) return; item = new NamespaceDomBrowserItem( this, ns ); - if( listView()->removedText.contains(ns->name()) ) + if( listView()->removedText.tqcontains(ns->name()) ) item->setOpen( true ); m_namespaces.insert( ns->name(), item ); } @@ -547,13 +547,13 @@ void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove ) void FolderBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.contains(klass->name()) ) + if( listView()->removedText.tqcontains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -584,13 +584,13 @@ void FolderBrowserItem::processClass( ClassDom klass, bool remove ) void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.contains(typeAlias->name()) ) + if( listView()->removedText.tqcontains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -607,7 +607,7 @@ void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) void FolderBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -625,7 +625,7 @@ void FolderBrowserItem::processFunction( FunctionDom fun, bool remove ) void FolderBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -679,13 +679,13 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item) void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove ) { - NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; + NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; if( !item ){ if( remove ) return; item = new NamespaceDomBrowserItem( this, ns ); - if( listView()->removedText.contains(ns->name()) ) + if( listView()->removedText.tqcontains(ns->name()) ) item->setOpen( true ); m_namespaces.insert( ns->name(), item ); } @@ -719,13 +719,13 @@ void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove ) void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.contains(klass->name()) ) + if( listView()->removedText.tqcontains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -756,13 +756,13 @@ void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove ) void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.contains(typeAlias->name()) ) + if( listView()->removedText.tqcontains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -779,7 +779,7 @@ void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool rem void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -797,7 +797,7 @@ void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove ) void NamespaceDomBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -844,13 +844,13 @@ bool ClassDomBrowserItem::selectItem(ItemDom item) void ClassDomBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.contains(klass->name()) ) + if( listView()->removedText.tqcontains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -881,13 +881,13 @@ void ClassDomBrowserItem::processClass( ClassDom klass, bool remove ) void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.contains(typeAlias->name()) ) + if( listView()->removedText.tqcontains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -904,7 +904,7 @@ void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -922,7 +922,7 @@ void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove ) void ClassDomBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -1212,13 +1212,13 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) ++it; } - 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; + TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString(); + TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString(); + TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString(); + TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString(); - TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString::null; - TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString::null; + TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString(); + TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString(); tooltip = access + strstatic + strsignal + strslot + strresult + fitem->dom()->scope().join("::") + "::" + fitem->dom()->name() @@ -1238,7 +1238,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) else if ( vitem->dom()->access() == CodeModelItem::Public ) access = "[public] "; - TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null; + TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString(); tooltip = access + strstatic + vitem->dom()->type() + " " + vitem->dom()->name(); } } @@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) kdDebug(0) << tooltip << endl; - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if ( item && r.isValid() && !tooltip.isEmpty() ) { @@ -1277,7 +1277,7 @@ void ClassViewWidget::slotCreateAccessMethods( ) if (item == 0) return; - m_part->languageSupport()->createAccessMethods(static_cast(static_cast(item->parent())->dom()),static_cast(item->dom())); + m_part->languageSupport()->createAccessMethods(static_cast(static_cast(item->tqparent())->dom()),static_cast(item->dom())); } } diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index 0ace5692..29276a31 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -43,9 +43,10 @@ class VariableDomBrowserItem; class KSelectAction; class KToggleAction; -class ClassViewWidget : public KListView, public QToolTip +class ClassViewWidget : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT public: enum ViewMode { @@ -120,10 +121,10 @@ class ClassViewItem: public FancyListViewItem { private: public: - ClassViewItem( TQListView* parent, const TQString& text=TQString::null ) - : FancyListViewItem( static_cast( parent )->m_paintStyles, parent, text ) {} - ClassViewItem( TQListViewItem* parent, const TQString& text=TQString::null ) - : FancyListViewItem( static_cast( parent->listView() )->m_paintStyles, parent, text ) {} + ClassViewItem( TQListView* tqparent, const TQString& text=TQString() ) + : FancyListViewItem( static_cast( tqparent )->m_paintStyles, tqparent, text ) {} + ClassViewItem( TQListViewItem* tqparent, const TQString& text=TQString() ) + : FancyListViewItem( static_cast( tqparent->listView() )->m_paintStyles, tqparent, text ) {} virtual const CodeModelItem* model() const { return 0; } @@ -152,10 +153,10 @@ public: class FolderBrowserItem: public ClassViewItem { public: - FolderBrowserItem( ClassViewWidget* widget, TQListView* parent, const TQString& name=TQString::null ) - : ClassViewItem( parent, name ), m_widget(widget) {} - FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* parent, const TQString& name=TQString::null ) - : ClassViewItem( parent, name ), m_widget(widget) {} + FolderBrowserItem( ClassViewWidget* widget, TQListView* tqparent, const TQString& name=TQString() ) + : ClassViewItem( tqparent, name ), m_widget(widget) {} + FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* tqparent, const TQString& name=TQString() ) + : ClassViewItem( tqparent, name ), m_widget(widget) {} virtual bool isFolder() const { return true; } @@ -184,10 +185,10 @@ private: class NamespaceDomBrowserItem: public ClassViewItem { public: - NamespaceDomBrowserItem( TQListView* parent, NamespaceDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - NamespaceDomBrowserItem( TQListViewItem* parent, NamespaceDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + NamespaceDomBrowserItem( TQListView* tqparent, NamespaceDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + NamespaceDomBrowserItem( TQListViewItem* tqparent, NamespaceDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -218,10 +219,10 @@ private: class ClassDomBrowserItem: public ClassViewItem { public: - ClassDomBrowserItem( TQListView* parent, ClassDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - ClassDomBrowserItem( TQListViewItem* parent, ClassDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + ClassDomBrowserItem( TQListView* tqparent, ClassDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + ClassDomBrowserItem( TQListViewItem* tqparent, ClassDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isClass() const { return true; } @@ -256,10 +257,10 @@ private: class TypeAliasDomBrowserItem: public ClassViewItem { public: - TypeAliasDomBrowserItem( TQListView* parent, TypeAliasDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - TypeAliasDomBrowserItem( TQListViewItem* parent, TypeAliasDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + TypeAliasDomBrowserItem( TQListView* tqparent, TypeAliasDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + TypeAliasDomBrowserItem( TQListViewItem* tqparent, TypeAliasDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isTypeAlias() const { return true; } @@ -284,10 +285,10 @@ private: class FunctionDomBrowserItem: public ClassViewItem { public: - FunctionDomBrowserItem( TQListView* parent, FunctionDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - FunctionDomBrowserItem( TQListViewItem* parent, FunctionDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + FunctionDomBrowserItem( TQListView* tqparent, FunctionDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + FunctionDomBrowserItem( TQListViewItem* tqparent, FunctionDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isFunction() const { return true; } @@ -315,10 +316,10 @@ private: class VariableDomBrowserItem: public ClassViewItem { public: - VariableDomBrowserItem( TQListView* parent, VariableDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - VariableDomBrowserItem( TQListViewItem* parent, VariableDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + VariableDomBrowserItem( TQListView* tqparent, VariableDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + VariableDomBrowserItem( TQListViewItem* tqparent, VariableDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isVariable() const { return true; } diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index 8bb8e963..1e2f7dfd 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -43,8 +43,8 @@ struct DigraphEdge }; -DigraphView::DigraphView(TQWidget *parent, const char *name) - : TQScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) +DigraphView::DigraphView(TQWidget *tqparent, const char *name) + : TQScrollView(tqparent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) { viewport()->setBackgroundMode(PaletteBase); @@ -173,13 +173,13 @@ TQStringList DigraphView::splitLine(TQString str) while (!str.isEmpty()) { if (str[0] == '"') { - int pos = str.find('"', 1); + int pos = str.tqfind('"', 1); if (pos == -1) pos = str.length(); result << str.mid(1, pos-1); str.remove(0, pos+1); } else { - int pos = str.find(' '); + int pos = str.tqfind(' '); if (pos == -1) pos = str.length(); result << str.left(pos); @@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext ) TQTextStream &is = *ifile.textStream(); is << "digraph G {" << endl; is << "rankdir=LR;" << endl; - is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl; + is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl; TQStringList::Iterator it; for (it = inputs.begin(); it != inputs.end(); ++it) is << (*it) << endl; @@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22)); triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22)); triangle[2] = p2; - p->drawPolygon(triangle, true); + p->tqdrawPolygon(triangle, true); } } @@ -323,7 +323,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e) TQPtrListIterator it1(nodes); for (; it1.current(); ++it1) { TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); - if (r.contains(e->pos())) { + if (r.tqcontains(e->pos())) { if (selNode) { TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2, selNode->w, selNode->h); @@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e) } -TQSize DigraphView::sizeHint() const +TQSize DigraphView::tqsizeHint() const { if (width == -1) return TQSize(100, 100); // arbitrary diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h index b7215075..216e972e 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -21,12 +21,13 @@ class DigraphNode; class DigraphEdge; -class DigraphView : public QScrollView +class DigraphView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - DigraphView(TQWidget *parent, const char *name); + DigraphView(TQWidget *tqparent, const char *name); ~DigraphView(); void addEdge(const TQString &name1, const TQString &name2); @@ -41,7 +42,7 @@ signals: protected: virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph); virtual void contentsMousePressEvent(TQMouseEvent *e); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: int toXPixel(double x); diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index a1f2c763..2eedf64d 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -41,30 +41,30 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) : TQDialog(0, "hierarchy dialog", false) { class_combo = new KComboView(true, 150, this); - class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // class_combo->setMinimumWidth(150); namespace_combo = new KComboView(true, 150, this); - namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // namespace_combo->setMinimumWidth(150); TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); - TQSplitter *splitter = new TQSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQBoxLayout *combo_layout = new TQHBoxLayout(); - layout->addLayout(combo_layout); + tqlayout->addLayout(combo_layout); combo_layout->addWidget(namespace_combo); combo_layout->addWidget(class_combo); combo_layout->addSpacing(60); combo_layout->addWidget(refresh_button); combo_layout->addWidget(save_button); combo_layout->addWidget(close_button); - layout->addWidget(splitter); + tqlayout->addWidget(splitter); connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); @@ -96,7 +96,7 @@ HierarchyDialog::~HierarchyDialog() void HierarchyDialog::save() { - KURLRequesterDlg dlg(TQString::null, this, "save_inheritance"); + KURLRequesterDlg dlg(TQString(), 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 ); @@ -104,7 +104,7 @@ void HierarchyDialog::save() if(dlg.exec() && dlg.selectedURL().isLocalFile()) { TQFileInfo fi(dlg.selectedURL().pathOrURL()); - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); KDevLanguageSupport *ls = m_part->languageSupport(); for (TQMap::const_iterator it = classes.begin(); it != classes.end(); ++it) { @@ -113,7 +113,7 @@ void HierarchyDialog::save() TQStringList baseClasses = it.data()->baseClassList(); for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - TQMap::const_iterator baseIt = uclasses.find(*bit); + TQMap::const_iterator baseIt = uclasses.tqfind(*bit); if (baseIt != uclasses.end()) { TQString formattedParentName = ls->formatClassName(baseIt.data()); @@ -143,7 +143,7 @@ void HierarchyDialog::refresh() TQStringList baseClasses = it.data()->baseClassList(); for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - TQMap::const_iterator baseIt = uclasses.find(*bit); + TQMap::const_iterator baseIt = uclasses.tqfind(*bit); if (baseIt != uclasses.end()) { TQString formattedParentName = ls->formatClassName(baseIt.data()); diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h index dd5c8a36..27d5b2a4 100644 --- a/parts/classview/hierarchydlg.h +++ b/parts/classview/hierarchydlg.h @@ -23,9 +23,10 @@ class ClassToolWidget; class KComboView; class TQListViewItem; -class HierarchyDialog : public QDialog +class HierarchyDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: HierarchyDialog( ClassViewPart *part ); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index fa83a4ff..78415d8c 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -46,7 +46,7 @@ namespace { template - TQValueList QValueList_reversed ( const TQValueList & list ) + TQValueList TQValueList_reversed ( const TQValueList & list ) { TQValueList rList; typename TQValueList::ConstIterator it = list.begin(); @@ -85,10 +85,10 @@ private: public: enum Type { Declaration, Definition }; - 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, TQListViewItem *parent, TQString name, Type type) - :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *tqparent, TQString name, Type type) + :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *tqparent, TQString name, Type type) + :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} ~FunctionNavItem() {} virtual void setup() @@ -104,8 +104,8 @@ private: }; -Navigator::Navigator(ClassViewPart *parent, const char *name) - : TQObject(parent, name), m_part(parent) +Navigator::Navigator(ClassViewPart *tqparent, const char *name) + : TQObject(tqparent, name), m_part(tqparent) { m_state = GoToDefinitions; m_navNoDefinition = true; @@ -289,7 +289,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap::iterator it2 = it; ++it; - if ( !toLeave.contains( it2.key() ) ) + if ( !toLeave.tqcontains( it2.key() ) ) { if (it2.data()) { @@ -331,7 +331,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap::iterator it2 = itt; ++itt; - if ( !toLeave.contains( it2.key() ) ) + if ( !toLeave.tqcontains( it2.key() ) ) { if (it2.data()) { @@ -397,14 +397,14 @@ TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleS TQString fScope; int cutpos; - if((cutpos = function.find('(')) != -1) { + if((cutpos = function.tqfind('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { ret.addItem( function ); return ret; } - if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { + if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } @@ -499,7 +499,7 @@ void Navigator::slotJumpToPreviousFunction() unsigned int currentLine, currentCol; m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol ); - TQValueList lines = QValueList_reversed ( functionStartLines() ); + TQValueList lines = TQValueList_reversed ( functionStartLines() ); if ( lines.isEmpty() ) return; TQValueList::iterator it = lines.begin(); diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h index 80b1ca4d..3338e4b1 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -36,13 +36,14 @@ class KAction; class TextPaintItem; TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyleStore& styles ); -class Navigator : public QObject +class Navigator : public TQObject { Q_OBJECT + TQ_OBJECT public: enum NavigationState { GoToDefinitions, GoToDeclarations }; - Navigator(ClassViewPart *parent, const char *name = 0); + Navigator(ClassViewPart *tqparent, const char *name = 0); ~Navigator(); void stopTimer(); diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp index bb7bf01d..bc1c4f3b 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, TQListView *parent, TQString name, NamespaceDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom) + :TQListViewItem(tqparent, 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) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } @@ -53,13 +53,13 @@ void NamespaceItem::setup() } -ClassItem::ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom) + :TQListViewItem(tqparent, 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) +ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } @@ -79,13 +79,13 @@ void ClassItem::setup() } -FunctionItem::FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom) + :TQListViewItem(tqparent, 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) +FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h index 7525a5d8..c3ea79a2 100644 --- a/parts/classview/viewcombos.h +++ b/parts/classview/viewcombos.h @@ -32,10 +32,10 @@ class KComboView; const TQString EmptyClasses = i18n("(Classes)"); const TQString EmptyFunctions = i18n("(Functions)"); -class NamespaceItem: public QListViewItem{ +class NamespaceItem: public TQListViewItem{ public: - NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom); - NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom); ~NamespaceItem(); NamespaceDom dom() const; virtual void setup(); @@ -44,10 +44,10 @@ private: ClassViewPart *m_part; }; -class ClassItem: public QListViewItem{ +class ClassItem: public TQListViewItem{ public: - ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom); - ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom); ~ClassItem(); ClassDom dom() const; virtual void setup(); @@ -56,10 +56,10 @@ private: ClassViewPart *m_part; }; -class FunctionItem: public QListViewItem{ +class FunctionItem: public TQListViewItem{ public: - FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom); - FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom); ~FunctionItem(); FunctionDom dom() const; virtual void setup(); diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp index e066a136..ab9febc4 100644 --- a/parts/ctags2/ctags2_createtagfile.cpp +++ b/parts/ctags2/ctags2_createtagfile.cpp @@ -16,8 +16,8 @@ #include "ctags2_part.h" -CreateTagFile::CreateTagFile(TQWidget* parent, const char* name, bool modal, WFlags fl) -: CTags2CreateTagFileBase( parent, name, modal, fl ) +CreateTagFile::CreateTagFile(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: CTags2CreateTagFileBase( tqparent, name, modal, fl ) { dirToTag->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly); newTagFilePath->setMode( KFile::File | KFile::LocalOnly ); diff --git a/parts/ctags2/ctags2_createtagfile.h b/parts/ctags2/ctags2_createtagfile.h index 068c1815..61cc6448 100644 --- a/parts/ctags2/ctags2_createtagfile.h +++ b/parts/ctags2/ctags2_createtagfile.h @@ -19,9 +19,10 @@ class CreateTagFile : public CTags2CreateTagFileBase { Q_OBJECT + TQ_OBJECT public: - CreateTagFile(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreateTagFile(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreateTagFile(); TQString name(); TQString tagsfilePath(); diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui index bf4469f3..ae3bcea4 100644 --- a/parts/ctags2/ctags2_createtagfilebase.ui +++ b/parts/ctags2/ctags2_createtagfilebase.ui @@ -1,6 +1,6 @@ CTags2CreateTagFileBase - + CTags2CreateTagFileBase @@ -19,7 +19,7 @@ unnamed - + textLabel3 @@ -32,7 +32,7 @@ displayName - + textLabel1_3 @@ -45,7 +45,7 @@ newTagFilePath - + textLabel2_2 @@ -58,9 +58,9 @@ dirToTag - + - layout6 + tqlayout6 @@ -76,14 +76,14 @@ Expanding - + 81 20 - + createTagFileButton @@ -91,7 +91,7 @@ &Create - + cancelButton @@ -135,11 +135,11 @@ validate() - + createTagFile() validate() - - + + kurlrequester.h klineedit.h diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index b05a12a4..60fe4ca5 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -58,8 +58,8 @@ typedef KDevGenericFactory CTags2Factory; static const KDevPluginInfo data("kdevctags2"); K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) -CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) +CTags2Part::CTags2Part(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevPlugin(&data, tqparent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); setXMLFile("kdevpart_ctags2.rc"); @@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context) popup->insertSeparator(); if ( showDeclaration ) - popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); + popup->insertItem( i18n("CTags - Go to Declaration: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) ); if ( showDefinition ) - popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); + popup->insertItem( i18n("CTags - Go to Definition: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDefinition()) ); if ( showLookup ) - popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) ); + popup->insertItem( i18n("CTags - Lookup: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoTag()) ); } } @@ -268,9 +268,9 @@ int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const & { if ( pattern.isEmpty() ) return -1; - // ctags interestingly escapes "/", but apparently nothing else. lets revert that + // ctags interestingly escapes "/", but aptqparently nothing else. lets revert that TQString unescaped = pattern; - unescaped.replace( "\\/", "/" ); + unescaped.tqreplace( "\\/", "/" ); // most of the time, the ctags pattern has the form /^foo$/ // but this isn't true for some macro definitions diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index 05a53c41..648c6ded 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -29,10 +29,11 @@ class KDialogBase; class CTags2Part : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - CTags2Part(TQObject *parent, const char *name, const TQStringList &); + CTags2Part(TQObject *tqparent, const char *name, const TQStringList &); ~CTags2Part(); int getFileLineFromPattern( KURL const & url, TQString const & pattern); diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp index c1a8d617..38227d1d 100644 --- a/parts/ctags2/ctags2_selecttagfile.cpp +++ b/parts/ctags2/ctags2_selecttagfile.cpp @@ -15,8 +15,8 @@ #include "ctags2_selecttagfile.h" -SelectTagFile::SelectTagFile( TQWidget* parent, const char* name, bool modal, WFlags fl) -: SelectTagFileBase( parent, name, modal, fl ) +SelectTagFile::SelectTagFile( TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: SelectTagFileBase( tqparent, name, modal, fl ) { tagFile->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); okButton->setEnabled( false ); diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index d4f4f5f9..a069743e 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -16,9 +16,10 @@ class SelectTagFile : public SelectTagFileBase { Q_OBJECT + TQ_OBJECT public: - SelectTagFile( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SelectTagFile( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SelectTagFile(); TQString name(); TQString tagsfilePath(); diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui index cddd5f26..db02f864 100644 --- a/parts/ctags2/ctags2_selecttagfilebase.ui +++ b/parts/ctags2/ctags2_selecttagfilebase.ui @@ -1,6 +1,6 @@ SelectTagFileBase - + SelectTagFileBase @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -32,7 +32,7 @@ displayName - + textLabel2 @@ -45,9 +45,9 @@ tagFile - + - layout4 + tqlayout4 @@ -63,14 +63,14 @@ Expanding - + 101 20 - + okButton @@ -78,7 +78,7 @@ O&K - + cancelButton @@ -116,10 +116,10 @@ validate() - + validate() - - + + kurlrequester.h klineedit.h diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index d7458a85..ea607eb6 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -30,8 +30,8 @@ #include "ctags2_createtagfile.h" -CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* parent, const char* name, WFlags fl ) - : CTags2SettingsWidgetBase( parent, name, fl ), m_part( part ) +CTags2SettingsWidget::CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent, const char* name, WFlags fl ) + : CTags2SettingsWidgetBase( tqparent, name, fl ), m_part( part ) { binaryPath->completionObject()->setMode( KURLCompletion::FileCompletion ); binaryPath->setMode( KFile::File | KFile::LocalOnly ); @@ -91,7 +91,7 @@ void CTags2SettingsWidget::loadSettings() while ( it != entryMap.end() ) { TQString file = config->readPathEntry( it.key() ); - new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.contains( file ) ); + new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.tqcontains( file ) ); ++it; } } diff --git a/parts/ctags2/ctags2_settingswidget.h b/parts/ctags2/ctags2_settingswidget.h index 5a9d5c71..1ee3ede0 100644 --- a/parts/ctags2/ctags2_settingswidget.h +++ b/parts/ctags2/ctags2_settingswidget.h @@ -18,11 +18,11 @@ class CTags2Part; -class TagsItem : public QCheckListItem +class TagsItem : public TQCheckListItem { public: - TagsItem( TQListView * parent, TQString name, TQString tagsfilePath, bool active ) - : TQCheckListItem( parent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath ) + TagsItem( TQListView * tqparent, TQString name, TQString tagsfilePath, bool active ) + : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox ), m_name( name ), m_tagsfilePath( tagsfilePath ) { setOn( active ); setText( 1, tagsfilePath ); @@ -40,9 +40,10 @@ private: class CTags2SettingsWidget : public CTags2SettingsWidgetBase { Q_OBJECT + TQ_OBJECT public: - CTags2SettingsWidget( CTags2Part * part, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CTags2SettingsWidget( CTags2Part * part, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~CTags2SettingsWidget(); signals: diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index 27898206..2ea6e4aa 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -1,6 +1,6 @@ CTags2SettingsWidgetBase - + CTags2SettingsWidgetBase @@ -16,11 +16,11 @@ unnamed - + tabWidget8 - + tab @@ -31,7 +31,7 @@ unnamed - + groupBox1 @@ -50,7 +50,7 @@ unnamed - + showDeclarationBox @@ -61,7 +61,7 @@ If checked, an option to go directly to the matching tag declaration will be shown. If more than one match, all matches will be shown in the main ctags result view. - + showDefinitionBox @@ -72,7 +72,7 @@ If checked, an option to go directly to the matching tag definition will be shown. If more than one match, all matches will be shown in the main ctags result view. - + showLookupBox @@ -85,7 +85,7 @@ - + groupBox3_2 @@ -104,7 +104,7 @@ unnamed - + jumpToFirstBox @@ -115,7 +115,7 @@ If more than one hit was produced from an attempt to find an exact match, go to the first match in the list. Note: the <i>Go To Next Match</i> shortcut can be used to step between the matches. - + tagfileCustomBox @@ -142,7 +142,7 @@ - + groupBox3 @@ -164,7 +164,7 @@ unnamed - + textLabel1 @@ -192,7 +192,7 @@ Expanding - + 20 31 @@ -201,7 +201,7 @@ - + tab @@ -212,15 +212,15 @@ unnamed - + - layout15 + tqlayout15 unnamed - + textLabel2 @@ -238,7 +238,7 @@ - + textLabel1_2 @@ -246,15 +246,15 @@ Other tag files: - + - layout21 + tqlayout21 unnamed - + createButton @@ -262,7 +262,7 @@ &Create... - + addButton @@ -270,7 +270,7 @@ &Add... - + removeButton @@ -290,7 +290,7 @@ Expanding - + 20 61 @@ -361,14 +361,14 @@ clear() - + createNewTagSlot() addNewTagFile() removeTagFile() moveUpTagFile() moveDownTagFile() - - + + klineedit.h kurlrequester.h diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index ab277966..f6fec985 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -28,7 +28,7 @@ #include "ctags2_widget.h" #include "tags.h" -class TagItem : public QListViewItem +class TagItem : public TQListViewItem { public: TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern ); @@ -104,7 +104,7 @@ void CTags2Widget::line_edit_changed_delayed( ) void CTags2Widget::showHitCount( int n ) { - hitcount_label->setText( i18n("Hits: %1").arg( n ) ); + hitcount_label->setText( i18n("Hits: %1").tqarg( n ) ); } int CTags2Widget::calculateHitCount( ) @@ -133,7 +133,7 @@ void CTags2Widget::itemExecuted( TQListViewItem * item ) void CTags2Widget::regeneratebutton_clicked() { - TQApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); _part->createTagsFile(); @@ -174,7 +174,7 @@ void CTags2Widget::goToNext( ) if ( (item = item->nextSibling()) != NULL ) { item->setSelected( true ); - output_view->repaint( true ); + output_view->tqrepaint( true ); itemExecuted( item ); return; } diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h index 8b3bb4f4..f86197c0 100644 --- a/parts/ctags2/ctags2_widget.h +++ b/parts/ctags2/ctags2_widget.h @@ -22,6 +22,7 @@ class TQListViewItem; class CTags2Widget : public CTags2WidgetBase { Q_OBJECT + TQ_OBJECT public: CTags2Widget( CTags2Part * part, const char* name = 0, WFlags fl = 0 ); diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index ef564767..801a9c3d 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -1,6 +1,6 @@ CTags2WidgetBase - + CTags2WidgetBase @@ -69,15 +69,15 @@ Result view for a tag lookup. Click a line to go to the corresponding place in the code. - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -93,7 +93,7 @@ Type the identifier you want to lookup. <p> The identifier will populate and display a reducing list as you type. - + hitcount_label @@ -111,14 +111,14 @@ Expanding - + 80 20 - + datetime_label @@ -126,7 +126,7 @@ Date: - + generate_button @@ -168,12 +168,12 @@ input_edit output_view - + line_edit_changed_delayed() line_edit_changed() regeneratebutton_clicked() - - + + klistview.h klineedit.h diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp index e198c577..012db208 100644 --- a/parts/ctags2/ctagskinds.cpp +++ b/parts/ctags2/ctagskinds.cpp @@ -290,7 +290,7 @@ static CTagsKindMapping *findKindMapping(const TQString &extension) TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension ) { - if ( kindChar == 0 ) return TQString::null; + if ( kindChar == 0 ) return TQString(); CTagsKindMapping *kindMapping = findKindMapping(extension); if (kindMapping) { @@ -302,5 +302,5 @@ TQString CTagsKinds::findKind( const char * kindChar, const TQString &extension } } - return TQString::null; + return TQString(); } diff --git a/parts/ctags2/readtags.c b/parts/ctags2/readtags.c index 38014d3f..dce0a2e8 100644 --- a/parts/ctags2/readtags.c +++ b/parts/ctags2/readtags.c @@ -649,7 +649,7 @@ static tagResult findSequential (tagFile *const file) return result; } -static tagResult find (tagFile *const file, tagEntry *const entry, +static tagResult tqfind (tagFile *const file, tagEntry *const entry, const char *const name, const int options) { tagResult result = TagFailure; @@ -758,7 +758,7 @@ extern tagResult tagsFind (tagFile *const file, tagEntry *const entry, { tagResult result = TagFailure; if (file != NULL && file->initialized) - result = find (file, entry, name, options); + result = tqfind (file, entry, name, options); return result; } diff --git a/parts/ctags2/tagitem.h b/parts/ctags2/tagitem.h index 19bc0a59..7108fcb9 100644 --- a/parts/ctags2/tagitem.h +++ b/parts/ctags2/tagitem.h @@ -14,7 +14,7 @@ #include -class TagItem : public QListViewItem +class TagItem : public TQListViewItem { public: TagItem(TQListView * lv, TQString const & tag, TQString const & type, TQString const & file, TQString const & pattern ); diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp index 19993823..8b83c701 100644 --- a/parts/ctags2/tags.cpp +++ b/parts/ctags2/tags.cpp @@ -123,7 +123,7 @@ Tags::TagList Tags::getMatches(const char* tagFile, const TQString & tagpart, bo { type = "macro"; } - if ( types.isEmpty() || types.contains( entry.kind ) ) + if ( types.isEmpty() || types.tqcontains( entry.kind ) ) { list << TagEntry( TQString( entry.name ), type, file, TQString( entry.address.pattern ) ); } diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h index 22b7e7ea..d289d9d6 100644 --- a/parts/ctags2/tags.h +++ b/parts/ctags2/tags.h @@ -45,7 +45,7 @@ public: /** * 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' + * @return returns true if tag database tqcontains 'tag' */ static bool hasTag( const TQString & tag ); diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp index e5a8c74d..aba0f07f 100644 --- a/parts/diff/diffdlg.cpp +++ b/parts/diff/diffdlg.cpp @@ -16,14 +16,14 @@ #include "diffdlg.h" #include "diffwidget.h" -DiffDlg::DiffDlg( TQWidget *parent, const char *name ): - KDialogBase( parent, name, true, i18n("Difference Viewer"), Ok ) +DiffDlg::DiffDlg( TQWidget *tqparent, const char *name ): + KDialogBase( tqparent, name, true, i18n("Difference Viewer"), Ok ) { diffWidget = new DiffWidget( this, "Main Diff Widget" ); setMainWidget( diffWidget ); - TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() ); - layout->addWidget( diffWidget ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() ); + tqlayout->addWidget( diffWidget ); } DiffDlg::~DiffDlg() diff --git a/parts/diff/diffdlg.h b/parts/diff/diffdlg.h index a25a3957..574ffaef 100644 --- a/parts/diff/diffdlg.h +++ b/parts/diff/diffdlg.h @@ -20,9 +20,10 @@ class DiffWidget; class DiffDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DiffDlg( TQWidget *parent = 0, const char *name = 0 ); + DiffDlg( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~DiffDlg(); public slots: diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index fab596ad..f6495932 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -41,8 +41,8 @@ static const KDevPluginInfo data("kdevdiff"); typedef KDevGenericFactory DiffFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) -DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) - : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) +DiffPart::DiffPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevDiffFrontend(&data, tqparent, name ? name : "DiffPart"), proc(0) { setInstance(DiffFactory::instance()); setXMLFile("kdevdiff.rc"); @@ -122,7 +122,7 @@ void DiffPart::contextMenu( TQPopupMenu* popup, const Context* context ) { int id = popup->insertItem( i18n( "Difference to Disk File" ), this, TQT_SLOT(localDiff()) ); - popup->setWhatsThis(id, i18n("Difference to disk file

Shows the difference between " + popup->TQMenuData::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 = TQString::null; + resultBuffer = resultErr = TQString(); delete proc; proc = new KProcess(); @@ -182,9 +182,9 @@ void DiffPart::processExited( KProcess* p ) else showDiff( resultBuffer ); } else { - KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr ); + KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr ); } - resultBuffer = resultErr = TQString::null; + resultBuffer = resultErr = TQString(); delete proc; proc = 0; } @@ -196,7 +196,7 @@ void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen ) void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen ) { - kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ) << endl; + kdDebug(9033) << "received Stderr: " << TQString::fromLocal8Bit( buf, buflen ).data() << endl; resultErr += TQString::fromLocal8Bit( buf, buflen ); } @@ -237,7 +237,7 @@ void DiffPart::showDiff( const TQString& diff ) void DiffPart::slotExecDiff() { - KURL url = KFileDialog::getOpenURL( TQString::null, TQString::null, 0, i18n("Please Select Patch File") ); + KURL url = KFileDialog::getOpenURL( TQString(), TQString(), 0, i18n("Please Select Patch File") ); if ( url.isEmpty() ) return; diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h index 0162f40c..6cbd8b28 100644 --- a/parts/diff/diffpart.h +++ b/parts/diff/diffpart.h @@ -27,9 +27,10 @@ class TQCString; class DiffPart : public KDevDiffFrontend { Q_OBJECT + TQ_OBJECT public: - DiffPart( TQObject *parent, const char *name, const TQStringList & ); + DiffPart( TQObject *tqparent, const char *name, const TQStringList & ); virtual ~DiffPart(); void openURL( const KURL& url ); diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 7d403e46..21e7709f 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -42,7 +42,7 @@ static const int POPUP_BASE = 130977; TQStringList KDiffTextEdit::extParts; TQStringList KDiffTextEdit::extPartsTranslated; -KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) +KDiffTextEdit::KDiffTextEdit( TQWidget* tqparent, const char* name ): TQTextEdit( tqparent, name ) { KConfig* config = kapp->config(); config->setGroup( "Diff" ); @@ -73,7 +73,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) int i = 0; for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { - popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i ); + popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i ); i++; } if ( !extPartsTranslated.isEmpty() ) @@ -90,7 +90,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) popup->insertSeparator( 3 ); popup->insertSeparator(); - popup->insertItem( i18n("Hide view"), parent(), TQT_SLOT(hideView()) ); + popup->insertItem( i18n("Hide view"), tqparent(), TQT_SLOT(hideView()) ); return popup; } @@ -180,8 +180,8 @@ void KDiffTextEdit::popupActivated( int id ) emit externalPartRequested( extParts[ id ] ); } -DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFlags f ): - TQWidget( parent, name, f ), m_part( part ), tempFile( 0 ) +DiffWidget::DiffWidget( DiffPart * part, TQWidget *tqparent, const char *name, WFlags f ): + TQWidget( tqparent, name, f ), m_part( part ), tempFile( 0 ) { job = 0; extPart = 0; @@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl // te->setMinimumSize( 300, 200 ); connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->addWidget( te ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( te ); } DiffWidget::~DiffWidget() @@ -229,11 +229,11 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService( extService, this, 0, this, 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService( extService, this, 0, TQT_TQOBJECT(this), 0 ); if ( !extPart || !extPart->widget() ) return; - layout()->add( extPart->widget() ); + tqlayout()->add( extPart->widget() ); setExtPartVisible( true ); diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h index dc8568c2..638073d0 100644 --- a/parts/diff/diffwidget.h +++ b/parts/diff/diffwidget.h @@ -30,11 +30,12 @@ namespace KParts { } // Helper class that displays a modified RMB popup menu -class KDiffTextEdit: public QTextEdit +class KDiffTextEdit: public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); + KDiffTextEdit( TQWidget* tqparent = 0, const char* name = 0 ); virtual ~KDiffTextEdit(); void applySyntaxHighlight(); void clearSyntaxHighlight(); @@ -58,12 +59,13 @@ private: bool _highlight; }; -class DiffWidget : public QWidget +class DiffWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DiffWidget( DiffPart * part, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + DiffWidget( DiffPart * part, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffWidget(); public slots: diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index 77e69705..33b74c80 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -37,8 +37,8 @@ typedef KDevGenericFactory DistpartFactory; static const KDevPluginInfo data("kdevdistpart"); K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) -DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DistpartPart") { +DistpartPart::DistpartPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; setInstance(DistpartFactory::instance()); diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index d380d4fd..870ba792 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -34,10 +34,11 @@ class KDialogBase; class DistpartPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - DistpartPart(TQObject *parent, const char *name, const TQStringList &); + DistpartPart(TQObject *tqparent, const char *name, const TQStringList &); ~DistpartPart(); public slots: diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index a987c009..7a53590b 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -1,7 +1,7 @@ distpart_ui Ian Reinhart Geiser <geiseri@yahoo.com> - + packaging_dialog @@ -21,13 +21,13 @@ 0 - + 0 0 - + 32767 32767 @@ -46,7 +46,7 @@ 0 - + Layout30 @@ -57,7 +57,7 @@ 0 - + titleLabel @@ -69,7 +69,7 @@ 0 - + 250 0 @@ -79,7 +79,7 @@ <H2>Project Packaging & Publishing</H2> - + KDevelopGraphic @@ -91,13 +91,13 @@ 0 - + 48 48 - + 48 48 @@ -112,7 +112,7 @@ - + actions_box @@ -127,7 +127,7 @@ Top - + tab @@ -143,7 +143,7 @@ srcDistFileListBox - + customProjectCheckBox @@ -154,7 +154,7 @@ Default is: %n-%v.tar.gz - + Layout19 @@ -165,7 +165,7 @@ 0 - + sourceOptionsGroupBox @@ -176,7 +176,7 @@ unnamed - + bzipCheckBox @@ -184,7 +184,7 @@ Use &bzip2 instead of gzip - + Layout34 @@ -195,7 +195,7 @@ 0 - + archiveNameLabel @@ -231,14 +231,14 @@ Expanding - + 0 20 - + addFile @@ -288,7 +288,7 @@ - + fileListLabel @@ -301,7 +301,7 @@ - + tab @@ -312,17 +312,17 @@ unnamed - + - layout12 + tqlayout12 unnamed - + - layout11 + tqlayout11 @@ -341,7 +341,7 @@ - + vendorLabel @@ -394,7 +394,7 @@ - + appNameLabel @@ -405,7 +405,7 @@ appNameLineEdit - + summaryLabel @@ -416,7 +416,7 @@ summaryLineEdit - + licenseLabel @@ -427,7 +427,7 @@ licenseLineEdit - + releaseLabel @@ -438,7 +438,7 @@ releaseLineEdit - + versionLabel @@ -493,7 +493,7 @@ Menu item: Project/Project Options/General/Version changes project compiled version number - + groupLabel @@ -504,7 +504,7 @@ changes project compiled version number groupLineEdit - + packagerLabel @@ -530,7 +530,7 @@ changes project compiled version number - + advancedOptionsGroupBox @@ -541,7 +541,7 @@ changes project compiled version number unnamed - + devPackageCheckBox @@ -549,7 +549,7 @@ changes project compiled version number &Create development package - + docsPackageCheckBox @@ -557,7 +557,7 @@ changes project compiled version number Create documentation package - + appIconCheckBox @@ -565,7 +565,7 @@ changes project compiled version number Include application icon - + archLabel @@ -573,7 +573,7 @@ changes project compiled version number Architecture target:<BR><b>(Note: You must have a compiler that supports this target)</b> - + i386 @@ -644,17 +644,17 @@ changes project compiled version number - + - layout13 + tqlayout13 unnamed - + - layout8 + tqlayout8 @@ -700,23 +700,23 @@ Build Files - + - layout16 + tqlayout16 unnamed - + - layout14 + tqlayout14 unnamed - + projectDescriptionLabel @@ -753,15 +753,15 @@ Build Files - + - layout15 + tqlayout15 unnamed - + TextLabel1 @@ -799,7 +799,7 @@ Build Files - + tab @@ -810,7 +810,7 @@ Build Files unnamed - + localOptionsGroupBox @@ -829,7 +829,7 @@ Build Files unnamed - + Layout15 @@ -840,7 +840,7 @@ Build Files 0 - + genHTMLCheckBox @@ -848,7 +848,7 @@ Build Files Ge&nerate HTML information page - + useRPMInfoCheckBox @@ -866,7 +866,7 @@ Build Files Fixed - + 20 20 @@ -885,14 +885,14 @@ Build Files Expanding - + 20 0 - + Layout21 @@ -923,7 +923,7 @@ Build Files - + remoteOptionsGroupBox @@ -954,14 +954,14 @@ Build Files 0 - + 250 0 - + Layout23 @@ -972,7 +972,7 @@ Build Files 0 - + fileSubmissionLabel @@ -993,7 +993,7 @@ Build Files Minimum - + 20 20 @@ -1034,7 +1034,7 @@ Build Files - + Layout25 @@ -1045,7 +1045,7 @@ Build Files 0 - + uploadCustomCheckBox @@ -1053,7 +1053,7 @@ Build Files Upload to &custom FTP site - + uploadftpkdeorgCheckBox @@ -1071,7 +1071,7 @@ Build Files Expanding - + 0 20 @@ -1102,7 +1102,7 @@ Build Files Reset - + uploadAppsKDEcomCheckBox @@ -1136,7 +1136,7 @@ Build Files srcPackagePushButton clicked() packaging_dialog - slotsrcPackagePushButtonPressed() + Q_SLOTSrcPackagePushButtonPressed() importSPECPushButton @@ -1152,9 +1152,9 @@ Build Files srcDistFileListBox - clicked(QListBoxItem*) + clicked(TQListBoxItem*) packaging_dialog - slotRemoveFile(QListBoxItem*) + slotRemoveFile(TQListBoxItem*) @@ -1201,17 +1201,17 @@ Build Files klineedit.h ktextedit.h - + slotbuildAllPushButtonPressed() slotexportSPECPushButtonPressed() slotimportSPECPushButtonPressed() - slotsrcPackagePushButtonPressed() + Q_SLOTSrcPackagePushButtonPressed() slotAddFileButtonPressed() - slotRemoveFile(QListBoxItem *item) - + slotRemoveFile(TQListBoxItem *item) + DesktopIcon - - + + klistbox.h klineedit.h diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index eebbbe36..177bd966 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -51,8 +51,8 @@ #include "specsupport.h" #include "lsmsupport.h" -DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *parent) - :distpart_ui(parent, "dist_widget"), m_part(part) { +DistpartDialog::DistpartDialog(DistpartPart *part, TQWidget *tqparent) + :distpart_ui(tqparent, "dist_widget"), m_part(part) { m_spec = new SpecSupport(m_part); connect( customProjectCheckBox, TQT_SIGNAL(toggled(bool) ), @@ -142,14 +142,14 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() { } else { - prog->setLabel(i18n("Adding file: %1").arg( file) ); + prog->setLabel(i18n("Adding file: %1").tqarg( file) ); prog->progressBar()->setValue( (idx*100)/srcDistFileListBox->numRows() ); } } tar.close( ); prog->hide(); delete prog; - KMessageBox::information( this, i18n("Archive made at: %1").arg( filename ), i18n("Archive Done") ); + KMessageBox::information( this, i18n("Archive made at: %1").tqarg( filename ), i18n("Archive Done") ); } else @@ -192,7 +192,7 @@ 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(TQRegExp("[^/]*/"),"") )); + KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).tqreplace(TQRegExp("[^/]*/"),"") )); } } @@ -455,9 +455,9 @@ void DistpartDialog::setprojectChangelogMultilineEditText(TQString text) { TQString DistpartDialog::getSourceName() { TQString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : TQString("%n-%v"); name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz"; - return name.replace(TQRegExp("%n"),getappNameFormatLineEditText()) - .replace(TQRegExp("%v"),getversionLineEditText()) - .replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd")); + return name.tqreplace(TQRegExp("%n"),getappNameFormatLineEditText()) + .tqreplace(TQRegExp("%v"),getversionLineEditText()) + .tqreplace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd")); } void DistpartDialog::loadSettings() { @@ -592,7 +592,7 @@ void DistpartDialog::slotAddFileButtonPressed(){ } void DistpartDialog::slotRemoveFile(TQListBoxItem *item){ - if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){ + if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").tqarg( item->text() ), i18n("Remove File") )){ for(uint count =0; count< srcDistFileListBox->numRows(); count++){ if ( item == srcDistFileListBox->item(count)){ srcDistFileListBox->removeItem(count); diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h index 32712ee1..36f70582 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -46,10 +46,11 @@ class ReadOnlyPart; class DistpartDialog : public distpart_ui { Q_OBJECT + TQ_OBJECT public: - DistpartDialog(DistpartPart *part, TQWidget *parent); + DistpartDialog(DistpartPart *part, TQWidget *tqparent); ~DistpartDialog(); signals: diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index ab4d684f..985c7c0f 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -38,23 +38,9 @@ #include /// \FIXME This is at least the fifth place in the kdevelop code something like this exists -TQString QRegExp_escape(const TQString& str ) +TQString TQRegExp_escape(const TQString& str ) { -#if QT_VERSION >= 0x030100 return TQRegExp::escape(str); -#else - // this block is copyrighted by Trolltech AS (GPL) - static const char meta[] = "$()*+.?[\\]^{|}"; - TQString quoted = str; - int i = 0; - - while ( i < (int) quoted.length() ) { - if ( strchr(meta, quoted[i].latin1()) != 0 ) - quoted.insert( i++, "\\" ); - i++; - } - return quoted; -#endif } SpecSupport::SpecSupport(DistpartPart *part) : packageBase(), m_part(part) { @@ -86,7 +72,7 @@ SpecSupport::~SpecSupport() { void SpecSupport::slotbuildAllPushButtonPressed() { TQMap::Iterator it; TQFile file1(dir + "/" + getAppSource()); - TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); + TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource()); if (!file2.exists()) { if (!file1.exists()) { TQMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first.")); @@ -95,17 +81,17 @@ void SpecSupport::slotbuildAllPushButtonPressed() { else if (KDevMakeFrontend *makeFrontend = m_part->extension("KDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) + - " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir")))); + " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir")))); } if (KDevMakeFrontend *makeFrontend = m_part->extension("KDevelop/MakeFrontend")) - makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + + makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -ba " + m_part->project()->projectName() + ".spec"); } // TQPushButton* exportSPECPushButton; void SpecSupport::slotexportSPECPushButtonPressed() { TQMap::Iterator it; - TQString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory()); + TQString specname = ((it = map.tqfind("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory()); specname += ("/" + m_part->project()->projectName() + ".spec"); TQFile file(specname); @@ -122,7 +108,7 @@ TQString SpecSupport::getInfo(TQString s, TQString motif) { TQRegExp re(motif + "[ \t]*([^ \t].*[^ \t])[ \t]*"); if (re.exactMatch(s)) return re.cap(1); - return TQString::null; + return TQString(); } // TQPushButton* importSPECPushButton; @@ -185,7 +171,7 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { TQMap::Iterator it; TQFile file1(dir + "/" + getAppSource()); - TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); + TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource()); if (!file2.exists()) { if (!file1.exists()) { TQMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first.")); @@ -194,10 +180,10 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { else if (KDevMakeFrontend *makeFrontend = m_part->extension("KDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) + - " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir")))); + " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir")))); } if (KDevMakeFrontend *makeFrontend = m_part->extension("KDevelop/MakeFrontend")) - makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + + makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -bs " + m_part->project()->projectName() + ".spec"); } @@ -226,7 +212,7 @@ void SpecSupport::parseDotRpmmacros() { TQString value = re.cap(2).stripWhiteSpace(); while(subst.search(value) != -1) { - value.replace(TQRegExp("%\\{"+ QRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1))); + value.tqreplace(TQRegExp("%\\{"+ TQRegExp_escape( subst.cap(1) ) +"\\}"),*map.tqfind(subst.cap(1))); } map.insert(re.cap(1),value); } @@ -245,7 +231,7 @@ void SpecSupport::parseDotRpmmacros() { bool SpecSupport::createRpmDirectoryFromMacro(const TQString & name) { TQMap::Iterator it; - if((it = map.find(name)) != map.end()) { + if((it = map.tqfind(name)) != map.end()) { TQDir dir(*it); if (!dir.exists()) return dir.mkdir(*it); } diff --git a/parts/documentation/KDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h index e398e89d..a4c49b8d 100644 --- a/parts/documentation/KDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -27,6 +27,7 @@ class DocumentationPart; class KDevDocumentationIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KDevDocumentationIface(DocumentationPart *part); diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp index 21913089..28be5a8c 100644 --- a/parts/documentation/addcatalogdlg.cpp +++ b/parts/documentation/addcatalogdlg.cpp @@ -32,8 +32,8 @@ #include "kdevdocumentationplugin.h" AddCatalogDlg::AddCatalogDlg( TQValueList const & plugins, - TQWidget* parent, const char* name, bool modal, WFlags fl) - :AddCatalogDlgBase(parent,name, modal,fl), m_plugins( plugins ) + TQWidget* tqparent, const char* name, bool modal, WFlags fl) + :AddCatalogDlgBase(tqparent,name, modal,fl), m_plugins( plugins ) { for (TQValueList::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) { diff --git a/parts/documentation/addcatalogdlg.h b/parts/documentation/addcatalogdlg.h index 0a437294..ec5654fa 100644 --- a/parts/documentation/addcatalogdlg.h +++ b/parts/documentation/addcatalogdlg.h @@ -29,8 +29,9 @@ class DocumentationPlugin; class AddCatalogDlg: public AddCatalogDlgBase { Q_OBJECT + TQ_OBJECT public: - AddCatalogDlg( TQValueList const & plugins, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + AddCatalogDlg( TQValueList const & plugins, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~AddCatalogDlg(); TQString title() const; diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index 5274d12b..a24d4d79 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -1,6 +1,6 @@ AddCatalogDlgBase - + AddCatalogDlgBase @@ -19,9 +19,9 @@ unnamed - + - layout20 + tqlayout20 @@ -35,7 +35,7 @@ false - + textLabel3 @@ -53,7 +53,7 @@ Expanding - + 20 18 @@ -65,7 +65,7 @@ locationURL - + textLabel1 @@ -76,7 +76,7 @@ locationURL - + titleLabel @@ -90,14 +90,14 @@ titleEdit - + docTypeCombo - + Layout1 @@ -121,14 +121,14 @@ Expanding - + 20 20 - + buttonOk @@ -145,7 +145,7 @@ true - + buttonCancel @@ -195,11 +195,11 @@ locationURLChanged(const QString&) - + locationURLChanged( const QString & ) docTypeChanged( const QString & ) - - + + klineedit.h kurlrequester.h diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index ff2bbece..c361947e 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -65,7 +65,7 @@ TQString DocBookmarkOwner::currentURL() const if (activePart) return activePart->url().url(); else - return TQString::null; + return TQString(); } TQString DocBookmarkOwner::currentTitle() const @@ -79,21 +79,21 @@ TQString DocBookmarkOwner::currentTitle() const return activePart->url().prettyURL(); } else - return TQString::null; + return TQString(); } class DocBookmarkItem: public DocumentationItem { public: - DocBookmarkItem(Type type, KListView *parent, const TQString &name) - :DocumentationItem(type, parent, name) + DocBookmarkItem(Type type, KListView *tqparent, const TQString &name) + :DocumentationItem(type, tqparent, name) { } - DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name) - :DocumentationItem(type, parent, after, name) + DocBookmarkItem(Type type, KListView *tqparent, DocumentationItem *after, const TQString &name) + :DocumentationItem(type, tqparent, after, name) { } - DocBookmarkItem(Type type, DocumentationItem *parent, const TQString &name) - :DocumentationItem(type, parent, name) + DocBookmarkItem(Type type, DocumentationItem *tqparent, const TQString &name) + :DocumentationItem(type, tqparent, name) { } void setBookmark(const KBookmark &bm) { m_bm = bm; } @@ -107,8 +107,8 @@ private: //class BookmarkView -BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) - :TQWidget(parent, name), m_widget(parent) +BookmarkView::BookmarkView(DocumentationWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_widget(tqparent) { m_bmManager = new DocBookmarkManager(m_widget->part()); m_bmOwner = new DocBookmarkOwner(m_widget->part()); diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index 4f639c7c..b180478c 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -47,11 +47,12 @@ private: DocumentationPart *m_part; }; -class BookmarkView : public QWidget +class BookmarkView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - BookmarkView(DocumentationWidget *parent = 0, const char *name = 0); + BookmarkView(DocumentationWidget *tqparent = 0, const char *name = 0); ~BookmarkView(); public slots: diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 2581f5a0..074f6e2b 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -33,8 +33,8 @@ #include "documentation_part.h" #include "docutils.h" -ContentsView::ContentsView(DocumentationWidget *parent, const char *name) - :TQWidget(parent, name), m_widget(parent) +ContentsView::ContentsView(DocumentationWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_widget(tqparent) { TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0); m_view = new KListView(this); diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index 73b133d0..ad323d01 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -27,11 +27,12 @@ class DocumentationWidget; class TQListViewItem; class KListView; -class ContentsView : public QWidget +class ContentsView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ContentsView(DocumentationWidget *parent, const char *name = 0); + ContentsView(DocumentationWidget *tqparent, const char *name = 0); ~ContentsView(); KListView *view() const { return m_view; } diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index b8d6071c..17735dd6 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -23,8 +23,8 @@ #include "kdevdocumentationplugin.h" -DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) - :KListView(parent, name) +DocConfigListView::DocConfigListView(TQWidget *tqparent, const char *name) + :KListView(tqparent, name) { // setSorting(-1); addColumn(i18n("TOC")); @@ -66,7 +66,7 @@ void DocConfigListView::clickedItem(TQListViewItem *item, const TQPoint &// pnt cfg->setIndex(!cfg->index()); else if ((c == 2) && (cfg->fullTextSearchPossible())) cfg->setFullTextSearch(!cfg->fullTextSearch()); - repaintItem(item); + tqrepaintItem(item); } #include "docconfiglistview.moc" diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index a7c0aea0..b81b0203 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -25,8 +25,9 @@ class DocConfigListView : public KListView { Q_OBJECT + TQ_OBJECT public: - DocConfigListView(TQWidget *parent = 0, const char *name = 0); + DocConfigListView(TQWidget *tqparent = 0, const char *name = 0); ~DocConfigListView(); protected slots: diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 0184c4c9..3bcefe97 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -51,8 +51,8 @@ #include "docutils.h" DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, - DocumentationWidget *widget, TQWidget *parent, const char *name, WFlags fl) - :DocGlobalConfigWidgetBase(parent, name, fl), m_part(part), m_widget(widget) + DocumentationWidget *widget, TQWidget *tqparent, const char *name, WFlags fl) + :DocGlobalConfigWidgetBase(tqparent, name, fl), m_part(part), m_widget(widget) { m_View = new DocConfigListView( viewHolder ); viewHolder->addWidget( m_View ); @@ -100,7 +100,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels @@ -195,7 +195,7 @@ void DocGlobalConfigWidget::accept() for (TQStringList::const_iterator it2 = app.constBegin(); it2 != app.constEnd(); ++it2) { - if (!locs.contains(*it2)) + if (!locs.tqcontains(*it2)) locs.append(*it2); } } diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index afef5730..dc2ab3f0 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -32,9 +32,10 @@ class KListView; class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: DocGlobalConfigWidget(DocumentationPart *part, DocumentationWidget *widget, - TQWidget *parent = 0, const char *name = 0, WFlags fl = 0); + TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0); ~DocGlobalConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 1af1e011..7798ed79 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -1,6 +1,6 @@ DocGlobalConfigWidgetBase - + DocGlobalConfigWidgetBase @@ -22,11 +22,11 @@ 0 - + docTab - + tab @@ -37,7 +37,7 @@ unnamed - + viewHolder @@ -49,7 +49,7 @@ 0 - + WStackPage @@ -58,15 +58,15 @@ - + - layout1 + tqlayout1 unnamed - + addCollectionButton @@ -74,7 +74,7 @@ &Add... - + editCollectionButton @@ -82,7 +82,7 @@ &Edit... - + removeCollectionButton @@ -100,7 +100,7 @@ Expanding - + 20 40 @@ -111,7 +111,7 @@ - + TabPage @@ -132,22 +132,22 @@ Expanding - + 20 190 - + - layout5 + tqlayout5 unnamed - + htsearchbinLabel @@ -176,7 +176,7 @@ Minimum - + 20 16 @@ -199,7 +199,7 @@ StrongFocus - + htdigbinLabel @@ -218,7 +218,7 @@ StrongFocus - + databaseDirLabel @@ -229,7 +229,7 @@ databaseDirEdit - + htmergebinLabel @@ -244,7 +244,7 @@ - + TabPage @@ -265,14 +265,14 @@ Expanding - + 20 20 - + buttonGroup1 @@ -283,7 +283,7 @@ unnamed - + find_box @@ -291,7 +291,7 @@ &Find in documentation - + index_box @@ -299,7 +299,7 @@ &Look in documentation index - + search_box @@ -307,7 +307,7 @@ S&earch in documentation - + info_box @@ -315,7 +315,7 @@ Goto &infopage - + man_box @@ -325,7 +325,7 @@ - + useAssistant_box @@ -333,7 +333,7 @@ Use KDevelop &Assistant to browse documentation - + groupBox1 @@ -344,7 +344,7 @@ unnamed - + textLabel1 @@ -373,7 +373,7 @@ fixedFont_combo - + textLabel1_2 @@ -392,7 +392,7 @@ fixedFont_combo - + textLabel2 @@ -411,7 +411,7 @@ zoom_combo - + 20 @@ -542,15 +542,15 @@ info_box man_box - + addCollectionButtonClicked() editCollectionButtonClicked() removeCollectionButtonClicked() collectionsBoxCurrentChanged( int ) updateConfig() updateIndex() - - + + kurlrequester.h klineedit.h diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp index a37ad5cb..910cd5d4 100644 --- a/parts/documentation/docprojectconfigwidget.cpp +++ b/parts/documentation/docprojectconfigwidget.cpp @@ -33,8 +33,8 @@ #include "documentation_part.h" #include "documentation_widget.h" -DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent, const char *name) - :DocProjectConfigWidgetBase(parent, name), m_part(part) +DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent, const char *name) + :DocProjectConfigWidgetBase(tqparent, name), m_part(part) { for (TQValueList::const_iterator it = m_part->m_plugins.constBegin(); it != m_part->m_plugins.constEnd(); ++it) diff --git a/parts/documentation/docprojectconfigwidget.h b/parts/documentation/docprojectconfigwidget.h index c5d904b5..8a925a50 100644 --- a/parts/documentation/docprojectconfigwidget.h +++ b/parts/documentation/docprojectconfigwidget.h @@ -27,8 +27,9 @@ class DocumentationPlugin; class DocProjectConfigWidget: public DocProjectConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - DocProjectConfigWidget(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); + DocProjectConfigWidget(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void changeDocSystem(const TQString &text); diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index ccff4bfc..25bf023f 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -1,6 +1,6 @@ DocProjectConfigWidgetBase - + DocProjectConfigWidgetBase @@ -26,14 +26,14 @@ Expanding - + 20 60 - + groupBox1 @@ -52,7 +52,7 @@ false - + textLabel2 @@ -63,7 +63,7 @@ catalogURL - + textLabel1 @@ -88,14 +88,14 @@ docSystemCombo - + docSystemCombo - + groupBox2 @@ -106,7 +106,7 @@ unnamed - + textLabel1_2 @@ -140,10 +140,10 @@ catalogURL docSystemCombo - + changeDocSystem(const QString &) - - + + klineedit.h kpushbutton.h diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 32e57d9e..0d22c07a 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdocumentation"); typedef KDevGenericFactory DocumentationFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) -DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), +DocumentationPart::DocumentationPart(TQObject *tqparent, const char *name, const TQStringList& ) + :KDevPlugin(&data, tqparent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); @@ -98,7 +98,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T TQWhatsThis::add(m_widget, i18n("Documentation browser

" "The documentation browser gives access to various " - "documentation sources (Qt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp " + "documentation sources (TQt DCF, Doxygen, KDoc, KDevelopTOC and DevHelp " "documentation) and the KDevelop manuals. It also provides documentation index " "and full text search capabilities.")); @@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart() void DocumentationPart::loadDocumentationPlugins() { KTrader::OfferList docPluginOffers = - KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"), - TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION)); + KTrader::self()->query(TQString::tqfromLatin1("KDevelop/DocumentationPlugins"), + TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION)); KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin(); for ( ; serviceIt != docPluginOffers.end(); ++serviceIt ) @@ -156,7 +156,7 @@ void DocumentationPart::emitIndexSelected(IndexBox *indexBox) { if (!m_hasIndex) { - TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor)); + TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); emit indexSelected(indexBox); indexBox->fill(); m_hasIndex = true; @@ -347,13 +347,13 @@ void DocumentationPart::infoPage() void DocumentationPart::manPage(const TQString &term) { - TQString url = TQString::fromLatin1("man:/%1").arg(term); + TQString url = TQString::tqfromLatin1("man:/%1").tqarg(term); partController()->showDocument(KURL(url)); } void DocumentationPart::infoPage(const TQString &term) { - TQString url = TQString::fromLatin1("info:/%1").arg(term); + TQString url = TQString::tqfromLatin1("info:/%1").tqarg(term); partController()->showDocument(KURL(url)); } @@ -465,40 +465,40 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context) TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30); int id = -1; if (hasContextFeature(Finder)) { - id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed), + id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed), this, TQT_SLOT(contextFindDocumentation())); - popup->setWhatsThis(id, i18n("Find documentation

" + popup->tqsetWhatsThis(id, i18n("Find documentation

" "Opens the documentation finder tab and searches " "all possible sources of documentation like " "table of contents, index, man and info databases, " "Google, etc.")); } if (hasContextFeature(IndexLookup)) { - id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed), + id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed), this, TQT_SLOT(contextLookInDocumentationIndex())); - popup->setWhatsThis(id, i18n("Look in documentation index

" + popup->tqsetWhatsThis(id, i18n("Look in documentation index

" "Opens the documentation index tab. It allows " "a term to be entered which will be looked for in " "the documentation index.")); } if (hasContextFeature(FullTextSearch)) { - id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed), + id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed), this, TQT_SLOT(contextSearchInDocumentation())); - popup->setWhatsThis(id, i18n("Search in documentation

Searches " + popup->tqsetWhatsThis(id, i18n("Search in documentation

Searches " "for a term under the cursor in " "the documentation. For this to work, " "a full text index must be created first, which can be done in the " "configuration dialog of the documentation plugin.")); } if (hasContextFeature(GotoMan)) { - id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed), + id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed), this, TQT_SLOT(contextManPage())); - popup->setWhatsThis(id, i18n("Goto manpage

Tries to open a man page for the term under the cursor.")); + popup->tqsetWhatsThis(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), + id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed), this, TQT_SLOT(contextInfoPage()) ); - popup->setWhatsThis(id, i18n("Goto infopage

Tries to open an info page for the term under the cursor.")); + popup->tqsetWhatsThis(id, i18n("Goto infopage

Tries to open an info page for the term under the cursor.")); } if (id != -1) popup->insertSeparator(); @@ -665,7 +665,7 @@ TQCString DocumentationPart::startAssistant() kdDebug() << dcopName.data() << endl; //@fixme: is there another way to wait for the remote object to be loaded - while (!KApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation")) + while (!KApplication::dcopClient()->remoteObjects(dcopName).tqcontains("KDevDocumentation")) usleep(500); } } @@ -675,7 +675,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().find("kdevassistant") != -1 ) + if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) { return false; } diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index 056785a0..1334b8ca 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -42,10 +42,11 @@ class TQPopupMenu; class DocumentationPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: enum ContextFeature { Finder, IndexLookup, FullTextSearch, GotoMan, GotoInfo }; - DocumentationPart(TQObject *parent, const char *name, const TQStringList &); + DocumentationPart(TQObject *tqparent, const char *name, const TQStringList &); ~DocumentationPart(); void emitIndexSelected(IndexBox *indexBox); diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index d579142b..21325e81 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -34,9 +34,10 @@ class SearchView; class BookmarkView; class KListView; -class DocumentationWidget : public QWidget +class DocumentationWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: DocumentationWidget(DocumentationPart *part); ~DocumentationWidget(); diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index 79fa9915..4291a745 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, cons if (showSearch) { menu.insertSeparator(); - menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4); + menu.insertItem(TQString("%1: %2").tqarg(i18n("Search")).tqarg(KStringHandler::csqueeze(title,20)), 4); } switch (menu.exec(pos)) diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index fec2dc11..2962e58d 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -1,6 +1,6 @@ EditBookmarkDlg - + EditBookmarkDlg @@ -24,7 +24,7 @@ locationEdit - + textLabel1 @@ -35,7 +35,7 @@ nameEdit - + textLabel1_2 @@ -51,7 +51,7 @@ nameEdit - + Layout1 @@ -75,14 +75,14 @@ Expanding - + 20 20 - + buttonOk @@ -99,7 +99,7 @@ true - + buttonCancel @@ -125,7 +125,7 @@ Expanding - + 20 0 @@ -156,7 +156,7 @@ buttonOk buttonCancel - + kpushbutton.h klineedit.h diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp index 8bdc19d5..ed8c2467 100644 --- a/parts/documentation/editcatalogdlg.cpp +++ b/parts/documentation/editcatalogdlg.cpp @@ -28,9 +28,9 @@ #include "docutils.h" #include "kdevdocumentationplugin.h" -EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent, +EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* tqparent, const char* name, bool modal, WFlags fl) - :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin) + :EditCatalogBase(tqparent,name, modal,fl), m_plugin(plugin) { if (m_plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles)) { diff --git a/parts/documentation/editcatalogdlg.h b/parts/documentation/editcatalogdlg.h index f8f1fabf..9f54faf8 100644 --- a/parts/documentation/editcatalogdlg.h +++ b/parts/documentation/editcatalogdlg.h @@ -27,9 +27,10 @@ class DocumentationPlugin; class EditCatalogDlg : public EditCatalogBase { Q_OBJECT + TQ_OBJECT public: EditCatalogDlg(DocumentationPlugin *plugin, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~EditCatalogDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 3fd4caf9..07989ef9 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -1,6 +1,6 @@ EditCatalogBase - + EditCatalogBase @@ -25,7 +25,7 @@ unnamed - + Layout1 @@ -49,14 +49,14 @@ Expanding - + 20 20 - + buttonOk @@ -73,7 +73,7 @@ true - + buttonCancel @@ -89,9 +89,9 @@ - + - layout3 + tqlayout3 @@ -107,14 +107,14 @@ Expanding - + 20 40 - + textLabel1_2 @@ -130,7 +130,7 @@ locationURL - + titleLabel @@ -184,10 +184,10 @@ buttonOk buttonCancel - + locationURLChanged( const QString & ) - - + + kpushbutton.h klineedit.h diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 782ef467..60b0bce1 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -41,15 +41,15 @@ #include -FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name) - :FindDocumentationBase(parent, name), +FindDocumentation::FindDocumentation(DocumentationWidget* tqparent, const char* name) + :FindDocumentationBase(tqparent, name), man_item(0), info_item(0), index_item(0), google_item(0), contents_item(0), - last_item(0), m_widget(parent) + last_item(0), m_widget(tqparent) { - TQWidget* tmp = TQApplication::desktop(); + TQWidget* tmp = TQT_TQWIDGET(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 ); + proc_man = new KProcess( TQT_TQOBJECT(this) ); + proc_info = new KProcess( TQT_TQOBJECT(this) ); connect( proc_man, TQT_SIGNAL(processExited( KProcess* )), this, TQT_SLOT(procManExited( KProcess* )) ); @@ -94,11 +94,11 @@ void FindDocumentation::clickOnItem( TQListViewItem * item ) DocumentationItem* doc_item = dynamic_cast(item); - if(item->parent() == man_item || - item->parent() == info_item || - item->parent() == google_item || - item->parent() == index_item || - item->parent() == contents_item) + if(item->tqparent() == man_item || + item->tqparent() == info_item || + item->tqparent() == google_item || + item->tqparent() == index_item || + item->tqparent() == contents_item) m_widget->part()->partController()->showDocument(doc_item->url()); } @@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* ) void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len) { - proc_info_out += TQString::fromLatin1( buf, len ); + proc_info_out += TQString::tqfromLatin1( buf, len ); } void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len) { - proc_man_out += TQString::fromLatin1( buf, len ); + proc_man_out += TQString::tqfromLatin1( buf, len ); } void FindDocumentation::searchInInfo() @@ -228,7 +228,7 @@ void FindDocumentation::searchInContents() catalogItem->load(); catalogItem->plugin()->setCatalogURL(catalogItem); } - if (it.current()->text(0).contains(search_term->text(),false)) + if (it.current()->text(0).tqcontains(search_term->text(),false)) { DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document, contents_item, it.current()->text(0) ); @@ -260,7 +260,7 @@ void FindDocumentation::searchInIndex() DocumentationItem* newitem = 0; while(item) { - if(!item->text().contains(search_term->text(),false)) + if(!item->text().tqcontains(search_term->text(),false)) break; IndexItem::List urls = item->urls(); diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index 0a9a3e0a..25088d9a 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -31,8 +31,9 @@ class KProcess; class FindDocumentation : public FindDocumentationBase { Q_OBJECT + TQ_OBJECT public: - FindDocumentation(DocumentationWidget* parent, const char* name = 0); + FindDocumentation(DocumentationWidget* tqparent, const char* name = 0); ~FindDocumentation(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index df04ca81..823aad2c 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -28,8 +28,8 @@ #include #include -FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal) - :FindDocumentationOptionsBase(parent,name, modal), +FindDocumentationOptions::FindDocumentationOptions(TQWidget* tqparent, const char* name, bool modal) + :FindDocumentationOptionsBase(tqparent,name, modal), m_man_item(0), m_info_item(0), m_index_item(0), m_google_item(0), m_contents_item(0) { readOptions(); diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h index 0c88317b..3fb2ed7c 100644 --- a/parts/documentation/find_documentation_options.h +++ b/parts/documentation/find_documentation_options.h @@ -29,8 +29,9 @@ class KConfig; class FindDocumentationOptions : public FindDocumentationOptionsBase { Q_OBJECT + TQ_OBJECT public: - FindDocumentationOptions(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE); + FindDocumentationOptions(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE); ~FindDocumentationOptions(); /*$PUBLIC_FUNCTIONS$*/ virtual bool isContents( TQCheckListItem * item ); diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index c2beadc9..de265bfe 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -1,6 +1,6 @@ FindDocumentationOptionsBase - + FindDocumentationOptionsBase @@ -22,7 +22,7 @@ unnamed - + @@ -38,7 +38,7 @@ source_list - + Layout9_3 @@ -59,14 +59,14 @@ Expanding - + 20 20 - + moveup_button @@ -74,7 +74,7 @@ Move &Up - + movedown_button @@ -92,7 +92,7 @@ Expanding - + 20 20 @@ -101,7 +101,7 @@ - + goto_first_match @@ -109,7 +109,7 @@ Go to first match - + Layout1 @@ -133,14 +133,14 @@ Expanding - + 20 20 - + buttonOk @@ -157,7 +157,7 @@ true - + buttonCancel @@ -173,7 +173,7 @@ - + textLabel1 @@ -210,9 +210,9 @@ sources and change their priority here. sourceMoveDown() - + sourceMoveUp() sourceMoveDown() - - + + diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index 58e6aeb0..19da4dab 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -1,7 +1,7 @@ FindDocumentationBase Tobias Gläßer - + FindDocumentationBase @@ -28,7 +28,7 @@ unnamed - + textLabel1 @@ -36,7 +36,7 @@ Search term: - + button_search @@ -52,7 +52,7 @@ search_term - + butten_options @@ -70,7 +70,7 @@ Expanding - + 100 20 @@ -110,9 +110,9 @@ result_list - executed(QListViewItem*) + executed(TQListViewItem*) FindDocumentationBase - clickOnItem(QListViewItem*) + clickOnItem(TQListViewItem*) butten_options @@ -122,9 +122,9 @@ result_list - mouseButtonPressed(int,QListViewItem*,const QPoint&,int) + mouseButtonPressed(int,TQListViewItem*,const QPoint&,int) FindDocumentationBase - buttonPressedOnItem(int,QListViewItem*,const QPoint&,int) + buttonPressedOnItem(int,TQListViewItem*,const QPoint&,int) search_term @@ -134,9 +134,9 @@ result_list - returnPressed(QListViewItem*) + returnPressed(TQListViewItem*) FindDocumentationBase - clickOnItem(QListViewItem*) + clickOnItem(TQListViewItem*) @@ -145,7 +145,7 @@ result_list butten_options - + clickOptions() setSearchTerm( const QString & term ) startSearch() @@ -156,10 +156,10 @@ searchInInfo() procManReadFromStdout() procInfoReadFromStdout() - clickOnItem( QListViewItem * item ) - buttonPressedOnItem( int button, QListViewItem * item, const QPoint & pos, int c ) - - + clickOnItem( TQListViewItem * item ) + buttonPressedOnItem( int button, TQListViewItem * item, const QPoint & pos, int c ) + + klineedit.h klistview.h diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 6a7eddcf..a9e240be 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -38,8 +38,8 @@ #include "documentation_part.h" #include "documentation_widget.h" -IndexView::IndexView(DocumentationWidget *parent, const char *name) - :TQWidget(parent, name), m_widget(parent) +IndexView::IndexView(DocumentationWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_widget(tqparent) { TQVBoxLayout *l = new TQVBoxLayout(this, 0, 0); @@ -85,7 +85,7 @@ void IndexView::searchInIndex(TQListBoxItem *item) else { SelectTopic *dia = new SelectTopic(urls); - dia->topicLabel->setText(dia->topicLabel->text().arg(item->text())); + dia->topicLabel->setText(dia->topicLabel->text().tqarg(item->text())); if (dia->exec()) m_widget->part()->partController()->showDocument(dia->selectedURL()); delete dia; @@ -123,7 +123,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) if (!watched || !e) return true; - if ((watched == m_edit) && (e->type() == TQEvent::KeyPress)) + if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_edit)) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) diff --git a/parts/documentation/indexview.h b/parts/documentation/indexview.h index 92f965f2..8fb04e4d 100644 --- a/parts/documentation/indexview.h +++ b/parts/documentation/indexview.h @@ -28,11 +28,12 @@ class TQListBoxItem; class DocumentationWidget; class FindDocumentation; -class IndexView : public QWidget +class IndexView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IndexView(DocumentationWidget *parent = 0, const char *name = 0); + IndexView(DocumentationWidget *tqparent = 0, const char *name = 0); ~IndexView(); virtual bool eventFilter(TQObject *watched, TQEvent *e); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 3364f71a..22c375d2 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -33,30 +33,30 @@ //class DocumentationItem -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, const TQString &name) - :KListViewItem(parent, name), m_type(type) + :KListViewItem(tqparent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *tqparent, const TQString &name) - :KListViewItem(parent, name), m_type(type) + :KListViewItem(tqparent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *tqparent, KListViewItem *after, const TQString &name) - :KListViewItem(parent, after, name), m_type(type) + :KListViewItem(tqparent, after, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * tqparent, KListViewItem * after, const TQString & name ) - :KListViewItem(parent, after, name), m_type(type) + :KListViewItem(tqparent, after, name), m_type(type) { init(); } @@ -90,8 +90,8 @@ void DocumentationItem::init( ) DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), + KListView *tqparent, const TQString &name) + :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { setExpandable(true); @@ -99,8 +99,8 @@ DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, } DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), + DocumentationItem *tqparent, const TQString &name) + :DocumentationItem(DocumentationItem::Catalog, tqparent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { setExpandable(true); @@ -172,7 +172,7 @@ IndexItem::List IndexItem::urls() const TQValueList itemProtos = m_listbox->items[text()]; for (TQValueList::const_iterator it = itemProtos.begin(); it != itemProtos.end(); ++it) - urlList.append(qMakePair((*it)->description(), (*it)->url())); + urlList.append(tqMakePair((*it)->description(), (*it)->url())); return urlList; } @@ -181,9 +181,9 @@ IndexItem::List IndexItem::urls() const //class ConfigurationItem -ConfigurationItem::ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, +ConfigurationItem::ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible) - :TQCheckListItem(parent, "", TQCheckListItem::CheckBox), m_title(title), m_url(url), + :TQCheckListItem(tqparent, "", 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 ) @@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu p->fillRect(0, 0, width, height(), cg.brush(crole)); TQFontMetrics fm(lv->fontMetrics()); - int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int styleflags = TQStyle::Style_Default; @@ -229,7 +229,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu y = (fm.height() + 2 + marg - boxsize) / 2; TQStyleOption opt(this); - lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt); return; @@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const { if ((c == 0) || (c == 1) || (c == 2)) - return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; + return lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; return TQListViewItem::width(fm, lv, c); } @@ -253,8 +253,8 @@ int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int //class DocumentationPlugin -DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name) - :TQObject(parent, name), config(pluginConfig), m_indexCreated(false) +DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *tqparent, const char *name) + :TQObject(tqparent, name), config(pluginConfig), m_indexCreated(false) { } @@ -462,7 +462,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin(); it != deletedConfigurationItems.constEnd(); ++it) { - if (namedCatalogs.contains(*it)) + if (namedCatalogs.tqcontains(*it)) delete namedCatalogs[*it]; } deletedConfigurationItems.clear(); @@ -472,15 +472,15 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL it != entryMap.end(); ++it) { config->setGroup("Locations"); - if (restrictions.contains(it.key()) || (!catalogEnabled(it.key()))) + if (restrictions.tqcontains(it.key()) || (!catalogEnabled(it.key()))) { - if (namedCatalogs.contains(it.key())) + if (namedCatalogs.tqcontains(it.key())) delete namedCatalogs[it.key()]; } else { kdDebug() << "updating 1" << endl; - if (!namedCatalogs.contains(it.key())) //create catalog if it does not exist + if (!namedCatalogs.tqcontains(it.key())) //create catalog if it does not exist { DocumentationCatalogItem * item = createCatalog(contents, it.key(), config->readPathEntry(it.key())); loadIndex(index, item); @@ -493,7 +493,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL clearCatalogIndex(namedCatalogs[it.key()]); } else if ( (indexEnabled(namedCatalogs[it.key()])) //index is requested in configuration but does not yet exist - && (!indexes.contains(namedCatalogs[it.key()])) ) + && (!indexes.tqcontains(namedCatalogs[it.key()])) ) { kdDebug() << " index requested " << endl; loadIndex(index, namedCatalogs[it.key()]); @@ -512,7 +512,7 @@ void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) for (TQMap::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { - if (namedCatalogs.contains(it.key()) + if (namedCatalogs.tqcontains(it.key()) && namedCatalogs[it.key()]->isProjectDocumentationItem()) continue; @@ -613,8 +613,8 @@ void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e) //class IndexBox -IndexBox::IndexBox(TQWidget *parent, const char *name) - :KListBox(parent, name), m_dirty(false) +IndexBox::IndexBox(TQWidget *tqparent, const char *name) + :KListBox(tqparent, name), m_dirty(false) { } @@ -630,7 +630,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item) if (items[text].count() == 0) { items.remove(text); - TQListBoxItem *item = findItem(text, Qt::CaseSensitive | Qt::ExactMatch); + TQListBoxItem *item = tqfindItem(text, TQt::CaseSensitive | TQt::ExactMatch); if (item) delete item; } diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index 0c1dcf0d..fc7af7e3 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -43,10 +43,10 @@ public: Document /** URL; + typedef TQPair URL; typedef TQValueList List; IndexItem(IndexBox *listbox, const TQString &text); @@ -136,7 +136,7 @@ private: /**Documentation index view.*/ class IndexBox: public KListBox{ public: - IndexBox(TQWidget *parent = 0, const char *name = 0); + IndexBox(TQWidget *tqparent = 0, const char *name = 0); virtual void addIndexItem(IndexItemProto *item); virtual void removeIndexItem(IndexItemProto *item); @@ -158,10 +158,10 @@ class TQFontMetrics; class DocumentationPlugin; /**Documentation configuration item.*/ -class ConfigurationItem: public QCheckListItem +class ConfigurationItem: public TQCheckListItem { public: - ConfigurationItem(TQListView *parent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, + ConfigurationItem(TQListView *tqparent, DocumentationPlugin * plugin, const TQString &title, const TQString &url, bool indexPossible, bool fullTextSearchPossible); virtual TQString title() const { return m_title; } @@ -214,9 +214,10 @@ methods to load documentation catalogs and indexes for a documentation of that type. It also has methods to configure catalogs and provides a list of URL's for the full text search tool. */ -class DocumentationPlugin: public QObject +class DocumentationPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: /**Capability of documentation plugin.*/ enum Capability { Index=1 /** catalogLocatorProps() = 0; + virtual TQPair catalogLocatorProps() = 0; /**Returns a title of catalog defined by an url parameter.*/ virtual TQString catalogTitle(const TQString &url) = 0; @@ -389,6 +390,7 @@ Represents functionality to display project documentation catalog and index in d */ class ProjectDocumentationPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: ProjectDocumentationPlugin(DocumentationPlugin *docPlugin, DocumentationPlugin::ProjectDocType type); virtual ~ProjectDocumentationPlugin(); diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index e0b19de9..fb033a7f 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -38,9 +38,9 @@ static const KDevPluginInfo data("docchmplugin"); typedef KDevGenericFactory DocCHMPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) ) -DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args +DocCHMPlugin::DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList // args ) - :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation autoSetup(); @@ -59,15 +59,15 @@ DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const return item; } -QPair DocCHMPlugin::catalogLocatorProps() +TQPair DocCHMPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.chm"); + return TQPair(KFile::File, "*.chm"); } TQString DocCHMPlugin::catalogTitle(const TQString& // url ) { - return TQString::null; + return TQString(); } TQString DocCHMPlugin::pluginName() const @@ -127,9 +127,9 @@ void DocCHMPlugin::createIndex(IndexBox* // index } -static KListViewItem* chainEnd(KListViewItem *parent) { - if(parent == 0) return 0; - KListViewItem* ret = dynamic_cast(parent->firstChild()); +static KListViewItem* chainEnd(KListViewItem *tqparent) { + if(tqparent == 0) return 0; + KListViewItem* ret = dynamic_cast(tqparent->firstChild()); if(ret == 0) return 0; while(ret->nextSibling() != 0) { ret = dynamic_cast(ret->nextSibling()); @@ -138,15 +138,15 @@ static KListViewItem* chainEnd(KListViewItem *parent) { } static TQString decodeHTML(const TQString& s) { - TQRegExp rx(TQString::fromLatin1("&#(\\d+);| ")); + TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);| ")); TQString out = s; int pos = rx.search(out); while(pos > -1) { TQString found = rx.cap(0); if(found != " ") { - out.replace(pos, found.length(), static_cast(rx.cap(1).toInt())); + out.tqreplace(pos, found.length(), static_cast(rx.cap(1).toInt())); }else{ - out.replace(pos, found.length(), " "); + out.tqreplace(pos, found.length(), " "); } pos = rx.search(out, pos+1); } @@ -163,11 +163,11 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) items.push_back(item); for(TQStringList::Iterator it = lines.begin(); it != lines.end();) { bool ok1 = true, ok2 = true; - int parent = (*it).toInt(&ok1); + int tqparent = (*it).toInt(&ok1); ++it; int current = (*it).toInt(&ok2); ++it; - if(int(items.size()) != current || !ok1 || !ok2 || parent < 0 || parent >= int(items.size()) || current < 0 || current != int(items.size())) { + if(int(items.size()) != current || !ok1 || !ok2 || tqparent < 0 || tqparent >= int(items.size()) || current < 0 || current != int(items.size())) { kdDebug(9002) << "DocCHMPlugin::createTOC error while parsing output of ioslave" << endl; break; } @@ -178,9 +178,9 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) ++it; items.push_back(new DocumentationItem( - DocumentationItem::Document, items[parent], chainEnd(items[parent]), decodeHTML(name))); + DocumentationItem::Document, items[tqparent], chainEnd(items[tqparent]), decodeHTML(name))); items[current]->setURL(url); - if(parent != 0) items[parent]->setType(DocumentationItem::Book); + if(tqparent != 0) items[tqparent]->setType(DocumentationItem::Book); } diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index ca90a978..3f069faf 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -25,15 +25,16 @@ class DocCHMPlugin :public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); + DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList args = TQStringList()); ~DocCHMPlugin(); virtual TQString pluginName() const; virtual void setCatalogURL(DocumentationCatalogItem* item); virtual TQString catalogTitle(const TQString& url); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index ae95aff1..47012a2b 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -32,9 +32,9 @@ static const KDevPluginInfo data("doccustomplugin"); typedef KDevGenericFactory DocCustomPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) ) -DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args +DocCustomPlugin::DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList // args ) - :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -62,14 +62,14 @@ DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, co return item; } -QPair DocCustomPlugin::catalogLocatorProps() +TQPair DocCustomPlugin::catalogLocatorProps() { - return QPair(KFile::File, "all/allfiles"); + return TQPair(KFile::File, "all/allfiles"); } TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocCustomPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index 77bc9750..33efec8f 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -24,7 +24,7 @@ class DocCustomPlugin : public DocumentationPlugin { public: - DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocCustomPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair 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 11c2b6a7..79106157 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -41,13 +41,13 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem { public: DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) { } DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) { } TQString devHelpFile() const { return m_devHelpFile; } @@ -73,9 +73,9 @@ static const KDevPluginInfo data("docdevhelpplugin"); typedef KDevGenericFactory DocDevHelpPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) ) -DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name, +DocDevHelpPlugin::DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation); autoSetup(); @@ -90,29 +90,29 @@ DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, c return new DevHelpDocumentationCatalogItem(url, this, contents, title); } -QPair DocDevHelpPlugin::catalogLocatorProps() +TQPair DocDevHelpPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.devhelp"); + return TQPair(KFile::File, "*.devhelp"); } TQString DocDevHelpPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f)) - return TQString::null; + return TQString(); f.close(); TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", TQString::null); + return docEl.attribute("title", TQString()); } TQString DocDevHelpPlugin::pluginName() const @@ -194,7 +194,7 @@ void DocDevHelpPlugin::autoSetupPlugin() continue; scanList << dir.path(); - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) @@ -224,8 +224,8 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) d.setFilter(TQDir::Files); //scan for *.devhelp files - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -240,7 +240,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) void DocDevHelpPlugin::pushToScanStack(TQValueStack &stack, const TQString &value) { - if ( (!value.isEmpty()) && (!stack.contains(value)) ) + if ( (!value.isEmpty()) && (!stack.tqcontains(value)) ) { stack << value; kdDebug() << "Devhelp scan stack: +: " << value << endl; @@ -320,7 +320,7 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item) addTocSect(dhItem, childEl, baseUrl, true); } -void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, +void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book) { while (!childEl.isNull()) @@ -330,11 +330,11 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE TQString name = childEl.attribute("name"); TQString url = childEl.attribute("link"); - if (name.isEmpty() && url.contains("ix")) + if (name.isEmpty() && url.tqcontains("ix")) name = "Index"; DocumentationItem *item = new DocumentationItem( - book ? DocumentationItem::Book : DocumentationItem::Document, parent, name); + book ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); item->setURL(KURL(baseUrl+"/"+url)); TQDomElement grandchildEl = childEl.lastChild().toElement(); @@ -371,7 +371,7 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item) if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString())); item->setURL(url); } } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 9e4df5c2..dde545d3 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -28,8 +28,9 @@ class DocDevHelpPlugin: public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDevHelpPlugin(); virtual TQString pluginName() const; @@ -47,14 +48,14 @@ public: virtual TQStringList fullTextSearchLocations(); virtual void autoSetupPlugin(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: void pushToScanStack(TQValueStack &stack, const TQString &value); void scanDevHelpDir(const TQString &path); - void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false); + void addTocSect(DocumentationItem *tqparent, 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 f9761155..77997d6b 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug typedef KDevGenericFactory DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) -DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name) +DocDjvuPlugin::DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, cons return item; } -QPair DocDjvuPlugin::catalogLocatorProps() +TQPair DocDjvuPlugin::catalogLocatorProps() { - return QPair(KFile::File, "all/allfiles"); + return TQPair(KFile::File, "all/allfiles"); } TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocDjvuPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index 05689bd8..ec99e024 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -24,7 +24,7 @@ class DocDjvuPlugin : public DocumentationPlugin { public: - DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDjvuPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair 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 a92eb60f..f50ceb3d 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -44,13 +44,13 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem { public: DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) { } DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) { } TQString origUrl() const { return m_origUrl; } @@ -64,8 +64,8 @@ static const KDevPluginInfo data("docdoxygenplugin"); typedef KDevGenericFactory DocDoxygenPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) ) -DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) - :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name) +DocDoxygenPlugin::DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList) + :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles ); autoSetup(); @@ -75,22 +75,22 @@ DocDoxygenPlugin::~DocDoxygenPlugin() { } -QPair DocDoxygenPlugin::catalogLocatorProps() +TQPair DocDoxygenPlugin::catalogLocatorProps() { - return QPair(KFile::File, "index.html *.tag"); + return TQPair(KFile::File, "index.html *.tag"); } TQString DocDoxygenPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); if (fi.extension(false) == "html") { TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQTextStream ts(&f); TQString contents = ts.read(); @@ -118,7 +118,7 @@ TQString DocDoxygenPlugin::catalogTitle(const TQString& url) return re.cap(1); } } - return TQString::null; + return TQString(); } TQString DocDoxygenPlugin::pluginName() const @@ -256,7 +256,7 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it if (!d.exists()) continue; - const QFileInfoList *dirEntries = d.entryInfoList(); + const TQFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) @@ -306,7 +306,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) if (!d.exists()) continue; - const QFileInfoList *dirEntries = d.entryInfoList(); + const TQFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) @@ -434,9 +434,9 @@ void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index, } void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, - DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix) + DocumentationCatalogItem *item, TQDomElement &tqparentEl, const TQString &prefix) { - TQDomElement docEl = parentEl; + TQDomElement docEl = tqparentEl; TQDomElement childEl = docEl.firstChild().toElement(); while (!childEl.isNull()) @@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, TQString filename = childEl.namedItem("filename").firstChild().toText().data(); IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, - i18n("%1 Class Reference").arg(classname)); + i18n("%1 Class Reference").tqarg(classname)); indexItem->addURL(KURL(prefix + filename)); createIndexFromTag(dom, index, item, childEl, prefix + filename); @@ -460,14 +460,14 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, || (childEl.attribute("kind") == "slot") || (childEl.attribute("kind") == "signal") )) { - TQString classname = parentEl.namedItem("name").firstChild().toText().data(); + TQString classname = tqparentEl.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) { - IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist)); + IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist)); indexItem->addURL(KURL(prefix + "#" + anchor)); } } diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index 8cf9ec45..d24cedb9 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -28,8 +28,9 @@ class TQDomElement; class DocDoxygenPlugin: public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDoxygenPlugin(); virtual TQString pluginName() const; @@ -44,7 +45,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); @@ -52,12 +53,12 @@ public: virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: - 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 createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString(), + const TQString &baseHtmlUrl = TQString()); + void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString()); void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item, - TQDomElement &parentEl, const TQString &prefix); + TQDomElement &tqparentEl, const TQString &prefix); void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, const TQString &name); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 6dd73707..5829b0bb 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -43,13 +43,13 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem { public: TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) { } TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) { } TQString tocFile() const { return m_tocFile; } @@ -63,9 +63,9 @@ static const KDevPluginInfo data("dockdevtocplugin"); typedef KDevGenericFactory DocKDevTOCPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) ) -DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name, +DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index); autoSetup(); @@ -85,24 +85,24 @@ DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, c return new TOCDocumentationCatalogItem(url, this, contents, title); } -QPair DocKDevTOCPlugin::catalogLocatorProps() +TQPair DocKDevTOCPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.toc"); + return TQPair(KFile::File, "*.toc"); } TQString DocKDevTOCPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "kdeveloptoc")) - return TQString::null; + return TQString(); f.close(); TQDomElement titleEl = doc.documentElement().namedItem("title").toElement(); @@ -159,7 +159,7 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", TQString::null); + base = baseEl.attribute("href", TQString()); TQDomElement indexEl = docEl.namedItem("index").toElement(); TQDomElement childEl = indexEl.firstChild().toElement(); @@ -204,22 +204,22 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", TQString::null); + base = baseEl.attribute("href", TQString()); TQDomElement childEl = docEl.lastChild().toElement(); addTocSect(tocItem, childEl, base, 1); } -void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) +void DocKDevTOCPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level) { while (!childEl.isNull()) { - if (childEl.tagName() == TQString("tocsect%1").arg(level)) + if (childEl.tagName() == TQString("tocsect%1").tqarg(level)) { TQString name = childEl.attribute("name"); TQString url = childEl.attribute("url"); - DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name); + DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); item->setURL(KURL(constructURL(base, url))); TQDomElement grandchildEl = childEl.lastChild().toElement(); @@ -259,8 +259,8 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) if (baseEl.isNull()) item->setURL(KURL()); else - item->setURL(KURL(constructURL(baseEl.attribute("href", TQString::null), - baseEl.attribute("url", TQString::null)))); + item->setURL(KURL(constructURL(baseEl.attribute("href", TQString()), + baseEl.attribute("url", TQString())))); } } diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index 626848b9..fc980247 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -27,8 +27,9 @@ class DocKDevTOCPlugin : public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocKDevTOCPlugin(); virtual TQString pluginName() const; @@ -43,11 +44,11 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual void autoSetupPlugin(); protected: - void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level); + void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level); static TQString constructURL(const TQString &base, const TQString &url) ; }; diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 8fdc4643..17089c89 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl typedef KDevGenericFactory DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) -DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name) +DocPDBPlugin::DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const return item; } -QPair DocPDBPlugin::catalogLocatorProps() +TQPair DocPDBPlugin::catalogLocatorProps() { - return QPair(KFile::File, "all/allfiles"); + return TQPair(KFile::File, "all/allfiles"); } TQString DocPDBPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocPDBPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index b9544a7b..33bb5ded 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -24,7 +24,7 @@ class DocPDBPlugin : public DocumentationPlugin { public: - DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocPDBPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair 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 79dab511..8fa76deb 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin typedef KDevGenericFactory DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) -DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name) +DocPDFPlugin::DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const return item; } -QPair DocPDFPlugin::catalogLocatorProps() +TQPair DocPDFPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.pdf"); + return TQPair(KFile::File, "*.pdf"); } TQString DocPDFPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocPDFPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index b7e8b26b..e3a9c099 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -24,7 +24,7 @@ class DocPDFPlugin : public DocumentationPlugin { public: - DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocPDFPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair 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 b4118f97..5efe880f 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -37,17 +37,17 @@ #include "../../../../config.h" -class QtDocumentationCatalogItem: public DocumentationCatalogItem +class TQtDocumentationCatalogItem: public DocumentationCatalogItem { public: - QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) + TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) { } - QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) + TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) { } TQString dcfFile() const { return m_dcfFile; } @@ -57,23 +57,23 @@ private: }; static const KDevPluginInfo data("docqtplugin"); -typedef KDevGenericFactory DocQtPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) ) +typedef KDevGenericFactory DocTQtPluginFactory; +K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocTQtPluginFactory(data) ) -DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) - :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name) +DocTQtPlugin::DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList) + :DocumentationPlugin(DocTQtPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | CustomDocumentationTitles); autoSetup(); } -DocQtPlugin::~DocQtPlugin() +DocTQtPlugin::~DocTQtPlugin() { } -void DocQtPlugin::createTOC(DocumentationCatalogItem *item) +void DocTQtPlugin::createTOC(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return; @@ -135,32 +135,32 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) } } -void DocQtPlugin::autoSetupPlugin() +void DocTQtPlugin::autoSetupPlugin() { TQString qtDocDir(QT_DOCDIR); qtDocDir = URLUtil::envExpand(qtDocDir); if (qtDocDir.isEmpty()) { - qtDocDir = getenv("QTDIR"); + qtDocDir = getenv("TQTDIR"); } if (!qtDocDir.isEmpty()) { config->setGroup("Search Settings"); - config->writeEntry("Qt Reference Documentation", true); + config->writeEntry("TQt Reference Documentation", true); config->setGroup("Index Settings"); - config->writeEntry("Qt Reference Documentation", true); + config->writeEntry("TQt Reference Documentation", true); config->setGroup("Locations"); - 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("TQt Reference Documentation", qtDocDir + TQString("/qt.dcf")); + config->writePathEntry("TQt Assistant Manual", qtDocDir + TQString("/assistant.dcf")); + config->writePathEntry("TQt Designer Manual", qtDocDir + TQString("/designer.dcf")); + config->writePathEntry("Guide to the TQt Translation Tools", qtDocDir + TQString("/linguist.dcf")); config->writePathEntry("qmake User Guide", qtDocDir + TQString("/qmake.dcf")); } } -void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) +void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return; @@ -185,19 +185,19 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString())); item->setURL(url); } } -TQString DocQtPlugin::pluginName() const +TQString DocTQtPlugin::pluginName() const { - return i18n("Qt Documentation Collection"); + return i18n("TQt Documentation Collection"); } -bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) +bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return false; @@ -213,9 +213,9 @@ bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) return false; } -void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) +void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return; @@ -249,10 +249,10 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) } } -void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, +void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, TQDomElement section) { - //adymo: do not load section to index for Qt reference documentation + //adymo: do not load section to index for TQt reference documentation TQString title = section.attribute("title"); if (fi.fileName() != "qt.dcf") { @@ -285,7 +285,7 @@ void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, Documentat } } -TQStringList DocQtPlugin::fullTextSearchLocations() +TQStringList DocTQtPlugin::fullTextSearchLocations() { TQStringList locs; @@ -306,34 +306,34 @@ TQStringList DocQtPlugin::fullTextSearchLocations() return locs; } -QPair DocQtPlugin::catalogLocatorProps() +TQPair DocTQtPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.xml *.dcf"); + return TQPair(KFile::File, "*.xml *.dcf"); } -TQString DocQtPlugin::catalogTitle(const TQString &url) +TQString DocTQtPlugin::catalogTitle(const TQString &url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "DCF")) - return TQString::null; + return TQString(); f.close(); TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", TQString::null); + return docEl.attribute("title", TQString()); } -DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) +DocumentationCatalogItem *DocTQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) { - return new QtDocumentationCatalogItem(url, this, contents, title); + return new TQtDocumentationCatalogItem(url, this, contents, title); } #include "docqtplugin.moc" diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index e09ce7a5..1bc1e865 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -17,20 +17,21 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef DOCQTPLUGIN_H -#define DOCQTPLUGIN_H +#ifndef DOCTQTPLUGIN_H +#define DOCTQTPLUGIN_H #include #include class KConfig; -class DocQtPlugin : public DocumentationPlugin +class DocTQtPlugin : public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); - ~DocQtPlugin(); + DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + ~DocTQtPlugin(); virtual TQString pluginName() const; @@ -46,7 +47,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair 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 1d7543c3..dbcbb07f 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -76,7 +76,7 @@ ChmProtocol::~ChmProtocol() void ChmProtocol::get( const KURL& url ) { /** When :catalog is appended to the end, a plain-text representation of the catalog - * is given out where each entry consists of four lines, an integer representing the parent + * is given out where each entry consists of four lines, an integer representing the tqparent * of the node, an integer representing a node's ID, the Title of the Node, and it's hyperlink. * When :contents is appended, all contained htm- and html-files will be printed, each in a line. */ @@ -105,7 +105,7 @@ void ChmProtocol::get( const KURL& url ) } - if (m_dirMap.find(path) == m_dirMap.end()) { + if (m_dirMap.tqfind(path) == m_dirMap.end()) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } @@ -178,25 +178,25 @@ void ChmProtocol::get( const KURL& url ) TQRegExp mergeParam("", false); mergeParam.setMinimal(true); - std::stack parents; + std::stack tqparents; int counter = 1; int current = 0; int old = 0, pos = 0; - parents.push(0); - while ((pos = s.find(object, pos)) != -1) { + tqparents.push(0); + while ((pos = s.tqfind(object, pos)) != -1) { if(htmlOutput) output += s.mid(old, pos - old); if(catalog) { TQRegExp ex("

    |
", false); ex.setMinimal(true); TQString ms = s.mid(old, pos - old); int pos = 0; - while( (pos = ms.find(ex, pos)) != -1) { + while( (pos = ms.tqfind(ex, pos)) != -1) { if(ms.mid(pos, 4) == "
    ") { - parents.push(current); + tqparents.push(current); } else{ - if(parents.empty()){ + if(tqparents.empty()){ }else{ - current = parents.top(); - parents.pop(); + current = tqparents.top(); + tqparents.pop(); } } pos++; @@ -206,9 +206,9 @@ void ChmProtocol::get( const KURL& url ) old = pos; TQString obj = object.cap(1); TQString name, local; - if (obj.find(nameParam) != -1) { + if (obj.tqfind(nameParam) != -1) { name = nameParam.cap(1); - if (obj.find(localParam) != -1) { + if (obj.tqfind(localParam) != -1) { local = localParam.cap(1); //output += "" + name + ""; //added by lucida lucida@users.sf.net @@ -221,7 +221,7 @@ void ChmProtocol::get( const KURL& url ) KURL u = url; u.setPath(bigpath + local); TQString str; - output += str.sprintf("%i\n%i\n", parents.top(), current); + output += str.sprintf("%i\n%i\n", tqparents.top(), current); output += name + "\n" + u.prettyURL() + "\n"; } m_bIndex = 1; @@ -233,10 +233,10 @@ void ChmProtocol::get( const KURL& url ) if(htmlOutput) output += name; } } - if (obj.find(mergeParam) != -1 && htmlOutput) { + if (obj.tqfind(mergeParam) != -1 && htmlOutput) { TQString link = mergeParam.cap(1); - TQString href = link.left(link.find("::")); - TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1); + TQString href = link.left(link.tqfind("::")); + TQString path = m_chmFile.left(m_chmFile.tqfindRev("/") + 1); //output += " (link)"; m_bIndex = 1; output += " (link)"; @@ -301,7 +301,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) { //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl; - fullPath = fullPath.replace(TQRegExp("::"), ""); + fullPath = fullPath.tqreplace(TQRegExp("::"), ""); // Are we already looking at that file ? if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) ) @@ -324,7 +324,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) fullPath += '/'; //kdDebug() << "the full path is " << fullPath << endl; - while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 ) { TQString tryPath = fullPath.left( pos ); //kdDebug() << fullPath << " trying " << tryPath << endl; @@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) } else { - path = TQString::fromLatin1("/"); + path = TQString::tqfromLatin1("/"); } kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl; break; diff --git a/parts/documentation/protocols/chm/chmfile.cpp b/parts/documentation/protocols/chm/chmfile.cpp index 43ae8877..2d705b8e 100644 --- a/parts/documentation/protocols/chm/chmfile.cpp +++ b/parts/documentation/protocols/chm/chmfile.cpp @@ -66,7 +66,7 @@ bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) con char tag[4]; if (f.readBlock(tag, 4) != 4) return false; - if (!qstrncmp(tag, "PMGL", 4)) + if (!tqstrncmp(tag, "PMGL", 4)) { uint quickref_length = getIntel32(f); f.at(f.at() + 12); @@ -87,7 +87,7 @@ bool Chm::getChunk(TQFile& f, uint chunkSize, ChmDirectoryMap& directoryMap) con return (f.at(f.at() + quickref_length)); } - else if (!qstrncmp(tag, "PMGI", 4)) + else if (!tqstrncmp(tag, "PMGI", 4)) { // evaluation of the index chunk is not yet implemented => skip it return f.at(f.at() + chunkSize - 4); @@ -105,7 +105,7 @@ bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& c // read CHM file header char tag[4]; - if (f.readBlock(tag, 4) != 4 || qstrncmp(tag, "ITSF", 4)) return false; + if (f.readBlock(tag, 4) != 4 || tqstrncmp(tag, "ITSF", 4)) return false; uint chm_version = getIntel32(f); if (!f.at(f.at() + 0x30)) return false; @@ -120,7 +120,7 @@ bool Chm::read(const TQString& fileSpec, ChmDirectoryMap& dirMap, TQByteArray& c // read directory header if (!f.at(section_1_offset)) return false; - if (f.readBlock(tag, 4) != 4 || qstrncmp(tag, "ITSP", 4)) return false; + if (f.readBlock(tag, 4) != 4 || tqstrncmp(tag, "ITSP", 4)) return false; if (!f.at(f.at() + 12)) return false; uint directory_chunk_size = getIntel32(f); if (!f.at(f.at() + 24)) return false; diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp index b8f45ae2..212eb244 100644 --- a/parts/documentation/protocols/chm/decompress.cpp +++ b/parts/documentation/protocols/chm/decompress.cpp @@ -121,7 +121,7 @@ struct * The LZX document does not state the uncompressed block has an * uncompressed length field. Where does this length field come from, so * we can know how large the block is? The implementation has it as the 24 - * bits following after the 3 blocktype bits, before the alignment + * bits following after the 3 blocktype bits, before the tqalignment * padding. * * The LZX document states that aligned offset blocks have their aligned @@ -228,7 +228,7 @@ int LZXinit(int window) { * REMOVE_BITS(n) removes N bits from the bit buffer * * These bit access routines work by using the area beyond the MSB and the - * LSB as a free source of zeroes. This avoids having to mask any bits. + * LSB as a free source of zeroes. This avoids having to tqmask any bits. * So we have to know the bit width of the bitbuffer variable. This is * sizeof(ULONG) * 8, also defined as ULONG_BITS */ @@ -328,9 +328,9 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { register UBYTE bit_num = 1; ULONG fill; ULONG pos = 0; /* the current position in the decode table */ - ULONG table_mask = 1 << nbits; - ULONG bit_mask = table_mask >> 1; /* don't do 0 length codes */ - ULONG next_symbol = bit_mask; /* base of allocation for long codes */ + ULONG table_tqmask = 1 << nbits; + ULONG bit_tqmask = table_tqmask >> 1; /* don't do 0 length codes */ + ULONG next_symbol = bit_tqmask; /* base of allocation for long codes */ /* fill entries for codes short enough for a direct mapping */ while (bit_num <= nbits) @@ -341,27 +341,27 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { { leaf = pos; - if ((pos += bit_mask) > table_mask) return 1; /* table overrun */ + if ((pos += bit_tqmask) > table_tqmask) return 1; /* table overrun */ /* fill all possible lookups of this symbol with the symbol itself */ - fill = bit_mask; + fill = bit_tqmask; while (fill-- > 0) table[leaf++] = sym; } } - bit_mask >>= 1; + bit_tqmask >>= 1; bit_num++; } /* if there are any codes longer than nbits */ - if (pos != table_mask) + if (pos != table_tqmask) { /* clear the remainder of the table */ - for (sym = pos; sym < table_mask; sym++) table[sym] = 0; + for (sym = pos; sym < table_tqmask; sym++) table[sym] = 0; /* give ourselves room for codes to grow by up to 16 more bits */ pos <<= 16; - table_mask <<= 16; - bit_mask = 1 << 15; + table_tqmask <<= 16; + bit_tqmask = 1 << 15; while (bit_num <= 16) { @@ -385,16 +385,16 @@ int make_decode_table(ULONG nsyms, ULONG nbits, UBYTE *length, UWORD *table) { } table[leaf] = sym; - if ((pos += bit_mask) > table_mask) return 1; /* table overflow */ + if ((pos += bit_tqmask) > table_tqmask) return 1; /* table overflow */ } } - bit_mask >>= 1; + bit_tqmask >>= 1; bit_num++; } } /* full table? */ - if (pos == table_mask) return 0; + if (pos == table_tqmask) return 0; /* either erroneous table, or all elements are 0 - let's find out. */ for (sym = 0; sym < nsyms; sym++) if (length[sym]) return 1; @@ -555,7 +555,7 @@ int LZXdecompress(UBYTE* inpos, int inlen, UBYTE* outpos, int outlen) { togo -= this_run; LZX(block_remaining) -= this_run; - /* apply 2^x-1 mask */ + /* apply 2^x-1 tqmask */ window_posn &= window_size - 1; /* runs can't straddle the window wraparound */ if ((window_posn + this_run) > window_size) diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index b1d9d166..7b91c7fc 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -35,8 +35,8 @@ extern "C" KInstance* KChmPartFactory::s_instance = 0L; KAboutData* KChmPartFactory::s_about = 0L; -KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name ) - : KParts::Factory( parent, name ) +KChmPartFactory::KChmPartFactory( TQObject* tqparent, const char* name ) + : KParts::Factory( tqparent, name ) { } @@ -47,10 +47,10 @@ KChmPartFactory::~KChmPartFactory() delete s_about; } -KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, +KParts::Part* KChmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name, const char *, const TQStringList & ) { - KChmPart* part = new KChmPart( parentWidget, name ); + KChmPart* part = new KChmPart( tqparentWidget, name ); return part; } @@ -66,7 +66,7 @@ KInstance* KChmPartFactory::instance() } -KChmPart::KChmPart( TQWidget * parent, const char * name ) +KChmPart::KChmPart( TQWidget * tqparent, const char * name ) : KDevHTMLPart( ), m_job(0) { KInstance * instance = new KInstance( "kchmpart" ); diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 023f8ed9..37bb4695 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -33,13 +33,14 @@ class KAboutData; class KChmPartFactory: public KParts::Factory { Q_OBJECT + TQ_OBJECT public: - KChmPartFactory( TQObject *parent = 0, const char *name = 0 ); + KChmPartFactory( TQObject *tqparent = 0, const char *name = 0 ); virtual ~KChmPartFactory(); virtual KParts::Part* createPartObject( - TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance *instance(); @@ -54,6 +55,7 @@ class KChmPartFactory: public KParts::Factory class KChmPart : public KDevHTMLPart { Q_OBJECT + TQ_OBJECT public: KChmPart( TQWidget *, const char * = 0 ); KParts::BrowserExtension * extension() { return m_extension; } diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index c7b2305a..a2d688ec 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -49,8 +49,8 @@ #include "documentation_part.h" #include "docutils.h" -SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *name) - :TQWidget(parent, name), m_part(part) +SearchView::SearchView(DocumentationPart *part, TQWidget *tqparent, const char *name) + :TQWidget(tqparent, name), m_part(part) { TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -182,11 +182,11 @@ void SearchView::search() d.mkdir(savedir); 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) - .arg("builtin-short") - .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); + .tqarg(m_edit->text()) + .tqarg(m_searchMethodBox->currentItem()==1? "or" : "and") + .tqarg(50) + .tqarg("builtin-short") + .tqarg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score"); kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; @@ -211,7 +211,7 @@ void SearchView::search() } // While receiving data from the subprocess, we want - // to block the user interface, but still get repaint + // to block the user interface, but still get tqrepaint // events. Hack taken from NetAccess... kapp->setOverrideCursor(waitCursor); TQWidget blocker(0, 0, WType_Dialog | WShowModal); @@ -230,8 +230,8 @@ void SearchView::search() delete proc; // modify the search result - searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/"); - searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), ""); + searchResult = searchResult.tqreplace(TQRegExp("http://localhost/"), "file:/"); + searchResult = searchResult.tqreplace(TQRegExp("Content-type: text/html"), ""); // dump the search result TQFile f(savedir + "/results.html"); @@ -268,7 +268,7 @@ void SearchView::analyseSearchResults() TQRegExp starsExp("alt=\"\\*\""); starsExp.setMinimal(true); - int stars = line.contains(starsExp); + int stars = line.tqcontains(starsExp); TQRegExp urlExp("(.*)"); if (urlExp.search(line)==-1) diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index 98f11834..e1d9d106 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -30,11 +30,12 @@ class KPushButton; class KProcess; class TQListViewItem; -class SearchView: public QWidget +class SearchView: public TQWidget { Q_OBJECT + TQ_OBJECT public: - SearchView(DocumentationPart *part, TQWidget *parent = 0, const char *name = 0); + SearchView(DocumentationPart *part, TQWidget *tqparent = 0, const char *name = 0); ~SearchView(); public slots: diff --git a/parts/documentation/selecttopic.cpp b/parts/documentation/selecttopic.cpp index 4dab4d83..ef35a2a1 100644 --- a/parts/documentation/selecttopic.cpp +++ b/parts/documentation/selecttopic.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "selecttopic.h" -SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *parent, const char *name) - :SelectTopicBase(parent, name), m_urls(urls) +SelectTopic::SelectTopic(IndexItem::List &urls, TQWidget *tqparent, const char *name) + :SelectTopicBase(tqparent, name), m_urls(urls) { for (IndexItem::List::const_iterator it = m_urls.begin(); it != m_urls.end(); ++it) topicBox->insertItem((*it).first); diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index fdddbf4c..e90f893c 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -26,8 +26,9 @@ class SelectTopic: public SelectTopicBase{ Q_OBJECT + TQ_OBJECT public: - SelectTopic(IndexItem::List &urls, TQWidget *parent = 0, const char *name = 0); + SelectTopic(IndexItem::List &urls, TQWidget *tqparent = 0, const char *name = 0); KURL selectedURL(); public slots: diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index b363be2a..1d04e0a2 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -1,6 +1,6 @@ SelectTopicBase - + SelectTopicBase @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -46,14 +46,14 @@ Expanding - + 20 20 - + buttonOk @@ -70,7 +70,7 @@ true - + buttonCancel @@ -86,7 +86,7 @@ - + topicLabel @@ -97,7 +97,7 @@ listBox1 - + topicBox @@ -135,8 +135,8 @@ buttonOk buttonCancel - + newSlot() - - + + diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index 63e21888..d0146d0e 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -39,9 +39,9 @@ #define INDEXER -ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) +ProgressDialog::ProgressDialog(bool index, TQWidget *tqparent, const char *name) :KDialogBase(KDialogBase::Plain, i18n("Generating Search Index"), Cancel | Ok, Close, - parent, name, false) + tqparent, name, false) { proc = 0; @@ -122,7 +122,7 @@ void ProgressDialog::done(int r) void ProgressDialog::setFilesScanned(int n) { - filesLabel->setText(i18n("Files processed: %1").arg(n)); + filesLabel->setText(i18n("Files processed: %1").tqarg(n)); } void ProgressDialog::setFilesToDig(int n) @@ -162,7 +162,7 @@ void ProgressDialog::addDir(const TQString &dir) setFilesScanned(++filesScanned); } - TQDir d2(dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); + TQDir d2(dir, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); TQStringList dlist = d2.entryList(); for ( it=dlist.begin(); it != dlist.end(); ++it ) @@ -214,7 +214,7 @@ bool ProgressDialog::createConfig() if (language == "C") language = "en"; - TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language)); + TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language)); if (wrapper.isEmpty()) wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html")); if (wrapper.isEmpty()) @@ -323,12 +323,12 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) TQString line = TQString(buffer).left(len); int cnt=0, index=-1; - while ( (index = line.find("http://", index+1)) > 0) + while ( (index = line.tqfind("http://", index+1)) > 0) cnt++; filesDigged += cnt; cnt=0, index=-1; - while ( (index = line.find("not changed", index+1)) > 0) + while ( (index = line.tqfind("not changed", index+1)) > 0) cnt++; filesDigged -= cnt; diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h index 3383b2df..06746ad5 100644 --- a/parts/documentation/tools/htdig/htdigindex.h +++ b/parts/documentation/tools/htdig/htdigindex.h @@ -25,8 +25,9 @@ class KProgress; class ProgressDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ProgressDialog(bool index, TQWidget *parent=0, const char *name=0); + ProgressDialog(bool index, TQWidget *tqparent=0, const char *name=0); ~ProgressDialog(); void addDir(const TQString &dir); diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index de582013..658f5ae5 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -708,7 +708,7 @@ void ConfigBool::convertStrToVal() TQCString &Config::getString(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -724,7 +724,7 @@ TQCString &Config::getString(const char *fileName,int num,const char *name) cons TQStrList &Config::getList(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -740,7 +740,7 @@ TQStrList &Config::getList(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); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -756,7 +756,7 @@ TQCString &Config::getEnum(const char *fileName,int num,const char *name) const int &Config::getInt(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -772,7 +772,7 @@ int &Config::getInt(const char *fileName,int num,const char *name) const bool &Config::getBool(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -2493,7 +2493,7 @@ static void substEnvVarsInStrList(TQStrList &sl) { 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); + bool wasQuoted = (result.tqfind(' ')!=-1) || (result.tqfind('\t')!=-1); // here we strip the quote again substEnvVarsInString(result); @@ -2654,15 +2654,15 @@ void Config::check() } else { - if (warnFormat.find("$file")==-1) + if (warnFormat.tqfind("$file")==-1) { config_err("Warning: warning format does not contain a $file tag!\n"); } - if (warnFormat.find("$line")==-1) + if (warnFormat.tqfind("$line")==-1) { config_err("Warning: warning format does not contain a $line tag!\n"); } - if (warnFormat.find("$text")==-1) + if (warnFormat.tqfind("$text")==-1) { config_err("Warning: warning format foes not contain a $text tag!\n"); } @@ -2774,7 +2774,7 @@ void Config::check() 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) + if (alias.tqfind(re1)!=0 && alias.tqfind(re2)!=0) { config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", alias.data()); @@ -2963,25 +2963,25 @@ void Config::check() #define PUTENV putenv #define SEP ":" #endif - // check QHP creation requirements - if (Config_getBool("GENERATE_QHP")) + // check TQHP creation requirements + if (Config_getBool("GENERATE_TQHP")) { bool quit = false; if (!Config_getBool("GENERATE_HTML")) { - config_err("Warning: GENERATE_QHP=YES requires GENERATE_HTML=YES.\n"); + config_err("Warning: GENERATE_TQHP=YES requires GENERATE_HTML=YES.\n"); quit = true; } - if (Config_getString("QHP_NAMESPACE").isEmpty()) + if (Config_getString("TQHP_NAMESPACE").isEmpty()) { - config_err("Warning: GENERATE_QHP=YES requires QHP_NAMESPACE to be set.\n"); + config_err("Warning: GENERATE_TQHP=YES requires TQHP_NAMESPACE to be set.\n"); quit = true; } - if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty()) + if (Config_getString("TQHP_VIRTUAL_FOLDER").isEmpty()) { - config_err("Warning: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set.\n"); + config_err("Warning: GENERATE_TQHP=YES requires TQHP_VIRTUAL_FOLDER to be set.\n"); quit = true; } @@ -2991,16 +2991,16 @@ void Config::check() } } - // check QCH creation requirements - if (!Config_getString("QHG_LOCATION").isEmpty() && - !Config_getBool("GENERATE_QHP")) + // check TQCH creation requirements + if (!Config_getString("TQHG_LOCATION").isEmpty() && + !Config_getBool("GENERATE_TQHP")) { - config_err("Warning: Specifying QHG_LOCATION requires GENERATE_QHP=YES.\n"); + config_err("Warning: Specifying TQHG_LOCATION requires GENERATE_TQHP=YES.\n"); } - if (!Config_getString("QCH_FILE").isEmpty() && - Config_getString("QHG_LOCATION").isEmpty()) + if (!Config_getString("TQCH_FILE").isEmpty() && + Config_getString("TQHG_LOCATION").isEmpty()) { - config_err("Warning: Specifying QCH_FILE requires QHG_LOCATION to be set.\n"); + config_err("Warning: Specifying TQCH_FILE requires TQHG_LOCATION to be set.\n"); } if (Config_getBool("HAVE_DOT")) @@ -3042,7 +3042,7 @@ void Config::check() annotationFromBrief.append("is"); annotationFromBrief.append("provides"); annotationFromBrief.append("specifies"); - annotationFromBrief.append("contains"); + annotationFromBrief.append("tqcontains"); annotationFromBrief.append("represents"); annotationFromBrief.append("a"); annotationFromBrief.append("an"); @@ -3306,7 +3306,7 @@ void Config::create() "used as the annotated text. Otherwise, the brief description is used as-is. \n" "If left blank, the following values are used (\"$name\" is automatically \n" "replaced with the name of the entity): \"The $name class\" \"The $name widget\" \n" - "\"The $name file\" \"is\" \"provides\" \"specifies\" \"contains\" \n" + "\"The $name file\" \"is\" \"provides\" \"specifies\" \"tqcontains\" \n" "\"represents\" \"a\" \"an\" \"the\"\n" ); cb = addBool( @@ -3362,16 +3362,16 @@ void Config::create() "If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen \n" "will interpret the first line (until the first dot) of a JavaDoc-style \n" "comment as the brief description. If set to NO, the JavaDoc \n" - "comments will behave just like regular Qt-style comments \n" + "comments will behave just like regular TQt-style comments \n" "(thus requiring an explicit @brief command for a brief description.) \n", FALSE ); cb = addBool( - "QT_AUTOBRIEF", - "If the QT_AUTOBRIEF tag is set to YES then Doxygen will \n" - "interpret the first line (until the first dot) of a Qt-style \n" + "TQT_AUTOBRIEF", + "If the TQT_AUTOBRIEF tag is set to YES then Doxygen will \n" + "interpret the first line (until the first dot) of a TQt-style \n" "comment as the brief description. If set to NO, the comments \n" - "will behave just like regular Qt-style comments (thus requiring \n" + "will behave just like regular TQt-style comments (thus requiring \n" "an explicit \\brief command for a brief description.) \n", FALSE ); @@ -3773,12 +3773,12 @@ void Config::create() ); cs->setWidgetType(ConfigString::File); cs = addString( "LAYOUT_FILE", - "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n" - "doxygen. The layout file controls the global structure of the generated output files \n" - "in an output format independent way. The create the layout file that represents \n" + "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n" + "doxygen. The tqlayout file controls the global structure of the generated output files \n" + "in an output format independent way. The create the tqlayout file that represents \n" "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n" "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n" - "of the layout file.\n" + "of the tqlayout file.\n" ); cs->setWidgetType(ConfigString::File); addObsolete("DETAILS_AT_TOP"); @@ -3789,8 +3789,8 @@ void Config::create() //----------------------------------------------------------------------------------------------- cb = addBool( - "QUIET", - "The QUIET tag can be used to turn on/off the messages that are generated \n" + "TQUIET", + "The TQUIET tag can be used to turn on/off the messages that are generated \n" "by doxygen. Possible values are YES and NO. If left blank NO is used. \n", FALSE ); @@ -4132,7 +4132,7 @@ void Config::create() "To create a documentation set, doxygen will generate a Makefile in the \n" "HTML output directory. Running make will produce the docset in that \n" "directory and running \"make install\" will install the docset in \n" - "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find \n" + "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will tqfind \n" "it at startup. \n" "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html " "for more information. \n", @@ -4191,8 +4191,8 @@ void Config::create() cs->addDependency("GENERATE_HTML"); #if 0 cs = addString( - "QTHELP_FILE", - "If the GENERATE_HTMLHELP tag is set to YES, the QTHELP_FILE tag can \n" + "TQTHELP_FILE", + "If the GENERATE_HTMLHELP tag is set to YES, the TQTHELP_FILE tag can \n" "be used to specify the file name of the resulting .(qch|qhp) file. \n" "You can add a path in front of the file if the result should not be \n" "written to the html output directory. \n" @@ -4200,15 +4200,15 @@ void Config::create() cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); cs = addString( - "QTHELP_CONFIG", - "If DOXYGEN2QTHELP_LOC is set, QTHELP_CONFIG must specify the file name \n" + "TQTHELP_CONFIG", + "If DOXYGEN2TQTHELP_LOC is set, TQTHELP_CONFIG must specify the file name \n" "of a config file to pass to doxygen2qthelp. \n" ); cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); cs = addString( - "DOXYGEN2QTHELP_LOC", - "If the GENERATE_HTMLHELP tag is set to YES, the DOXYGEN2QTHELP_LOC tag \n" + "DOXYGEN2TQTHELP_LOC", + "If the GENERATE_HTMLHELP tag is set to YES, the DOXYGEN2TQTHELP_LOC tag \n" "can be used to specify the location (absolute path including file name) of \n" "the doxygen2qthelp tool. If non-empty doxygen will try to run doxygen2qthelp \n" "on the generated index.hhp.\n" @@ -4216,9 +4216,9 @@ void Config::create() cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); #endif - addObsolete("QTHELP_FILE"); - addObsolete("QTHELP_CONFIG"); - addObsolete("DOXYGEN2QTHELP_LOC"); + addObsolete("TQTHELP_FILE"); + addObsolete("TQTHELP_CONFIG"); + addObsolete("DOXYGEN2TQTHELP_LOC"); cb = addBool( "GENERATE_CHI", "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n" @@ -4255,71 +4255,71 @@ void Config::create() ///////////////////////////////////////////////////////// cb = addBool( - "GENERATE_QHP", - "If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER \n" + "GENERATE_TQHP", + "If the GENERATE_TQHP tag is set to YES and both TQHP_NAMESPACE and TQHP_VIRTUAL_FOLDER \n" "are set, an additional index file will be generated that can be used as input for \n" - "Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated \n" + "TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated \n" "HTML documentation. \n", FALSE ); cb->addDependency("GENERATE_HTML"); cs = addString( - "QCH_FILE", - "If the QHG_LOCATION tag is specified, the QCH_FILE tag can \n" + "TQCH_FILE", + "If the TQHG_LOCATION tag is specified, the TQCH_FILE tag can \n" "be used to specify the file name of the resulting .qch file. \n" "The path specified is relative to the HTML output folder. \n" ); cs->setWidgetType(ConfigString::File); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_NAMESPACE", - "The QHP_NAMESPACE tag specifies the namespace to use when generating \n" - "Qt Help Project output. For more information please see \n" + "TQHP_NAMESPACE", + "The TQHP_NAMESPACE tag specifies the namespace to use when generating \n" + "TQt Help Project output. For more information please see \n" "http://doc.trolltech.com/qthelpproject.html#namespace \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_VIRTUAL_FOLDER", - "The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n" - "Qt Help Project output. For more information please see \n" + "TQHP_VIRTUAL_FOLDER", + "The TQHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n" + "TQt Help Project output. For more information please see \n" "http://doc.trolltech.com/qthelpproject.html#virtual-folders \n" ); cs->setDefaultValue("doc"); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_CUSTOM_FILTER_NAME", - "If QHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. \n" + "TQHP_CUSTOM_FILTER_NAME", + "If TQHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. \n" "For more information please see \n" "http://doc.trolltech.com/qthelpproject.html#custom-filters \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_CUST_FILTER_ATTRS", - "The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add." + "TQHP_CUST_FILTER_ATTRS", + "The TQHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add." "For more information please see \n" - "Qt Help Project / Custom Filters. \n" + "TQt Help Project / Custom Filters. \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_SECT_FILTER_ATTRS", - "The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n" + "TQHP_SECT_FILTER_ATTRS", + "The TQHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n" "filter section matches. \n" - "Qt Help Project / Filter Attributes. \n" + "TQt Help Project / Filter Attributes. \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHG_LOCATION", - "If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can \n" - "be used to specify the location of Qt's qhelpgenerator. \n" + "TQHG_LOCATION", + "If the GENERATE_TQHP tag is set to YES, the TQHG_LOCATION tag can \n" + "be used to specify the location of TQt's qhelpgenerator. \n" "If non-empty doxygen will try to run qhelpgenerator on the generated \n" ".qhp file .\n" ); cs->setWidgetType(ConfigString::File); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); ///////////////////////////////////////////////////////// // MISC ///////////////////////////////////////////////// @@ -4857,7 +4857,7 @@ void Config::create() cs = addString( "DOT_FONTNAME", "By default doxygen will write a font called FreeSans.ttf to the output \n" "directory and reference it in all dot files that doxygen generates. This \n" - "font does not include all possible unicode characters however, so when you need \n" + "font does not include all possible tqunicode characters however, so when you need \n" "these (or just want a differently looking font) you can specify the font name \n" "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n" "which can be done by putting it in a standard location or by setting the \n" @@ -5005,7 +5005,7 @@ void Config::create() "nodes that will be shown in the graph. If the number of nodes in a graph \n" "becomes larger than this value, doxygen will truncate the graph, which is \n" "visualized by representing a node as a red box. Note that doxygen if the \n" - "number of direct children of the root node in a graph is already larger than \n" + "number of direct tqchildren of the root node in a graph is already larger than \n" "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n" "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n", 0,10000, 50 @@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name) } totalSize+=size+2; contents.resize(totalSize); - contents.at(totalSize-2)='\n'; // to help the scanner - contents.at(totalSize-1)='\0'; + contents.tqat(totalSize-2)='\n'; // to help the scanner + contents.tqat(totalSize-1)='\0'; return contents; } } diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h index 2486956e..19d877d8 100644 --- a/parts/doxygen/config.h +++ b/parts/doxygen/config.h @@ -30,7 +30,7 @@ class ConfigOption enum { /*! Maximum length of an option in the config file. Used for - * alignment purposes. + * tqalignment purposes. */ MAX_OPTION_LENGTH = 23 }; @@ -409,7 +409,7 @@ class Config */ ConfigOption *get(const char *name) const { - return m_dict->find(name); + return m_dict->tqfind(name); } /* @} */ diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index 8269bf0e..eb08f0f9 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -27,8 +27,8 @@ #include "messages.h" -DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *parent, const char *name) - : TQTabWidget(parent, name) +DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *tqparent, const char *name) + : TQTabWidget(tqparent, name) { m_hasChanged = false; m_dependencies = new TQDict< TQPtrList >(257); @@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget() } -TQSize DoxygenConfigWidget::sizeHint() const +TQSize DoxygenConfigWidget::tqsizeHint() const { // without this the whole dialog becomes much too large - return TQSize(TQTabWidget::sizeHint().width(), 1); + return TQSize(TQTabWidget::tqsizeHint().width(), 1); } @@ -184,13 +184,13 @@ void DoxygenConfigWidget::addDependency(TQDict *switches, if (dep.isEmpty()) return; - IInput *parent = m_inputWidgets->find(dep); - Q_ASSERT(parent!=0); - IInput *child = m_inputWidgets->find(name); + IInput *tqparent = m_inputWidgets->tqfind(dep); + Q_ASSERT(tqparent!=0); + IInput *child = m_inputWidgets->tqfind(name); Q_ASSERT(child!=0); - if (!switches->find(dep)) - switches->insert(dep, parent->qobject()); - TQPtrList *list = m_dependencies->find(dep); + if (!switches->tqfind(dep)) + switches->insert(dep, tqparent->qobject()); + TQPtrList *list = m_dependencies->tqfind(dep); if (!list) { list = new TQPtrList; m_dependencies->insert(dep, list); @@ -201,7 +201,7 @@ void DoxygenConfigWidget::addDependency(TQDict *switches, void DoxygenConfigWidget::toggle(const TQString &name, bool state) { - TQPtrList *inputs = m_dependencies->find(name); + TQPtrList *inputs = m_dependencies->tqfind(name); Q_ASSERT(inputs!=0); IInput *input = inputs->first(); while (input) { diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index 4dd68178..54584f07 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -21,12 +21,13 @@ class IInput; -class DoxygenConfigWidget : public QTabWidget +class DoxygenConfigWidget : public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - DoxygenConfigWidget( const TQString &fileName, TQWidget *parent=0, const char *name=0 ); + DoxygenConfigWidget( const TQString &fileName, TQWidget *tqparent=0, const char *name=0 ); ~DoxygenConfigWidget(); public slots: @@ -37,7 +38,7 @@ private slots: void changed(); private: - TQSize sizeHint() const; + TQSize tqsizeHint() const; void loadFile(); void saveFile(); void init(); diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 833f4938..29265ceb 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -51,8 +51,8 @@ typedef KDevGenericFactory DoxygenFactory; static const KDevPluginInfo data("kdevdoxygen"); K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) -DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) +DoxygenPart::DoxygenPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); setXMLFile("kdevdoxygen.rc"); @@ -172,7 +172,7 @@ void DoxygenPart::adjustDoxyfile() patterns->addValue("*.tlh"); patterns->addValue("*.diff"); patterns->addValue("*.patch"); - patterns->addValue("*.moc"); + patterns->addValue("*.tqmoc"); patterns->addValue("*.xpm"); patterns->addValue("*.dox"); } @@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( ) if (poDir != 0) *poDir->valueRef() = dirVal; - KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name())); + KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name())); return; } @@ -485,7 +485,7 @@ void DoxygenPart::slotActivePartChanged( KParts::Part * part ) if (doc != 0) m_file = doc->url().path(); else - m_file = TQString::null; + m_file = TQString(); // <- m_activeEditor = dynamic_cast(part); m_cursor = part ? dynamic_cast(part->widget()) : 0; diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index 7756a791..a77545c9 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -40,9 +40,10 @@ namespace KTextEditor{ class DoxygenPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - DoxygenPart( TQObject *parent, const char *name, const TQStringList & ); + DoxygenPart( TQObject *tqparent, const char *name, const TQStringList & ); ~DoxygenPart(); private slots: diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index e316d69e..bf4af7ea 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -110,16 +110,16 @@ static const char* const update_xpm_data[] = const char **update_xpm = (const char **)update_xpm_data; -InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag) - : TQWidget(parent), state(flag), key(k) +InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * tqparent, bool &flag) + : TQWidget(tqparent), state(flag), key(k) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); cb = new TQCheckBox(text,this); init(); - layout->addWidget(cb); - layout->addStretch(1); + tqlayout->addWidget(cb); + tqlayout->addStretch(1); connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); } @@ -151,19 +151,19 @@ void InputBool::setEnabled(bool b) } -InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal) - : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) +InputInt::InputInt(const TQString &label, TQWidget *tqparent, int &val, int minVal, int maxVal) + : TQWidget(tqparent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) { - TQHBoxLayout *layout = new TQHBoxLayout(this, 5); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); sp = new TQSpinBox(minVal, maxVal, 1, this); lab = new TQLabel(sp, label+":", this); init(); - layout->addWidget(lab); - layout->addWidget(sp); - layout->addStretch(1); + tqlayout->addWidget(lab); + tqlayout->addWidget(sp); + tqlayout->addStretch(1); connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } @@ -175,8 +175,8 @@ InputInt::~InputInt() void InputInt::init() { - m_val = QMAX(m_minVal, m_val); - m_val = QMIN(m_maxVal, m_val); + m_val = TQMAX(m_minVal, m_val); + m_val = TQMIN(m_maxVal, m_val); sp->setValue(m_val); } @@ -197,31 +197,31 @@ void InputInt::setEnabled(bool state) InputString::InputString(const TQString & label, - TQWidget *parent, TQCString &s, StringMode m) - : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0) + TQWidget *tqparent, TQCString &s, StringMode m) + : TQWidget(tqparent), str(s), sm(m), m_values(0), m_index(0) { le = 0; br = 0; com = 0; if (m == StringFixed) { - TQHBoxLayout *layout = new TQHBoxLayout(this, 5); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); com = new TQComboBox(this); lab = new TQLabel(com,label+":", this); - layout->addWidget(lab); - layout->addWidget(com); - layout->addStretch(1); + tqlayout->addWidget(lab); + tqlayout->addWidget(com); + tqlayout->addStretch(1); } else { - TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); + TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); le = new KLineEdit(this); lab = new TQLabel(le,label+":", this); - layout->addWidget(lab, 0, 0); + tqlayout->addWidget(lab, 0, 0); le->setText(s); - layout->addWidget(le, 0, 1); + tqlayout->addWidget(le, 0, 1); if (m == StringFile || m == StringDir) { br = new TQPushButton(this); br->setPixmap(SmallIcon(m==StringFile? "document" : "folder")); TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder")); - layout->addWidget(br, 0, 2); + tqlayout->addWidget(br, 0, 2); } } @@ -245,7 +245,7 @@ InputString::~InputString() void InputString::init() { if (sm == StringFixed) { - int *itemIndex = m_values->find(str); + int *itemIndex = m_values->tqfind(str); if (itemIndex) com->setCurrentItem(*itemIndex); else @@ -324,32 +324,32 @@ void InputString::browse() InputStrList::InputStrList(const TQString & label, - TQWidget *parent, TQStrList &sl, ListMode lm) - : TQWidget(parent), strList(sl) + TQWidget *tqparent, TQStrList &sl, ListMode lm) + : TQWidget(tqparent), strList(sl) { - TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5); + TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5); - TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */ - TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5); + TQWidget *dw = new TQWidget(this); /* dummy widget used for tqlayouting */ + TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5); le = new KLineEdit(dw); lab = new TQLabel(le,label+":", this ); - layout->addWidget(lab, 0, 0); - boxlayout->addWidget(le, 1); + tqlayout->addWidget(lab, 0, 0); + boxtqlayout->addWidget(le, 1); add = new TQPushButton(dw); add->setPixmap(TQPixmap( add_xpm )); TQToolTip::add(add, i18n("Add item")); - boxlayout->addWidget(add); + boxtqlayout->addWidget(add); del = new TQPushButton(dw); del->setPixmap(TQPixmap( del_xpm )); TQToolTip::add(del, i18n("Delete selected item")); - boxlayout->addWidget(del); + boxtqlayout->addWidget(del); upd = new TQPushButton(dw); upd->setPixmap(TQPixmap( update_xpm )); TQToolTip::add(upd, i18n("Update selected item")); - boxlayout->addWidget(upd); + boxtqlayout->addWidget(upd); lb = new TQListBox(this); lb->setMinimumSize(400, 100); @@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label, brFile = new TQPushButton(dw); brFile->setPixmap(SmallIcon("document")); TQToolTip::add(brFile, i18n("Browse to a file")); - boxlayout->addWidget(brFile); + boxtqlayout->addWidget(brFile); } if (lm & ListDir) { brDir = new TQPushButton(dw); brDir->setPixmap(SmallIcon("folder")); TQToolTip::add(brDir, i18n("Browse to a folder")); - boxlayout->addWidget(brDir); + boxtqlayout->addWidget(brDir); } } - layout->addWidget(dw, 0, 1); - layout->addWidget(lb, 1, 1); + tqlayout->addWidget(dw, 0, 1); + tqlayout->addWidget(lb, 1, 1); connect( le, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(addString()) ); diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h index b046f39c..ac73ce20 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -36,14 +36,15 @@ class IInput class InputBool : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: - InputBool(const TQCString &key, const TQString &text, TQWidget *parent, bool &flag); + InputBool(const TQCString &key, const TQString &text, TQWidget *tqparent, bool &flag); ~InputBool(); void init(); virtual void setEnabled(bool b); - virtual TQObject *qobject() { return this; } + virtual TQObject *qobject() { return TQT_TQOBJECT(this); } virtual bool getState() const { return state; } signals: @@ -63,15 +64,16 @@ private: class InputInt : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: - InputInt(const TQString &text, TQWidget *parent, + InputInt(const TQString &text, TQWidget *tqparent, int &val, int minVal, int maxVal); ~InputInt(); void init(); virtual void setEnabled(bool); - TQObject *qobject() { return this; } + TQObject *qobject() { return TQT_TQOBJECT(this); } signals: void changed(); @@ -91,6 +93,7 @@ private: class InputString : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: enum StringMode { StringFree=0, @@ -99,14 +102,14 @@ public: StringFixed=3 }; - InputString(const TQString &text, TQWidget *parent, + InputString(const TQString &text, TQWidget *tqparent, TQCString &s, StringMode m=StringFree); ~InputString(); void init(); void addValue(const char *s); void setEnabled(bool); - TQObject *qobject() { return this; } + TQObject *qobject() { return TQT_TQOBJECT(this); } signals: void changed(); @@ -131,6 +134,7 @@ private: class InputStrList : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: enum ListMode { ListString=0, @@ -139,13 +143,13 @@ public: ListFileDir=ListFile|ListDir }; - InputStrList(const TQString &text, TQWidget *parent, + InputStrList(const TQString &text, TQWidget *tqparent, TQStrList &sl, ListMode v=ListString); ~InputStrList(); void init(); void setEnabled(bool); - TQObject *qobject() { return this; } + TQObject *qobject() { return TQT_TQOBJECT(this); } signals: void changed(); diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp index 8819b109..ee56cb34 100644 --- a/parts/doxygen/messages.cpp +++ b/parts/doxygen/messages.cpp @@ -90,7 +90,7 @@ TQString message(const TQCString &key) // configuration options related to warning and progress messages //--------------------------------------------------------------------------- addMessage("Messages", i18n("Messages")); - addMessage("QUIET", i18n("Suppress output")); + addMessage("TQUIET", i18n("Suppress output")); addMessage("WARNINGS", i18n("Show warnings")); addMessage("WARN_IF_UNDOCUMENTED", i18n("Warn about undocumented entities")); addMessage("WARN_IF_DOC_ERROR", i18n("Warn if error in documents")); @@ -289,7 +289,7 @@ TQString message(const TQCString &key) initialized = true; } - if (!sMessages.contains(key)) + if (!sMessages.tqcontains(key)) { kdDebug() << "Unhandled message: " << key << endl; diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp index 11a0f2a6..ca31669f 100644 --- a/parts/filecreate/addglobaldlg.cpp +++ b/parts/filecreate/addglobaldlg.cpp @@ -21,14 +21,14 @@ #include /* - * Constructs a AddGlobalDlg as a child of 'parent', with the + * Constructs a AddGlobalDlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFlags fl ) - : TQDialog( parent, name, modal, fl ) +AddGlobalDlg::AddGlobalDlg( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : TQDialog( tqparent, name, modal, fl ) { if ( !name ) @@ -68,7 +68,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 ); languageChange(); - resize( TQSize(511, 282).expandedTo(minimumSizeHint()) ); + resize( TQSize(511, 282).expandedTo(tqminimumSizeHint()) ); // signals and slots connections connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); @@ -80,7 +80,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla */ AddGlobalDlg::~AddGlobalDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -93,9 +93,9 @@ void AddGlobalDlg::languageChange() buttonHelp->setGuiItem( KStdGuiItem::help() ); buttonHelp->setAccel( TQKeySequence( tr2i18n( "F1" ) ) ); buttonOk->setGuiItem( KStdGuiItem::ok() ); - buttonOk->setAccel( TQKeySequence( TQString::null ) ); + buttonOk->setAccel( TQKeySequence( TQString() ) ); buttonCancel->setGuiItem( KStdGuiItem::cancel() ); - buttonCancel->setAccel( TQKeySequence( TQString::null ) ); + buttonCancel->setAccel( TQKeySequence( TQString() ) ); 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 481309e7..2e7435dc 100644 --- a/parts/filecreate/addglobaldlg.h +++ b/parts/filecreate/addglobaldlg.h @@ -20,12 +20,13 @@ class TQListView; class TQListViewItem; class TQPushButton; -class AddGlobalDlg : public QDialog +class AddGlobalDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddGlobalDlg( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddGlobalDlg( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddGlobalDlg(); TQPushButton* buttonHelp; diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index df4963fa..6a1dc7e6 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -39,8 +39,8 @@ #include "kdevpartcontroller.h" -FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name): - FCConfigWidgetBase(parent, name), m_part(part), m_global(global) +FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *tqparent, const char *name): + FCConfigWidgetBase(tqparent, name), m_part(part), m_global(global) { fc_view->setSorting(-1, FALSE); fcglobal_view->setSorting(-1, FALSE); @@ -113,7 +113,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) TQString subtyperef = element.attribute("subtyperef"); if (subtyperef.isNull()) { - TQListViewItem *it = view->findItem(ext, 0); + TQListViewItem *it = view->tqfindItem(ext, 0); if (it) { ((TQCheckListItem*)it)->setOn(true); @@ -128,7 +128,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) } else { - TQListViewItem *it = view->findItem(subtyperef, 0); + TQListViewItem *it = view->tqfindItem(subtyperef, 0); if (it) ((TQCheckListItem*)it)->setOn(true); } @@ -147,9 +147,9 @@ void FCConfigWidget::loadProjectTemplates(TQListView *view) { TQDir templDir( m_part->project()->projectDirectory() + "/templates/" ); templDir.setFilter( TQDir::Files ); - const QFileInfoList * list = templDir.entryInfoList(); + const TQFileInfoList * list = templDir.entryInfoList(); if( list ){ - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { FileType * filetype; @@ -217,7 +217,7 @@ void FCConfigWidget::saveProjectConfig() TQListViewItemIterator it( fcglobal_view ); for( ; it.current( ); ++it ){ - if (!it.current()->parent()) + if (!it.current()->tqparent()) { TQCheckListItem *chit = dynamic_cast(it.current()); if ( !chit ) continue; @@ -259,7 +259,7 @@ void FCConfigWidget::saveProjectConfig() TQString dest; dest = m_part->project()->projectDirectory() + "/templates/"; if (it2.current()->text(1) == "create") - copyTemplate(TQString::null, dest, it2.current()->text(0)); + copyTemplate(TQString(), dest, it2.current()->text(0)); else copyTemplate(it2.current()->text(1), dest, it2.current()->text(0)); } @@ -271,7 +271,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element { TQListViewItemIterator it( fc_view ); for( ; it.current( ); ++it ){ - if (!it.current()->parent()) + if (!it.current()->tqparent()) { TQDomElement type = dom.createElement( "type" ); type.setAttribute( "ext", it.current()->text(0) ); @@ -295,7 +295,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element else dest = m_part->project()->projectDirectory() + "/templates/"; if (it.current()->text(4) == "create") - copyTemplate(TQString::null, dest, it.current()->text(0)); + copyTemplate(TQString(), dest, it.current()->text(0)); else copyTemplate(it.current()->text(4), dest, it.current()->text(0)); } @@ -322,7 +322,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element else dest = m_part->project()->projectDirectory() + "/templates/"; if (lastChild->text(4) == "create") - copyTemplate(TQString::null, dest, it.current()->text(0) + "-" + lastChild->text(0)); + copyTemplate(TQString(), dest, it.current()->text(0) + "-" + lastChild->text(0)); else copyTemplate(lastChild->text(4), dest, it.current()->text(0) + "-" + lastChild->text(0)); } @@ -434,15 +434,15 @@ void FCConfigWidget::copyToProject_button_clicked() { TQListViewItem *it_copy_parent = 0; TQString destParent; - if (it->parent()) + if (it->tqparent()) { - 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) + "-"; - TQCheckListItem *chk = dynamic_cast(it->parent()); + it_copy_parent = new TQListViewItem(fc_view, it->tqparent()->text(0), + it->tqparent()->text(1), + it->tqparent()->text(2), + it->tqparent()->text(3), + locate("data", "kdevfilecreate/file-templates/"+ it->tqparent()->text(0))); + destParent += it->tqparent()->text(0) + "-"; + TQCheckListItem *chk = dynamic_cast(it->tqparent()); if (chk) chk->setOn(false); } @@ -497,7 +497,7 @@ void FCConfigWidget::newtype_button_clicked() void FCConfigWidget::newsubtype_button_clicked() { - if (fc_view->currentItem() && (!fc_view->currentItem()->parent())) + if (fc_view->currentItem() && (!fc_view->currentItem()->tqparent())) { FCTypeEdit *te = new FCTypeEdit(this); if (te->exec() == TQDialog::Accepted ) @@ -541,10 +541,10 @@ void FCConfigWidget::moveup_button_clicked() return; TQListViewItemIterator it( i ); - TQListViewItem *parent = i->parent(); + TQListViewItem *tqparent = i->tqparent(); --it; while ( it.current() ) { - if ( it.current()->parent() == parent ) + if ( it.current()->tqparent() == tqparent ) break; --it; } @@ -564,10 +564,10 @@ void FCConfigWidget::movedown_button_clicked() return; TQListViewItemIterator it( i ); - TQListViewItem *parent = i->parent(); + TQListViewItem *tqparent = i->tqparent(); it++; while ( it.current() ) { - if ( it.current()->parent() == parent ) + if ( it.current()->tqparent() == tqparent ) break; it++; } @@ -649,7 +649,7 @@ void FCConfigWidget::edit_template_content_button_clicked( ) 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."), TQString::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(), "Edit template content warning"); fctemplates_view->currentItem()->setPixmap(0, SmallIcon("edit")); urlsToEdit.append(content); } @@ -662,8 +662,8 @@ void FCConfigWidget::edit_type_content_button_clicked( ) return; TQListViewItem *it = fc_view->currentItem(); TQString type_name = it->text(0); - if (it->parent()) - type_name.prepend(it->parent()->text(0) + "-"); + if (it->tqparent()) + type_name.prepend(it->tqparent()->text(0) + "-"); if (!m_global) { TQString typePath = m_part->project()->projectDirectory() + "/templates/" + type_name; @@ -674,9 +674,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."), TQString::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(), "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."), TQString::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(), "Edit type template content warning"); fc_view->currentItem()->setPixmap(0, SmallIcon("edit")); urlsToEdit.append(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."), TQString::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(), "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."), TQString::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(), "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 2e69b6d5..19087ba6 100644 --- a/parts/filecreate/fcconfigwidget.h +++ b/parts/filecreate/fcconfigwidget.h @@ -29,8 +29,9 @@ class FileType; class FCConfigWidget : public FCConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name); + FCConfigWidget(FileCreatePart * part, bool global, TQWidget *tqparent, const char *name); ~FCConfigWidget(); diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui index 72f62260..089141a2 100644 --- a/parts/filecreate/fcconfigwidgetbase.ui +++ b/parts/filecreate/fcconfigwidgetbase.ui @@ -1,6 +1,6 @@ FCConfigWidgetBase - + FCConfigWidgetBase @@ -22,11 +22,11 @@ 0 - + fc_tabs - + tab1 @@ -37,7 +37,7 @@ unnamed - + remove_button @@ -45,7 +45,7 @@ Re&move Type - + edittype_button @@ -53,7 +53,7 @@ Edit T&ype... - + newsubtype_button @@ -61,7 +61,7 @@ New &Subtype... - + newtype_button @@ -69,7 +69,7 @@ &New Type... - + Type Extension @@ -140,14 +140,14 @@ Expanding - + 20 20 - + moveup_button @@ -155,7 +155,7 @@ Move &Up - + movedown_button @@ -173,7 +173,7 @@ Fixed - + 20 20 @@ -190,14 +190,14 @@ Fixed - + 20 20 - + edit_type_content_button @@ -207,7 +207,7 @@ - + tab2 @@ -218,7 +218,7 @@ unnamed - + Type Extension @@ -286,14 +286,14 @@ Expanding - + 330 20 - + copyToProject_button @@ -303,7 +303,7 @@ - + tab3 @@ -314,7 +314,7 @@ unnamed - + Template Name @@ -339,7 +339,7 @@ AllColumns - + edittemplate_button @@ -347,7 +347,7 @@ C&hange Content... - + newtemplate_button @@ -355,7 +355,7 @@ &New Template... - + templatesDir_label @@ -363,7 +363,7 @@ - + removetemplate_button @@ -381,14 +381,14 @@ Expanding - + 20 150 - + edit_template_content_button @@ -406,7 +406,7 @@ Fixed - + 20 20 @@ -520,7 +520,7 @@ AddGlobalDlg *global_dlg; - + removetemplate_button_clicked() copyToProject_button_clicked() newtype_button_clicked() @@ -534,7 +534,7 @@ edit_template_contents_button_clicked() edit_template_content_button_clicked() edit_type_content_button_clicked() - - - + + + diff --git a/parts/filecreate/fctemplateedit.cpp b/parts/filecreate/fctemplateedit.cpp index b019ddb9..1fcc6e02 100644 --- a/parts/filecreate/fctemplateedit.cpp +++ b/parts/filecreate/fctemplateedit.cpp @@ -11,8 +11,8 @@ #include "fctemplateedit.h" #include -FCTemplateEdit::FCTemplateEdit(TQWidget *parent, const char *name): - FCTemplateEditBase(parent, name) +FCTemplateEdit::FCTemplateEdit(TQWidget *tqparent, const char *name): + FCTemplateEditBase(tqparent, name) { connect( templatename_edit, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT( slotTemplateNameChanged( ))); diff --git a/parts/filecreate/fctemplateedit.h b/parts/filecreate/fctemplateedit.h index 8ecf7a81..a5a0c2f6 100644 --- a/parts/filecreate/fctemplateedit.h +++ b/parts/filecreate/fctemplateedit.h @@ -17,8 +17,9 @@ class FCTemplateEdit : public FCTemplateEditBase { Q_OBJECT + TQ_OBJECT public: - FCTemplateEdit(TQWidget *parent=0, const char *name=0); + FCTemplateEdit(TQWidget *tqparent=0, const char *name=0); ~FCTemplateEdit(); diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui index 976bff33..6ea599e2 100644 --- a/parts/filecreate/fctemplateeditbase.ui +++ b/parts/filecreate/fctemplateeditbase.ui @@ -1,6 +1,6 @@ FCTemplateEditBase - + FCTemplateEditBase @@ -19,9 +19,9 @@ unnamed - + - layout5 + tqlayout5 @@ -30,7 +30,7 @@ 0 - + textLabel1 @@ -40,7 +40,7 @@ Template &name: - + AlignBottom @@ -54,15 +54,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -77,7 +77,7 @@ Set template content from &file: - + AlignBottom @@ -96,7 +96,7 @@ 0 - + 0 26 @@ -108,9 +108,9 @@ - + - layout1 + tqlayout1 @@ -126,14 +126,14 @@ Expanding - + 40 20 - + ok_button @@ -144,7 +144,7 @@ true - + cancel_button @@ -180,11 +180,11 @@ kdialog.h fctemplateeditbase.ui.h - + init() - - - + + + kurlrequester.h klineedit.h diff --git a/parts/filecreate/fctemplateeditbase.ui.h b/parts/filecreate/fctemplateeditbase.ui.h index f4fcfa05..5750f988 100644 --- a/parts/filecreate/fctemplateeditbase.ui.h +++ b/parts/filecreate/fctemplateeditbase.ui.h @@ -12,7 +12,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -22,5 +22,5 @@ void FCTemplateEditBase::init() { - templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); + templatename_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this))); } diff --git a/parts/filecreate/fctypeedit.cpp b/parts/filecreate/fctypeedit.cpp index 5ee4eb0d..dfb29ef6 100644 --- a/parts/filecreate/fctypeedit.cpp +++ b/parts/filecreate/fctypeedit.cpp @@ -13,8 +13,8 @@ #include "fctypeedit.h" -FCTypeEdit::FCTypeEdit(TQWidget *parent, char *name) - : FCTypeEditBase(parent, name) +FCTypeEdit::FCTypeEdit(TQWidget *tqparent, char *name) + : FCTypeEditBase(tqparent, name) { connect( typeext_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged())); connect( typename_edit, TQT_SIGNAL( textChanged ( const TQString & )),this, TQT_SLOT( slotTypeEditTextChanged( ))); diff --git a/parts/filecreate/fctypeedit.h b/parts/filecreate/fctypeedit.h index f5a9bf7b..122b0b57 100644 --- a/parts/filecreate/fctypeedit.h +++ b/parts/filecreate/fctypeedit.h @@ -17,8 +17,9 @@ class FCTypeEdit : public FCTypeEditBase { Q_OBJECT + TQ_OBJECT public: - FCTypeEdit(TQWidget *parent = 0, char *name = 0); + FCTypeEdit(TQWidget *tqparent = 0, char *name = 0); ~FCTypeEdit(); diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index 8bc06f87..893a9be3 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -1,6 +1,6 @@ FCTypeEditBase - + FCTypeEditBase @@ -19,9 +19,9 @@ unnamed - + - layout5 + tqlayout5 @@ -30,7 +30,7 @@ 0 - + textLabel1 @@ -43,23 +43,23 @@ Type &extension: - + AlignBottom typename_edit - + typeext_edit - + - layout3 + tqlayout3 @@ -68,30 +68,30 @@ 0 - + textLabel3 Type &name: - + AlignBottom typedescr_edit - + typename_edit - + - layout3_2 + tqlayout3_2 @@ -100,21 +100,21 @@ 0 - + textLabel3_2 Type &description: - + AlignBottom typedescr_edit - + typedescr_edit @@ -125,7 +125,7 @@ icon_url - + 80 80 @@ -138,15 +138,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -161,7 +161,7 @@ Set template content from &file: - + AlignBottom @@ -180,7 +180,7 @@ 0 - + 0 26 @@ -192,9 +192,9 @@ - + - layout1 + tqlayout1 @@ -210,14 +210,14 @@ Expanding - + 40 20 - + ok_button @@ -228,7 +228,7 @@ true - + cancel_button @@ -268,11 +268,11 @@ kdialog.h fctypeeditbase.ui.h - + init() - - - + + + kicondialog.h kurlrequester.h diff --git a/parts/filecreate/fctypeeditbase.ui.h b/parts/filecreate/fctypeeditbase.ui.h index b9ec29b5..07576b6b 100644 --- a/parts/filecreate/fctypeeditbase.ui.h +++ b/parts/filecreate/fctypeeditbase.ui.h @@ -12,7 +12,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -22,5 +22,5 @@ void FCTypeEditBase::init() { - typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), this)); + typeext_edit->setValidator(new TQRegExpValidator(TQRegExp("^\\S*$"), TQT_TQOBJECT(this))); } diff --git a/parts/filecreate/file-templates/ui b/parts/filecreate/file-templates/ui index 858b4678..0a453896 100644 --- a/parts/filecreate/file-templates/ui +++ b/parts/filecreate/file-templates/ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,5 +16,5 @@ Form1 - + diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog index 975ba4d4..60a0004d 100644 --- a/parts/filecreate/file-templates/ui-confdialog +++ b/parts/filecreate/file-templates/ui-confdialog @@ -1,6 +1,6 @@ MyDialog1 - + MyDialog1 @@ -28,7 +28,7 @@ 6 - + New Item @@ -46,11 +46,11 @@ - + tabWidget - + Widget2 @@ -58,7 +58,7 @@ Tab - + Widget3 @@ -67,7 +67,7 @@ - + Layout1 @@ -81,7 +81,7 @@ 6 - + buttonHelp @@ -105,14 +105,14 @@ Expanding - + 20 20 - + buttonOk @@ -129,7 +129,7 @@ true - + buttonCancel @@ -161,5 +161,5 @@ reject() - + diff --git a/parts/filecreate/file-templates/ui-dialog b/parts/filecreate/file-templates/ui-dialog index fc2aefce..4b0c8bb2 100644 --- a/parts/filecreate/file-templates/ui-dialog +++ b/parts/filecreate/file-templates/ui-dialog @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,5 +16,5 @@ Form1 - + diff --git a/parts/filecreate/file-templates/ui-dialog-qt4 b/parts/filecreate/file-templates/ui-dialog-qt4 index d35cb285..b2096e86 100644 --- a/parts/filecreate/file-templates/ui-dialog-qt4 +++ b/parts/filecreate/file-templates/ui-dialog-qt4 @@ -3,7 +3,7 @@ Dialog - + 0 diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb index 7ccbfb94..2929f9e3 100644 --- a/parts/filecreate/file-templates/ui-dialogb +++ b/parts/filecreate/file-templates/ui-dialogb @@ -1,6 +1,6 @@ MyDialog1 - + MyDialog1 @@ -18,7 +18,7 @@ true - + Layout1 @@ -40,7 +40,7 @@ 6 - + buttonHelp @@ -64,14 +64,14 @@ Expanding - + 20 20 - + buttonOk @@ -88,7 +88,7 @@ true - + buttonCancel @@ -119,5 +119,5 @@ reject() - + diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4 index 2413393e..e1b84f42 100644 --- a/parts/filecreate/file-templates/ui-dialogb-qt4 +++ b/parts/filecreate/file-templates/ui-dialogb-qt4 @@ -3,7 +3,7 @@ Dialog - + 0 @@ -15,7 +15,7 @@ Dialog - + 20 @@ -24,7 +24,7 @@ 33 - + 0 @@ -36,7 +36,7 @@ Qt::Horizontal - + 131 31 @@ -45,20 +45,20 @@ - + OK - + Cancel - + diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr index 8cf208ec..0b7dde40 100644 --- a/parts/filecreate/file-templates/ui-dialogr +++ b/parts/filecreate/file-templates/ui-dialogr @@ -1,6 +1,6 @@ MyDialog1 - + MyDialog1 @@ -18,7 +18,7 @@ true - + Layout5 @@ -40,7 +40,7 @@ 6 - + buttonOk @@ -57,7 +57,7 @@ true - + buttonCancel @@ -71,7 +71,7 @@ true - + buttonHelp @@ -95,7 +95,7 @@ Expanding - + 20 20 @@ -119,5 +119,5 @@ reject() - + diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4 index 57d81913..8e2d0608 100644 --- a/parts/filecreate/file-templates/ui-dialogr-qt4 +++ b/parts/filecreate/file-templates/ui-dialogr-qt4 @@ -3,7 +3,7 @@ Dialog - + 0 @@ -15,7 +15,7 @@ Dialog - + 300 @@ -24,7 +24,7 @@ 106 - + 0 @@ -32,14 +32,14 @@ 6 - + OK - + Cancel @@ -50,7 +50,7 @@ Qt::Vertical - + 20 40 @@ -58,7 +58,7 @@ - + diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin index 854da009..4e0a093b 100644 --- a/parts/filecreate/file-templates/ui-mainwin +++ b/parts/filecreate/file-templates/ui-mainwin @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -415,7 +415,7 @@ helpAbout() - + fileNew() fileOpen() fileSave() @@ -431,6 +431,6 @@ helpIndex() helpContents() helpAbout() - - + + diff --git a/parts/filecreate/file-templates/ui-mainwin-qt4 b/parts/filecreate/file-templates/ui-mainwin-qt4 index 814096cc..a444cfa3 100644 --- a/parts/filecreate/file-templates/ui-mainwin-qt4 +++ b/parts/filecreate/file-templates/ui-mainwin-qt4 @@ -3,7 +3,7 @@ MainWindow - + 0 @@ -15,8 +15,8 @@ MainWindow - - + + 0 diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog index a28ae7c7..3c45b07b 100644 --- a/parts/filecreate/file-templates/ui-tabdialog +++ b/parts/filecreate/file-templates/ui-tabdialog @@ -1,6 +1,6 @@ MyDialog1 - + MyDialog1 @@ -28,11 +28,11 @@ 6 - + tabWidget - + Widget8 @@ -40,7 +40,7 @@ Tab - + Widget9 @@ -49,7 +49,7 @@ - + Layout1 @@ -63,7 +63,7 @@ 6 - + buttonHelp @@ -87,14 +87,14 @@ Expanding - + 20 20 - + buttonOk @@ -111,7 +111,7 @@ true - + buttonCancel @@ -143,5 +143,5 @@ reject() - + diff --git a/parts/filecreate/file-templates/ui-widget b/parts/filecreate/file-templates/ui-widget index 858b4678..0a453896 100644 --- a/parts/filecreate/file-templates/ui-widget +++ b/parts/filecreate/file-templates/ui-widget @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,5 +16,5 @@ Form1 - + diff --git a/parts/filecreate/file-templates/ui-widget-qt4 b/parts/filecreate/file-templates/ui-widget-qt4 index 2aecd3c9..d8b6e63c 100644 --- a/parts/filecreate/file-templates/ui-widget-qt4 +++ b/parts/filecreate/file-templates/ui-widget-qt4 @@ -3,7 +3,7 @@ Form - + 0 diff --git a/parts/filecreate/file-templates/ui-wizard b/parts/filecreate/file-templates/ui-wizard index 7c68689b..01338af0 100644 --- a/parts/filecreate/file-templates/ui-wizard +++ b/parts/filecreate/file-templates/ui-wizard @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -15,7 +15,7 @@ Form1 - + page @@ -24,5 +24,5 @@ - + diff --git a/parts/filecreate/filecreate_filedialog.cpp b/parts/filecreate/filecreate_filedialog.cpp index ecc8df42..1baa2132 100644 --- a/parts/filecreate/filecreate_filedialog.cpp +++ b/parts/filecreate/filecreate_filedialog.cpp @@ -21,9 +21,9 @@ namespace FileCreate { FileDialog::FileDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal, TQWidget * extraWidget) : - KFileDialog(startDir, filter, parent, name, modal, extraWidget) { + KFileDialog(startDir, filter, tqparent, name, modal, extraWidget) { setOperationMode(Saving); diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h index b1523648..26852cfc 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -21,10 +21,11 @@ namespace FileCreate { class FileDialog : public KFileDialog { Q_OBJECT + TQ_OBJECT public: FileDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal, TQWidget * extraWidget); virtual ~FileDialog(); diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp index 86075af8..aa02fe23 100644 --- a/parts/filecreate/filecreate_listitem.cpp +++ b/parts/filecreate/filecreate_listitem.cpp @@ -51,7 +51,7 @@ namespace FileCreate { void ListItem::setHeight( int height ) { - KListViewItem::setHeight( QMAX(QMAX(height,m_iconHeight), m_filetypeRenderer->height() ) ); + KListViewItem::setHeight( TQMAX(TQMAX(height,m_iconHeight), m_filetypeRenderer->height() ) ); } void ListItem::prepareResize() { diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp index b4b84de1..6b41bb0b 100644 --- a/parts/filecreate/filecreate_newfile.cpp +++ b/parts/filecreate/filecreate_newfile.cpp @@ -29,9 +29,9 @@ namespace FileCreate { - NewFileChooser::NewFileChooser(TQWidget * parent) : + NewFileChooser::NewFileChooser(TQWidget * tqparent) : KDialogBase(KDialogBase::Plain, i18n("New file dialog (title)", "New File"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, parent, "New file", true) + KDialogBase::Ok, tqparent, "New file", true) { TQVBoxLayout* lay = new TQVBoxLayout( plainPage(), 5, 5 ); diff --git a/parts/filecreate/filecreate_newfile.h b/parts/filecreate/filecreate_newfile.h index c1d3b730..04239e90 100644 --- a/parts/filecreate/filecreate_newfile.h +++ b/parts/filecreate/filecreate_newfile.h @@ -26,8 +26,9 @@ class KLineEdit; namespace FileCreate { class NewFileChooser : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewFileChooser(TQWidget *parent=0); + NewFileChooser(TQWidget *tqparent=0); virtual ~NewFileChooser(); void setFileTypes(TQPtrList typelist); KURL url() const; diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index e07656b9..e8fbecff 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -61,9 +61,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) using namespace FileCreate; -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) +FileCreatePart::FileCreatePart(TQObject *tqparent, const char *name, const TQStringList & ) +// : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) + : KDevCreateFile(&data, tqparent, name ? name : "FileCreatePart"), m_subPopups(0) { setInstance(FileCreateFactory::instance()); setXMLFile("kdevpart_filecreate.rc"); @@ -78,7 +78,7 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+Qt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); + KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+TQt::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(); @@ -210,8 +210,8 @@ void FileCreatePart::slotProjectClosed() { void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(), - TQString::null, - TQString::null, + TQString(), + TQString(), filetype->subtypeRef()); openCreatedFile(createdFile); @@ -274,7 +274,7 @@ FileType * FileCreatePart::getType(const TQString & ex, const TQString subtRef) TQString subtypeRef = subtRef; TQString ext = ex; - int dashPos = ext.find('-'); + int dashPos = ext.tqfind('-'); if (dashPos>-1 && subtRef.isNull()) { ext = ex.left(dashPos); subtypeRef = ex.mid(dashPos+1); @@ -301,7 +301,7 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su TQString subtypeRef = subtRef; TQString ext = ex; - int dashPos = ext.find('-'); + int dashPos = ext.tqfind('-'); if (dashPos>-1 && subtRef.isNull()) { ext = ex.left(dashPos); subtypeRef = ex.mid(dashPos+1); @@ -383,7 +383,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString selectedURL = dialog.url(); const FileType *selectedFileType = dialog.selectedType(); - if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesQMakeBuildSystem) ) { + if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) { result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT; return result; } @@ -425,7 +425,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString // work out the path relative to the project directory // TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX ); TQString relToProj; - if( project()->options() & KDevProject::UsesQMakeBuildSystem ) + if( project()->options() & KDevProject::UsesTQMakeBuildSystem ) { relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath ); project()->addFile(relToProj); @@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString } void FileCreatePart::slotNoteFiletype(const FileType * filetype) { - kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl; + kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::tqfromLatin1("Null") ) << endl; m_filedialogFiletype = filetype; } @@ -483,7 +483,7 @@ void FileCreatePart::slotInitialize( ) } } else { // if an extension + subtype have been specified, enable - // the subtype and the extension (the 'parent') + // the subtype and the extension (the 'tqparent') FileType * filetype = getType(ext); FileType * subtype = getType(ext,subtyperef); if (filetype && subtype) { @@ -501,9 +501,9 @@ void FileCreatePart::slotInitialize( ) TQDir templDir( project()->projectDirectory() + "/templates/" ); if (templDir.exists()) { templDir.setFilter( TQDir::Files ); - const QFileInfoList * list = templDir.entryInfoList(); + const TQFileInfoList * list = templDir.entryInfoList(); if( list ){ - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { addFileType(fi->fileName()); @@ -559,4 +559,4 @@ void FileCreatePart::slotGlobalInitialize( ) #include "filecreate_part.moc" -// kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on; +// kate: indent-width 2; tqreplace-tabs on; tab-width 4; space-indent on; diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h index 605f6fbf..c8da5b27 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -39,10 +39,11 @@ using namespace FileCreate; class FileCreatePart : public KDevCreateFile { Q_OBJECT + TQ_OBJECT friend class FCConfigWidget; public: - FileCreatePart(TQObject *parent, const char *name, const TQStringList &); + FileCreatePart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~FileCreatePart(); /** @@ -52,26 +53,26 @@ public: /** * 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 TQString::null. + * much information as you know. Leave what you don't know as TQString(). * 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(TQString ext = TQString::null, - TQString dir = TQString::null, - TQString name = TQString::null, - TQString subtype = TQString::null); + virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(), + TQString dir = TQString(), + TQString name = TQString(), + TQString subtype = TQString()); /** * 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 TQString & ext, const TQString subtype = TQString::null); + FileType * getType(const TQString & ext, const TQString subtype = TQString()); /** * 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 TQString & ext, const TQString subtype = TQString::null); + FileType * getEnabledType(const TQString & ext, const TQString subtype = TQString()); public slots: diff --git a/parts/filecreate/filecreate_typechoosersig.h b/parts/filecreate/filecreate_typechoosersig.h index 233afe70..ad98fa68 100644 --- a/parts/filecreate/filecreate_typechoosersig.h +++ b/parts/filecreate/filecreate_typechoosersig.h @@ -9,6 +9,7 @@ class FileType; class Signaller : public TQObject { Q_OBJECT + TQ_OBJECT public: Signaller() : TQObject() { } diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 10816904..5c39393b 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -67,7 +67,7 @@ namespace FileCreate { else kdDebug(9034) << "No match!" << endl; } - // If an exact match is not found (e.g. current points to a 'parent' type) then + // If an exact match is not found (e.g. current points to a 'tqparent' type) then // look instead for an extension match if (changeToRow==-1) { for(it = typeForRow.begin(); it!= typeForRow.end() && changeToRow==-1; ++it) { @@ -164,7 +164,7 @@ namespace FileCreate { return; } - m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL; + m_selected = typeForRow.tqcontains(row) ? typeForRow[row] : NULL; TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) ); } @@ -191,7 +191,7 @@ namespace FileCreate { if( !i ) continue; - TQSize size = i->sizeHint(); + TQSize size = i->tqsizeHint(); maxHeight = size.height()>maxHeight ? size.height() : maxHeight; } setRowHeight(row,maxHeight+2); // bit of extra room @@ -206,13 +206,13 @@ namespace FileCreate { if( !i ) continue; - TQSize size = item(r,col)->sizeHint(); + TQSize size = item(r,col)->tqsizeHint(); maxWidth = size.width()>maxWidth ? size.width() : maxWidth; } setColumnWidth(col,maxWidth+2); // bit of extra room } -#if QT_VERSION < 0x030100 +#if [[[TQT_VERSION IS DEPRECATED]]] < 0x030100 void FriendlyWidget::selectRow(int row) { if (numCols()>0 && rowrow to filetype filetype. diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index 5d307bff..282426c0 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -70,7 +70,7 @@ namespace FileCreate { lvi = lvi->nextSibling(); else { while (lvi && !lvi->nextSibling()) - lvi = lvi->parent(); + lvi = lvi->tqparent(); } } diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h index db2a6b13..89201539 100644 --- a/parts/filecreate/filecreate_widget3.h +++ b/parts/filecreate/filecreate_widget3.h @@ -30,6 +30,7 @@ namespace FileCreate { class ListWidget : public KListView, public TypeChooser { Q_OBJECT + TQ_OBJECT public: diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index 07817479..4e53e9f3 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -20,8 +20,8 @@ FileListItem * FileListItem::s_activeItem = 0; -FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState state ) - : TQListViewItem( parent, url.fileName() ), +FileListItem::FileListItem( TQListView * tqparent, KURL const & url, DocumentState state ) + : TQListViewItem( tqparent, url.fileName() ), _url( url ) { @@ -73,7 +73,7 @@ void FileListItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column if ( isActive() ) { - mcg.setColor( TQColorGroup::Base, Qt::yellow ); + mcg.setColor( TQColorGroup::Base, TQt::yellow ); } TQListViewItem::paintCell( p, mcg, column, width, align ); diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h index 7f9f7965..fd0d0a77 100644 --- a/parts/filelist/filelist_item.h +++ b/parts/filelist/filelist_item.h @@ -20,10 +20,10 @@ #include -class FileListItem : public QListViewItem +class FileListItem : public TQListViewItem { public: - FileListItem( TQListView * parent, KURL const & url, DocumentState = Clean ); + FileListItem( TQListView * tqparent, KURL const & url, DocumentState = Clean ); KURL url(); diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 6f494f93..e31f3fbd 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -34,8 +34,8 @@ * @param part * @return */ -FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) - : KListView(parent), TQToolTip( viewport() ), _part( part ) +FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *tqparent) + : KListView(tqparent), TQToolTip( viewport() ), _part( part ) { addColumn( "" ); header()->hide(); @@ -81,7 +81,7 @@ void FileListWidget::startRefreshTimer( ) void FileListWidget::maybeTip( TQPoint const & p ) { FileListItem * item = static_cast( itemAt( p ) ); - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if ( item && r.isValid() ) { @@ -208,7 +208,7 @@ void FileListWidget::activePartChanged( KParts::Part * part ) item = static_cast( item->nextSibling() ); } } - repaintContents(); + tqrepaintContents(); } void FileListWidget::documentChangedState( const KURL & url, DocumentState state ) @@ -287,7 +287,7 @@ void FileListWidget::restoreSelections(const TQStringList & list) TQListViewItem * item = firstChild(); while ( item ) { - if ( list.contains( item->text(0) ) ) + if ( list.tqcontains( item->text(0) ) ) { item->setSelected( true ); } diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index d30aa6f6..f2c2bd51 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -30,13 +30,14 @@ class FileListItem; namespace KParts { class Part; } -class FileListWidget : public KListView, public QToolTip +class FileListWidget : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT public: - FileListWidget(ProjectviewPart *part, TQWidget *parent=0); + FileListWidget(ProjectviewPart *part, TQWidget *tqparent=0); ~FileListWidget(); protected: diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index 0f138e1a..c552a5fd 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -25,8 +25,8 @@ #include -ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name) - : ProjectviewConfigBase(parent, name) +ProjectviewConfig::ProjectviewConfig(TQWidget *tqparent, const char *name) + : ProjectviewConfigBase(tqparent, name) { KConfig * config = kapp->config(); config->setGroup("File List Plugin"); diff --git a/parts/filelist/projectviewconfig.h b/parts/filelist/projectviewconfig.h index 44195ab0..d81de3a9 100644 --- a/parts/filelist/projectviewconfig.h +++ b/parts/filelist/projectviewconfig.h @@ -27,8 +27,9 @@ class ProjectviewConfig: public ProjectviewConfigBase { Q_OBJECT + TQ_OBJECT public: - ProjectviewConfig(TQWidget *parent = 0, const char *name = 0); + ProjectviewConfig(TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui index 7a0241db..ba22dcd7 100644 --- a/parts/filelist/projectviewconfigbase.ui +++ b/parts/filelist/projectviewconfigbase.ui @@ -1,6 +1,6 @@ ProjectviewConfigBase - + ProjectviewConfigBase @@ -19,7 +19,7 @@ unnamed - + inToolview @@ -36,7 +36,7 @@ Uncheck this if you want the toolbar together with all other toolbars. You can disable it then - + onlyProject @@ -53,7 +53,7 @@ Check this if you want to ignore files that are not part of the project - + closeOpenFiles @@ -80,7 +80,7 @@ Expanding - + 20 61 @@ -89,5 +89,5 @@ - + diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 91b46b53..c3341cd8 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -68,8 +68,8 @@ K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data)) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "FileListPart") +ProjectviewPart::ProjectviewPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "FileListPart") { setInstance(projectviewFactory::instance()); setXMLFile("kdevfilelist.rc"); @@ -107,7 +107,7 @@ ProjectviewPart::~ProjectviewPart() delete m_guibuilder; if ( m_widget ) { mainWindow()->removeView( m_widget ); - delete m_widget; // deletes the children as well + delete m_widget; // deletes the tqchildren as well } } @@ -389,7 +389,7 @@ void ProjectviewPart::slotOpenProjectView(const TQString &view) m_currentProjectView = view; - if (m_projectViews.contains(view) > 0) + if (m_projectViews.tqcontains(view) > 0) { FileInfoList viewUrls = m_projectViews[view]; @@ -400,7 +400,7 @@ void ProjectviewPart::slotOpenProjectView(const TQString &view) for (KURL::List::Iterator it = urlsToClose.begin(); it != urlsToClose.end(); ++it) { // it is in the list of wanted files and do we want it at all - if ((viewUrls.contains(*it) > 0) && (!onlyProject || !project() || project()->isProjectFile((*it).path()) )) + if ((viewUrls.tqcontains(*it) > 0) && (!onlyProject || !project() || project()->isProjectFile((*it).path()) )) { viewUrls.remove(*it); // don't open if it is open already it = urlsToClose.remove(it); @@ -439,7 +439,7 @@ void ProjectviewPart::adjustViewActions() m_openPrjViewAction->clear(); m_openPrjViewAction->setItems(viewList); - int i = viewList.findIndex(m_currentProjectView); + int i = viewList.tqfindIndex(m_currentProjectView); if (i > -1) { m_openPrjViewAction->setCurrentItem(i); @@ -490,8 +490,8 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) 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), TQString::null, i18n("Overwrite")) != KMessageBox::Continue) + if (m_projectViews.tqcontains(newProjectView) > 0 && + KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("A view session named %1 already exists.
    Do you want to overwrite it?    ").tqarg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue) { return; } diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index 7c8d8de3..c8555f8b 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -56,13 +56,14 @@ FIXME at project open I get the default view and the open files at last close class ProjectviewPart: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: typedef TQMap ViewMap; // typedef TQMap FileInfoMap; - ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args); + ProjectviewPart(TQObject *tqparent, const char *name, const TQStringList &args); ~ProjectviewPart(); // reimplemented from KDevPlugin diff --git a/parts/filelist/projectviewprojectconfig.cpp b/parts/filelist/projectviewprojectconfig.cpp index b411dbbd..0b471ff1 100644 --- a/parts/filelist/projectviewprojectconfig.cpp +++ b/parts/filelist/projectviewprojectconfig.cpp @@ -24,8 +24,8 @@ #include "projectviewpart.h" -ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent, const char *name) - : ProjectviewProjectConfigBase(parent, name), m_part(part) +ProjectviewProjectConfig::ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *tqparent, const char *name) + : ProjectviewProjectConfigBase(tqparent, name), m_part(part) { kComboDefault->clear(); kComboDefault->insertItem(""); diff --git a/parts/filelist/projectviewprojectconfig.h b/parts/filelist/projectviewprojectconfig.h index 0c36db2f..2a7ee5c5 100644 --- a/parts/filelist/projectviewprojectconfig.h +++ b/parts/filelist/projectviewprojectconfig.h @@ -28,8 +28,9 @@ class ProjectviewPart; class ProjectviewProjectConfig: public ProjectviewProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *parent = 0, const char *name = 0); + ProjectviewProjectConfig(ProjectviewPart *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui index 7ff9a0b0..a6b2643c 100644 --- a/parts/filelist/projectviewprojectconfigbase.ui +++ b/parts/filelist/projectviewprojectconfigbase.ui @@ -1,6 +1,6 @@ ProjectviewProjectConfigBase - + ProjectviewProjectConfigBase @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -61,7 +61,7 @@ Expanding - + 265 20 @@ -78,7 +78,7 @@ Expanding - + 20 71 @@ -87,7 +87,7 @@ - + kcombobox.h diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp index b4e1a993..f2123d60 100644 --- a/parts/filelist/toolbarguibuilder.cpp +++ b/parts/filelist/toolbarguibuilder.cpp @@ -22,8 +22,8 @@ #include -ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget) - : KXMLGUIBuilder(widget), KToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent) +ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *tqparent, TQWidget *widget) + : KXMLGUIBuilder(widget), KToolBar(tqparent, "ToolbarGUIbuilder"), m_parent(tqparent) { // setHidden(true); setFrameStyle(0); @@ -34,7 +34,7 @@ ToolbarGUIBuilder::~ToolbarGUIBuilder() { } -TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id) +TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id) { if (element.tagName().lower() == "toolbar") { @@ -42,11 +42,11 @@ TQWidget * ToolbarGUIBuilder::createContainer(TQWidget *parent, int index, const return this; } else { - return KXMLGUIBuilder::createContainer(parent, index, element, id); + return KXMLGUIBuilder::createContainer(tqparent, index, element, id); } } -void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id) +void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id) { if (container == this) { @@ -54,6 +54,6 @@ void ToolbarGUIBuilder::removeContainer(TQWidget *container, TQWidget *parent, T reparent(0, TQPoint(0, 0)); } else - KXMLGUIBuilder::removeContainer(container, parent, element, id); + KXMLGUIBuilder::removeContainer(container, tqparent, element, id); } diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h index ec02c371..c3b6ef51 100644 --- a/parts/filelist/toolbarguibuilder.h +++ b/parts/filelist/toolbarguibuilder.h @@ -34,20 +34,20 @@ class ToolbarGUIBuilder : public KXMLGUIBuilder, public KToolBar { public: - ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget); + ToolbarGUIBuilder(TQWidget *tqparent, TQWidget *widget); virtual ~ToolbarGUIBuilder(); /** * Called when a new XML gui client is added to the gui factory. */ - virtual TQWidget *createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id); + virtual TQWidget *createContainer(TQWidget *tqparent, 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(TQWidget *container, TQWidget *parent, TQDomElement &element, int id); + virtual void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id); private: TQWidget * m_parent; diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index 4e30fe50..baf4dc86 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -34,8 +34,8 @@ typedef KDevGenericFactory FileSelectorFactory; static const KDevPluginInfo data("kdevfileselector"); K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) -FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") +FileSelectorPart::FileSelectorPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index ae8012ea..d2e8d9ec 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -14,8 +14,9 @@ class KDialogBase; class FileSelectorPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FileSelectorPart(TQObject *parent, const char *name, const TQStringList &); + FileSelectorPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~FileSelectorPart(); KAction *newFileAction() const { return m_newFileAction; } diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 804270e1..e9e60f47 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -72,12 +72,12 @@ // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) -static void silenceQToolBar(QtMsgType, const char *) +static void silenceTQToolBar(TQtMsgType, const char *) {} -KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent) - : KToolBar( parent, "KDev FileSelector Toolbar", true ) +KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *tqparent) + : KToolBar( tqparent, "KDev FileSelector Toolbar", true ) { setMinimumWidth(10); } @@ -91,8 +91,8 @@ void KDevFileSelectorToolBar::setMovingEnabled( bool) } -KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent) - :TQFrame(parent),m_tb(0) +KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *tqparent) + :TQFrame(tqparent),m_tb(0) {} KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent() {} @@ -105,7 +105,7 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { - setMinimumHeight(m_tb->sizeHint().height()); + setMinimumHeight(m_tb->tqsizeHint().height()); m_tb->resize(width(),height()); } } @@ -115,8 +115,8 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow, KDevPartController *partController, - TQWidget * parent, const char * name ) - : TQWidget(parent, name), + TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), m_part(part), mainwin(mainWindow), partController(partController) @@ -125,7 +125,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main TQVBoxLayout* lo = new TQVBoxLayout(this); - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this); toolbar = new KDevFileSelectorToolBar(tbp); @@ -133,10 +133,10 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main lo->addWidget(tbp); toolbar->setMovingEnabled(false); toolbar->setFlat(true); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -171,7 +171,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); lo->addWidget(filterBox); @@ -186,7 +186,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main // kaction for the dir sync method acSyncDir = new KAction( i18n("Current Document Directory"), "dirsynch", 0, - this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( KToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); @@ -209,7 +209,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), this, TQT_SLOT( setDir( const TQString& ) ) ); - waitingUrl = TQString::null; + waitingUrl = TQString(); // whatsthis help TQWhatsThis::add @@ -349,10 +349,10 @@ void KDevFileSelector::slotFilterChange( const TQString & nf ) if ( empty ) { dir->clearFilter(); - filter->lineEdit()->setText( TQString::null ); + filter->lineEdit()->setText( TQString() ); TQToolTip::add ( btnFilter, - TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) ); + TQString( i18n("Apply last filter (\"%1\")") ).tqarg( lastFilter ) ); } else { @@ -415,7 +415,7 @@ void KDevFileSelector::btnFilterClick() { if ( !btnFilter->isOn() ) { - slotFilterChange( TQString::null ); + slotFilterChange( TQString() ); } else { @@ -432,7 +432,7 @@ void KDevFileSelector::autoSync() if ( isVisible() ) { setActiveDocumentDir(); - waitingUrl = TQString::null; + waitingUrl = TQString(); } // else set waiting url else @@ -454,13 +454,13 @@ void KDevFileSelector::autoSync( KParts::Part *part ) KURL u ( doc->url() ); if ( u.isEmpty() ) { - waitingUrl = TQString::null; + waitingUrl = TQString(); return; } if ( isVisible() ) { setDir( u.directory() ); - waitingUrl = TQString::null; + waitingUrl = TQString(); } else { @@ -499,13 +499,13 @@ void KDevFileSelector::showEvent( TQShowEvent * ) { kdDebug()<<"syncing fs on show"<listBox(); - if ( o == lb && e->type() == TQEvent::Show ) + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; - int w = QMIN( mainwin->main()->width(), lb->contentsWidth() + add ); + int w = TQMIN( mainwin->main()->width(), lb->contentsWidth() + add ); lb->resize( w, lb->height() ); /// @todo - move the listbox to a suitable place if nessecary /// @todo - decide if it is worth caching the size while untill the contents @@ -537,16 +537,16 @@ bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) //BEGIN ACtionLBItem /* - QListboxItem that can store and return a string, + TQListboxItem that can store and return a string, used for the toolbar action selector. */ -class ActionLBItem : public QListBoxPixmap +class ActionLBItem : public TQListBoxPixmap { public: ActionLBItem( TQListBox *lb=0, const TQPixmap &pm = TQPixmap(), - const TQString &text=TQString::null, - const TQString &str=TQString::null ) : + const TQString &text=TQString(), + const TQString &str=TQString() ) : TQListBoxPixmap( lb, pm, text ), _str(str) {} @@ -575,8 +575,8 @@ KURL KDevFileSelector::activeDocumentUrl( ) //////////////////////////////////////////////////////////////////////////////// // KFSConfigPage implementation //////////////////////////////////////////////////////////////////////////////// -KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs ) - : TQWidget( parent, name ), +KFSConfigPage::KFSConfigPage( TQWidget *tqparent, const char *name, KDevFileSelector *kfs ) + : TQWidget( tqparent, name ), fileSelector( kfs ), bDirty( false ) { @@ -762,13 +762,13 @@ void KFSConfigPage::init() TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { - lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); + lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); if ( *it == "bookmarks" || *it == "sync_dir" ) ac = fileSelector->actionCollection()->action( (*it).latin1() ); else ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() ); if ( ac ) - new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it ); + new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it ); } // sync diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index 4811c398..cf06d42a 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -60,18 +60,20 @@ namespace KTextEditor class KDevFileSelectorToolBar: public KToolBar { Q_OBJECT + TQ_OBJECT public: - KDevFileSelectorToolBar(TQWidget *parent); + KDevFileSelectorToolBar(TQWidget *tqparent); virtual ~KDevFileSelectorToolBar(); virtual void setMovingEnabled( bool b ); }; -class KDevFileSelectorToolBarParent: public QFrame +class KDevFileSelectorToolBarParent: public TQFrame { Q_OBJECT + TQ_OBJECT public: - KDevFileSelectorToolBarParent(TQWidget *parent); + KDevFileSelectorToolBarParent(TQWidget *tqparent); ~KDevFileSelectorToolBarParent(); void setToolBar(KDevFileSelectorToolBar *tb); @@ -85,9 +87,10 @@ protected: class KDevDirOperator: public KDirOperator { Q_OBJECT + TQ_OBJECT public: - KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) - :KDirOperator(urlName, parent, name), m_part(part) + KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *tqparent=0, const char *name=0) + :KDirOperator(urlName, tqparent, name), m_part(part) { } @@ -98,9 +101,10 @@ private: FileSelectorPart *m_part; }; -class KDevFileSelector : public QWidget +class KDevFileSelector : public TQWidget { Q_OBJECT + TQ_OBJECT friend class KFSConfigPage; @@ -109,7 +113,7 @@ public: enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 }; KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0, - TQWidget * parent = 0, const char * name = 0 ); + TQWidget * tqparent = 0, const char * name = 0 ); ~KDevFileSelector(); void readConfig( KConfig *, const TQString & ); @@ -174,11 +178,12 @@ private: of the path and file filter combos, and how to handle user closed session. */ -class KFSConfigPage : public QWidget +class KFSConfigPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); + KFSConfigPage( TQWidget* tqparent=0, const char *name=0, KDevFileSelector *kfs=0); virtual ~KFSConfigPage() {}; public slots: diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp index 0534901b..3bf21922 100644 --- a/parts/fileselector/kactionselector.cpp +++ b/parts/fileselector/kactionselector.cpp @@ -46,8 +46,8 @@ class KActionSelectorPrivate { //BEGIN Constructor/destructor -KActionSelector::KActionSelector( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KActionSelector::KActionSelector( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { d = new KActionSelectorPrivate(); d->moveOnDoubleClick = true; @@ -342,7 +342,7 @@ void KActionSelector::polish() void KActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; - if ( (e->state() & Qt::ControlButton) ) + if ( (e->state() & TQt::ControlButton) ) { switch ( e->key() ) { @@ -369,7 +369,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { - if ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) ) + if ( (((TQKeyEvent*)e)->state() & TQt::ControlButton) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h index 2b49114f..9bcbeeea 100644 --- a/parts/fileselector/kactionselector.h +++ b/parts/fileselector/kactionselector.h @@ -75,18 +75,19 @@ class KActionSelectorPrivate; class KActionSelector : public TQWidget { Q_OBJECT + TQ_OBJECT Q_ENUMS( ButtonIconSize InsertionPolicy ) - Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) - Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) - 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 ) + TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) + TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) + TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) + TQ_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel ) + TQ_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize ) + TQ_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy ) + TQ_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy ) + TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( TQWidget *parent=0, const char *name=0 ); + KActionSelector( TQWidget *tqparent=0, const char *name=0 ); ~KActionSelector(); /** diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 6467b83f..68ce3189 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -35,15 +35,15 @@ #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu ) - : TQObject( parent, "KBookmarkHandler" ), +KBookmarkHandler::KBookmarkHandler( KDevFileSelector *tqparent, KPopupMenu* kpopupmenu ) + : TQObject( tqparent, "KBookmarkHandler" ), KBookmarkOwner(), - mParent( parent ), + mParent( tqparent ), m_menu( kpopupmenu ), m_importStream( 0L ) { if (!m_menu) - m_menu = new KPopupMenu( parent, "bookmark menu" ); + m_menu = new KPopupMenu( tqparent, "bookmark menu" ); TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); if ( file.isEmpty() ) diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index 86fa5031..a9ec5ad1 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -31,9 +31,10 @@ class KActionMenu; class KBookmarkHandler : public TQObject, public KBookmarkOwner { Q_OBJECT + TQ_OBJECT public: - KBookmarkHandler( KDevFileSelector *parent, KPopupMenu *kpopupmenu=0 ); + KBookmarkHandler( KDevFileSelector *tqparent, KPopupMenu *kpopupmenu=0 ); ~KBookmarkHandler(); // KBookmarkOwner interface: diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index b59f2ad2..112eec4a 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -20,8 +20,8 @@ #include "addfilegroupdlg.h" -AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name) - : TQDialog(parent, name, true) +AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { TQLabel *title_label = new TQLabel(i18n("&Title:"), this); title_edit = new KLineEdit(old_title, this); @@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - layout->addLayout(grid); + tqlayout->addLayout(grid); grid->addWidget(title_label, 0, 0); grid->addWidget(title_edit, 0, 1); grid->addWidget(pattern_label, 1, 0); @@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString m_pOk->setDefault(true); 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); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h index 9692fe89..20c54d37 100644 --- a/parts/fileview/addfilegroupdlg.h +++ b/parts/fileview/addfilegroupdlg.h @@ -16,12 +16,13 @@ #include class TQPushButton; -class AddFileGroupDialog : public QDialog +class AddFileGroupDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 ); + AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *tqparent=0, const char *name=0 ); ~AddFileGroupDialog(); TQString title() const diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp index c1a4f5bc..277bab4e 100644 --- a/parts/fileview/filegroupsconfigwidget.cpp +++ b/parts/fileview/filegroupsconfigwidget.cpp @@ -21,8 +21,8 @@ FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part, - TQWidget *parent, const char *name) - : FileGroupsConfigWidgetBase(parent, name) + TQWidget *tqparent, const char *name) + : FileGroupsConfigWidgetBase(tqparent, name) { m_part = part; diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h index 7c2759cb..c236aa43 100644 --- a/parts/fileview/filegroupsconfigwidget.h +++ b/parts/fileview/filegroupsconfigwidget.h @@ -20,9 +20,10 @@ class FileGroupsPart; class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 ); + FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *tqparent, const char *name=0 ); ~FileGroupsConfigWidget(); public slots: diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui index 3b548458..9b2779f1 100644 --- a/parts/fileview/filegroupsconfigwidgetbase.ui +++ b/parts/fileview/filegroupsconfigwidgetbase.ui @@ -1,6 +1,6 @@ FileGroupsConfigWidgetBase - + filegroups_config_widget @@ -19,7 +19,7 @@ unnamed - + Layout3 @@ -30,7 +30,7 @@ 0 - + title_label @@ -41,7 +41,7 @@ listview - + Group @@ -76,7 +76,7 @@ - + Layout3 @@ -97,14 +97,14 @@ Expanding - + 20 20 - + addgroup_button @@ -112,7 +112,7 @@ &Add Group... - + editgroup_button @@ -120,7 +120,7 @@ &Edit Group... - + deletegroup_button @@ -138,14 +138,14 @@ Expanding - + 20 20 - + moveup_button @@ -153,7 +153,7 @@ Move &Up - + movedown_button @@ -171,7 +171,7 @@ Expanding - + 20 20 @@ -217,13 +217,13 @@ kdialog.h - + addGroup() editGroup() removeGroup() moveUp() moveDown() - - - + + + diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 4451ff2a..29dccd55 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -36,8 +36,8 @@ typedef KDevGenericFactory FileGroupsFactory; static const KDevPluginInfo data("kdevfilegroups"); K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) -FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") +FileGroupsPart::FileGroupsPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 22cb055e..85f83164 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -23,9 +23,10 @@ class KDialogBase; class FileGroupsPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FileGroupsPart( TQObject *parent, const char *name, const TQStringList & ); + FileGroupsPart( TQObject *tqparent, const char *name, const TQStringList & ); ~FileGroupsPart(); public slots: diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 14f1d50c..d2b1b8ad 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -74,10 +74,10 @@ private: const TQString m_pattern; }; -class FileViewFolderItem : public QListViewItem +class FileViewFolderItem : public TQListViewItem { public: - FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern); + FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern); bool matches(const TQString &fileName); private: @@ -85,8 +85,8 @@ private: }; -FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern) - : TQListViewItem(parent, name) +FileViewFolderItem::FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern) + : TQListViewItem(tqparent, name) { setPixmap(0, SmallIcon("folder")); m_patterns.setAutoDelete(true); @@ -97,7 +97,7 @@ FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, TQString pattern = *ci; TQString tail = pattern.right( pattern.length() - 1 ); - if ( (tail).contains('*') || pattern.contains('?') || pattern.contains('[') || pattern.contains(']') ) + if ( (tail).tqcontains('*') || pattern.tqcontains('?') || pattern.tqcontains('[') || pattern.tqcontains(']') ) { m_patterns.append( new RegExpComparator( pattern ) ); } @@ -130,10 +130,10 @@ bool FileViewFolderItem::matches(const TQString &fileName) } -class FileGroupsFileItem : public QListViewItem +class FileGroupsFileItem : public TQListViewItem { public: - FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName); + FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName); TQString fileName() const { return fullname; } @@ -142,8 +142,8 @@ private: }; -FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName) - : TQListViewItem(parent), fullname(fileName) +FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName) + : TQListViewItem(tqparent), fullname(fileName) { setPixmap(0, SmallIcon("document")); TQFileInfo fi(fileName); @@ -162,7 +162,7 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) */ LocationID=-1; - setFocusPolicy(ClickFocus); + setFocusPolicy(TQ_ClickFocus); setRootIsDecorated(true); setResizeMode(TQListView::LastColumn); setSorting(-1); @@ -179,12 +179,12 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(), - this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(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, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); + TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("Display the Location Column

    Displays a column with the location of the files.")); m_part = part; @@ -209,12 +209,12 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item) if (!item) return; - // toggle open state for parents + // toggle open state for tqparents if (item->childCount() > 0) setOpen(item, !isOpen(item)); // Is it a group item? - if (!item->parent()) + if (!item->tqparent()) return; FileGroupsFileItem *fgfitem = static_cast(item); @@ -228,9 +228,9 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const popup.insertTitle(i18n("File Groups")); /// @todo Add, remove groups int customizeId = popup.insertItem(i18n("Customize...")); - popup.setWhatsThis(customizeId, i18n("Customize

    Opens Customize File Groups dialog where the groups can be managed.")); + popup.tqsetWhatsThis(customizeId, i18n("Customize

    Opens Customize File Groups dialog where the groups can be managed.")); if (item) { - if (item->parent()) { + if (item->tqparent()) { // Not for group items FileGroupsFileItem *fvfitem = static_cast(item); TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName(); @@ -371,7 +371,7 @@ void FileGroupsWidget::addFile(const TQString &fileName) if (fvgitem->matches(fileName)) { TQString f = fileName; - if (fileName.contains(m_part->project()->projectDirectory())) + if (fileName.tqcontains(m_part->project()->projectDirectory())) f = fileName.mid(m_part->project()->projectDirectory().length()+1); (void) new FileGroupsFileItem(fvgitem, f); // fvgitem->sortChildItems(0, true); diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index cd7b2f63..b77bbf8d 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -21,6 +21,7 @@ class KDevProject; class FileGroupsWidget : public KListView { Q_OBJECT + TQ_OBJECT public: FileGroupsWidget(FileGroupsPart *part); diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp index 3ccf5921..5f4478bc 100644 --- a/parts/fileview/fileitemfactory.cpp +++ b/parts/fileview/fileitemfactory.cpp @@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& m_isActiveDir = false; setVisible( listView()->shouldBeShown( this ) ); foundolddir = true; - repaint(); + tqrepaint(); } if ( this->path() == newdir && isDir() && !m_isActiveDir ) @@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& m_isActiveDir = true; setVisible( listView()->shouldBeShown( this ) ); foundnewdir = true; - repaint(); + tqrepaint(); } if( foundnewdir && foundolddir ) @@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl; m_isProjectFile = pf; setVisible( listView()->shouldBeShown( this ) ); - repaint(); + tqrepaint(); return true; } @@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) /////////////////////////////////////////////////////////////////////////////// void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment) + int column, int width, int tqalignment) { if ( listView()->showNonProjectFiles() && isProjectFile() ) { @@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); } diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h index 065591d7..fcb606fc 100644 --- a/parts/fileview/fileitemfactory.h +++ b/parts/fileview/fileitemfactory.h @@ -28,20 +28,20 @@ namespace filetreeview { friend class FileTreeBranchItem; protected: - FileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false ) + FileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false ) { hideOrShow(); } - FileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( false ) + FileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( false ) { hideOrShow(); } virtual ~FileTreeViewItem() {} public: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); FileTreeWidget* listView() const; void hideOrShow(); bool isProjectFile() const { return m_isProjectFile; } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 02b7be86..a35d1a6d 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -30,9 +30,9 @@ using namespace filetreeview; // class FileTreeViewWidgetImpl /////////////////////////////////////////////////////////////////////////////// -FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ) - : TQObject( parent, name ), m_branchItemFactory( 0 ), - m_part( parent->part() ), m_isReloadingTree( false ) +FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name ) + : TQObject( tqparent, name ), m_branchItemFactory( 0 ), + m_part( tqparent->part() ), m_isReloadingTree( false ) { kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl; @@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const { - return static_cast( parent() ); + return static_cast( TQT_TQWIDGET(tqparent()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt if (item == fileTree()->firstChild() && canReloadTree()) { int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); - popupMenu->setWhatsThis( id, i18n("Reload tree

    Reloads the project files tree.") ); + popupMenu->tqsetWhatsThis( id, i18n("Reload tree

    Reloads the project files tree.") ); } m_actionToggleShowNonProjectFiles->plug( popupMenu ); diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index 621452b4..34f19ca3 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -36,11 +36,12 @@ class TQPopupMenu; * A base class for providing additional features to the standard KFileTreeViewItem-based widget we * use for listing files in project directory. */ -class FileTreeViewWidgetImpl : public QObject +class FileTreeViewWidgetImpl : public TQObject { Q_OBJECT + TQ_OBJECT public: - FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ); + FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name ); virtual ~FileTreeViewWidgetImpl(); //! return a list containing the filenames of the currently selected items. diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index f5aa0ff4..a21ba427 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -51,8 +51,8 @@ using namespace filetreeview; // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ) - : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) +FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ) + : KFileTreeView( tqparent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) { kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl; if (versionControl() && infoProvider) @@ -234,7 +234,7 @@ TQString FileTreeWidget::projectDirectory() */ bool FileTreeWidget::isInProject(const TQString &fileName) const { - return m_projectFiles.contains(fileName); + return m_projectFiles.tqcontains(fileName); } /////////////////////////////////////////////////////////////////////////////// @@ -262,10 +262,10 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr continue; kdDebug(9017) << "adding file: " << *it << endl; const TQString file = projectDirectory() + "/" + ( *it ); - if ( !m_projectFiles.contains( file ) ) + if ( !m_projectFiles.tqcontains( file ) ) { // We got a new file to add to this project. - // Ensure all the parent directories are part of the project set, too. + // Ensure all the tqparent directories are part of the project set, too. TQStringList paths = TQStringList::split( "/", *it); paths.pop_back(); while( !paths.isEmpty() ) @@ -273,10 +273,10 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr // We are adding the directories from longest (the one containing our file), // to the shortest, measured from root directory of our project. // 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 - + // we may stop adding, because its tqparent directories were already added - // in some previous addition. TQString joinedPaths = paths.join("/"); - if( m_projectFiles.contains( joinedPaths ) ) + if( m_projectFiles.tqcontains( joinedPaths ) ) break; m_projectFiles.insert( projectDirectory() + "/" + joinedPaths, true ); paths.pop_back(); diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index f9608029..f7a7ac51 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -47,8 +47,9 @@ class KDevVersionControl; class FileTreeWidget : public KFileTreeView { Q_OBJECT + TQ_OBJECT public: - FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); + FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ); virtual ~FileTreeWidget(); void openDirectory(const TQString &dirName); diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 0e3758c9..c5d0655a 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileViewPart"), +FileViewPart::FileViewPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index 01f84d32..985d15ed 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -24,9 +24,10 @@ class KDevVersionControl; class FileViewPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FileViewPart( TQObject *parent, const char *name, const TQStringList & ); + FileViewPart( TQObject *tqparent, const char *name, const TQStringList & ); virtual ~FileViewPart(); //! Colors to use for VCS visual feed-back diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index db921fb1..040f6312 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -34,11 +34,11 @@ // class PartWidget /////////////////////////////////////////////////////////////////////////////// -PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) - : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ), +PartWidget::PartWidget( FileViewPart *part, TQWidget *tqparent ) + : TQVBox( tqparent, "fileviewpartwidget" ), m_filetree( 0 ), m_filter( 0 ), m_btnFilter( 0 ), m_part( part ) { - Q_ASSERT( part && parent ); + Q_ASSERT( part && tqparent ); KDevVCSFileInfoProvider *infoProvider = 0; if (part && part->versionControl() && part->versionControl()->fileInfoProvider()) @@ -50,14 +50,14 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) m_filetree->setIcon(SmallIcon("folder")); TQWhatsThis::add(m_filetree, i18n("File tree

    " "The file viewer shows all files of the project " - "in a tree layout.")); + "in a tree tqlayout.")); 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( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); @@ -100,8 +100,8 @@ void PartWidget::slotFilterChange( const TQString & nf ) bool empty = f.isEmpty() || f == "*"; if ( empty ) { - m_filter->lineEdit()->setText( TQString::null ); - TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) ); + m_filter->lineEdit()->setText( TQString() ); + TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) ); } else { @@ -127,7 +127,7 @@ void PartWidget::slotBtnFilterClick() { if ( !m_btnFilter->isOn() ) { - slotFilterChange( TQString::null ); + slotFilterChange( TQString() ); } else { diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h index 03090e2b..66c57228 100644 --- a/parts/fileview/partwidget.h +++ b/parts/fileview/partwidget.h @@ -16,11 +16,12 @@ class FileViewPart; -class PartWidget : public QVBox +class PartWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: - PartWidget( FileViewPart *part, TQWidget *parent = 0 ); + PartWidget( FileViewPart *part, TQWidget *tqparent = 0 ); virtual ~PartWidget(); class FileTreeWidget *m_filetree; diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp index 67a8da28..943f8850 100644 --- a/parts/fileview/stdfiletreewidgetimpl.cpp +++ b/parts/fileview/stdfiletreewidgetimpl.cpp @@ -23,10 +23,10 @@ class StdFileTreeViewItem : public filetreeview::FileTreeViewItem { public: - StdFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : FileTreeViewItem( parent, item, branch, pf ) {} - StdFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) - : FileTreeViewItem( parent, item, branch ) {} + StdFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : FileTreeViewItem( tqparent, item, branch, pf ) {} + StdFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : FileTreeViewItem( tqparent, item, branch ) {} }; /////////////////////////////////////////////////////////////////////////////// @@ -39,22 +39,22 @@ public: 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 ); + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ); }; /////////////////////////////////////////////////////////////////////////////// -KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ) +KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ) { - if (!parent || !fileItem) + if (!tqparent || !fileItem) return 0; - FileTreeWidget *lv = static_cast( parent )->listView(); + FileTreeWidget *lv = static_cast( tqparent )->listView(); const KURL fileURL = fileItem->url(); const bool isDirectory = lv->isInProject( fileURL.path() ); - return new StdFileTreeViewItem( parent, fileItem, this, isDirectory ); + return new StdFileTreeViewItem( tqparent, fileItem, this, isDirectory ); } /////////////////////////////////////////////////////////////////////////////// @@ -74,14 +74,14 @@ public: // class StdFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent ) - : FileTreeViewWidgetImpl( parent, "stdfiletreewidgetimpl" ) +StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *tqparent ) + : FileTreeViewWidgetImpl( tqparent, "stdfiletreewidgetimpl" ) { kdDebug(9017) << "StdFileTreeWidgetImpl::StdFileTreeWidgetImpl()" << endl; setBranchItemFactory( new StdBranchItemFactory ); - parent->addColumn( TQString::null ); + tqparent->addColumn( TQString() ); header()->hide(); } diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h index a9ba7159..260d2372 100644 --- a/parts/fileview/stdfiletreewidgetimpl.h +++ b/parts/fileview/stdfiletreewidgetimpl.h @@ -23,8 +23,9 @@ class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl { Q_OBJECT + TQ_OBJECT public: - StdFileTreeWidgetImpl( FileTreeWidget *parent ); + StdFileTreeWidgetImpl( FileTreeWidget *tqparent ); virtual ~StdFileTreeWidgetImpl(); /* diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp index 63067c04..117955d5 100644 --- a/parts/fileview/vcscolorsconfigwidget.cpp +++ b/parts/fileview/vcscolorsconfigwidget.cpp @@ -51,8 +51,8 @@ VCSColors &VCSColors::operator=( const VCSColors &others ) /////////////////////////////////////////////////////////////////////////////// VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors, - TQWidget* parent, const char* name, WFlags fl) - : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part ) + TQWidget* tqparent, const char* name, WFlags fl) + : VCSColorsConfigWidgetBase( tqparent, name, fl ), m_part( part ) { setColors( vcsColors ); } diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h index b86038fa..61d1b0e7 100644 --- a/parts/fileview/vcscolorsconfigwidget.h +++ b/parts/fileview/vcscolorsconfigwidget.h @@ -37,10 +37,11 @@ struct VCSColors class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors, - TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~VCSColorsConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/fileview/vcscolorsconfigwidgetbase.ui b/parts/fileview/vcscolorsconfigwidgetbase.ui index 7e7998ce..51f93a11 100644 --- a/parts/fileview/vcscolorsconfigwidgetbase.ui +++ b/parts/fileview/vcscolorsconfigwidgetbase.ui @@ -1,6 +1,6 @@ VCSColorsConfigWidgetBase - + VCSColorsConfigWidgetBase @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -30,7 +30,7 @@ unnamed - + textLabel2 @@ -49,7 +49,7 @@ fileUpdatedColorCombo - + textLabel3 @@ -68,7 +68,7 @@ fileModifiedColorCombo - + textLabel4 @@ -87,7 +87,7 @@ fileConflictColorCombo - + textLabel1 @@ -106,7 +106,7 @@ fileAddedColorCombo - + textLabel5 @@ -125,7 +125,7 @@ fileStickyColorCombo - + textLabel5_3 @@ -144,7 +144,7 @@ fileStickyColorCombo - + textLabel5_2 @@ -163,7 +163,7 @@ fileStickyColorCombo - + textLabel6 @@ -182,7 +182,7 @@ fileUnknownColorCombo - + textLabel6_2 @@ -252,7 +252,7 @@ - + kcolorcombo.h kcolorcombo.h diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 131c2b4f..a513a1ae 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -42,16 +42,16 @@ using namespace filetreeview; class VCSFileTreeViewItem : public filetreeview::FileTreeViewItem { public: - VCSFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : 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( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) + VCSFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : FileTreeViewItem( tqparent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} + VCSFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : FileTreeViewItem( tqparent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) { // paint cell in a different color depending on VCS state TQColorGroup mycg( cg ); mycg.setColor( TQColorGroup::Base, *m_statusColor ); - FileTreeViewItem::paintCell( p, mycg, column, width, alignment ); + FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment ); } void setVCSInfo( const VCSFileInfo &info ); @@ -62,7 +62,7 @@ public: void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); } void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); } void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); } - void setStatus( const VCSFileInfo::FileState status ); + void settqStatus( const VCSFileInfo::FileState status ); private: TQColor *m_statusColor; // cached @@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info ) //setFileName( info.fileName ); setRepositoryRev( info.repoRevision ); setWorkingRev( info.workRevision ); - setStatus( info.state ); + settqStatus( info.state ); } /////////////////////////////////////////////////////////////////////////////// -void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status ) +void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status ) { setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) ); // Update color too @@ -130,7 +130,7 @@ public: KDevVCSFileInfoProvider *vcsInfoProvider ) : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {} // virtual ~VCSFileTreeBranchItem() {} - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ); private: KDevVCSFileInfoProvider *m_vcsInfoProvider; @@ -138,24 +138,24 @@ private: /////////////////////////////////////////////////////////////////////////////// -KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ) +KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ) { // kdDebug(9017) << "MyFileTreeBranch::createTreeViewItem(): " + fileItem->url().path() << endl; - if (!parent || !fileItem) + if (!tqparent || !fileItem) return 0; - FileTreeWidget *lv = static_cast( parent )->listView(); + FileTreeWidget *lv = static_cast( tqparent )->listView(); const KURL fileURL = fileItem->url(); const bool isDirectory = lv->isInProject( fileURL.path() ); - VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory ); + VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( tqparent, fileItem, this, isDirectory ); // 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; -// if (vcsFiles.contains( fileName )) +// if (vcsFiles.tqcontains( fileName )) // newItem->setVCSInfo( vcsFiles[ fileName ] ); // else // kdDebug(9017) << "!!!No VCS info for this file!!!" << endl; @@ -182,8 +182,8 @@ private: // class VCSFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ) - : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ), +VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ) + : FileTreeViewWidgetImpl( tqparent, "vcsfiletreewidgetimpl" ), m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ), m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 ) { @@ -193,10 +193,10 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil setBranchItemFactory( new VCSBranchItemFactory( m_vcsInfoProvider ) ); // Update the #define order on top if you change this order! - parent->addColumn( "Filename" ); - parent->addColumn( "Status" ); - parent->addColumn( "Work" ); - parent->addColumn( "Repo" ); + tqparent->addColumn( "Filename" ); + tqparent->addColumn( "tqStatus" ); + tqparent->addColumn( "Work" ); + tqparent->addColumn( "Repo" ); connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); @@ -218,7 +218,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); + connect( tqparent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// @@ -308,7 +308,7 @@ void VCSFileTreeWidgetImpl::vcsDirStatusReady( const VCSFileInfoMap &modifiedFil { const TQString fileName = item->fileName(); kdDebug(9017) << "Widget item filename is: " << fileName << endl; - if (modifiedFiles.contains( fileName )) + if (modifiedFiles.tqcontains( fileName )) { const VCSFileInfo &vcsInfo = modifiedFiles[ fileName ]; kdDebug(9017) << "Nice! Found info for this file: " << vcsInfo.toString() << endl; @@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository() const VCSFileTreeViewItem *myFileItem = static_cast( m_vcsStatusRequestedItem ); 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_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem ); m_isSyncingWithRepository = true; } @@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem ) const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() ); kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl; - m_vcsInfoProvider->requestStatus( relDirPath, item, false, false ); + m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false ); // m_isSyncingWithRepository = true; diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index 7a6761a9..b88766a5 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -25,8 +25,9 @@ class KToggleAction; class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl { Q_OBJECT + TQ_OBJECT public: - VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); + VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ); virtual ~VCSFileTreeWidgetImpl(); /* diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index dbb0dfc6..9824cdc9 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -29,8 +29,8 @@ static const KDevPluginInfo data("kdevfilter"); K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) -FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FilterPart") +FilterPart::FilterPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "FilterPart") { setInstance(FilterFactory::instance()); setXMLFile("kdevfilter.rc"); diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h index 55b89dbc..939590ed 100644 --- a/parts/filter/filterpart.h +++ b/parts/filter/filterpart.h @@ -22,9 +22,10 @@ class ShellFilterDialog; class FilterPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FilterPart( TQObject *parent, const char *name, const TQStringList & ); + FilterPart( TQObject *tqparent, const char *name, const TQStringList & ); ~FilterPart(); public slots: diff --git a/parts/filter/kdevfilterIface.h b/parts/filter/kdevfilterIface.h index d51acdbc..9d22c46b 100644 --- a/parts/filter/kdevfilterIface.h +++ b/parts/filter/kdevfilterIface.h @@ -10,6 +10,7 @@ class FilterPart; class KDevFilterIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KDevFilterIface( FilterPart* part ); diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 484cb4cc..740762d2 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -31,18 +31,18 @@ ShellFilterDialog::ShellFilterDialog() : TQDialog(0, "shell filter dialog", true) { - TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); combo = new TQComboBox(true, this); combo->setDuplicatesEnabled(false); - layout->addWidget(combo); + tqlayout->addWidget(combo); KButtonBox *buttonbox = new KButtonBox(this); start_button = buttonbox->addButton(i18n("&Start")); start_button->setDefault(true); cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->layout(); - layout->addWidget(buttonbox); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox); connect( start_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked()) ); @@ -120,7 +120,7 @@ void ShellFilterDialog::slotProcessExited(KProcess *) accept(); } else { KMessageBox::error(this, i18n("Process exited with status %1") - .arg(m_proc->exitStatus())); + .tqarg(m_proc->exitStatus())); reject(); } } diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h index 78785a11..842ea928 100644 --- a/parts/filter/shellfilterdlg.h +++ b/parts/filter/shellfilterdlg.h @@ -20,9 +20,10 @@ class KDevPlugin; class KProcess; -class ShellFilterDialog : public QDialog +class ShellFilterDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: ShellFilterDialog(); diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index e36278b5..17e740b6 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -32,18 +32,18 @@ ShellInsertDialog::ShellInsertDialog() : TQDialog(0, "shell filter dialog", true) { - TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); combo = new TQComboBox(true, this); combo->setDuplicatesEnabled(false); - layout->addWidget(combo); + tqlayout->addWidget(combo); KButtonBox *buttonbox = new KButtonBox(this); start_button = buttonbox->addButton(i18n("&Start")); start_button->setDefault(true); cancel_button = buttonbox->addButton(KStdGuiItem::cancel()); - buttonbox->layout(); - layout->addWidget(buttonbox); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox); connect( start_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked()) ); @@ -117,7 +117,7 @@ void ShellInsertDialog::slotProcessExited(KProcess *) accept(); } else { KMessageBox::error(this, i18n("Process exited with status %1") - .arg(m_proc->exitStatus())); + .tqarg(m_proc->exitStatus())); reject(); } } diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h index d532079f..b6954ade 100644 --- a/parts/filter/shellinsertdlg.h +++ b/parts/filter/shellinsertdlg.h @@ -20,9 +20,10 @@ class KDevPlugin; class KProcess; -class ShellInsertDialog : public QDialog +class ShellInsertDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: ShellInsertDialog(); diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index b3c2240f..63e40e89 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -27,8 +27,8 @@ static const KDevPluginInfo data("kdevfullscreen"); typedef KDevGenericFactory FullScreenFactory; K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) -FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) +FullScreenPart::FullScreenPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevPlugin(&data, tqparent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); // const KAboutData &abdata1 = *(info()); diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index 1b5fe53e..d248f686 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -20,8 +20,9 @@ class KAction; class FullScreenPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FullScreenPart(TQObject *parent, const char *name, const TQStringList &); + FullScreenPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~FullScreenPart(); public slots: diff --git a/parts/grepview/README.dox b/parts/grepview/README.dox index d5e9130a..23e0eac3 100644 --- a/parts/grepview/README.dox +++ b/parts/grepview/README.dox @@ -1,5 +1,5 @@ /** \class GrepViewPart -Integrates "find|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions. +Integrates "tqfind|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions. \authors Bernd Gehrmann diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 80264a92..80c06c8b 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -80,33 +80,33 @@ const char *filepatterns[] = { }; -GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name ) - : TQDialog(parent, name, false), m_part( part ) +GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *tqparent, const char *name ) + : TQDialog(tqparent, name, false), m_part( part ) { setCaption(i18n("Find in Files")); config = GrepViewFactory::instance()->config(); config->setGroup("GrepDialog"); - TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4); - layout->setColStretch(0, 0); - layout->setColStretch(1, 20); + TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4); + tqlayout->setColStretch(0, 0); + tqlayout->setColStretch(1, 20); TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); - layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter); + tqlayout->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(TQComboBox::NoInsertion); - layout->addWidget(pattern_combo, 0, 1); + tqlayout->addWidget(pattern_combo, 0, 1); TQLabel *template_label = new TQLabel(i18n("&Template:"), this); - layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); TQBoxLayout *template_layout = new TQHBoxLayout(4); - layout->addLayout(template_layout, 1, 1); + tqlayout->addLayout(template_layout, 1, 1); template_edit = new KLineEdit(this); template_label->setBuddy(template_edit); @@ -118,22 +118,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name template_layout->addWidget(template_combo, 0); TQBoxLayout *search_opts_layout = new TQHBoxLayout(15); - layout->addLayout(search_opts_layout, 2, 1); + tqlayout->addLayout(search_opts_layout, 2, 1); 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 TQCheckBox(i18n("C&ase sensitive"), this); - case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + case_sens_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); case_sens_box->setChecked(config->readBoolEntry("case_sens", true)); search_opts_layout->addWidget(case_sens_box); TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this); - layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); TQBoxLayout *dir_layout = new TQHBoxLayout(4); - layout->addLayout(dir_layout, 3, 1); + tqlayout->addLayout(dir_layout, 3, 1); dir_combo = new KComboBox( true, this ); dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths")); @@ -158,31 +158,31 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name dir_layout->addWidget( synch_button ); TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15); - layout->addLayout(dir_opts_layout, 4, 1); + tqlayout->addLayout(dir_opts_layout, 4, 1); 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 TQCheckBox(i18n("Limit search to &project files"), this); - use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + use_project_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); use_project_box->setChecked(config->readBoolEntry("search_project_files", true)); dir_opts_layout->addWidget(use_project_box); TQLabel *files_label = new TQLabel(i18n("&Files:"), this); - layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); files_combo = new KComboBox(true, this); - files_label->setBuddy(files_combo->focusProxy()); + files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); files_combo->insertStrList(filepatterns); - layout->addWidget(files_combo, 5, 1); + tqlayout->addWidget(files_combo, 5, 1); TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this); - layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); TQStringList exclude_list = config->readListEntry("exclude_patterns"); exclude_combo = new KComboBox(true, this); - exclude_label->setBuddy(files_combo->focusProxy()); + exclude_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); if (exclude_list.count()) { exclude_combo->insertStringList(exclude_list); } @@ -191,22 +191,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/"); exclude_combo->insertItem(""); } - layout->addWidget(exclude_combo, 6, 1); + tqlayout->addWidget(exclude_combo, 6, 1); TQBoxLayout *other_opts_layout = new TQHBoxLayout(15); - layout->addLayout(other_opts_layout, 7, 1); + tqlayout->addLayout(other_opts_layout, 7, 1); 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 TQCheckBox(i18n("&Suppress find errors"), this); - no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + no_find_err_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true)); other_opts_layout->addWidget(no_find_err_box); TQBoxLayout *button_layout = new TQHBoxLayout(4); - layout->addLayout(button_layout, 8, 1); + tqlayout->addLayout(button_layout, 8, 1); search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this); search_button->setDefault(true); KPushButton *done_button = new KPushButton(KStdGuiItem::cancel(), this); @@ -214,7 +214,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name button_layout->addWidget(search_button); button_layout->addWidget(done_button); - resize(sizeHint()); + resize(tqsizeHint()); TQWhatsThis::add(pattern_combo, i18n("Enter the regular expression you want to search for here.

    " @@ -261,7 +261,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name slotPatternChanged( pattern_combo->currentText() ); } -// Returns the contents of a TQComboBox as a QStringList +// Returns the contents of a TQComboBox as a TQStringList static TQStringList qCombo2StringList( TQComboBox* combo ) { TQStringList list; @@ -345,7 +345,7 @@ void GrepDialog::slotSearchClicked() void GrepDialog::show() { // not beautiful, but works with all window - // managers and Qt versions + // managers and TQt versions if (isVisible()) hide(); // TQDialog::hide(); diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h index 5c49a155..294dd326 100644 --- a/parts/grepview/grepdlg.h +++ b/parts/grepview/grepdlg.h @@ -25,12 +25,13 @@ class TQPushButton; class GrepViewPart; class KLineEdit; -class GrepDialog : public QDialog +class GrepDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - GrepDialog( GrepViewPart * part, TQWidget *parent=0, const char *name=0 ); + GrepDialog( GrepViewPart * part, TQWidget *tqparent=0, const char *name=0 ); ~GrepDialog(); void setPattern(const TQString &pattern) diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 6765f87f..e404ad2d 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -34,8 +34,8 @@ static const KDevPluginInfo data("kdevgrepview"); K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data)) -GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & ) - : KDevPlugin( &data, parent, name ? name : "GrepViewPart" ) +GrepViewPart::GrepViewPart( TQObject *tqparent, const char *name, const TQStringList & ) + : KDevPlugin( &data, tqparent, name ? name : "GrepViewPart" ) { setInstance(GrepViewFactory::instance()); @@ -116,9 +116,9 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context) if (!ident.isEmpty()) { m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); - int id = popup->insertItem( i18n("Grep: %1").arg(squeezed), + int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed), this, TQT_SLOT(slotContextGrep()) ); - popup->setWhatsThis(id, i18n("Grep

    Opens the find in files dialog " + popup->tqsetWhatsThis(id, i18n("Grep

    Opens the find in files dialog " "and sets the pattern to the text under the cursor.")); popup->insertSeparator(); } diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h index 65baced0..f33dd240 100644 --- a/parts/grepview/grepviewpart.h +++ b/parts/grepview/grepviewpart.h @@ -25,9 +25,10 @@ class GrepViewWidget; class GrepViewPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - GrepViewPart( TQObject *parent, const char *name, const TQStringList & ); + GrepViewPart( TQObject *tqparent, const char *name, const TQStringList & ); ~GrepViewPart(); private slots: diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 78aa4224..e565a7d8 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -55,11 +55,11 @@ private: GrepListBoxItem::GrepListBoxItem(const TQString &fileName, const TQString &lineNumber, const TQString &text, bool showFilename) - : ProcessListBoxItem( TQString::null, Normal), + : ProcessListBoxItem( TQString(), Normal), fileName(fileName), lineNumber(lineNumber), text(text.stripWhiteSpace()), show(showFilename) { - this->text.replace( TQChar('\t'), TQString(" ") ); + this->text.tqreplace( TQChar('\t'), TQString(" ") ); } @@ -73,7 +73,7 @@ void GrepListBoxItem::paint(TQPainter *p) { TQColor base, dim, result, bkground; if (listBox()) { - const TQColorGroup& group = listBox()->palette().active(); + const TQColorGroup& group = listBox()->tqpalette().active(); if (isSelected()) { bkground = group.button(); base = group.buttonText(); @@ -88,13 +88,13 @@ void GrepListBoxItem::paint(TQPainter *p) } else { - base = Qt::black; - dim = Qt::darkGreen; - result = Qt::blue; + base = TQt::black; + dim = TQt::darkGreen; + result = TQt::blue; if (isSelected()) - bkground = Qt::lightGray; + bkground = TQt::lightGray; else - bkground = Qt::white; + bkground = TQt::white; } TQFontMetrics fm = p->fontMetrics(); TQString stx = lineNumber + ": "; @@ -126,7 +126,7 @@ void GrepListBoxItem::paint(TQPainter *p) GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widget") { - m_layout = new TQHBoxLayout(this, 0, -1, "greplayout"); + m_layout = new TQHBoxLayout(this, 0, -1, "greptqlayout"); m_tabWidget = new KTabWidget(this); @@ -174,7 +174,7 @@ void GrepViewWidget::showDialog() if(selectIface && selectIface->hasSelection()) { TQString selText = selectIface->selection(); - if(!selText.contains('\n')) + if(!selText.tqcontains('\n')) { grepdlg->setPattern(selText); } @@ -193,7 +193,7 @@ void GrepViewWidget::showDialog() grepdlg->show(); } -// @todo - put this somewhere common - or just use Qt if possible +// @todo - put this somewhere common - or just use TQt if possible static TQString escape(const TQString &str) { TQString escaped("[]{}()\\^$?.+-*|"); @@ -201,7 +201,7 @@ static TQString escape(const TQString &str) for (uint i=0; i < str.length(); ++i) { - if (escaped.find(str[i]) != -1) + if (escaped.tqfind(str[i]) != -1) res += "\\"; res += str[i]; } @@ -305,7 +305,7 @@ void GrepViewWidget::searchActivated() } command = "cat "; - command += tmpFilePath.replace(' ', "\\ "); + command += tmpFilePath.tqreplace(' ', "\\ "); } } else @@ -319,7 +319,7 @@ void GrepViewWidget::searchActivated() files += " -o -name " + KShellProcess::quote(*it); } - TQString filepattern = "find "; + TQString filepattern = "tqfind "; filepattern += KShellProcess::quote(grepdlg->directoryString()); if (!grepdlg->recursiveFlag()) filepattern += " -maxdepth 1"; @@ -366,9 +366,9 @@ void GrepViewWidget::searchActivated() m_lastPattern = grepdlg->patternString(); TQString pattern = grepdlg->templateString(); if (grepdlg->regexpFlag()) - pattern.replace(TQRegExp("%s"), grepdlg->patternString()); + pattern.tqreplace(TQRegExp("%s"), grepdlg->patternString()); else - pattern.replace(TQRegExp("%s"), escape( grepdlg->patternString() ) ); + pattern.tqreplace(TQRegExp("%s"), escape( grepdlg->patternString() ) ); command += KShellProcess::quote(pattern); m_curOutput->startJob("", command); @@ -402,11 +402,11 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line) { str = TQString::fromLocal8Bit( line ); } - if ( (pos = str.find(':')) != -1) + if ( (pos = str.tqfind(':')) != -1) { filename = str.left(pos); str.remove( 0, pos+1 ); - if ( ( pos = str.find(':') ) != -1) + if ( ( pos = str.tqfind(':') ) != -1) { linenumber = str.left(pos); str.remove( 0, pos+1 ); @@ -452,7 +452,7 @@ void GrepViewWidget::popupMenu(TQListBoxItem*, const TQPoint& p) void GrepViewWidget::slotKeepOutput( ) { - if ( m_lastPattern == TQString::null ) return; + if ( m_lastPattern == TQString() ) return; m_tabWidget->changeTab(m_curOutput, m_lastPattern); diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h index 9c232b1b..f0b57aff 100644 --- a/parts/grepview/grepviewwidget.h +++ b/parts/grepview/grepviewwidget.h @@ -25,8 +25,9 @@ class TQToolButton; class GrepViewProcessWidget : public ProcessWidget { Q_OBJECT + TQ_OBJECT public: - GrepViewProcessWidget(TQWidget* parent) : ProcessWidget(parent) {}; + GrepViewProcessWidget(TQWidget* tqparent) : ProcessWidget(tqparent) {}; ~GrepViewProcessWidget(){}; void setMatchCount(int newCount) { @@ -56,9 +57,10 @@ private: TQCString grepbuf; }; -class GrepViewWidget : public QWidget +class GrepViewWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: GrepViewWidget(GrepViewPart *part); diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index c103a3a8..e752335a 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -28,8 +28,8 @@ typedef KDevGenericFactory KonsoleViewFactory; static const KDevPluginInfo data("kdevkonsoleview"); K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data)) -KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart") +KonsoleViewPart::KonsoleViewPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "KonsoleViewPart") { setInstance( KonsoleViewFactory::instance() ); diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h index 89047a2d..4731069b 100644 --- a/parts/konsole/konsoleviewpart.h +++ b/parts/konsole/konsoleviewpart.h @@ -22,8 +22,9 @@ class KDevShellWidget; class KonsoleViewPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &); + KonsoleViewPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KonsoleViewPart(); private slots: diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index cced1b88..ef34f3f3 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -58,7 +58,7 @@ void KonsoleViewWidget::activate() if (!part) return; - part->widget()->setFocusPolicy(TQWidget::WheelFocus); + part->widget()->setFocusPolicy(TQ_WheelFocus); setFocusProxy(part->widget()); part->widget()->setFocus(); diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h index cd3e57bc..53bfdb94 100644 --- a/parts/konsole/konsoleviewwidget.h +++ b/parts/konsole/konsoleviewwidget.h @@ -27,9 +27,10 @@ namespace KParts { class TQVBoxLayout; -class KonsoleViewWidget : public QWidget +class KonsoleViewWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KonsoleViewWidget(KonsoleViewPart *part); virtual ~KonsoleViewWidget(); diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 2f45f867..bce4df7e 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -21,8 +21,8 @@ typedef KDevGenericFactory OpenWithFactory; static const KDevPluginInfo data("kdevopenwith"); K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data)) -OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "OpenWithPart") +OpenWithPart::OpenWithPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "OpenWithPart") { setInstance( OpenWithFactory::instance() ); @@ -50,7 +50,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) KPopupMenu * openAsPopup = new KPopupMenu( popup ); int id = popup->insertItem( i18n("Open As"), openAsPopup ); - popup->setWhatsThis(id, i18n("Open As

    Lists all encodings that can be used to open the selected file.")); + popup->tqsetWhatsThis(id, i18n("Open As

    Lists all encodings that can be used to open the selected file.")); TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames(); @@ -80,19 +80,19 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) } id = popup->insertItem( i18n("Open With"), openWithPopup ); - popup->setWhatsThis(id, i18n("Open With

    Lists all applications that can be used to open the selected file.")); + popup->tqsetWhatsThis(id, i18n("Open With

    Lists all applications that can be used to open the selected file.")); openWithPopup->insertSeparator(); // make sure the generic "Open with ..." entry gets appended to the submenu id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog())); - openWithPopup->setWhatsThis(id, i18n("Open With...

    Provides a dialog to choose the application to open the selected file.")); + openWithPopup->tqsetWhatsThis(id, i18n("Open With...

    Provides a dialog to choose the application to open the selected file.")); } void OpenWithPart::openWithService() { - KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name()); + KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast(sender()))->name()); if (ptr) { KRun::run(*ptr, m_urls); diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h index 230fedcd..0f72adf8 100644 --- a/parts/openwith/openwithpart.h +++ b/parts/openwith/openwithpart.h @@ -12,10 +12,11 @@ class Context; class OpenWithPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - OpenWithPart(TQObject *parent, const char *name, const TQStringList &); + OpenWithPart(TQObject *tqparent, const char *name, const TQStringList &); ~OpenWithPart(); diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index a21cf7db..1b314464 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -33,8 +33,8 @@ static const KDevPluginInfo data("kdevappoutputview"); typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) -AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") +AppOutputViewPart::AppOutputViewPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevAppFrontend(&data, tqparent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); @@ -100,7 +100,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin 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 += TQString(" --workdir '%1'").arg(directory); + cmd += TQString(" --workdir '%1'").tqarg(directory); } cmd += " -e /bin/sh -c '"; cmd += program; diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index b0b0982a..bb26aad8 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -23,9 +23,10 @@ class AppOutputWidget; class AppOutputViewPart : public KDevAppFrontend { Q_OBJECT + TQ_OBJECT public: - AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & ); + AppOutputViewPart( TQObject *tqparent, const char *name, const TQStringList & ); ~AppOutputViewPart(); virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal); diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index c58065a2..89c3ced5 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -79,7 +79,7 @@ void AppOutputWidget::slotRowSelected(TQListBoxItem* row) if (row) { if (assertMatch.exactMatch(row->text())) { m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1); - m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").arg(assertMatch.cap(1)), 10000); + m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000); m_part->mainWindow()->lowerView(this); } else if (lineInfoMatch.search(row->text()) != -1) { @@ -180,11 +180,11 @@ bool AppOutputWidget::filterSingleLine(const TQString & line) if ( m_filter.m_isRegExp ) { - return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 ); + return ( line.tqfind( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 ); } else { - return ( line.find( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 ); + return ( line.tqfind( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 ); } } @@ -339,7 +339,7 @@ void AppOutputWidget::copySelected() if (isSelected(i)) buffer += item(i)->text() + "\n"; } - kapp->clipboard()->setText(buffer, QClipboard::Clipboard); + kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard); } void AppOutputWidget::addPartialStderrLine(const TQCString & line) diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h index 0673f106..7fbe35be 100644 --- a/parts/outputviews/appoutputwidget.h +++ b/parts/outputviews/appoutputwidget.h @@ -22,6 +22,7 @@ class AppOutputViewPart; class AppOutputWidget : public ProcessWidget { Q_OBJECT + TQ_OBJECT friend class AppOutputViewPart; public: AppOutputWidget(AppOutputViewPart* part); diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp index 9d48f1c8..c365d6cf 100644 --- a/parts/outputviews/compileerrorfilter.cpp +++ b/parts/outputviews/compileerrorfilter.cpp @@ -53,7 +53,7 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats() // ld ErrorFormat( "undefined reference", 0, 0, 0 ), ErrorFormat( "undefined symbol", 0, 0, 0 ), - ErrorFormat( "ld: cannot find", 0, 0, 0 ), + ErrorFormat( "ld: cannot tqfind", 0, 0, 0 ), ErrorFormat( "No such file", 0, 0, 0 ), // make ErrorFormat( "No rule to make target", 0, 0, 0 ), @@ -98,9 +98,9 @@ void CompileErrorFilter::processLine( const TQString& line ) text = regExp.cap( format->textGroup ); compiler = format->compiler; TQString cap = regExp.cap(3); - if (cap.contains("warning:", false) || cap.contains("Warnung:", false)) + if (cap.tqcontains("warning:", false) || cap.tqcontains("Warnung:", false)) isWarning = true; - if (regExp.cap(3).contains("instantiated from", false)) { + if (regExp.cap(3).tqcontains("instantiated from", false)) { isInstantiationInfo = true; } break; @@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line ) if( hasmatch ) { // Add hacks for error strings you want excluded here - if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0 - || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 ) + if( text.tqfind( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0 + || text.tqfind( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 ) hasmatch = false; } diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h index 2f67adaf..7a2fe1dc 100644 --- a/parts/outputviews/compileerrorfilter.h +++ b/parts/outputviews/compileerrorfilter.h @@ -22,6 +22,7 @@ class MakeItem; class CompileErrorFilter : public TQObject, public OutputFilter { Q_OBJECT + TQ_OBJECT public: CompileErrorFilter( OutputFilter& ); diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp index 02629797..9d110533 100644 --- a/parts/outputviews/directorystatusmessagefilter.cpp +++ b/parts/outputviews/directorystatusmessagefilter.cpp @@ -85,26 +85,26 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString //@todo: other translations! // 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 TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); - static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory")); + // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK + // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK + static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)")); + static TQRegExp enEnter(TQString::tqfromLatin1(".*: Entering directory")); kdDebug(9004) << "Directory filter line " << line << endl; // 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 || - line.find(pl_e) > -1 || - line.find(ja_e) > -1 || - line.find(ko_e) > -1 || - line.find(ko_b) > -1 || - line.find(pt_br_e) > -1 || - line.find(ru_e) > -1 || - line.find(de_e1) > -1 || - line.find(de_e2) > -1 || - line.find(es_e) > -1 || - line.find(nl_e) > -1) + if(line.tqfind(en_e) > -1 || + line.tqfind(fr_e) > -1 || + line.tqfind(pl_e) > -1 || + line.tqfind(ja_e) > -1 || + line.tqfind(ko_e) > -1 || + line.tqfind(ko_b) > -1 || + line.tqfind(pt_br_e) > -1 || + line.tqfind(ru_e) > -1 || + line.tqfind(de_e1) > -1 || + line.tqfind(de_e2) > -1 || + line.tqfind(es_e) > -1 || + line.tqfind(nl_e) > -1) { // grab the directory name if(dirChange.search(line) > -1) @@ -157,24 +157,24 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString static const TQString po_l("Opuszczam katalog"); // 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 + // 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK + // 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)")); + static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)")); // 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 || - line.find(ja_l) > -1 || - (line.find(ko_l) > -1 && line.find(ko_b) > -1) || - line.find(pt_br_l) > -1 || - line.find(ru_l) > -1 || - line.find(de_l1) > -1 || - line.find(de_l2) > -1 || - line.find(es_l) > -1 || - line.find(nl_l) > -1 || - line.find(po_l) > -1) + if(line.tqfind(en_l) > -1 || + line.tqfind(fr_l) > -1 || + line.tqfind(ja_l) > -1 || + (line.tqfind(ko_l) > -1 && line.tqfind(ko_b) > -1) || + line.tqfind(pt_br_l) > -1 || + line.tqfind(ru_l) > -1 || + line.tqfind(de_l1) > -1 || + line.tqfind(de_l2) > -1 || + line.tqfind(es_l) > -1 || + line.tqfind(nl_l) > -1 || + line.tqfind(po_l) > -1) { // grab the directory name if(dirChange.search(line) > -1 ) diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h index 0d57e52d..4abaa23e 100644 --- a/parts/outputviews/directorystatusmessagefilter.h +++ b/parts/outputviews/directorystatusmessagefilter.h @@ -21,6 +21,7 @@ class ExitingDirectoryItem; class DirectoryStatusMessageFilter : public TQObject, public OutputFilter { Q_OBJECT + TQ_OBJECT public: DirectoryStatusMessageFilter( OutputFilter& ); diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index 729af672..07e16d99 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -1,6 +1,6 @@ FilterDlg - + FilterDlg @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -46,14 +46,14 @@ Expanding - + 20 20 - + buttonOk @@ -70,7 +70,7 @@ true - + buttonCancel @@ -86,7 +86,7 @@ - + filtergroup @@ -103,7 +103,7 @@ unnamed - + textLabel1 @@ -119,7 +119,7 @@ true - + caseSensitive @@ -127,7 +127,7 @@ C&ase sensitive - + regularExpression @@ -160,5 +160,5 @@ buttonOk buttonCancel - + diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 4edaae2b..ca3e843a 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -79,8 +79,8 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats() ActionFormat( i18n("built"), 1, 1, "\\[.+%\\] Built target (.*)" ), //cmake ActionFormat( i18n("generating"), 1, 1, "\\[.+%\\] Generating (.*)" ), //cmake - //moc and uic - ActionFormat( i18n("generating"), 1, 2, "/(moc|uic)\\b.*\\s-o\\s([^\\s;]+)"), + //tqmoc and uic + ActionFormat( i18n("generating"), 1, 2, "/(tqmoc|uic)\\b.*\\s-o\\s([^\\s;]+)"), ActionFormat( i18n("generating"), 1, 2, "^generating (.*)" ), //unsermake ActionFormat( i18n("linking"), "libtool", "/bin/sh\\s.*libtool.*--mode=link\\s.*\\s-o\\s([^\\s;]+)", 1 ), @@ -96,7 +96,7 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats() ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ), ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake - ActionFormat( TQString::null, TQString::null, 0, 0 ) + ActionFormat( TQString(), TQString(), 0, 0 ) }; return formats; @@ -167,11 +167,11 @@ void MakeActionFilter::test() 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. " + "g++ -c -pipe -Wall -W -O2 -DTQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. " "-I/home/john/src/kde/qt-copy/include -o test.o test.cpp", "compiling", "g++", "test.cpp" ) << TestItem( // simple qmake compile different option order - "g++ -c -o test.o -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. " + "g++ -c -o test.o -pipe -Wall -W -O2 -DTQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. " "-I/home/john/src/kde/qt-copy/include test.cpp", "compiling", "g++", "test.cpp" ) << TestItem( // simple qmake link @@ -181,7 +181,7 @@ void MakeActionFilter::test() << TestItem( // automake 1.7, srcdir != builddir "if /bin/sh ../../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. " "-I/home/john/src/kde/kdevelop/lib/interfaces -I../.. -I/usr/local/kde/include -I/home/john/src/kde/qt-copy/include " - "-I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W " + "-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W " "-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion " "-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new " "-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f " @@ -193,7 +193,7 @@ void MakeActionFilter::test() "if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/kdevelop/src -I.. -I/home/john/src/kde/kdevelop/lib/interfaces " "-I/home/john/src/kde/kdevelop/lib/sourceinfo -I/home/john/src/kde/kdevelop/lib/util -I/home/john/src/kde/kdevelop/lib " "-I/home/john/src/kde/kdevelop/lib/qextmdi/include -I/home/john/src/kde/kdevelop/lib/structure -I/usr/local/kde/include " - "-I/home/john/src/kde/qt-copy/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor " + "-I/home/john/src/kde/qt-copy/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor " "-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi " "-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security " "-Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -MT mainwindowideal.o -MD -MP -MF " @@ -203,7 +203,7 @@ void MakeActionFilter::test() "compiling", "g++", "mainwindowideal.cpp" ) << TestItem( // automake and libtool compiling *.c files "if /bin/sh ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces" - "-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT " + "-I../../lib/util -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT " "-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings " "-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -g3 -fno-inline -Wformat-security -Wmissing-format-attribute -MT readtags.lo " "-MD -MP -MF \".deps/readtags.Tpo\" -c -o readtags.lo readtags.c; then mv -f \".deps/readtags.Tpo\" " @@ -213,7 +213,7 @@ void MakeActionFilter::test() "source='makewidget.cpp' object='makewidget.lo' libtool=yes depfile='.deps/makewidget.Plo' " "tmpdepfile='.deps/makewidget.TPlo' depmode=gcc3 /bin/sh ../../admin/depcomp /bin/sh ../../libtool --mode=compile " "--tag=CXX g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../lib/interfaces -I../../lib/util -I/opt/kde3/include " - "-I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef " + "-I/usr/lib/qt3/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef " "-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE " "-Wcast-align -Wconversion -fno-builtin -g -O2 -g3 -O0 -fno-exceptions -fno-check-new -c -o makewidget.lo `test -f " "'makewidget.cpp' || echo './'`makewidget.cpp", @@ -233,7 +233,7 @@ void MakeActionFilter::test() "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " - "kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " + "kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", "linking", "libtool", "libkfilereplacepart.la.closure") << TestItem( //libtool, linking 3 @@ -241,13 +241,13 @@ void MakeActionFilter::test() "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la -rpath /opt/kde3/lib/kde3 " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib -version-info 1:0:0 kfilereplacepart.lo " - "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " + "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", "linking", "libtool", "libkfilereplacepart.la") << TestItem( //automake, builddir!=srcdir, libtool=no, compiling " g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project " "-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include " - "-I../../quanta/dialogs -DQT_THREAD_SUPPORT -D_REENTRANT -DKOMMANDER -DDESIGNER -DQT_NO_SQL -DHAVE_KDE -Wnon-virtual-dtor " + "-I../../quanta/dialogs -DTQT_THREAD_SUPPORT -D_REENTRANT -DKOMMANDER -DDESIGNER -DTQT_NO_SQL -DHAVE_KDE -Wnon-virtual-dtor " "-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE " "-Wcast-align -Wconversion -Wchar-subscripts -fno-builtin -g3 -DKDE_NO_COMPAT -fno-exceptions -fno-check-new -fno-common -c -o project.o " "`test -f '/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp' || " @@ -272,14 +272,14 @@ void MakeActionFilter::test() "quanta_init.cpp; " "then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \".deps/quanta_init.Tpo\"; " "exit 1; fi", - "compiling", "g++", "quanta_init.cpp") + "compiling", "g++", "tquanta_init.cpp") << TestItem( //libtool, automake 1.8, file with full path "if g++ -DHAVE_CONFIG_H -I. -I/home/andris/ " "-DBUILD_KAFKAPART -MT quanta_init.o -MD -MP -MF \".deps/quanta_init.Tpo\" -c -o quanta_init.o " "/home/andris/quanta_init.cpp; " "then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \".deps/quanta_init.Tpo\"; " "exit 1; fi", - "compiling", "g++", "quanta_init.cpp") + "compiling", "g++", "tquanta_init.cpp") ; TQValueList::const_iterator it = testItems.begin(); diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h index 4f3a0e68..1809c74d 100644 --- a/parts/outputviews/makeactionfilter.h +++ b/parts/outputviews/makeactionfilter.h @@ -23,6 +23,7 @@ class ActionItem; class MakeActionFilter : public TQObject, public OutputFilter { Q_OBJECT + TQ_OBJECT public: #ifdef DEBUG diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index 218bb894..fe1f8424 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -84,12 +84,8 @@ TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg ) TQString MakeItem::br() { - // Qt >= 3.1 doesn't need a
    . -#if QT_VERSION < 0x040000 - static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "
    "; -#else + // TQt >= 3.1 doesn't need a
    . static const TQString br; -#endif return br; } @@ -128,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus ) m_text = i18n("*** Compilation aborted ***"); if ( m_normalExit ) if (m_exitStatus ) - m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus ); + m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus ); else m_text = i18n("*** Success ***"); } @@ -143,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true; TQString EnteringDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) - return i18n("Entering directory %1").arg( directory ); + return i18n("Entering directory %1").tqarg( directory ); return m_text; } TQString ExitingDirectoryItem::text( EOutputLevel outputLevel ) { if ( outputLevel < eFull ) - return i18n("Leaving directory %1").arg( directory ); + return i18n("Leaving directory %1").tqarg( directory ); return m_text; } diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 7c9dcb79..cd98a3e2 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -30,8 +30,8 @@ static const KDevPluginInfo data("kdevmakeview"); typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) -MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevMakeFrontend(&data, parent, name) +MakeViewPart::MakeViewPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevMakeFrontend(&data, tqparent, name) { setInstance(MakeViewFactory::instance()); @@ -52,11 +52,11 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); KAction *action; - action = new KAction( i18n("&Next Error"), Key_F4, m_widget, TQT_SLOT(nextError()), + action = new KAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(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, TQT_SLOT(prevError()), + action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(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.")); diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 808a9208..0d70edaf 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -23,9 +23,10 @@ class MakeWidget; class MakeViewPart : public KDevMakeFrontend { Q_OBJECT + TQ_OBJECT public: - MakeViewPart( TQObject *parent, const char *name, const TQStringList & ); + MakeViewPart( TQObject *tqparent, const char *name, const TQStringList & ); ~MakeViewPart(); virtual TQWidget* widget(); virtual void updateSettingsFromConfig(); diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 3ccc4608..b7d5ed2f 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -162,7 +162,7 @@ MakeWidget::MakeWidget(MakeViewPart *part) { updateSettingsFromConfig(); - setTextFormat( Qt::RichText ); + setTextFormat( TQt::RichText ); if ( m_bLineWrapping ) setWordWrap(WidgetWidth); @@ -178,7 +178,7 @@ MakeWidget::MakeWidget(MakeViewPart *part) dirstack.setAutoDelete(true); - childproc = new KProcess(this); + childproc = new KProcess(TQT_TQOBJECT(this)); procLineMaker = new ProcessLineMaker( childproc ); connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), @@ -247,20 +247,20 @@ void MakeWidget::startNextJob() currentCommand = *it; commandList.remove(it); - int i = currentCommand.findRev(" gmake"); + int i = currentCommand.tqfindRev(" gmake"); if ( i == -1 ) - i = currentCommand.findRev(" make"); + i = currentCommand.tqfindRev(" make"); if ( i == -1 ) m_bCompiling = false; else { TQString s = currentCommand.right(currentCommand.length() - i); - if ( s.contains("configure ") || - s.contains(" Makefile.cvs") || - s.contains(" clean") || - s.contains(" distclean") || - s.contains(" package-messages") || - s.contains(" install") ) + if ( s.tqcontains("configure ") || + s.tqcontains(" Makefile.cvs") || + s.tqcontains(" clean") || + s.tqcontains(" distclean") || + s.tqcontains(" package-messages") || + s.tqcontains(" install") ) { m_bCompiling = false; } @@ -337,12 +337,12 @@ void MakeWidget::copy() selection.remove((selection.length()-1) - removeend, removeend); } - selection.replace("<","<"); - selection.replace(">",">"); - selection.replace(""","\""); - selection.replace("&","&"); + selection.tqreplace("<","<"); + selection.tqreplace(">",">"); + selection.tqreplace(""","\""); + selection.tqreplace("&","&"); - kapp->clipboard()->setText(selection, QClipboard::Clipboard); + kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard); } void MakeWidget::nextError() @@ -378,11 +378,7 @@ void MakeWidget::prevError() if (m_lastErrorSelected != -1) { m_lastErrorSelected = -1; -#if QT_VERSION >= 0x030100 parag = (int)m_items.count(); -#else - parag = m_items.size(); -#endif if (!scanErrorBackward(parag)) KNotifyClient::beep(); } @@ -393,7 +389,7 @@ void MakeWidget::prevError() void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e ) { TQTextEdit::contentsMouseReleaseEvent(e); - if ( e->button() != LeftButton ) + if ( e->button() != Qt::LeftButton ) return; searchItem(paragraphAt(e->pos())); } @@ -413,9 +409,9 @@ void MakeWidget::keyPressEvent(TQKeyEvent *e) // returns the current directory for parag TQString MakeWidget::directory(int parag) const { - TQValueVector::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] ); + TQValueVector::const_iterator it = tqFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] ); if ( it == m_items.end() ) - return TQString::null; + return TQString(); // run backwards over directories and figure out where we are while ( it != m_items.begin() ) { --it; @@ -423,7 +419,7 @@ TQString MakeWidget::directory(int parag) const if ( edi ) return edi->directory + "/"; } - return TQString::null; + return TQString(); } // hackish function that will return true and put string "file" in "fName" if the file @@ -457,7 +453,7 @@ void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const TQStringList files = m_part->project()->allFiles(); for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it) { - if( (*it).contains( file ) ) + if( (*it).tqcontains( file ) ) { fName = URLUtil::canonicalPath( m_part->project()->projectDirectory() + "/" + *it ); } @@ -570,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *) { if (childproc->exitStatus()) { - KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors")); + KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors")); emit m_part->commandFailed(currentCommand); } else { - KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully")); + KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully")); emit m_part->commandFinished(currentCommand); } } @@ -584,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *) insertItem( item ); displayPendingItem(); - m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000); + m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(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 @@ -692,7 +688,7 @@ void MakeWidget::insertItem( MakeItem* new_item ) bool MakeWidget::brightBg() { int h,s,v; - paletteBackgroundColor().hsv( &h, &s, &v ); + TQColor(paletteBackgroundColor()).hsv( &h, &s, &v ); return (v > 127); } @@ -704,22 +700,22 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->insertSeparator(); int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); - pMenu->setWhatsThis(id, i18n("Line wrapping

    Enables or disables wrapping of command lines displayed.")); + pMenu->tqsetWhatsThis(id, i18n("Line wrapping

    Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); 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->tqsetWhatsThis(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, TQT_SLOT(slotShortCompilerOutput()) ); - pMenu->setWhatsThis(id, i18n("Short compiler output

    Suppresses all the compiler flags and formats to something readable.")); + pMenu->tqsetWhatsThis(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, TQT_SLOT(slotFullCompilerOutput()) ); - pMenu->setWhatsThis(id, i18n("Full compiler output

    Displays unmodified compiler output.")); + pMenu->tqsetWhatsThis(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, TQT_SLOT(toggleShowDirNavigMessages())); - pMenu->setWhatsThis(id, i18n("Show directory navigation messages

    Shows cd commands that are executed while building.")); + pMenu->tqsetWhatsThis(id, i18n("Show directory navigation messages

    Shows cd commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); return pMenu; @@ -756,9 +752,9 @@ void MakeWidget::refill() } -void MakeWidget::slotVeryShortCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eVeryShort); } -void MakeWidget::slotShortCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eShort); } -void MakeWidget::slotFullCompilerOutput() { setTextFormat( Qt::RichText ); setCompilerOutputLevel(eFull); } +void MakeWidget::slotVeryShortCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eVeryShort); } +void MakeWidget::slotShortCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eShort); } +void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setCompilerOutputLevel(eFull); } void MakeWidget::setCompilerOutputLevel(EOutputLevel level) { diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h index bdc7d451..dd8b2b63 100644 --- a/parts/outputviews/makewidget.h +++ b/parts/outputviews/makewidget.h @@ -34,9 +34,10 @@ class KURL; namespace KTextEditor { class Document; } -class MakeWidget : public QTextEdit +class MakeWidget : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: MakeWidget(MakeViewPart *part); diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h index 3494de84..57b8f643 100644 --- a/parts/outputviews/otherfilter.h +++ b/parts/outputviews/otherfilter.h @@ -21,6 +21,7 @@ class MakeItem; class OtherFilter : public TQObject, public OutputFilter { Q_OBJECT + TQ_OBJECT public: OtherFilter(); diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index dbf2b554..5f6ae0f0 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevpartexplorer"); typedef KDevGenericFactory PartExplorerPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) -PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) - : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) +PartExplorerPlugin::PartExplorerPlugin( TQObject *tqparent, const char *name, const TQStringList & ) + : KDevPlugin( &data, tqparent, name ? name : "PartExplorerPlugin" ) { // we need an instance setInstance( PartExplorerPluginFactory::instance() ); diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h index 528d2a45..826ae6ed 100644 --- a/parts/partexplorer/partexplorer_plugin.h +++ b/parts/partexplorer/partexplorer_plugin.h @@ -24,11 +24,12 @@ class PartExplorerForm; class PartExplorerPlugin : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ); + PartExplorerPlugin( TQObject *tqparent, const char *name, const TQStringList & ); /** * Destructor diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index f944b393..d8b0cccf 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -35,9 +35,9 @@ namespace PartExplorer{ class PropertyItem : public KListViewItem { public: - PropertyItem( KListViewItem *parent, const TQString &propertyName, + PropertyItem( KListViewItem *tqparent, const TQString &propertyName, const TQString &propertyType, const TQString &propertyValue ) - : KListViewItem( parent ) + : KListViewItem( tqparent ) { setText( 0, propertyName ); setText( 1, propertyType ); @@ -47,7 +47,7 @@ public: TQString tipText() const { TQString tip = i18n("Name: %1 | Type: %2 | Value: %3"); - return tip.arg( text(0) ).arg( text(1) ).arg( text(2) ); + return tip.tqarg( text(0) ).tqarg( text(1) ).tqarg( text(2) ); } }; @@ -58,10 +58,10 @@ public: class ResultList; -class ResultsToolTip: public QToolTip +class ResultsToolTip: public TQToolTip { public: - ResultsToolTip( ResultsList* parent ); + ResultsToolTip( ResultsList* tqparent ); virtual void maybeTip( const TQPoint& p ); private: @@ -71,8 +71,8 @@ private: class ResultsList : public KListView { public: - ResultsList( TQWidget *parent ) - : KListView( parent, "resultslist" ) + ResultsList( TQWidget *tqparent ) + : KListView( tqparent, "resultslist" ) { this->setShowToolTips( false ); new ResultsToolTip( this ); @@ -86,8 +86,8 @@ public: } }; -ResultsToolTip::ResultsToolTip( ResultsList* parent ) - : TQToolTip( parent->viewport() ), m_resultsList( parent ) +ResultsToolTip::ResultsToolTip( ResultsList* tqparent ) + : TQToolTip( tqparent->viewport() ), m_resultsList( tqparent ) { } @@ -96,7 +96,7 @@ void ResultsToolTip::maybeTip( const TQPoint& p ) PartExplorer::PropertyItem *item = dynamic_cast( m_resultsList->itemAt( p ) ); if ( item ) { - TQRect r = m_resultsList->itemRect( item ); + TQRect r = m_resultsList->tqitemRect( item ); if ( r.isValid() ) tip( r, item->tipText() ); } @@ -107,8 +107,8 @@ void ResultsToolTip::maybeTip( const TQPoint& p ) // class PartExplorerForm /////////////////////////////////////////////////////////////////////////////// -PartExplorerForm::PartExplorerForm( TQWidget *parent ) - : KDialogBase( parent, "parteplorerform", false, +PartExplorerForm::PartExplorerForm( TQWidget *tqparent ) + : KDialogBase( tqparent, "parteplorerform", false, i18n("Part Explorer - A Services Lister"), User1 | Close, User1, true ) { m_base = new PartExplorerFormBase( this, "partexplorerformbase", 0 ); @@ -116,12 +116,12 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent ) m_resultsList->addColumn( i18n( "Property" ) ); m_resultsList->addColumn( i18n( "Type" ) ); m_resultsList->addColumn( i18n( "Value" ) ); - m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, + m_resultsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 0, 0, m_resultsList->sizePolicy().hasHeightForWidth() ) ); 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 ); + m_base->tqlayout()->add( m_resultsList ); setMainWidget( m_base ); m_base->typeCombo->lineEdit()->setFocus(); @@ -212,7 +212,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services ) TQVariant property = service->property( propertyName ); TQString propertyType = property.typeName(); TQString propertyValue; - if (propertyType == "TQStringList") { + if (propertyType == TQSTRINGLIST_OBJECT_NAME_STRING) { propertyValue = property.toStringList().join(", "); } else { @@ -220,7 +220,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services ) } TQString dProperty = " *** Found property < %1, %2, %3 >"; - dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue ); + dProperty = dProperty.tqarg( propertyName ).tqarg( propertyType ).tqarg( propertyValue ); kdDebug( 9000 ) << dProperty << endl; new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue ); diff --git a/parts/partexplorer/partexplorerform.h b/parts/partexplorer/partexplorerform.h index 7ccc140d..c28c37c0 100644 --- a/parts/partexplorer/partexplorerform.h +++ b/parts/partexplorer/partexplorerform.h @@ -26,8 +26,9 @@ class PartExplorerFormBase; class PartExplorerForm : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PartExplorerForm( TQWidget *parent = 0 ); + PartExplorerForm( TQWidget *tqparent = 0 ); virtual ~PartExplorerForm(); /** diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui index dd9beeb3..1928ad80 100644 --- a/parts/partexplorer/partexplorerformbase.ui +++ b/parts/partexplorer/partexplorerformbase.ui @@ -1,6 +1,6 @@ PartExplorerFormBase - + PartExplorerFormBase @@ -30,7 +30,7 @@ unnamed - + textLabel1 @@ -63,7 +63,7 @@ false - + textLabel1_2 @@ -85,7 +85,7 @@ - + constraintsText @@ -104,7 +104,7 @@ <b>Constraints</b>Refine your query by writing additional constraints such as <i>([X-KDevelop-Scope]='Global')</i>). - + resultsLabel @@ -130,8 +130,8 @@ kdialog.h - - + + kcombobox.h klineedit.h diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 2c1de0ce..f76701e7 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -49,8 +49,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) using namespace KTextEditor; -QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) +QuickOpenPart::QuickOpenPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevQuickOpen(&data, tqparent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); setXMLFile("kdevpart_quickopen.rc"); diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index 19d92222..6dbfb770 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -18,8 +18,8 @@ * */ -#ifndef __KDEVPART_QUICKOPEN_H__ -#define __KDEVPART_QUICKOPEN_H__ +#ifndef __KDEVPART_TQUICKOPEN_H__ +#define __KDEVPART_TQUICKOPEN_H__ #include #include @@ -30,8 +30,9 @@ class KAction; class QuickOpenPart : public KDevQuickOpen { Q_OBJECT + TQ_OBJECT public: - QuickOpenPart(TQObject *parent, const char *name, const TQStringList &); + QuickOpenPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~QuickOpenPart(); void selectItem( ItemDom item ); diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 38e0fcab..13f8f402 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -1,6 +1,6 @@ QuickOpenDialogBase - + QuickOpenDialogBase @@ -22,7 +22,7 @@ unnamed - + nameLabel @@ -33,7 +33,7 @@ nameEdit - + itemListLabel @@ -49,7 +49,7 @@ itemList - + Layout1 @@ -73,14 +73,14 @@ Expanding - + 20 20 - + buttonOk @@ -97,7 +97,7 @@ true - + buttonCancel @@ -135,9 +135,9 @@ itemList - doubleClicked(QListBoxItem*) + doubleClicked(TQListBoxItem*) QuickOpenDialogBase - slotExecuted(QListBoxItem*) + slotExecuted(TQListBoxItem*) nameEdit @@ -153,7 +153,7 @@ itemList - returnPressed(QListBoxItem*) + returnPressed(TQListBoxItem*) QuickOpenDialogBase slotReturnPressed() @@ -164,13 +164,13 @@ buttonOk buttonCancel - + slotTextChanged( const QString & ) - executed( QListBoxItem * ) - slotExecuted( QListBoxItem * ) + executed( TQListBoxItem * ) + slotExecuted( TQListBoxItem * ) slotReturnPressed() - - + + klistbox.h klineedit.h diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index b97e47a3..993ad9d6 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -35,14 +35,14 @@ #include "quickopen_part.h" #include "quickopenfunctionchooseform.h" -QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) - : QuickOpenDialog( part, parent, name, modal, fl ) +QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : QuickOpenDialog( part, tqparent, name, modal, fl ) { nameLabel->setText( i18n("Class &name:") ); itemListLabel->setText( i18n("Class &list:") ); findAllClasses( m_items ); - QStringList_unique( m_items ); + TQStringList_unique( m_items ); nameEdit->setFocus(); @@ -78,7 +78,7 @@ void QuickOpenClassDialog::accept() TQString fileStr; QuickOpenFunctionChooseForm fdlg( this, "" ); - fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name())); + fdlg.setCaption(i18n("Select The Location of Class %1").tqarg(klasses.first()->name())); fdlg.textLabel2->setText(i18n("Class name:")); for( ClassList::const_iterator it = klasses.constBegin(); it != klasses.constEnd() ; ++it ) diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h index fd01fe25..41423285 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -18,8 +18,8 @@ * */ -#ifndef QUICKOPENCLASSDIALOG_H -#define QUICKOPENCLASSDIALOG_H +#ifndef TQUICKOPENCLASSDIALOG_H +#define TQUICKOPENCLASSDIALOG_H #include "quickopendialog.h" #include @@ -30,8 +30,9 @@ class QuickOpenPart; class QuickOpenClassDialog : public QuickOpenDialog { Q_OBJECT + TQ_OBJECT public: - QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenClassDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenClassDialog(); public slots: diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index e0d40295..bebbbc53 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -28,8 +28,8 @@ #include "quickopendialog.h" #include "quickopen_part.h" -QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) - : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) +QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : QuickOpenDialogBase( tqparent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); @@ -58,7 +58,7 @@ 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. - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); TQApplication::sendEvent(itemList, &e); } @@ -74,7 +74,7 @@ bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e ) if (!watched || !e) return true; - if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress)) + if ((TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(nameEdit)) && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) @@ -117,7 +117,7 @@ TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text) TQStringList::const_iterator it = m_items.begin(); while( it != m_items.end() ) { - if ( (*it).find( re ) != -1 ) + if ( (*it).tqfind( re ) != -1 ) { matches << *it; } @@ -127,7 +127,7 @@ TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text) return matches; } -void QuickOpenDialog::QStringList_unique( TQStringList & list ) +void QuickOpenDialog::TQStringList_unique( TQStringList & list ) { if ( list.size() < 2 ) return; diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index 6d441684..3b6fe84e 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -18,8 +18,8 @@ * */ -#ifndef QUICKOPENDIALOG_H -#define QUICKOPENDIALOG_H +#ifndef TQUICKOPENDIALOG_H +#define TQUICKOPENDIALOG_H #include #include @@ -34,9 +34,10 @@ class KCompletion; class QuickOpenDialog : public QuickOpenDialogBase { Q_OBJECT + TQ_OBJECT public: - QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenDialog(); virtual bool eventFilter(TQObject *watched, TQEvent *e); @@ -51,7 +52,7 @@ protected: void maybeUpdateSelection(); void setFirstItemSelected(); virtual void itemSelectionChanged(); - void QStringList_unique( TQStringList & list ); + void TQStringList_unique( TQStringList & list ); TQStringList wildCardCompletion( const TQString & text ); TQStringList m_items; QuickOpenPart* m_part; diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp index adc4a919..0ceeab21 100644 --- a/parts/quickopen/quickopenfiledialog.cpp +++ b/parts/quickopen/quickopenfiledialog.cpp @@ -35,8 +35,8 @@ #include "quickopenfiledialog.h" #include "quickopen_part.h" -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) - : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( false ) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : QuickOpenDialog( part, tqparent, name, modal, fl ), m_hasFullPaths( false ) { nameLabel->setText( i18n("File &name:") ); itemListLabel->setText( i18n("File &list:") ); @@ -50,14 +50,14 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, setFirstItemSelected(); } -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 ) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : QuickOpenDialog( part, tqparent, name, modal, fl ), m_hasFullPaths( true ) { nameLabel->setText( i18n("File &name:") ); itemListLabel->setText( i18n("File &list:") ); m_items = urls.toStringList(); - QStringList_unique( m_items ); + TQStringList_unique( m_items ); if (m_part->project()) { diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h index 852f0f5b..69c51316 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -18,8 +18,8 @@ * */ -#ifndef QUICKOPENFILEDIALOG_H -#define QUICKOPENFILEDIALOG_H +#ifndef TQUICKOPENFILEDIALOG_H +#define TQUICKOPENFILEDIALOG_H #include "quickopendialog.h" #include @@ -32,9 +32,10 @@ class KCompletion; class QuickOpenFileDialog : public QuickOpenDialog { Q_OBJECT + TQ_OBJECT public: - 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 ); + QuickOpenFileDialog(QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* tqparent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenFileDialog(); public slots: diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp index a8853417..63d487b8 100644 --- a/parts/quickopen/quickopenfunctionchooseform.cpp +++ b/parts/quickopen/quickopenfunctionchooseform.cpp @@ -28,10 +28,10 @@ #include "quickopenfunctionchooseform.h" -QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl) -: QuickOpenFunctionChooseFormBase(parent,name, modal,fl) +QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: QuickOpenFunctionChooseFormBase(tqparent,name, modal,fl) { - setCaption( i18n("Select One Argument or File of Function %1").arg( name ) ); + setCaption( i18n("Select One Argument or File of Function %1").tqarg( name ) ); slotArgsChange( 0 ); slotFileChange( 0 ); } diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h index b8d462a5..1119b4fa 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -18,8 +18,8 @@ * */ -#ifndef QUICKOPENFUNCTIONCHOOSEFORM_H -#define QUICKOPENFUNCTIONCHOOSEFORM_H +#ifndef TQUICKOPENFUNCTIONCHOOSEFORM_H +#define TQUICKOPENFUNCTIONCHOOSEFORM_H #include "quickopenfunctionchooseformbase.h" @@ -28,9 +28,10 @@ class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase { Q_OBJECT + TQ_OBJECT public: - QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionChooseForm(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionChooseForm(); void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; } diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 09c872d9..81ae7d2d 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -1,6 +1,6 @@ QuickOpenFunctionChooseFormBase - + QuickOpenFunctionChooseFormBase @@ -32,7 +32,7 @@ - + cancelBtn @@ -48,7 +48,7 @@ &Cancel - + okBtn @@ -70,15 +70,15 @@ false - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -111,22 +111,22 @@ Expanding - + 261 31 - + - layout3 + tqlayout3 unnamed - + textLabel2 @@ -218,11 +218,11 @@ okBtn cancelBtn - + slotFileChange( int id ) slotArgsChange( int id ) - - + + ksqueezedtextlabel.h klistbox.h diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp index 8b877b8b..3887ced4 100644 --- a/parts/quickopen/quickopenfunctiondialog.cpp +++ b/parts/quickopen/quickopenfunctiondialog.cpp @@ -39,8 +39,8 @@ #include "quickopenfunctionchooseform.h" #include "quickopenfunctiondialog.h" -QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* parent, const char* name, bool modal, WFlags fl) -: QuickOpenDialog(part, parent, name, modal, fl) +QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: QuickOpenDialog(part, tqparent, name, modal, fl) { nameLabel->setText( i18n("Function &name:") ); itemListLabel->setText( i18n("Function &list:") ); @@ -74,7 +74,7 @@ void QuickOpenFunctionDialog::fillItemList() { for( FunctionList::const_iterator it = m_functionDefList.begin(); it != m_functionDefList.end(); ++it ) m_items << (*it)->name(); - QStringList_unique( m_items ); + TQStringList_unique( m_items ); } QuickOpenFunctionDialog::~QuickOpenFunctionDialog() @@ -207,7 +207,7 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() { } m_functionDefList = accepted; m_items = acceptedItems; - QStringList_unique( m_items ); + TQStringList_unique( m_items ); } m_scope = scope; diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h index c02a9296..24da168b 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -18,8 +18,8 @@ * */ -#ifndef QUICKOPENFUNCTIONDLG_H -#define QUICKOPENFUNCTIONDLG_H +#ifndef TQUICKOPENFUNCTIONDLG_H +#define TQUICKOPENFUNCTIONDLG_H #include @@ -32,9 +32,10 @@ class QuickOpenPart; class QuickOpenFunctionDialog : public QuickOpenDialog { Q_OBJECT + TQ_OBJECT public: - QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionDialog(); void gotoFile( TQString name ); diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp index 834b7a1e..5d9b6e88 100644 --- a/parts/regexptest/regexptestdlg.cpp +++ b/parts/regexptest/regexptestdlg.cpp @@ -66,23 +66,19 @@ void RegexpTestDialog::somethingChanged() subgroups_listview->clear(); if ( qregexp_button->isChecked() || qregexp_min_button->isChecked() ) - checkQRegExp(); + checkTQRegExp(); else if ( kregexp_button->isChecked() ) checkKRegExp(); else checkPOSIX(); } -void RegexpTestDialog::checkQRegExp() +void RegexpTestDialog::checkTQRegExp() { TQRegExp rx( pattern_edit->text() ); rx.setMinimal( qregexp_min_button->isChecked() ); if ( !rx.isValid() ) { -#if QT_VERSION >= 0x030100 success_label->setText( rx.errorString() ); -#else - success_label->setText( i18n("Error compiling the regular expression.") ); -#endif return; } if ( rx.search( teststring_edit->text() ) < 0 ) { @@ -90,11 +86,7 @@ void RegexpTestDialog::checkQRegExp() return; } success_label->setText( i18n("Successfully matched") ); -#if QT_VERSION >= 0x030100 int numCaptures = rx.numCaptures() + 1; -#else - int numCaptures = 10; -#endif for ( int i = 0; i < numCaptures; ++i ) { new TQListViewItem( subgroups_listview, TQString::number( i ), rx.cap( i ) ); } @@ -152,7 +144,7 @@ void RegexpTestDialog::checkPOSIX() regcompMessage = i18n("Invalid collating element"); break; case REG_EPAREN: - regcompMessage = i18n("Unmatched parenthesis group operators"); + regcompMessage = i18n("Unmatched tqparenthesis group operators"); break; case REG_ESUBREG: regcompMessage = i18n("Invalid back reference to subexpression"); diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h index 6b02ea02..457e53fb 100644 --- a/parts/regexptest/regexptestdlg.h +++ b/parts/regexptest/regexptestdlg.h @@ -20,6 +20,7 @@ class KDevPlugin; class RegexpTestDialog : public RegexpTestDialogBase { Q_OBJECT + TQ_OBJECT public: RegexpTestDialog( KDevPlugin *part ); @@ -34,7 +35,7 @@ protected slots: private: virtual void somethingChanged(); virtual void checkPOSIX(); - virtual void checkQRegExp(); + virtual void checkTQRegExp(); virtual void checkKRegExp(); virtual void insertQuoted(); diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui index 7b52620a..1b5b01f9 100644 --- a/parts/regexptest/regexptestdlgbase.ui +++ b/parts/regexptest/regexptestdlgbase.ui @@ -1,6 +1,6 @@ RegexpTestDialogBase - + regexp_test_dialog @@ -22,7 +22,7 @@ unnamed - + pattern_label @@ -33,7 +33,7 @@ pattern_edit - + teststring_label @@ -52,7 +52,7 @@ Enter a string which will be matched against the regular expression - + success_label @@ -68,7 +68,7 @@ - + Layout4 @@ -79,7 +79,7 @@ 0 - + insertbutton @@ -103,14 +103,14 @@ Expanding - + 20 20 - + cancelbutton @@ -134,7 +134,7 @@ enter a regular expression, for example <tt>KD.*</tt>, which matches all strings beginning with "KD" - + flavor_group @@ -153,7 +153,7 @@ unnamed - + basicposix_button @@ -167,7 +167,7 @@ A description of this syntax can be found in the grep manpage - + extendedposix_button @@ -178,7 +178,7 @@ A description of this syntax can be found in the grep manpage - + qregexp_button @@ -189,7 +189,7 @@ A description of this syntax can be found in the documentation of the QRegExp class - + qregexp_min_button @@ -200,7 +200,7 @@ Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation for more details. - + kregexp_button @@ -213,7 +213,7 @@ - + rxedit_button @@ -224,15 +224,15 @@ true - + - layout2 + tqlayout2 unnamed - + subgroups_label @@ -240,7 +240,7 @@ Matched subgroups: - + Group @@ -339,13 +339,13 @@ kdialog.h - + insertQuoted() somethingChanged() showRegExpEditor() - - - + + + klineedit.h diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 8a3c8bd5..a991171a 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -24,8 +24,8 @@ static const KDevPluginInfo data("kdevregexptest"); typedef KDevGenericFactory RegexpTestFactory; K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) -RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") +RegexpTestPart::RegexpTestPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "RegexpTestPart") { setInstance(RegexpTestFactory::instance()); setXMLFile("kdevregexptest.rc"); diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h index d0446cef..5318b86e 100644 --- a/parts/regexptest/regexptestpart.h +++ b/parts/regexptest/regexptestpart.h @@ -22,9 +22,10 @@ class RegexpTestDialog; class RegexpTestPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - RegexpTestPart( TQObject *parent, const char *name, const TQStringList & ); + RegexpTestPart( TQObject *tqparent, const char *name, const TQStringList & ); ~RegexpTestPart(); private slots: diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 7a64cac8..ebeeb311 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -24,24 +24,24 @@ #include "replace_widget.h" -static const KDevPluginInfo data("kdevreplace"); +static const KDevPluginInfo data("kdevtqreplace"); typedef KDevGenericFactory ReplaceFactory; -K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data)) +K_EXPORT_COMPONENT_FACTORY(libkdevtqreplace, ReplaceFactory(data)) -ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin( &data, parent, name ? name : "ReplacePart" ) +ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevPlugin( &data, tqparent, name ? name : "ReplacePart" ) { setInstance(ReplaceFactory::instance()); - setXMLFile("kdevpart_replace.rc"); + setXMLFile("kdevpart_tqreplace.rc"); m_widget = new ReplaceWidget(this); - m_widget->setIcon( SmallIcon("filefind") ); + m_widget->setIcon( SmallIcon("filetqfind") ); m_widget->setCaption(i18n("Replace")); TQWhatsThis::add (m_widget, i18n("Replace

    " - "This window shows a preview of a string replace " + "This window shows a preview of a string tqreplace " "operation. Uncheck a line to exclude that replacement. " "Uncheck a file to exclude the whole file from the " "operation. " @@ -60,7 +60,7 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& "can enter a string or a regular expression which is then " "searched for within all files in the locations " "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.") ); + "can replace them with the specified string, exclude them from replace operation or cancel the whole tqreplace.") ); connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); @@ -99,9 +99,9 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context) if (!ident.isEmpty()) { m_popupstr = ident; TQString squeezed = KStringHandler::csqueeze(ident, 30); - int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed), + int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed), this, TQT_SLOT(slotReplace()) ); - popup->setWhatsThis(id, i18n("Replace Project Wide

    Opens the find in files dialog " + popup->tqsetWhatsThis(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 8fb6f5e3..efad03bd 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -25,9 +25,10 @@ class Context; class ReplacePart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - ReplacePart(TQObject *parent, const char *name, const TQStringList &); + ReplacePart(TQObject *tqparent, const char *name, const TQStringList &); ~ReplacePart(); public slots: diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index c20c3bbc..957f845a 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -65,25 +65,25 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) _terminateOperation( false ) { // setup outputview - TQVBoxLayout * layout = new TQVBoxLayout( this ); - TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this ); + TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout ); _cancel = new KPushButton( KStdGuiItem::cancel(), this ); - _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this ); + _tqreplace = new KPushButton( KGuiItem(i18n("Replace"),"filetqfind"), this ); _cancel->setEnabled( false ); - _replace->setEnabled( false ); + _tqreplace->setEnabled( false ); - buttonlayout->addWidget( _replace ); - buttonlayout->addWidget( _cancel ); + buttontqlayout->addWidget( _tqreplace ); + buttontqlayout->addWidget( _cancel ); _listview = new ReplaceView( this ); - layout->addWidget( _listview ); + tqlayout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); + connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( tqfind() ) ); - connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); + connect( _tqreplace, TQT_SIGNAL( clicked() ), TQT_SLOT( tqreplace() ) ); connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); @@ -142,7 +142,7 @@ void ReplaceWidget::showDialog() } -void ReplaceWidget::find() +void ReplaceWidget::tqfind() { _listview->clear(); m_part->mainWindow()->raiseView( this ); @@ -153,7 +153,7 @@ void ReplaceWidget::find() if ( showReplacements() ) { _cancel->setEnabled( true ); - _replace->setEnabled( true ); + _tqreplace->setEnabled( true ); } else { @@ -162,7 +162,7 @@ void ReplaceWidget::find() } } -void ReplaceWidget::replace() +void ReplaceWidget::tqreplace() { makeReplacements(); clear(); @@ -174,7 +174,7 @@ void ReplaceWidget::clear() _listview->clear(); _cancel->setEnabled( false ); - _replace->setEnabled( false ); + _tqreplace->setEnabled( false ); m_part->mainWindow()->setViewAvailable( this, false ); } @@ -215,7 +215,7 @@ bool ReplaceWidget::showReplacements() break; } - if ( openfiles.contains( *it ) ) + if ( openfiles.tqcontains( *it ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( *it ) ) { @@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements() } ++it; - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } m_part->core()->running( m_part, false ); @@ -290,7 +290,7 @@ bool ReplaceWidget::makeReplacements() { TQString currentfile = fileitem->file(); - if ( openfiles.contains( currentfile ) ) + if ( openfiles.tqcontains( currentfile ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( currentfile ) ) { @@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements() } fileitem = fileitem->nextSibling(); - kapp->processEvents( 100 ); + kapp->tqprocessEvents( 100 ); } // Telling the project about the edited files @@ -343,7 +343,7 @@ bool ReplaceWidget::makeReplacements() m_part->core()->running( m_part, false ); - if ( calledUrl != TQString::null ) + if ( calledUrl != TQString() ) { m_part->partController()->editDocument( calledUrl, calledLine ); setCursorPos( m_part->partController()->activePart(), calledCol, calledLine ); @@ -437,7 +437,7 @@ TQStringList ReplaceWidget::openProjectFiles() if ( KTextEditor::Editor * ed = dynamic_cast( part ) ) { TQString editorpath = ed->url().path(); - if ( projectfiles.contains( editorpath ) ) + if ( projectfiles.tqcontains( editorpath ) ) { openfiles.append( editorpath ); } diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index 771643db..ea1e3dc6 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -26,9 +26,10 @@ class ReplaceDlgImpl; class ReplaceItem; class ReplaceView; -class ReplaceWidget : public QWidget +class ReplaceWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: ReplaceWidget(ReplacePart *part); @@ -41,8 +42,8 @@ protected: virtual void focusInEvent(TQFocusEvent *e); private slots: - void find(); - void replace(); + void tqfind(); + void tqreplace(); void clear(); void editDocument( const TQString & ,int ); void setCursorPos( KParts::Part *part, uint line, uint col ); @@ -68,7 +69,7 @@ private: ReplaceView * _listview; TQPushButton * _cancel; - TQPushButton * _replace; + TQPushButton * _tqreplace; uint calledCol; uint calledLine; diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui index b1c7db92..81d9fd68 100644 --- a/parts/replace/replacedlg.ui +++ b/parts/replace/replacedlg.ui @@ -1,6 +1,6 @@ ReplaceDlg - + ReplaceDlg @@ -20,7 +20,7 @@ 0 - + 32767 32767 @@ -33,7 +33,7 @@ unnamed - + groupBox2 @@ -44,7 +44,7 @@ unnamed - + case_box @@ -55,7 +55,7 @@ true - + buttonGroup2 @@ -72,7 +72,7 @@ 0 - + strings_all_radio @@ -83,7 +83,7 @@ true - + strings_wholewords_radio @@ -91,15 +91,15 @@ Whole words onl&y - + - layout3 + tqlayout3 unnamed - + strings_regexp_radio @@ -110,7 +110,7 @@ Use regexp to specify target - + regexp_button @@ -141,7 +141,7 @@ - + buttonGroup1 @@ -152,7 +152,7 @@ unnamed - + files_all_radio @@ -166,7 +166,7 @@ All files in the project will be considered. - + files_open_radio @@ -177,7 +177,7 @@ Only open project files will be considered. - + files_path_radio @@ -198,15 +198,15 @@ - + - layout4 + tqlayout4 unnamed - + expression_varning_label @@ -229,14 +229,14 @@ Expanding - + 40 20 - + find_button @@ -250,7 +250,7 @@ Start looking for possible replacement targets. - + cancel_button @@ -260,7 +260,7 @@ - + groupBox1 @@ -271,12 +271,12 @@ unnamed - + textLabel1 - &Text to find: + &Text to tqfind: find_combo @@ -290,7 +290,7 @@ Target string - + textLabel2 @@ -369,8 +369,8 @@ kdialog.h - - + + kcombobox.h klineedit.h diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index b0c5bffd..0973e54f 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -27,7 +27,7 @@ TQString escape(const TQString &str) for (uint i=0; i < str.length(); ++i) { - if (escaped.find(str[i]) != -1) + if (escaped.tqfind(str[i]) != -1) res += "\\"; res += str[i]; } @@ -37,8 +37,8 @@ TQString escape(const TQString &str) } -ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* parent, const char* name, bool modal, WFlags fl) - : ReplaceDlg(parent,name, modal,fl), _regexp_dialog( 0 ) +ReplaceDlgImpl::ReplaceDlgImpl(TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : ReplaceDlg(tqparent,name, modal,fl), _regexp_dialog( 0 ) { connect( find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( saveComboHistories() ) ); diff --git a/parts/replace/replacedlgimpl.h b/parts/replace/replacedlgimpl.h index 5ff94c75..73d49cb5 100644 --- a/parts/replace/replacedlgimpl.h +++ b/parts/replace/replacedlgimpl.h @@ -9,9 +9,10 @@ class TQDialog; class ReplaceDlgImpl : public ReplaceDlg { Q_OBJECT + TQ_OBJECT public: - ReplaceDlgImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + ReplaceDlgImpl(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ReplaceDlgImpl(); TQRegExp expressionPattern(); diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp index d810e2ad..087e2b1f 100644 --- a/parts/replace/replaceitem.cpp +++ b/parts/replace/replaceitem.cpp @@ -45,18 +45,18 @@ void ReplaceItem::setChecked( bool checked ) { if ( !isFile() ) // this is a child item { - if ( checked || !(parent()->hasCheckedChildren())) + if ( checked || !(tqparent()->hasCheckedChildren())) { - if ( parent()->isOn() != checked ) + if ( tqparent()->isOn() != checked ) { - parent()->_clicked = false; - parent()->setOn( checked ); + tqparent()->_clicked = false; + tqparent()->setOn( checked ); } } return; } - // this is a parent item, set self and children + // this is a tqparent item, set self and tqchildren ReplaceItem * item = firstChild(); while ( item ) { @@ -84,13 +84,13 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); TQFontMetrics fm( lv->fontMetrics() ); - int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int r = marg; @@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, else y = (fm.height() + 2 + marg - boxsize) / 2; - lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); @@ -128,8 +128,8 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, p->setPen( TQPen( cg.text() ) ); TQColorGroup mcg = cg; - mcg.setColor( TQColorGroup::Text, ( isFile() ? Qt::darkGreen : Qt::blue ) ); - mcg.setColor( TQColorGroup::HighlightedText, ( isFile() ? Qt::darkGreen : Qt::blue ) ); + mcg.setColor( TQColorGroup::Text, ( isFile() ? TQt::darkGreen : TQt::blue ) ); + mcg.setColor( TQColorGroup::HighlightedText, ( isFile() ? TQt::darkGreen : TQt::blue ) ); TQListViewItem::paintCell( p, mcg, column, width - r, align ); } @@ -138,8 +138,8 @@ void ReplaceItem::activate( int, TQPoint const & localPos ) { TQListView * lv = listView(); TQCheckBox cb(0); - int boxsize = cb.sizeHint().width(); -//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = cb.tqsizeHint().width(); +//that's KDE-3.1 only int boxsize = lv->style().tqpixelMetric(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 4cea682c..8d4f3fd3 100644 --- a/parts/replace/replaceitem.h +++ b/parts/replace/replaceitem.h @@ -18,12 +18,12 @@ #include "replaceview.h" -class ReplaceItem : public QCheckListItem +class ReplaceItem : public TQCheckListItem { public: // the file item - ReplaceItem( ReplaceView * parent, ReplaceItem * after, TQString file ) : - TQCheckListItem( parent, + ReplaceItem( ReplaceView * tqparent, ReplaceItem * after, TQString file ) : + TQCheckListItem( tqparent, after, file, TQCheckListItem::CheckBox ), _file( file ), _string( file ), _line( 0 ), _isfile( true ), @@ -34,8 +34,8 @@ public: } // the line item - ReplaceItem( ReplaceItem * parent, ReplaceItem * after, TQString file, TQString string, int line ) : - TQCheckListItem( parent, + ReplaceItem( ReplaceItem * tqparent, ReplaceItem * after, TQString file, TQString string, int line ) : + TQCheckListItem( tqparent, after, TQString::number( line + 1 ) + ": " + string, TQCheckListItem::CheckBox ), _file( file ), _string( string ), _line( line ), _isfile( false ), @@ -76,9 +76,9 @@ public: return _lineclicked; } - ReplaceItem * parent() const + ReplaceItem * tqparent() const { - return static_cast( TQListViewItem::parent() ); + return static_cast( TQListViewItem::tqparent() ); } ReplaceItem * firstChild() const diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 6730971a..5f5eee77 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -27,7 +27,7 @@ ReplaceItem * ReplaceView::firstChild() const } -ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile( 0 ) +ReplaceView::ReplaceView( TQWidget * tqparent ) : KListView( tqparent ), _latestfile( 0 ) { setSorting( -1 ); addColumn( "" ); @@ -36,7 +36,7 @@ ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile TQPalette pal = palette(); TQColorGroup cg = pal.active(); - cg.setColor( TQColorGroup::Highlight, Qt::lightGray ); + cg.setColor( TQColorGroup::Highlight, TQt::lightGray ); pal.setActive( cg ); setPalette( pal ); @@ -60,7 +60,7 @@ void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream line++; } // this is the hit - ostream << istream.readLine().replace( _regexp, _replacement ) << "\n"; + ostream << istream.readLine().tqreplace( _regexp, _replacement ) << "\n"; line++; } @@ -84,9 +84,9 @@ void ReplaceView::showReplacementsForFile( TQTextStream & stream, TQString const { TQString s = stream.readLine(); - if ( s.contains( _regexp ) > 0 ) + if ( s.tqcontains( _regexp ) > 0 ) { - s.replace( _regexp, _replacement ); + s.tqreplace( _regexp, _replacement ); if ( firstline ) { @@ -119,7 +119,7 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po else if ( btn == Qt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) - item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); + item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(item).top() ) ); } } } diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h index 7031d80d..ceb480f3 100644 --- a/parts/replace/replaceview.h +++ b/parts/replace/replaceview.h @@ -24,6 +24,7 @@ class ReplaceItem; class ReplaceView : public KListView { Q_OBJECT + TQ_OBJECT signals: void editDocument( const TQString &, int ); diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 78749465..6314306e 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -24,8 +24,8 @@ #include #include #include -scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name) - : scriptingGlobalConfigBase(parent, name), m_part(part) +scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent, const char *name) + : scriptingGlobalConfigBase(tqparent, name), m_part(part) { // read kconfig and post list to the m_dirs KConfig *cfg = kapp->config(); diff --git a/parts/scripting/scriptingglobalconfig.h b/parts/scripting/scriptingglobalconfig.h index 85343e33..3d132d58 100644 --- a/parts/scripting/scriptingglobalconfig.h +++ b/parts/scripting/scriptingglobalconfig.h @@ -28,8 +28,9 @@ class scriptingPart; class scriptingGlobalConfig: public scriptingGlobalConfigBase { Q_OBJECT + TQ_OBJECT public: - scriptingGlobalConfig(scriptingPart *part, TQWidget *parent = 0, const char *name = 0); + scriptingGlobalConfig(scriptingPart *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/scripting/scriptingglobalconfigbase.ui b/parts/scripting/scriptingglobalconfigbase.ui index 19647501..155925f5 100644 --- a/parts/scripting/scriptingglobalconfigbase.ui +++ b/parts/scripting/scriptingglobalconfigbase.ui @@ -1,6 +1,6 @@ scriptingGlobalConfigBase - + scriptingGlobalConfigBase @@ -33,7 +33,7 @@ false - + textLabel2 @@ -43,7 +43,7 @@ - + keditlistbox.h klineedit.h diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 496746b2..7a332fd8 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -47,8 +47,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) +scriptingPart::scriptingPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); setXMLFile("kdevscripting.rc"); @@ -86,8 +86,8 @@ void scriptingPart::setupActions() KConfig *cfg = kapp->config(); searchDirs += cfg->readListEntry("SearchDirs"); - unplugActionList(TQString::fromLatin1( "script_actions" )); - plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs)); + unplugActionList(TQString::tqfromLatin1( "script_actions" )); + plugActionList( TQString::tqfromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs)); } void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo) diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index 5d1c2c6c..8465764d 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -37,8 +37,9 @@ Please read the README.dox file for more info about this part class scriptingPart: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - scriptingPart(TQObject *parent, const char *name, const TQStringList &args); + scriptingPart(TQObject *tqparent, const char *name, const TQStringList &args); ~scriptingPart(); public slots: diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index eb1c47ac..e130d1e6 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -37,8 +37,8 @@ static const KDevPluginInfo data("kdevsnippet"); typedef KDevGenericFactory snippetFactory; K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) -SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) +SnippetPart::SnippetPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevPlugin(&data, tqparent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); setXMLFile("kdevpart_snippet.rc"); @@ -112,9 +112,9 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg ) TQStringList SnippetPart::getAllLanguages() { KTrader::OfferList languageSupportOffers = - KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"), - TQString::fromLatin1("[X-KDevelop-Version] == %1" - ).arg( KDEVELOP_PLUGIN_VERSION )); + KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"), + TQString::tqfromLatin1("[X-KDevelop-Version] == %1" + ).tqarg( KDEVELOP_PLUGIN_VERSION )); TQStringList languages; diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index c62950fc..f9f7bc93 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -27,10 +27,11 @@ For more info read the README.dox file class SnippetPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - SnippetPart(TQObject *parent, const char *name, const TQStringList &); + SnippetPart(TQObject *tqparent, const char *name, const TQStringList &); ~SnippetPart(); KAboutData * aboutData(); TQStringList getAllLanguages(); diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 2c35d5c5..e555115a 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -50,7 +50,7 @@ SnippetWidget::SnippetWidget(SnippetPart *part) : KListView(0, "snippet widget"), TQToolTip( viewport() ), m_part( part ) { - // init the QPtrList + // init the TQPtrList _list.setAutoDelete(TRUE); // init the KListView @@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget() writeConfig(); delete _cfg; - /* We need to delete the child items before the parent items + /* We need to delete the child items before the tqparent items otherwise KDevelop would crash on exiting */ SnippetItem * item; while (_list.count() > 0) { @@ -111,7 +111,7 @@ void SnippetWidget::slotAdd() which the selected item is a child of*/ SnippetGroup * group = dynamic_cast(selectedItem()); if (!group) - group = dynamic_cast(selectedItem()->parent()); + group = dynamic_cast(selectedItem()->tqparent()); /*fill the combobox with the names of all SnippetGroup entries*/ for (SnippetItem *it=_list.first(); it; it=_list.next()) { @@ -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?"),TQString::null,KStdGuiItem::del()) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString(),KStdGuiItem::del()) == KMessageBox::Cancel) return; @@ -218,10 +218,10 @@ void SnippetWidget::slotEdit() pSnippet->setName( dlg.snippetName->text() ); pSnippet->setText( dlg.snippetText->text() ); - /* if the user changed the parent we need to move the snippet */ + /* if the user changed the tqparent we need to move the snippet */ if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) { SnippetGroup * newGroup = dynamic_cast(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list)); - pSnippet->parent()->takeItem(pSnippet); + pSnippet->tqparent()->takeItem(pSnippet); newGroup->insertItem(pSnippet); pSnippet->resetParent(); } @@ -327,9 +327,9 @@ void SnippetWidget::writeConfig() SnippetGroup * group = dynamic_cast(item); if (group) { kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; - strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount); - strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount); - strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount); + strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount); + strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount); + strKeyText=TQString("snippetGroupLang_%1").tqarg(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=TQString("snippetName_%1").arg(iSnipCount); - strKeyText=TQString("snippetText_%1").arg(iSnipCount); - strKeyId=TQString("snippetParent_%1").arg(iSnipCount); + strKeyName=TQString("snippetName_%1").tqarg(iSnipCount); + strKeyText=TQString("snippetText_%1").tqarg(iSnipCount); + strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount); _cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyText, item->getText()); @@ -357,8 +357,8 @@ void SnippetWidget::writeConfig() 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=TQString("snippetSavedName_%1").arg(iCount); - strKeyText=TQString("snippetSavedVal_%1").arg(iCount); + strKeyName=TQString("snippetSavedName_%1").tqarg(iCount); + strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount); _cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyText, it.data()); @@ -394,8 +394,8 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg) TQString strKeyName=""; TQString strKeyText=""; for ( int i=0; ireadNumEntry("snippetGroupCount", -1); for ( int i=0; ireadNumEntry("snippetCount", 0); for ( int i=0; ireadNumEntry("snippetSavedCount", 0); - for ( int i=1; i<=iCount; i++) { //read the saved-values and store in QMap - strKeyName=TQString("snippetSavedName_%1").arg(i); - strKeyText=TQString("snippetSavedVal_%1").arg(i); + for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap + strKeyName=TQString("snippetSavedName_%1").tqarg(i); + strKeyText=TQString("snippetSavedVal_%1").tqarg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -526,7 +526,7 @@ void SnippetWidget::maybeTip( const TQPoint & p ) if (!item) return; - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if (r.isValid() && _SnippetConfig.useToolTips() ) @@ -589,15 +589,15 @@ TQString SnippetWidget::parseText(TQString text, TQString del) TQRect rMulti = _SnippetConfig.getMultiRect(); do { - iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this QRegExp + iFound = text.tqfind(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this TQRegExp if (iFound >= 0) { - iEnd = text.find(del, iFound+1)+1; + iEnd = text.tqfind(del, iFound+1)+1; strName = text.mid(iFound, iEnd-iFound); if ( strName != del+del ) { //if not doubel-delimiter if (iInMeth == 0) { //if input-method "single" is selected if ( mapVar[strName].length() <= 0 ) { // and not already in map - strMsg=i18n("Please enter the value for %1:").arg(strName); + strMsg=i18n("Please enter the value for %1:").tqarg(strName); strNew = showSingleVarDialog( strName, &_mapSaved, rSingle ); if (strNew=="") return ""; //user clicked Cancle @@ -612,7 +612,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) } if (iInMeth == 0) { //if input-method "single" is selected - str.replace(strName, strNew); + str.tqreplace(strName, strNew); } mapVar[strName] = strNew; @@ -627,13 +627,13 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog 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()); + str.tqreplace(it.key(), it.data()); } } else { return ""; } - rMulti.setWidth(w); //this is a hack to save the dialog's dimensions in only one QRect + rMulti.setWidth(w); //this is a hack to save the dialog's dimensions in only one TQRect rMulti.setHeight(bh); rMulti.setTop(oh); rMulti.setLeft(0); @@ -671,35 +671,35 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + labTop->tqsetSizePolicy( 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); - layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + tqlayoutTop->addWidget(labTop, 0, 0); + tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add - for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout + for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; cb = new TQCheckBox( &dlg, "cbVar" ); cb->setChecked( FALSE ); cb->setText(it.key()); - layoutVar->addWidget( cb, i ,0, Qt::AlignTop ); + tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop ); te = new KTextEdit( &dlg, "teVar" ); - layoutVar->addWidget( te, i, 1, Qt::AlignTop ); + tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { cb->setChecked( TRUE ); @@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapaddMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" ); btn1->setText(i18n("&Cancel")); - btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); - layoutBtn->addWidget( btn1, 0, 0 ); + tqlayoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" ); btn2->setText(i18n("&Apply")); btn2->setDefault( TRUE ); - btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); - layoutBtn->addWidget( btn2, 0, 1 ); + tqlayoutBtn->addWidget( btn2, 0, 1 ); - layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -742,7 +742,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMap 1) { - TQRect r = dlg.geometry(); + TQRect r = dlg.tqgeometry(); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setWidth(iWidth); dlg.setGeometry(r); @@ -763,9 +763,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapgeometry().height(); - iOneHeight = layoutVar->geometry().height() / mapVar2Te.count(); - iWidth = dlg.geometry().width(); + iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height(); + iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count(); + iWidth = dlg.tqgeometry().width(); } //do some cleanup @@ -777,10 +777,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapaddWidget(labTop, 0, 0); - labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); - layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + tqlayoutTop->addWidget(labTop, 0, 0); + labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); + tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -820,8 +820,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapsetText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); - layoutVar->addWidget( te, 0, 1, Qt::AlignTop); - layoutVar->addWidget( cb, 1, 1, Qt::AlignTop); + tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop); + tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { cb->setChecked( TRUE ); te->setText((*mapSave)[var]); @@ -832,18 +832,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapaddMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" ); btn1->setText(i18n("&Cancel")); - layoutBtn->addWidget( btn1, 0, 0 ); + tqlayoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" ); btn2->setText(i18n("&Apply")); btn2->setDefault( TRUE ); - layoutBtn->addWidget( btn2, 0, 1 ); + tqlayoutBtn->addWidget( btn2, 0, 1 ); - layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -863,7 +863,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMaptext(); //copy the entered values back the the given map - dlgSize = dlg.geometry(); + dlgSize = dlg.tqgeometry(); } //do some cleanup @@ -872,10 +872,10 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap(item2); if (!group) - group = dynamic_cast(item2->parent()); + group = dynamic_cast(item2->tqparent()); TQCString dropped; - TQByteArray data = e->encodedData("text/plain"); + TQByteArray data = e->tqencodedData("text/plain"); if ( e->provides("text/plain") && data.size()>0 ) { //get the data from the event... TQString encData(data.data()); @@ -958,7 +958,7 @@ void SnippetWidget::languageChanged() for (SnippetItem *it=_list.first(); it; it=_list.next()) { SnippetGroup * group = dynamic_cast(it); if (group) { - if (group->getLanguage() == i18n("All") || langs.contains(group->getLanguage())) { + if (group->getLanguage() == i18n("All") || langs.tqcontains(group->getLanguage())) { group->setOpen(TRUE); } else { group->setOpen(FALSE); diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 7aa1f24e..40d77406 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -37,9 +37,10 @@ It inherits KListView and TQToolTip which is needed for showing the tooltips which contains the text of the snippet @author Robert Gruber */ -class SnippetWidget : public KListView, public QToolTip +class SnippetWidget : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT friend class SnippetSettings; //to allow SnippetSettings to call languageChanged() diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui index a7d4530b..acf7841b 100644 --- a/parts/snippet/snippetdlg.ui +++ b/parts/snippet/snippetdlg.ui @@ -1,6 +1,6 @@ SnippetDlg - + SnippetDlg @@ -19,9 +19,9 @@ unnamed - + - layout5 + tqlayout5 @@ -37,7 +37,7 @@ Expanding - + 40 20 @@ -62,9 +62,9 @@ - + - layout3 + tqlayout3 @@ -91,14 +91,14 @@ Expanding - + 20 80 - + textLabel1 @@ -109,21 +109,21 @@ snippetName - + textLabel2 &Snippet: - + AlignTop snippetText - + textLabelGroup @@ -131,7 +131,7 @@ Group: - + toolBtnHelp @@ -200,10 +200,10 @@ snippetdlg.ui.h - + slotHelp() - - + + kpushbutton.h kpushbutton.h diff --git a/parts/snippet/snippetdlg.ui.h b/parts/snippet/snippetdlg.ui.h index 41ad9d8c..103a49b0 100644 --- a/parts/snippet/snippetdlg.ui.h +++ b/parts/snippet/snippetdlg.ui.h @@ -9,7 +9,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/parts/snippet/snippetitem.cpp b/parts/snippet/snippetitem.cpp index e2f08a2b..69010a5d 100644 --- a/parts/snippet/snippetitem.cpp +++ b/parts/snippet/snippetitem.cpp @@ -11,20 +11,20 @@ #include "snippetitem.h" -SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text ) - : TQListViewItem( parent, name ) +SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text ) + : TQListViewItem( tqparent, name ) { strName = name; strText = text; iParent = -1; } -SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text) - : TQListViewItem( parent, name ) +SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text) + : TQListViewItem( tqparent, name ) { strName = name; strText = text; - iParent = ((SnippetGroup *)parent)->getId(); + iParent = ((SnippetGroup *)tqparent)->getId(); } SnippetItem::~SnippetItem() @@ -69,7 +69,7 @@ void SnippetItem::setName(TQString name) void SnippetItem::resetParent() { - SnippetGroup * group = dynamic_cast(parent()); + SnippetGroup * group = dynamic_cast(tqparent()); if (group) iParent = group->getId(); } @@ -100,8 +100,8 @@ Deklaration for class SnippetGroup int SnippetGroup::iMaxId = 1; -SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id, TQString lang) - : SnippetItem(parent, name, "GROUP") +SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id, TQString lang) + : SnippetItem(tqparent, name, "GROUP") { if (id > 0) { iId = id; diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h index ee181725..d96ecd5b 100644 --- a/parts/snippet/snippetitem.h +++ b/parts/snippet/snippetitem.h @@ -24,7 +24,7 @@ It also holds the needed data for one snippet. class SnippetItem : public TQListViewItem { friend class SnippetGroup; public: - SnippetItem(TQListViewItem * parent, TQString name, TQString text); + SnippetItem(TQListViewItem * tqparent, TQString name, TQString text); ~SnippetItem(); TQString getName(); @@ -37,7 +37,7 @@ public: static SnippetGroup * findGroupById(int id, TQPtrList &list); private: - SnippetItem(TQListView * parent, TQString name, TQString text); + SnippetItem(TQListView * tqparent, TQString name, TQString text); TQString strName; TQString strText; int iParent; @@ -51,7 +51,7 @@ it in the main TQPtrList. */ class SnippetGroup : public SnippetItem { public: - SnippetGroup(TQListView * parent, TQString name, int id, TQString lang=i18n("All")); + SnippetGroup(TQListView * tqparent, TQString name, int id, TQString lang=i18n("All")); ~SnippetGroup(); int getId() { return iId; } diff --git a/parts/snippet/snippetsettings.cpp b/parts/snippet/snippetsettings.cpp index 8e559ba5..d66094e7 100644 --- a/parts/snippet/snippetsettings.cpp +++ b/parts/snippet/snippetsettings.cpp @@ -15,14 +15,14 @@ #include "snippet_widget.h" -SnippetSettings::SnippetSettings(TQWidget *parent, const char *name) - : SnippetSettingsBase(parent, name) +SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name) + : SnippetSettingsBase(tqparent, name) { _widget = NULL; } -SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name) - : SnippetSettingsBase(parent, name) +SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name) + : SnippetSettingsBase(tqparent, name) { _cfg = w->getSnippetConfig(); _widget = w; diff --git a/parts/snippet/snippetsettings.h b/parts/snippet/snippetsettings.h index 2f51a823..44c84e33 100644 --- a/parts/snippet/snippetsettings.h +++ b/parts/snippet/snippetsettings.h @@ -24,9 +24,10 @@ same named .ui file class SnippetSettings : public SnippetSettingsBase { Q_OBJECT + TQ_OBJECT public: - SnippetSettings(TQWidget *parent = 0, const char *name = 0); - SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0); + SnippetSettings(TQWidget *tqparent = 0, const char *name = 0); + SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0); ~SnippetSettings(); diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui index 54b8c325..3d2b6a39 100644 --- a/parts/snippet/snippetsettingsbase.ui +++ b/parts/snippet/snippetsettingsbase.ui @@ -1,6 +1,6 @@ SnippetSettingsBase - + SnippetSettingsBase @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -30,7 +30,7 @@ unnamed - + cbToolTip @@ -56,14 +56,14 @@ Expanding - + 20 70 - + buttonGroup1 @@ -74,7 +74,7 @@ unnamed - + btnGroup @@ -85,7 +85,7 @@ unnamed - + rbSingle @@ -102,7 +102,7 @@ An input dialog will be displayed for every variable within a snippet - + rbAll @@ -121,15 +121,15 @@ - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -144,7 +144,7 @@ leDelimiter - + 40 32767 @@ -164,7 +164,7 @@ Expanding - + 40 20 @@ -175,7 +175,7 @@ - + btnGroupAutoOpen @@ -186,7 +186,7 @@ unnamed - + rbOpenOnActiv @@ -200,7 +200,7 @@ <qt>If the group's language is the same as the project's primary language, the group will be automatically opened.</qt> - + rbOpenOnSupported @@ -221,7 +221,7 @@ - + klineedit.h diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 332d97e3..3697b89f 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -28,8 +28,8 @@ typedef KDevGenericFactory TextToolsFactory; static const KDevPluginInfo data("kdevtexttools"); K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) -TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "TextToolsPart") +TextToolsPart::TextToolsPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "TextToolsPart") { setInstance(TextToolsFactory::instance()); // setXMLFile("kdevfileview.rc"); diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h index ce348f6d..42443c48 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -22,9 +22,10 @@ class TextToolsWidget; class TextToolsPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - TextToolsPart( TQObject *parent, const char *name, const TQStringList & ); + TextToolsPart( TQObject *tqparent, const char *name, const TQStringList & ); ~TextToolsPart(); private slots: diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index 630609c5..1f7c9375 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -27,14 +27,14 @@ #include "texttoolspart.h" -class TextStructItem : public QListViewItem +class TextStructItem : public TQListViewItem { public: - TextStructItem(TQListView *parent) - : TQListViewItem(parent) + TextStructItem(TQListView *tqparent) + : TQListViewItem(tqparent) {} - TextStructItem(TQListViewItem *parent) - : TQListViewItem(parent) + TextStructItem(TQListViewItem *tqparent) + : TQListViewItem(tqparent) { TQListViewItem *item = this; while (item->nextSibling()) @@ -45,10 +45,10 @@ public: TQString text(int) const { - return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra); + return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra); } - TextStructItem *parentStructItem() - { return static_cast(parent()); } + TextStructItem *tqparentStructItem() + { return static_cast(tqparent()); } TQString tag; TQString extra; @@ -57,13 +57,13 @@ public: }; -TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const char *name) - : KListView(parent, name) +TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { setResizeMode(TQListView::LastColumn); setSorting(-1); header()->hide(); - addColumn(TQString::null); + addColumn(TQString()); m_part = part; @@ -128,7 +128,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) cursorIface->setCursorPosition(line, col); } - if (button == MidButton) { + if (button == Qt::MidButton) { KTextEditor::SelectionInterface *selectionIface = dynamic_cast(rwpart); if (selectionIface) { @@ -144,7 +144,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) void TextToolsWidget::slotReturnPressed(TQListViewItem *item) { - slotItemPressed(LeftButton, item); + slotItemPressed(Qt::LeftButton, item); } @@ -165,7 +165,7 @@ void TextToolsWidget::stop() disconnect( m_timer ); m_relevantTags.clear(); m_emptyTags.clear(); - m_cachedText = TQString::null; + m_cachedText = TQString(); } @@ -291,17 +291,17 @@ void TextToolsWidget::parseXML() ++endpos; } - if (!m_relevantTags.contains(tag)) { + if (!m_relevantTags.tqcontains(tag)) { pos = endpos; continue; } TextStructItem *closingItem = currentItem; - while (closingItem->parent() && closingItem->tag != tag) - closingItem = closingItem->parentStructItem(); - if (closingItem->parent()) { + while (closingItem->tqparent() && closingItem->tag != tag) + closingItem = closingItem->tqparentStructItem(); + if (closingItem->tqparent()) { closingItem->endpos = endpos; - currentItem = closingItem->parentStructItem(); + currentItem = closingItem->tqparentStructItem(); } else { kdDebug(9030) << "found no opening tag " << tag << "." << endl; } @@ -327,7 +327,7 @@ void TextToolsWidget::parseXML() ++endpos; } - if (!m_relevantTags.contains(tag)) { + if (!m_relevantTags.tqcontains(tag)) { pos = endpos; continue; } @@ -337,7 +337,7 @@ void TextToolsWidget::parseXML() item->pos = pos; item->endpos = -1; - if (m_emptyTags.contains(tag)) + if (m_emptyTags.tqcontains(tag)) item->endpos = endpos; else currentItem = item; @@ -376,9 +376,9 @@ void TextToolsWidget::parseLaTeX() 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)) - currentItem = currentItem->parentStructItem(); + int level = hierarchyLevels.tqfind(tag); + while (currentItem->tqparent() && level <= hierarchyLevels.tqfind(currentItem->tag)) + currentItem = currentItem->tqparentStructItem(); TextStructItem *item = new TextStructItem(currentItem); item->tag = tag; @@ -386,7 +386,7 @@ void TextToolsWidget::parseLaTeX() item->pos = pos+1; item->endpos = pos+re.matchedLength()-1; // lie - if (level > hierarchyLevels.find(currentItem->tag)) + if (level > hierarchyLevels.tqfind(currentItem->tag)) currentItem = item; pos = pos+re.matchedLength(); diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h index 5403b736..edbd834b 100644 --- a/parts/texttools/texttoolswidget.h +++ b/parts/texttools/texttoolswidget.h @@ -24,11 +24,12 @@ namespace KTextEditor { class EditInterface; } class TextToolsWidget : public KListView { Q_OBJECT + TQ_OBJECT public: enum Mode { HTML, Docbook, LaTeX }; - TextToolsWidget( TextToolsPart *part, TQWidget *parent=0, const char *name=0 ); + TextToolsWidget( TextToolsPart *part, TQWidget *tqparent=0, const char *name=0 ); ~TextToolsWidget(); void setMode(Mode mode, KParts::Part *part); diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index e1de784a..02195822 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -24,8 +24,8 @@ static const KDevPluginInfo data("kdevtipofday"); typedef KDevGenericFactory TipOfDayFactory; K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) -TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") +TipOfDayPart::TipOfDayPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index a60856e8..faf3ca19 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -13,10 +13,11 @@ class TipOfDayPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - TipOfDayPart(TQObject *parent, const char *name, const TQStringList &); + TipOfDayPart(TQObject *tqparent, const char *name, const TQStringList &); public slots: diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index 2ec5e8b4..e17d7f37 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -1,6 +1,6 @@ AddToolDialog - + add_tool_dialog @@ -19,7 +19,7 @@ unnamed - + cmdlineLabel_2 @@ -30,7 +30,7 @@ paramEdit - + capturedBox @@ -41,7 +41,7 @@ If this is checked, the output of the application will be shown in the application output view; otherwise, all output will be ignored. - + cmdlineLabel @@ -66,7 +66,7 @@ Horizontal - + menutextLabel @@ -102,7 +102,7 @@ executed.</p> The text that appears in the Tools-Menu - + Layout2 @@ -123,14 +123,14 @@ executed.</p> Expanding - + 20 0 - + okButton @@ -141,7 +141,7 @@ executed.</p> true - + cancelButton @@ -228,15 +228,15 @@ executed.</p> addtooldlg.ui.h - class QListViewItem; + class TQListViewItem; - + init() - getApp() - treeSelectionChanged( QListViewItem * lvi ) - - - + getApp() + treeSelectionChanged( TQListViewItem * lvi ) + + + kurlrequester.h klineedit.h diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h index 045e7809..fea69766 100644 --- a/parts/tools/addtooldlg.ui.h +++ b/parts/tools/addtooldlg.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index c6517d8f..95400863 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -65,9 +65,9 @@ template class TQPtrList; // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( KListView* tqparent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) - : TQListViewItem( parent, name ) + : TQListViewItem( tqparent, name ) { init(pixmap, parse, dir, p, c, dE); } @@ -75,9 +75,9 @@ KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & na // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* tqparent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) - : TQListViewItem( parent, name ) + : TQListViewItem( tqparent, name ) { init(pixmap, parse, dir, p, c, dE); } @@ -94,7 +94,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con exec = _exec; dEntry = _dEntry; exec.simplifyWhiteSpace(); - exec.truncate(exec.find(' ')); + exec.truncate(exec.tqfind(' ')); } @@ -104,7 +104,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const { if (directory) - return TQString::fromLatin1(" ") + text(column).upper(); + return TQString::tqfromLatin1(" ") + text(column).upper(); else return text(column).upper(); } @@ -117,8 +117,8 @@ void KDevAppTreeListItem::activate() void KDevAppTreeListItem::setOpen( bool o ) { - if( o && !parsed ) { // fill the children before opening - ((KDevApplicationTree *) parent())->addDesktopGroup( path, this ); + if( o && !parsed ) { // fill the tqchildren before opening + ((KDevApplicationTree *) tqparent())->addDesktopGroup( path, this ); parsed = true; } TQListViewItem::setOpen( o ); @@ -131,13 +131,13 @@ bool KDevAppTreeListItem::isDirectory() // ---------------------------------------------------------------------- -KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) - : KListView( parent, name ), currentitem(0) +KDevApplicationTree::KDevApplicationTree( TQWidget *tqparent, const char* name ) + : KListView( tqparent, name ), currentitem(0) { addColumn( i18n("Known Applications") ); setRootIsDecorated( true ); - addDesktopGroup( TQString::null ); + addDesktopGroup( TQString() ); connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); @@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i) void KDevApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)); + setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent)); KListView::resizeEvent(e); } diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h index ee56a20c..2e869889 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -36,7 +36,7 @@ class TQStringList; /** * @internal */ -class KDevAppTreeListItem : public QListViewItem +class KDevAppTreeListItem : public TQListViewItem { bool parsed; bool directory; @@ -50,9 +50,9 @@ protected: void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry); public: - KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap, + KDevAppTreeListItem( KListView* tqparent, 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, + KDevAppTreeListItem( TQListViewItem* tqparent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); bool isDirectory(); @@ -74,8 +74,9 @@ protected: class KDevApplicationTree : public KListView { Q_OBJECT + TQ_OBJECT public: - KDevApplicationTree( TQWidget *parent, const char* name = 0 ); + KDevApplicationTree( TQWidget *tqparent, const char* name = 0 ); /** * Add a group of .desktop/.kdelnk entries diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index f9daca4b..ac1b9464 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -39,8 +39,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) TQMap externalToolMenuEntries; -ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin( &data, parent, name ? name : "ToolsPart") +ToolsPart::ToolsPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin( &data, tqparent, name ? name : "ToolsPart") { setInstance(ToolsFactory::instance()); @@ -57,7 +57,7 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - // Apparently action lists can only be plugged after the + // Aptqparently action lists can only be plugged after the // xmlgui client has been registered TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu())); } @@ -113,7 +113,7 @@ void ToolsPart::updateMenu() void ToolsPart::slotToolActivated() { - TQString df = sender()->name(); + TQString df = TQT_TQOBJECT(const_cast(sender()))->name(); kapp->startServiceByDesktopPath(df); } @@ -135,21 +135,21 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) TQString word = KDevEditorUtil::currentWord( doc ); // This should really be checked before inserting into the popup - if (cmdline.contains("%D") && projectDirectory.isNull()) + if (cmdline.tqcontains("%D") && projectDirectory.isNull()) return; - cmdline.replace(TQRegExp("%D"), projectDirectory); + cmdline.tqreplace(TQRegExp("%D"), projectDirectory); - if (cmdline.contains("%S") && fileName.isNull()) + if (cmdline.tqcontains("%S") && fileName.isNull()) return; - cmdline.replace(TQRegExp("%S"), fileName); + cmdline.tqreplace(TQRegExp("%S"), fileName); - if (cmdline.contains("%T") && selection.isNull()) + if (cmdline.tqcontains("%T") && selection.isNull()) return; - cmdline.replace(TQRegExp("%T"), selection); + cmdline.tqreplace(TQRegExp("%T"), selection); - if (cmdline.contains("%W") && word.isNull()) + if (cmdline.tqcontains("%W") && word.isNull()) return; - cmdline.replace(TQRegExp("%W"), word); + cmdline.tqreplace(TQRegExp("%W"), word); if (captured) { @@ -224,7 +224,7 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context) void ToolsPart::toolsMenuActivated() { - TQString menutext = sender()->name(); + TQString menutext = TQT_TQOBJECT(const_cast(sender()))->name(); KConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); TQString cmdline = config->readPathEntry("CommandLine"); @@ -236,7 +236,7 @@ void ToolsPart::toolsMenuActivated() if (isdesktopfile) kapp->startServiceByDesktopPath(cmdline); else - startCommand(cmdline, captured, TQString::null); + startCommand(cmdline, captured, TQString()); } diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h index 5ced9a5e..5654d1ef 100644 --- a/parts/tools/tools_part.h +++ b/parts/tools/tools_part.h @@ -23,10 +23,11 @@ class ToolsWidget; class ToolsPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - ToolsPart( TQObject *parent, const char *name, const TQStringList & ); + ToolsPart( TQObject *tqparent, const char *name, const TQStringList & ); ~ToolsPart(); diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index c8b4566f..915490d1 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -17,8 +17,8 @@ #include "kapplicationtree.h" -ToolsConfig::ToolsConfig(TQWidget *parent, const char *name) - : TQWidget(parent, name), _tree(0) +ToolsConfig::ToolsConfig(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name), _tree(0) { _entries.setAutoDelete(true); } @@ -30,7 +30,7 @@ void ToolsConfig::showEvent(TQShowEvent *e) if (!_tree) { - TQApplication::setOverrideCursor(Qt::waitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -162,7 +162,7 @@ void ToolsConfig::updateList() _list->insertItem(it.current()->icon, it.current()->name); _list->setUpdatesEnabled(true); - _list->repaint(); + _list->tqrepaint(); } diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h index 8359adff..81ae27ab 100644 --- a/parts/tools/toolsconfig.h +++ b/parts/tools/toolsconfig.h @@ -24,13 +24,14 @@ public: }; -class ToolsConfig : public QWidget +class ToolsConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ToolsConfig(TQWidget *parent = 0, const char *name = 0); + ToolsConfig(TQWidget *tqparent = 0, const char *name = 0); public slots: diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index b4643b26..5020b123 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -41,8 +41,8 @@ struct ToolsConfigEntry }; -ToolsConfigWidget::ToolsConfigWidget(TQWidget *parent, const char *name) - : ToolsConfigWidgetBase(parent, name) +ToolsConfigWidget::ToolsConfigWidget(TQWidget *tqparent, const char *name) + : ToolsConfigWidgetBase(tqparent, name) { m_toolsmenuEntries.setAutoDelete(true); m_filecontextEntries.setAutoDelete(true); @@ -125,7 +125,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict *entryDict) { TQString menutext = entry->menutext; - if (entryDict->find(menutext)) { + if (entryDict->tqfind(menutext)) { delete entry; KMessageBox::sorry(this, i18n("An entry with this title exists already.")); return false; diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h index b58c9ea4..d0b468ac 100644 --- a/parts/tools/toolsconfigwidget.h +++ b/parts/tools/toolsconfigwidget.h @@ -23,9 +23,10 @@ struct ToolsConfigEntry; class ToolsConfigWidget : public ToolsConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - ToolsConfigWidget(TQWidget *parent=0, const char *name=0); + ToolsConfigWidget(TQWidget *tqparent=0, const char *name=0); ~ToolsConfigWidget(); public slots: diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui index 5b8baab0..68fbf33e 100644 --- a/parts/tools/toolsconfigwidgetbase.ui +++ b/parts/tools/toolsconfigwidgetbase.ui @@ -1,6 +1,6 @@ ToolsConfigWidgetBase - + tools_config_widget @@ -25,11 +25,11 @@ 0 - + tabwidget - + toolmenuTab @@ -40,12 +40,12 @@ unnamed - + toolsmenuBox - + Layout4_3 @@ -66,14 +66,14 @@ Expanding - + 20 20 - + toolsmenuaddButton @@ -84,7 +84,7 @@ true - + toolsmenuremoveButton @@ -105,7 +105,7 @@ Expanding - + 20 20 @@ -124,7 +124,7 @@ Expanding - + 20 20 @@ -133,7 +133,7 @@ - + filecontextTab @@ -144,12 +144,12 @@ unnamed - + filecontextBox - + Layout4_2 @@ -170,14 +170,14 @@ Expanding - + 20 20 - + filecontextaddButton @@ -188,7 +188,7 @@ true - + filecontextremoveButton @@ -209,7 +209,7 @@ Expanding - + 20 20 @@ -228,7 +228,7 @@ Expanding - + 20 20 @@ -237,7 +237,7 @@ - + dircontextTab @@ -248,12 +248,12 @@ unnamed - + dircontextBox - + Layout4 @@ -274,14 +274,14 @@ Expanding - + 20 20 - + dircontextaddButton @@ -292,7 +292,7 @@ true - + dircontextremoveButton @@ -313,7 +313,7 @@ Expanding - + 20 20 @@ -332,7 +332,7 @@ Expanding - + 20 20 @@ -397,14 +397,14 @@ kdialog.h - + dircontextaddClicked() filecontextaddClicked() filecontextremoveClicked() dircontextremoveClicked() toolsmenuaddClicked() toolsmenuremoveClicked() - - - + + + diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui index 149a1db1..4a5a8c98 100644 --- a/parts/uimode/uichooser.ui +++ b/parts/uimode/uichooser.ui @@ -1,6 +1,6 @@ UIChooser - + UIChooser @@ -22,15 +22,15 @@ 0 - + - layout1 + tqlayout1 unnamed - + TabModeGroup @@ -44,7 +44,7 @@ unnamed - + AlwaysShowTabs @@ -55,7 +55,7 @@ true - + NeverShowTabs @@ -65,7 +65,7 @@ - + HoverCloseGroup @@ -82,7 +82,7 @@ unnamed - + DoNotCloseOnHover @@ -93,7 +93,7 @@ true - + DoCloseOnHover @@ -105,15 +105,15 @@ - + - layout2 + tqlayout2 unnamed - + IDEAlButtonGroup @@ -127,7 +127,7 @@ unnamed - + IconsOnly @@ -135,7 +135,7 @@ Icons - + TextOnly @@ -146,7 +146,7 @@ true - + TextAndIcons @@ -156,7 +156,7 @@ - + TabbedBrowsingGroup @@ -170,7 +170,7 @@ unnamed - + OpenNewTabAfterCurrent @@ -178,7 +178,7 @@ Open &new tab after current tab - + ShowTabIcons @@ -186,7 +186,7 @@ &Show icons on document tabs - + ShowCloseTabsButton @@ -198,7 +198,7 @@ - + textLabel1 @@ -213,7 +213,7 @@ Note: Changes will take effect after KDevelop is restarted - + WordBreak|AlignCenter @@ -242,9 +242,9 @@ kdialog.h - + maybeEnableCloseOnHover(bool) - - - + + + diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index 855f4daf..64a07b70 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -18,8 +18,8 @@ typedef KDevGenericFactory UIChooserFactory; static const KDevPluginInfo data("kdevuichooser"); K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) -UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin( &data, parent, name ? name : "UIChooserPart") +UIChooserPart::UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin( &data, tqparent, name ? name : "UIChooserPart") { setInstance(UIChooserFactory::instance()); diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h index 5f0826fa..1e48d35b 100644 --- a/parts/uimode/uichooser_part.h +++ b/parts/uimode/uichooser_part.h @@ -15,9 +15,10 @@ class ConfigWidgetProxy; class UIChooserPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - UIChooserPart(TQObject *parent, const char *name, const TQStringList &); + UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &); ~UIChooserPart(); private slots: diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index 2fe6b919..064380e0 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -27,8 +27,8 @@ #include "kdevmainwindow.h" #include "uichooser_widget.h" -UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name) - : UIChooser(parent, name) +UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *tqparent, const char *name) + : UIChooser(tqparent, name) ,m_part(part), _lastMode(0L) { load(); diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h index e9f7a7ed..4901f1af 100644 --- a/parts/uimode/uichooser_widget.h +++ b/parts/uimode/uichooser_widget.h @@ -12,6 +12,7 @@ class UIChooserPart; class UIChooserWidget : public UIChooser { Q_OBJECT + TQ_OBJECT public: @@ -20,7 +21,7 @@ public: _NeverShowTabs = 2 }; - UIChooserWidget( UIChooserPart * part, TQWidget *parent=0, const char *name=0 ); + UIChooserWidget( UIChooserPart * part, TQWidget *tqparent=0, const char *name=0 ); public slots: void accept(); diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui index 35ded9c1..3bdd854c 100644 --- a/parts/valgrind/dialog_widget.ui +++ b/parts/valgrind/dialog_widget.ui @@ -1,6 +1,6 @@ DialogWidget - + DialogWidget @@ -16,7 +16,7 @@ unnamed - + groupBox1 @@ -32,7 +32,7 @@ executableEdit - + textLabel3 @@ -43,7 +43,7 @@ paramEdit - + textLabel2 @@ -61,11 +61,11 @@ - + stack - + WStackPage @@ -79,7 +79,7 @@ 0 - + groupBox2 @@ -90,7 +90,7 @@ unnamed - + memleakBox @@ -101,9 +101,9 @@ true - + - layout2 + tqlayout2 @@ -122,14 +122,14 @@ Fixed - + 20 20 - + reachableBox @@ -139,17 +139,17 @@ - + - childrenBox + tqchildrenBox - &Trace children + &Trace tqchildren - + - layout3 + tqlayout3 @@ -158,7 +158,7 @@ 0 - + textLabel5 @@ -179,7 +179,7 @@ valExecutableEdit - + textLabel4 @@ -196,7 +196,7 @@ - + WStackPage @@ -210,7 +210,7 @@ 0 - + groupBox3 @@ -221,9 +221,9 @@ unnamed - + - layout3_2 + tqlayout3_2 @@ -232,7 +232,7 @@ 0 - + textLabel5_2 @@ -253,7 +253,7 @@ ctExecutableEdit - + textLabel4_2 @@ -266,17 +266,17 @@ - + ctChildrenBox - &Trace children + &Trace tqchildren - + groupBox4 @@ -292,7 +292,7 @@ kcExecutableEdit - + textLabel4_2_2 @@ -323,7 +323,7 @@ paramEdit memleakBox reachableBox - childrenBox + tqchildrenBox valExecutableEdit valParamEdit ctChildrenBox @@ -334,12 +334,12 @@ kdialog.h - + checkBoxToggled() init() - - - + + + kurlrequester.h klineedit.h diff --git a/parts/valgrind/dialog_widget.ui.h b/parts/valgrind/dialog_widget.ui.h index 9a2570ae..70f1d5f8 100644 --- a/parts/valgrind/dialog_widget.ui.h +++ b/parts/valgrind/dialog_widget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 67c05c56..247eaee1 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -16,8 +16,8 @@ #include "valgrind_dialog.moc" -ValgrindDialog::ValgrindDialog( Type type, TQWidget* parent ) - : KDialogBase( parent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ), +ValgrindDialog::ValgrindDialog( Type type, TQWidget* tqparent ) + : KDialogBase( tqparent, "valgrind dialog", true, i18n("Valgrind Memory Check"), Ok|Cancel ), m_type(type) { w = new DialogWidget( this ); @@ -89,7 +89,7 @@ void ValgrindDialog::setValExecutable( const TQString& ve ) 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" ); +static const TQString tqchildrenParam( "--trace-tqchildren=yes" ); TQString ValgrindDialog::valParams() const { @@ -100,8 +100,8 @@ TQString ValgrindDialog::valParams() const params += " " + leakCheckParam; if ( w->reachableBox->isChecked() ) params += " " + reachableParam; - if ( w->childrenBox->isChecked() ) - params += " " + childrenParam; + if ( w->tqchildrenBox->isChecked() ) + params += " " + tqchildrenParam; return params; } @@ -109,18 +109,18 @@ TQString ValgrindDialog::valParams() const void ValgrindDialog::setValParams( const TQString& params ) { TQString myParams = params; - if ( myParams.contains( leakCheckParam ) ) + if ( myParams.tqcontains( leakCheckParam ) ) w->memleakBox->setChecked( true ); - if ( myParams.contains( reachableParam ) ) + if ( myParams.tqcontains( reachableParam ) ) w->reachableBox->setChecked( true ); - if ( myParams.contains( childrenParam ) ) - w->childrenBox->setChecked( true ); + if ( myParams.tqcontains( tqchildrenParam ) ) + w->tqchildrenBox->setChecked( true ); w->init(); - myParams = myParams.replace( TQRegExp( memCheckParam ), "" ); - myParams = myParams.replace( TQRegExp( leakCheckParam ), "" ); - myParams = myParams.replace( TQRegExp( reachableParam ), "" ); - myParams = myParams.replace( TQRegExp( childrenParam ), "" ); + myParams = myParams.tqreplace( TQRegExp( memCheckParam ), "" ); + myParams = myParams.tqreplace( TQRegExp( leakCheckParam ), "" ); + myParams = myParams.tqreplace( TQRegExp( reachableParam ), "" ); + myParams = myParams.tqreplace( TQRegExp( tqchildrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->valParamEdit->setText( myParams ); } @@ -150,7 +150,7 @@ TQString ValgrindDialog::ctParams() const { TQString params = w->ctParamEdit->text(); if ( w->ctChildrenBox->isChecked() ) - params += " " + childrenParam; + params += " " + tqchildrenParam; return params; } @@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params ) //force --tool=callgrind if no params are given if (myParams.isEmpty()) myParams = "--tool=callgrind"; - if ( myParams.contains( childrenParam ) ) + if ( myParams.tqcontains( tqchildrenParam ) ) w->ctChildrenBox->setChecked( true ); w->init(); - myParams = myParams.replace( TQRegExp( childrenParam ), "" ); + myParams = myParams.tqreplace( TQRegExp( tqchildrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->ctParamEdit->setText( myParams ); } diff --git a/parts/valgrind/valgrind_dialog.h b/parts/valgrind/valgrind_dialog.h index a57d4529..d3422b80 100644 --- a/parts/valgrind/valgrind_dialog.h +++ b/parts/valgrind/valgrind_dialog.h @@ -14,10 +14,11 @@ class DialogWidget; class ValgrindDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum Type { Memcheck = 0, Calltree = 1 }; - ValgrindDialog( Type type, TQWidget* parent = 0 ); + ValgrindDialog( Type type, TQWidget* tqparent = 0 ); ~ValgrindDialog(); // the app to check diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 801d1c2a..064129cf 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -26,8 +26,8 @@ typedef KDevGenericFactory ValgrindFactory; static const KDevPluginInfo data("kdevvalgrind"); K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) -ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) - : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) +ValgrindPart::ValgrindPart( TQObject *tqparent, const char *name, const TQStringList& ) + : KDevPlugin( &data, tqparent, name ? name : "ValgrindPart" ) { setInstance( ValgrindFactory::instance() ); setXMLFile( "kdevpart_valgrind.rc" ); @@ -87,13 +87,13 @@ void ValgrindPart::projectOpened() void ValgrindPart::loadOutput() { - TQString fName = KFileDialog::getOpenFileName(TQString::null, "*", 0, i18n("Open Valgrind Output")); + TQString fName = KFileDialog::getOpenFileName(TQString(), "*", 0, i18n("Open Valgrind Output")); if ( fName.isEmpty() ) return; TQFile f( fName ); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) ); + KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").tqarg(fName) ); return; } @@ -206,9 +206,9 @@ void ValgrindPart::slotStopButtonClicked( KDevPlugin* which ) void ValgrindPart::clear() { m_widget->clear(); - currentMessage = TQString::null; + currentMessage = TQString(); currentPid = -1; - lastPiece = TQString::null; + lastPiece = TQString(); } void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, const TQString& valExec, const TQString& valParams ) @@ -234,7 +234,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co DomUtil::PairList::ConstIterator it; for (it = run_envvars.begin(); it != run_envvars.end(); ++it) { - envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second); + envVarList << TQString("%1=\"%2\" ").tqarg((*it).first).tqarg((*it).second); } *proc << envVarList.join("") << valExec << valParams << exec << params; @@ -269,7 +269,7 @@ void ValgrindPart::receivedString( const TQString& str ) lastPiece = lines.back(); lines.pop_back(); } else { - lastPiece = TQString::null; + lastPiece = TQString(); } appendMessages( lines ); } @@ -286,7 +286,7 @@ void ValgrindPart::appendMessages( const TQStringList& lines ) if ( valRe.cap( 2 ).isEmpty() ) { appendMessage( currentMessage ); - currentMessage = TQString::null; + currentMessage = TQString(); } else if ( cPid != currentPid ) { appendMessage( currentMessage ); currentMessage = *it; @@ -303,8 +303,8 @@ void ValgrindPart::processExited( KProcess* p ) { if ( p == proc ) { appendMessage( currentMessage + lastPiece ); - currentMessage = TQString::null; - lastPiece = TQString::null; + currentMessage = TQString(); + lastPiece = TQString(); core()->running( this, false ); if (kcInfo.runKc) @@ -312,7 +312,7 @@ void ValgrindPart::processExited( KProcess* p ) KProcess *kcProc = new KProcess; // kcProc->setWorkingDirectory(kcInfo.kcWorkDir); *kcProc << kcInfo.kcPath; - *kcProc << TQString("callgrind.out.%1").arg(p->pid()); + *kcProc << TQString("callgrind.out.%1").tqarg(p->pid()); kcProc->start(KProcess::DontCare); } } diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h index 6453dd8f..f7e3a4cf 100644 --- a/parts/valgrind/valgrind_part.h +++ b/parts/valgrind/valgrind_part.h @@ -16,9 +16,10 @@ class KProcess; class ValgrindPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - ValgrindPart( TQObject *parent, const char *name, const TQStringList & ); + ValgrindPart( TQObject *tqparent, const char *name, const TQStringList & ); ~ValgrindPart(); void runValgrind( const TQString& exec, const TQString& parameters, const TQString& valExec, const TQString& valParameters ); diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 39c51094..00eca21e 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -21,18 +21,18 @@ #define VALLISTVIEWITEMRTTI 130977 // helper class to sort the ListView by item number instead of the string representation of the item number -class ValListViewItem: public QListViewItem +class ValListViewItem: public TQListViewItem { public: - ValListViewItem( TQListView* parent, int key, int pid, const TQString& message ): - TQListViewItem( parent, TQString::number( key ), TQString::number( pid ), message ), + ValListViewItem( TQListView* tqparent, int key, int pid, const TQString& message ): + TQListViewItem( tqparent, 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 TQString& message, const TQString& filename, int line, bool active ): - TQListViewItem( parent, TQString::number( key ), TQString::null, message ), + ValListViewItem( ValListViewItem* tqparent, int key, int pid, const TQString& message, const TQString& filename, int line, bool active ): + TQListViewItem( tqparent, TQString::number( key ), TQString(), message ), _key( key ), _pid( pid ), backtrace( true ), _filename( filename ), _line( line ), _active( active ) { - if ( parent->_pid != _pid && _pid > 0 ) + if ( tqparent->_pid != _pid && _pid > 0 ) setText( 1, TQString::number( _pid ) ); } diff --git a/parts/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h index 8f75e7e4..ab9c1a22 100644 --- a/parts/valgrind/valgrind_widget.h +++ b/parts/valgrind/valgrind_widget.h @@ -12,9 +12,10 @@ class KListView; class TQListViewItem; class TQPopupMenu; -class ValgrindWidget : public QWidget +class ValgrindWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: ValgrindWidget( ValgrindPart *part ); diff --git a/parts/valgrind/valgrinditem.h b/parts/valgrind/valgrinditem.h index 14e3bb07..d2093910 100644 --- a/parts/valgrind/valgrinditem.h +++ b/parts/valgrind/valgrinditem.h @@ -8,7 +8,7 @@ class ValgrindBacktraceItem { public: enum Type { Unknown, SourceCode, Library }; - ValgrindBacktraceItem( const TQString& rawOutput = TQString::null ); + ValgrindBacktraceItem( const TQString& rawOutput = TQString() ); ~ValgrindBacktraceItem(); TQString message() const { return _message; } diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index 58ef9444..16cad089 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") +VCSManagerPart::VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, tqparent, name ? name : "VCSManagerPart") { kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; @@ -95,7 +95,7 @@ void VCSManagerPart::loadVCSPlugin() m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace(); if ( m_vcsPluginName.isEmpty() ) return; - TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName ); + TQString constraint = TQString( "DesktopEntryName=='%1'" ).tqarg( m_vcsPluginName ); pluginController()->loadPlugin( "KDevelop/VersionControl", constraint ); } diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index 2d8cf63d..2d135b73 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -38,8 +38,9 @@ Please read the README.dox file for more info about this part class VCSManagerPart: public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args); + VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &args); ~VCSManagerPart(); TQString vcsPlugin(); void loadVCSPlugin(); diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp index 9a081f3a..2202484b 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp +++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp @@ -28,8 +28,8 @@ #include "vcsmanagerprojectconfig.h" #include "vcsmanagerpart.h" -VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent, const char *name ) - : VCSManagerProjectConfigBase( parent, name ), m_part( part ) +VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent, const char *name ) + : VCSManagerProjectConfigBase( tqparent, name ), m_part( part ) { setup(); } @@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( ) int current = 0; - TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString("[X-KDevelop-Version] == %1").tqarg(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 c452ac41..9dbe0b27 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfig.h +++ b/parts/vcsmanager/vcsmanagerprojectconfig.h @@ -29,8 +29,9 @@ class VCSManagerPart; class VCSManagerProjectConfig: public VCSManagerProjectConfigBase { Q_OBJECT + TQ_OBJECT public: - VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0); + VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent = 0, const char *name = 0); public slots: void accept(); diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui index 735a018f..471e3efa 100644 --- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui +++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui @@ -1,6 +1,6 @@ VCSManagerProjectConfigBase - + VCSManagerProjectConfigBase @@ -19,18 +19,18 @@ unnamed - + textLabel1 Version control system to use for this project: - + WordBreak|AlignVCenter - + vcsCombo @@ -45,7 +45,7 @@ Expanding - + 31 131 @@ -54,5 +54,5 @@ - + -- cgit v1.2.1