From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:43 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kfilereplace/commandengine.cpp | 6 +- kfilereplace/configurationclasses.cpp | 4 +- kfilereplace/kaddstringdlg.cpp | 6 +- kfilereplace/kaddstringdlgs.ui | 26 +-- kfilereplace/kfilereplacelib.cpp | 8 +- kfilereplace/kfilereplacepart.cpp | 46 ++--- kfilereplace/kfilereplaceview.cpp | 18 +- kfilereplace/kfilereplaceviewwdg.ui | 14 +- kfilereplace/knewprojectdlg.cpp | 2 +- kfilereplace/knewprojectdlgs.ui | 28 +-- kfilereplace/koptionsdlgs.ui | 6 +- kfilereplace/report.cpp | 6 +- kimagemapeditor/drawzone.cpp | 6 +- kimagemapeditor/drawzone.h | 2 +- kimagemapeditor/imagemap.cpp | 2 +- kimagemapeditor/kimagemapeditor.cpp | 72 +++---- kimagemapeditor/kimearea.cpp | 80 ++++---- kimagemapeditor/kimearea.h | 4 +- kimagemapeditor/kimecommands.cpp | 20 +- kimagemapeditor/kimedialogs.cpp | 156 +++++++-------- kimagemapeditor/kimedialogs.h | 2 +- kimagemapeditor/kimeshell.cpp | 4 +- klinkstatus/data/styles/results_stylesheet.xsl | 2 +- klinkstatus/src/actionmanager.cpp | 2 +- klinkstatus/src/engine/linkchecker.cpp | 82 ++++---- klinkstatus/src/engine/linkchecker.h | 14 +- klinkstatus/src/engine/linkfilter.cpp | 6 +- klinkstatus/src/engine/linkfilter.h | 10 +- klinkstatus/src/engine/linkstatus.cpp | 58 +++--- klinkstatus/src/engine/linkstatus.h | 42 ++-- klinkstatus/src/engine/linkstatus_impl.h | 142 +++++++------- klinkstatus/src/engine/searchmanager.cpp | 80 ++++---- klinkstatus/src/engine/searchmanager.h | 32 +-- klinkstatus/src/engine/searchmanager_impl.h | 2 +- klinkstatus/src/klinkstatus.lsm | 2 +- klinkstatus/src/parser/url.cpp | 6 +- klinkstatus/src/parser/url.h | 8 +- klinkstatus/src/ui/documentrootdialog.cpp | 2 +- klinkstatus/src/ui/resultssearchbar.cpp | 34 ++-- klinkstatus/src/ui/resultssearchbar.h | 4 +- klinkstatus/src/ui/resultview.cpp | 42 ++-- klinkstatus/src/ui/resultview.h | 16 +- klinkstatus/src/ui/sessionwidget.cpp | 22 +-- klinkstatus/src/ui/sessionwidget.h | 6 +- klinkstatus/src/ui/sessionwidgetbase.ui | 44 ++--- .../ui/settings/configidentificationdialogui.ui | 2 +- klinkstatus/src/ui/settings/configsearchdialog.ui | 8 +- klinkstatus/src/ui/tablelinkstatus.cpp | 158 +++++++-------- klinkstatus/src/ui/tablelinkstatus.h | 30 +-- klinkstatus/src/ui/tabwidgetsession.cpp | 6 +- klinkstatus/src/ui/tabwidgetsession.h | 4 +- klinkstatus/src/ui/treeview.cpp | 108 +++++------ klinkstatus/src/ui/treeview.h | 16 +- klinkstatus/src/utils/xsl.cpp | 50 ++--- kommander/Kommander-TODO.kno | 8 +- kommander/editor/actiondnd.cpp | 62 +++--- kommander/editor/actiondnd.h | 2 +- kommander/editor/actioneditor.ui | 2 +- kommander/editor/assoctexteditor.ui | 8 +- kommander/editor/assoctexteditorimpl.cpp | 14 +- kommander/editor/choosewidget.ui | 8 +- kommander/editor/choosewidgetimpl.cpp | 6 +- kommander/editor/choosewidgetimpl.h | 2 +- kommander/editor/command.cpp | 80 ++++---- kommander/editor/command.h | 14 +- kommander/editor/connectioneditor.ui | 14 +- kommander/editor/connectioneditorimpl.cpp | 24 +-- kommander/editor/createtemplate.ui | 6 +- kommander/editor/filechooser.cpp | 10 +- kommander/editor/formfile.cpp | 8 +- kommander/editor/formsettings.ui | 4 +- kommander/editor/formwindow.cpp | 84 ++++---- kommander/editor/functions.ui | 38 ++-- kommander/editor/functionsimpl.cpp | 26 +-- kommander/editor/hierarchyview.cpp | 12 +- kommander/editor/iconvieweditor.ui | 10 +- kommander/editor/iconvieweditorimpl.cpp | 2 +- kommander/editor/kommander-new.xml | 4 +- kommander/editor/kommander.xml | 8 +- kommander/editor/layout.cpp | 66 +++---- kommander/editor/layout.h | 14 +- kommander/editor/listboxeditor.ui | 10 +- kommander/editor/listboxeditorimpl.cpp | 2 +- kommander/editor/listeditor.ui | 2 +- kommander/editor/listvieweditor.ui | 18 +- kommander/editor/listvieweditorimpl.cpp | 2 +- kommander/editor/mainwindow.cpp | 70 +++---- kommander/editor/mainwindowactions.cpp | 54 +++--- kommander/editor/messagelog.cpp | 12 +- kommander/editor/metadatabase.cpp | 48 ++--- kommander/editor/metadatabase.h | 2 +- kommander/editor/multilineeditor.ui | 4 +- kommander/editor/multilineeditorimpl.cpp | 4 +- kommander/editor/newform.ui | 4 +- kommander/editor/newformimpl.cpp | 2 +- kommander/editor/paletteeditor.ui | 14 +- kommander/editor/paletteeditoradvanced.ui | 10 +- kommander/editor/paletteeditoradvancedimpl.cpp | 12 +- kommander/editor/parser.cpp | 2 +- kommander/editor/pics/images.h | 12 +- kommander/editor/pixmapchooser.cpp | 4 +- kommander/editor/pixmapfunction.ui | 6 +- kommander/editor/preferences.ui | 4 +- kommander/editor/previewframe.cpp | 2 +- kommander/editor/previewwidget.ui | 4 +- kommander/editor/propertyeditor.cpp | 126 ++++++------ kommander/editor/propertyeditor.h | 6 +- kommander/editor/qcompletionedit.cpp | 4 +- kommander/editor/resource.cpp | 110 +++++------ kommander/editor/resource.h | 6 +- kommander/editor/sizehandle.cpp | 14 +- kommander/editor/styledbutton.cpp | 22 +-- kommander/editor/styledbutton.h | 4 +- kommander/editor/tableeditor.ui | 18 +- kommander/editor/tableeditorimpl.cpp | 2 +- kommander/editor/templates/Configuration_Dialog.ui | 2 +- .../templates/Dialog_with_Buttons_(Bottom).ui | 2 +- .../templates/Dialog_with_Buttons_(Right).ui | 2 +- kommander/editor/templates/Tab_Dialog.ui | 2 +- kommander/editor/widgetdatabase.cpp | 4 +- kommander/editor/widgetfactory.cpp | 162 ++++++++-------- kommander/editor/widgetfactory.h | 18 +- kommander/editor/wizardeditor.ui | 4 +- kommander/editor/wizardeditorimpl.cpp | 14 +- kommander/editor/workspace.cpp | 6 +- kommander/examples/current/a1.kmdr | 8 +- kommander/examples/current/b1.kmdr | 4 +- kommander/examples/current/kpartpart.kmdr | 4 +- kommander/examples/current/passvariables.kmdr | 18 +- kommander/examples/current/tableselect.kmdr | 4 +- kommander/examples/old/execprogram.kmdr | 4 +- kommander/examples/old/resize.kmdr | 4 +- kommander/examples/old/selectedwidgettext.kmdr | 2 +- kommander/examples/old/settings.kmdr | 4 +- kommander/examples/old/tar.kmdr | 8 +- kommander/examples/old/tidy.kmdr | 4 +- kommander/examples/old/widgetgenerator.kmdr | 4 +- kommander/examples/tutorial/append.kmdr | 4 +- kommander/examples/tutorial/arrays.kmdr | 4 +- kommander/examples/tutorial/calc.kmdr | 14 +- kommander/examples/tutorial/cmdline.kmdr | 4 +- kommander/examples/tutorial/dcop.kmdr | 4 +- kommander/examples/tutorial/initialize.kmdr | 4 +- kommander/examples/tutorial/picview.kmdr | 4 +- kommander/examples/tutorial/progressbar.kmdr | 4 +- kommander/examples/tutorial/settings.kmdr | 8 +- kommander/examples/tutorial/slots.kmdr | 4 +- kommander/examples/tutorial/strings.kmdr | 4 +- kommander/examples/tutorial/table.kmdr | 2 +- kommander/examples/tutorial/widgets.kmdr | 2 +- kommander/executor/dcopkommanderif.h | 2 +- kommander/executor/instance.cpp | 8 +- kommander/executor/instance.h | 2 +- kommander/factory/kommanderfactory.cpp | 136 ++++++------- kommander/factory/kommanderfactory.h | 6 +- kommander/kmdrtools/dcoptool-oldparser.kmdr | 18 +- kommander/kmdrtools/examples.kmdr | 4 +- kommander/part/kommander_part.cpp | 2 +- kommander/plugin/specialinformation.cpp | 12 +- kommander/plugin/specials.h | 6 +- kommander/pluginmanager/main.cpp | 4 +- kommander/pluginmanager/mainwindow.cpp | 2 +- kommander/widget/functionlib.cpp | 18 +- kommander/widget/kommanderfunctions.cpp | 16 +- kommander/widget/kommanderwidget.cpp | 46 ++--- kommander/widget/myprocess.cpp | 2 +- kommander/widget/parser.cpp | 24 +-- kommander/widgets/aboutdialog.cpp | 2 +- kommander/widgets/buttongroup.cpp | 4 +- kommander/widgets/checkbox.cpp | 4 +- kommander/widgets/combobox.cpp | 4 +- kommander/widgets/datepicker.cpp | 4 +- kommander/widgets/dialog.cpp | 12 +- kommander/widgets/execbutton.cpp | 10 +- kommander/widgets/fileselector.cpp | 8 +- kommander/widgets/groupbox.cpp | 4 +- kommander/widgets/label.cpp | 4 +- kommander/widgets/lineedit.cpp | 6 +- kommander/widgets/lineedit.h | 2 +- kommander/widgets/listbox.cpp | 4 +- kommander/widgets/pixmaplabel.cpp | 4 +- kommander/widgets/popupmenu.cpp | 6 +- kommander/widgets/progressbar.cpp | 8 +- kommander/widgets/radiobutton.cpp | 4 +- kommander/widgets/richtexteditor.cpp | 30 +-- kommander/widgets/spinboxint.cpp | 4 +- kommander/widgets/table.cpp | 6 +- kommander/widgets/textedit.cpp | 6 +- kommander/widgets/toolbox.cpp | 4 +- kommander/widgets/treewidget.cpp | 10 +- kommander/working/plugintemplate/widget.cpp | 2 +- kxsldbg/kxsldbg.cpp | 4 +- kxsldbg/kxsldbgpart/kxsldbg_part.cpp | 16 +- kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp | 6 +- kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp | 2 +- kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp | 40 ++-- kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp | 8 +- kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp | 82 ++++---- kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp | 84 ++++---- kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp | 28 +-- kxsldbg/kxsldbgpart/libxsldbg/files.cpp | 22 +-- kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp | 40 ++-- kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp | 26 +-- kxsldbg/kxsldbgpart/libxsldbg/options.cpp | 22 +-- kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp | 8 +- kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp | 20 +- kxsldbg/kxsldbgpart/libxsldbg/search.cpp | 8 +- kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp | 20 +- kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp | 4 +- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 46 ++--- kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp | 22 +-- kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h | 8 +- kxsldbg/kxsldbgpart/qxsldbgdoc.cpp | 2 +- kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui | 22 +-- kxsldbg/kxsldbgpart/xsldbgcallstack.ui | 4 +- kxsldbg/kxsldbgpart/xsldbgconfig.ui | 24 +-- kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp | 2 +- kxsldbg/kxsldbgpart/xsldbgdebugger.cpp | 6 +- kxsldbg/kxsldbgpart/xsldbgentities.ui | 6 +- kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui | 10 +- kxsldbg/kxsldbgpart/xsldbginspector.cpp | 2 +- kxsldbg/kxsldbgpart/xsldbglocalvariables.ui | 14 +- kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui | 6 +- kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgoutputview.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgoutputview.h | 2 +- kxsldbg/kxsldbgpart/xsldbgsources.ui | 4 +- kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui | 14 +- kxsldbg/xsldbgmain.cpp | 8 +- lib/compatibility/kmdi/qextmdi/kdemacros.h.in | 2 +- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 214 ++++++++++----------- lib/compatibility/kmdi/qextmdi/kdockwidget.h | 28 +-- lib/compatibility/kmdi/qextmdi/kdockwidget_p.h | 4 +- .../kmdi/qextmdi/kdockwidget_private.cpp | 70 +++---- lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp | 16 +- lib/compatibility/kmdi/qextmdi/kmdichildarea.h | 16 +- lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp | 84 ++++---- lib/compatibility/kmdi/qextmdi/kmdichildfrm.h | 8 +- .../kmdi/qextmdi/kmdichildfrmcaption.cpp | 4 +- lib/compatibility/kmdi/qextmdi/kmdichildview.cpp | 34 ++-- lib/compatibility/kmdi/qextmdi/kmdichildview.h | 16 +- lib/compatibility/kmdi/qextmdi/kmdidefines.h | 2 +- .../kmdi/qextmdi/kmdidockcontainer.cpp | 34 ++-- .../kmdi/qextmdi/kmdidocumentviewtabwidget.cpp | 6 +- lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp | 8 +- lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp | 54 +++--- lib/compatibility/kmdi/qextmdi/kmdimainfrm.h | 4 +- lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp | 10 +- lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp | 112 +++++------ lib/compatibility/kmdi/qextmdi/kmultitabbar.h | 4 +- lib/compatibility/kmdi/qextmdi/ktabbar.cpp | 22 +-- lib/compatibility/kmdi/qextmdi/ktabwidget.cpp | 10 +- lib/compatibility/knewstuff/downloaddialog.cpp | 44 ++--- lib/compatibility/knewstuff/downloaddialog.h | 2 +- lib/compatibility/knewstuff/engine.cpp | 6 +- lib/compatibility/knewstuff/entry.cpp | 2 +- lib/compatibility/knewstuff/knewstuff.cpp | 2 +- lib/compatibility/knewstuff/knewstuffgeneric.cpp | 4 +- lib/compatibility/knewstuff/knewstuffsecure.cpp | 6 +- lib/compatibility/knewstuff/providerdialog.cpp | 2 +- lib/compatibility/knewstuff/security.cpp | 2 +- lib/compatibility/knewstuff/uploaddialog.cpp | 2 +- quanta/Quanta-3.3-plan.kno | 16 +- quanta/components/csseditor/colorrequester.cpp | 2 +- quanta/components/csseditor/colorslider.cpp | 6 +- quanta/components/csseditor/csseditor.cpp | 6 +- quanta/components/csseditor/csseditors.ui | 12 +- quanta/components/csseditor/cssselector.cpp | 2 +- quanta/components/csseditor/cssselectors.ui | 50 ++--- quanta/components/csseditor/data/config.xml | 8 +- quanta/components/csseditor/encodingselector.cpp | 2 +- quanta/components/csseditor/encodingselectors.ui | 8 +- quanta/components/csseditor/fontfamilychooser.cpp | 12 +- quanta/components/csseditor/fontfamilychoosers.ui | 44 ++--- quanta/components/csseditor/propertysetter.cpp | 2 +- quanta/components/csseditor/styleeditor.cpp | 2 +- quanta/components/csseditor/stylesheetparser.cpp | 4 +- quanta/components/csseditor/tlpeditors.cpp | 2 +- quanta/components/cvsservice/cvscommitdlgs.ui | 2 +- quanta/components/cvsservice/cvsservice.cpp | 20 +- quanta/components/cvsservice/cvsupdatetodlgs.ui | 8 +- .../debugger/conditionalbreakpointdialogs.ui | 14 +- quanta/components/debugger/dbgp/dbgpnetwork.cpp | 6 +- quanta/components/debugger/dbgp/dbgpsettingss.ui | 10 +- quanta/components/debugger/dbgp/qbytearrayfifo.cpp | 2 +- .../debugger/dbgp/quantadebuggerdbgp.cpp | 54 +++--- .../components/debugger/dbgp/quantadebuggerdbgp.h | 2 +- quanta/components/debugger/debuggermanager.cpp | 12 +- quanta/components/debugger/debuggermanager.h | 2 +- quanta/components/debugger/debuggerui.cpp | 6 +- quanta/components/debugger/debuggerui.h | 6 +- quanta/components/debugger/debuggervariable.cpp | 6 +- quanta/components/debugger/debuggervariablesets.ui | 6 +- quanta/components/debugger/gubed/gubedsettingss.ui | 18 +- .../debugger/gubed/quantadebuggergubed.cpp | 70 +++---- .../debugger/gubed/quantadebuggergubed.h | 2 +- .../debugger/interfaces/debuggerclient.cpp | 10 +- .../debugger/interfaces/debuggerclient.h | 2 +- .../debugger/interfaces/debuggerinterface.h | 2 +- quanta/components/debugger/pathmapper.cpp | 2 +- quanta/components/debugger/pathmapperdialog.cpp | 2 +- quanta/components/debugger/pathmapperdialogs.ui | 6 +- .../debugger/quantadebuggerinterface.cpp | 4 +- .../components/debugger/quantadebuggerinterface.h | 2 +- quanta/components/debugger/variableslistview.cpp | 16 +- quanta/components/framewizard/areaattributedb.h | 6 +- quanta/components/framewizard/fmfpeditors.ui | 4 +- quanta/components/framewizard/fmrceditors.ui | 6 +- quanta/components/framewizard/framewizards.ui | 12 +- quanta/components/framewizard/selectablearea.cpp | 2 +- quanta/components/framewizard/treenode.cpp | 22 +-- quanta/components/framewizard/treenode.h | 24 +-- .../components/framewizard/visualframeeditor.cpp | 28 +-- quanta/components/framewizard/visualframeeditor.h | 2 +- quanta/components/tableeditor/tableeditor.cpp | 24 +-- quanta/components/tableeditor/tableeditors.ui | 14 +- quanta/components/tableeditor/tableitem.cpp | 6 +- quanta/components/tableeditor/tableitem.h | 10 +- quanta/dialogs/actionconfigdialog.cpp | 10 +- quanta/dialogs/actionconfigdialogs.ui | 22 +-- quanta/dialogs/casewidget.ui | 2 +- quanta/dialogs/debuggeroptionss.ui | 6 +- quanta/dialogs/dirtydialog.ui | 6 +- quanta/dialogs/dirtydlg.cpp | 2 +- quanta/dialogs/donationdialog.ui | 6 +- quanta/dialogs/dtdselectdialog.ui | 4 +- quanta/dialogs/dtepeditdlg.cpp | 24 +-- quanta/dialogs/dtepeditdlgs.ui | 16 +- quanta/dialogs/dtepstructureeditdlgs.ui | 10 +- quanta/dialogs/filecombo.cpp | 14 +- quanta/dialogs/fourbuttonmessagebox.ui | 8 +- quanta/dialogs/loadentitydlgs.ui | 2 +- quanta/dialogs/settings/abbreviation.cpp | 10 +- quanta/dialogs/settings/abbreviations.ui | 4 +- quanta/dialogs/settings/codetemplatedlgs.ui | 2 +- quanta/dialogs/settings/filemaskss.ui | 20 +- quanta/dialogs/settings/parseroptionsui.ui | 8 +- quanta/dialogs/settings/previewoptions.cpp | 12 +- quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/settings/previewoptionss.ui | 6 +- quanta/dialogs/settings/styleoptionss.ui | 8 +- quanta/dialogs/specialchardialog.cpp | 2 +- quanta/dialogs/specialchardialogs.ui | 12 +- quanta/dialogs/tagdialogs/colorcombo.cpp | 4 +- quanta/dialogs/tagdialogs/colorcombo.h | 2 +- quanta/dialogs/tagdialogs/listdlg.cpp | 2 +- quanta/dialogs/tagdialogs/pictureview.cpp | 2 +- quanta/dialogs/tagdialogs/tagattr.cpp | 2 +- quanta/dialogs/tagdialogs/tagdialog.cpp | 6 +- quanta/dialogs/tagdialogs/tagimgdlgdata.cpp | 2 +- quanta/dialogs/tagdialogs/tagmail.ui | 4 +- quanta/dialogs/tagdialogs/tagmisc.ui | 2 +- quanta/dialogs/tagdialogs/tagxml.cpp | 2 +- quanta/messages/annotationoutput.cpp | 8 +- quanta/messages/messageoutput.cpp | 10 +- quanta/parsers/dtd/dtd.cpp | 4 +- quanta/parsers/dtd/dtdparser.cpp | 24 +-- quanta/parsers/dtd/dtepcreationdlg.ui | 2 +- quanta/parsers/parser.cpp | 10 +- quanta/parsers/parsercommon.cpp | 2 +- quanta/parsers/qtag.h | 2 +- quanta/parsers/saparser.cpp | 12 +- quanta/parts/kafka/domtreeview.cpp | 4 +- quanta/parts/kafka/htmldocumentpropertiesui.ui | 14 +- quanta/parts/kafka/kafkacommon.cpp | 6 +- quanta/parts/kafka/kafkacommon.h | 10 +- quanta/parts/kafka/kafkadragobject.cpp | 6 +- quanta/parts/kafka/kafkadragobject.h | 2 +- quanta/parts/kafka/kafkahtmlpart.cpp | 4 +- quanta/parts/kafka/kafkahtmlpart.h | 2 +- quanta/parts/kafka/kafkasyncoptionsui.ui | 6 +- quanta/parts/kafka/undoredo.cpp | 4 +- quanta/parts/kafka/undoredo.h | 12 +- quanta/parts/kafka/wkafkapart.cpp | 10 +- quanta/parts/preview/whtmlpart.cpp | 8 +- quanta/parts/preview/whtmlpart.h | 2 +- quanta/plugins/pluginconfig.ui | 10 +- quanta/plugins/plugineditor.ui | 4 +- quanta/plugins/quantaplugin.cpp | 2 +- quanta/plugins/quantaplugininterface.cpp | 4 +- quanta/project/eventconfigurationdlg.cpp | 2 +- quanta/project/eventconfigurationdlgs.ui | 4 +- quanta/project/eventeditordlgs.ui | 2 +- quanta/project/project.cpp | 36 ++-- quanta/project/project.h | 8 +- quanta/project/projectlist.cpp | 4 +- quanta/project/projectnewfinal.cpp | 4 +- quanta/project/projectnewfinals.ui | 20 +- quanta/project/projectnewgeneral.cpp | 12 +- quanta/project/projectnewgenerals.ui | 36 ++-- quanta/project/projectnewlocal.cpp | 4 +- quanta/project/projectnewlocals.ui | 22 +-- quanta/project/projectnewwebs.ui | 18 +- quanta/project/projectoptions.ui | 14 +- quanta/project/projectprivate.cpp | 34 ++-- quanta/project/projectupload.cpp | 22 +-- quanta/project/projectuploads.ui | 10 +- quanta/project/projecturl.h | 12 +- quanta/project/rescanprj.cpp | 6 +- quanta/project/rescanprjdir.ui | 8 +- quanta/project/teammembersdlg.cpp | 8 +- quanta/project/teammembersdlgs.ui | 4 +- quanta/project/uploadprofiledlgs.ui | 8 +- quanta/project/uploadprofilespage.ui | 4 +- quanta/quanta_uml.xmi | 2 +- quanta/scripts/checkxml.kmdr | 6 +- quanta/scripts/docbook_table.kmdr | 2 +- quanta/scripts/dwt.kmdr | 6 +- quanta/scripts/gubed_install.kmdr | 4 +- quanta/scripts/htmlquickstart.kmdr | 6 +- quanta/scripts/listwizard.kmdr | 4 +- quanta/scripts/meinproc.kmdr | 6 +- quanta/scripts/picturewizard.kmdr | 4 +- quanta/scripts/tablewizard.kmdr | 4 +- quanta/scripts/tidy.kmdr | 6 +- quanta/scripts/xmlval.kmdr | 12 +- quanta/scripts/xsltproc.kmdr | 2 +- quanta/src/document.cpp | 30 +-- quanta/src/document.h | 8 +- quanta/src/dtds.cpp | 24 +-- quanta/src/kqapp.cpp | 12 +- quanta/src/main.cpp | 2 +- quanta/src/quanta.cpp | 104 +++++----- quanta/src/quanta.h | 8 +- quanta/src/quanta_init.cpp | 54 +++--- quanta/src/quantadoc.cpp | 24 +-- quanta/src/quantadoc.h | 2 +- quanta/src/quantaview.cpp | 18 +- quanta/src/quantaview.h | 4 +- quanta/src/viewmanager.cpp | 36 ++-- quanta/treeviews/basetreeview.cpp | 40 ++-- quanta/treeviews/basetreeview.h | 4 +- quanta/treeviews/filestreeview.cpp | 6 +- quanta/treeviews/projecttreeview.cpp | 24 +-- quanta/treeviews/projecttreeview.h | 8 +- quanta/treeviews/quantapropertiespage.ui | 8 +- quanta/treeviews/scripttreeview.cpp | 2 +- quanta/treeviews/servertreeview.cpp | 2 +- quanta/treeviews/structtreetag.cpp | 8 +- quanta/treeviews/structtreeview.cpp | 4 +- quanta/treeviews/structtreeview.h | 2 +- quanta/treeviews/tagattributeitems.cpp | 8 +- quanta/treeviews/tagattributetree.cpp | 10 +- quanta/treeviews/templatedirform.ui | 8 +- quanta/treeviews/templatestreeview.cpp | 24 +-- quanta/treeviews/uploadtreefile.cpp | 4 +- quanta/treeviews/uploadtreeview.cpp | 22 +-- quanta/utility/qpevents.cpp | 16 +- quanta/utility/quantabookmarks.cpp | 10 +- quanta/utility/quantacommon.cpp | 16 +- quanta/utility/quantanetaccess.cpp | 8 +- quanta/utility/tagaction.cpp | 24 +-- quanta/utility/toolbartabwidget.cpp | 14 +- 456 files changed, 3514 insertions(+), 3514 deletions(-) diff --git a/kfilereplace/commandengine.cpp b/kfilereplace/commandengine.cpp index e8955556..6d4ef03a 100644 --- a/kfilereplace/commandengine.cpp +++ b/kfilereplace/commandengine.cpp @@ -19,7 +19,7 @@ // QT #include #include -#include +#include #include // KDE @@ -34,9 +34,9 @@ TQString CommandEngine::datetime(const TQString& opt, const TQString& arg) { Q_UNUSED(arg); if(opt == "iso") - return TQDateTime::tqcurrentDateTime(Qt::LocalTime).toString(Qt::ISODate); + return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::ISODate); if(opt == "local") - return TQDateTime::tqcurrentDateTime(Qt::LocalTime).toString(Qt::LocalDate); + return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::LocalDate); return TQString(); } diff --git a/kfilereplace/configurationclasses.cpp b/kfilereplace/configurationclasses.cpp index bb66c3ef..f0c6bcc4 100644 --- a/kfilereplace/configurationclasses.cpp +++ b/kfilereplace/configurationclasses.cpp @@ -164,8 +164,8 @@ TQString ResultViewEntry::capturedText(const TQString& line) TQString ResultViewEntry::message(const TQString& capturedText, int x, int y) const { TQString data = m_data; - //return i18n(" captured text \"%1\" replaced with \"%2\" at line: %3, column: %4 ").tqarg(capturedText).tqarg(data).tqarg(TQString::number(x,10)).tqarg(TQString::number(y,10)); - return i18n(" Line:%3,Col:%4 - \"%1\" -> \"%2\"").tqarg(capturedText).tqarg(data).tqarg(TQString::number(x,10)).tqarg(TQString::number(y,10)); + //return i18n(" captured text \"%1\" replaced with \"%2\" at line: %3, column: %4 ").arg(capturedText).arg(data).arg(TQString::number(x,10)).arg(TQString::number(y,10)); + return i18n(" Line:%3,Col:%4 - \"%1\" -> \"%2\"").arg(capturedText).arg(data).arg(TQString::number(x,10)).arg(TQString::number(y,10)); } int ResultViewEntry::keyLength() const diff --git a/kfilereplace/kaddstringdlg.cpp b/kfilereplace/kaddstringdlg.cpp index 9c555ee6..8eded32e 100644 --- a/kfilereplace/kaddstringdlg.cpp +++ b/kfilereplace/kaddstringdlg.cpp @@ -16,7 +16,7 @@ * * ***************************************************************************/ // QT -#include +#include #include #include #include @@ -58,8 +58,8 @@ KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, c //PRIVATE void KAddStringDlg::initGUI() { - m_pbAdd->setIconSet(SmallIconSet(TQString::tqfromLatin1("forward"))); - m_pbDel->setIconSet(SmallIconSet(TQString::tqfromLatin1("back"))); + m_pbAdd->setIconSet(SmallIconSet(TQString::fromLatin1("forward"))); + m_pbDel->setIconSet(SmallIconSet(TQString::fromLatin1("back"))); m_stack->addWidget(m_stringView); m_stack->addWidget(m_stringView_2); diff --git a/kfilereplace/kaddstringdlgs.ui b/kfilereplace/kaddstringdlgs.ui index 820b1769..563aa33f 100644 --- a/kfilereplace/kaddstringdlgs.ui +++ b/kfilereplace/kaddstringdlgs.ui @@ -24,7 +24,7 @@ - tqlayout14 + layout14 @@ -84,7 +84,7 @@ - tqlayout11 + layout11 @@ -92,7 +92,7 @@ - tqlayout13 + layout13 @@ -118,7 +118,7 @@ - tqlayout14 + layout14 @@ -155,7 +155,7 @@ - tqlayout16 + layout16 @@ -171,7 +171,7 @@ Expanding - + 20 90 @@ -180,7 +180,7 @@ - tqlayout15 + layout15 @@ -190,7 +190,7 @@ m_pbDel - + 30 32767 @@ -204,7 +204,7 @@ m_pbAdd - + 30 32767 @@ -229,7 +229,7 @@ Expanding - + 20 90 @@ -348,7 +348,7 @@ - tqlayout2 + layout2 @@ -375,7 +375,7 @@ Expanding - + 90 20 @@ -384,7 +384,7 @@ - tqlayout1 + layout1 diff --git a/kfilereplace/kfilereplacelib.cpp b/kfilereplace/kfilereplacelib.cpp index b9073dea..5a3bfcd4 100644 --- a/kfilereplace/kfilereplacelib.cpp +++ b/kfilereplace/kfilereplacelib.cpp @@ -102,19 +102,19 @@ TQString KFileReplaceLib::formatFileSize(double size) if(size >= kilo && size < mega) { double d = size / kilo; - stringSize = i18n("%1 KB").tqarg(TQString::number(d,'f',2)); + stringSize = i18n("%1 KB").arg(TQString::number(d,'f',2)); } else if(size >= mega && size < giga) { double d = size / mega; - stringSize = i18n("%1 MB").tqarg(TQString::number(d,'f',2)); + stringSize = i18n("%1 MB").arg(TQString::number(d,'f',2)); } else if(size >= giga) { double d = size / giga; - stringSize = i18n("%1 GB").tqarg(TQString::number(d,'f',2)); + stringSize = i18n("%1 GB").arg(TQString::number(d,'f',2)); } return stringSize; } @@ -137,7 +137,7 @@ void KFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, KListVi if(!f || (err != 1) || (pgm != "KFileReplace")) { - KMessageBox::error(0, i18n("Cannot open the file %1 and load the string list. This file seems not to be a valid old kfr file or it is broken.").tqarg(fileName)); + KMessageBox::error(0, i18n("Cannot open the file %1 and load the string list. This file seems not to be a valid old kfr file or it is broken.").arg(fileName)); return ; } diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index 2a7934e2..dae70133 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include // KDE #include @@ -161,7 +161,7 @@ void KFileReplacePart::slotSearchingOperation() void KFileReplacePart::slotReplacingOperation() { - if (KMessageBox::warningContinueCancel(m_w, i18n("You have selected %1 as the encoding of the files.
Selecting the correct encoding is very important as if you have files that have some other encoding than the selected one, after a replace you may damage those files.

In case you do not know the encoding of your files, select utf8 and enable the creation of backup files. This setting will autodetect utf8 and utf16 files, but the changed files will be converted to utf8.").tqarg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(m_w, i18n("You have selected %1 as the encoding of the files.
Selecting the correct encoding is very important as if you have files that have some other encoding than the selected one, after a replace you may damage those files.

In case you do not know the encoding of your files, select utf8 and enable the creation of backup files. This setting will autodetect utf8 and utf16 files, but the changed files will be converted to utf8.").arg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel) return; if(!checkBeforeOperation()) return; @@ -258,7 +258,7 @@ void KFileReplacePart::slotCreateReport() TQFileInfo fileInfo(documentName); if(fileInfo.exists()) { - KMessageBox::error(m_w, i18n("A folder or a file named %1 already exists.").tqarg(documentName)); + KMessageBox::error(m_w, i18n("A folder or a file named %1 already exists.").arg(documentName)); return ; } @@ -266,7 +266,7 @@ void KFileReplacePart::slotCreateReport() if(!directoryName.mkdir(documentName, true)) { - KMessageBox::error(m_w, i18n("Cannot create the %1 folder.").tqarg(documentName)); + KMessageBox::error(m_w, i18n("Cannot create the %1 folder.").arg(documentName)); return ; } @@ -1022,7 +1022,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri TQFile currentFile(oldPathString); if(!currentFile.open(IO_ReadOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").tqarg(oldFileName),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").arg(oldFileName),TQString(), rcNotifyOnErrors); return ; } TQTextStream currentStream(¤tFile); @@ -1061,7 +1061,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri TQFile newFile(oldPathString); if(!newFile.open(IO_WriteOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").tqarg(oldFileName),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").arg(oldFileName),TQString(), rcNotifyOnErrors); return ; } TQTextStream newStream(&newFile); @@ -1097,8 +1097,8 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri } item->setText(4,TQString::number(occurrence,10)); - item->setText(5,TQString("%1[%2]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId())); - item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId())); + item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId())); + item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(oldFileInfo.groupId())); } } @@ -1110,7 +1110,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS if (!oldFile.open(IO_ReadOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").tqarg(oldFile.name()),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").arg(oldFile.name()),TQString(), rcNotifyOnErrors); return ; } @@ -1139,7 +1139,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS TQFile newFile(oldPathString); if(!newFile.open(IO_WriteOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").tqarg(newFile.name()),TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for writing.").arg(newFile.name()),TQString(), rcNotifyOnErrors); return ; } TQTextStream newStream( &newFile ); @@ -1171,8 +1171,8 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS item->setText(3,"-"); item->setText(4,TQString::number(occurrence,10)); - item->setText(5,TQString("%1[%2]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId())); - item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId())); + item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId())); + item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(oldFileInfo.groupId())); } } @@ -1196,7 +1196,7 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool& if(askConfirmReplace) { int answer = KMessageBox::questionYesNo(0, - i18n("Do you want to replace the string %1 with the string %2?").tqarg(it.key()).tqarg(it.data()), + i18n("Do you want to replace the string %1 with the string %2?").arg(it.key()).arg(it.data()), i18n("Confirm Replace"), i18n("Replace"), i18n("Do Not Replace"), @@ -1332,7 +1332,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa if(!file.open(IO_ReadOnly)) { - KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").tqarg(fileName), TQString(), rcNotifyOnErrors); + KMessageBox::information(m_w, i18n("Cannot open file %1 for reading.").arg(fileName), TQString(), rcNotifyOnErrors); return ; } // Creates a stream with the file @@ -1403,7 +1403,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa else capturedText = line.mid(pos,strKey.length()); - msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10)); + msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10)); tempItem->setMultiLinesEnabled(true); tempItem->setText(0,msg); occurrence = 1; @@ -1443,7 +1443,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa pos = line.find(strKey,pos+strKey.length()); } - msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10)); + msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10)); if(!item) item = new KListViewItem(rv); @@ -1475,8 +1475,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa item->setText(1,currentDir); item->setText(2,KFileReplaceLib::formatFileSize(fileInfo.size())); item->setText(3,TQString::number(occurrence,10)); - item->setText(4,TQString("%1[%2]").tqarg(fileInfo.owner()).tqarg(fileInfo.ownerId())); - item->setText(5,TQString("%1[%2]").tqarg(fileInfo.group()).tqarg(fileInfo.groupId())); + item->setText(4,TQString("%1[%2]").arg(fileInfo.owner()).arg(fileInfo.ownerId())); + item->setText(5,TQString("%1[%2]").arg(fileInfo.group()).arg(fileInfo.groupId())); } } @@ -1509,7 +1509,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) if(!file.open(IO_ReadOnly)) { - KMessageBox::error(m_w, i18n("Cannot open the file %1 and load the string list.").tqarg(fileName)); + KMessageBox::error(m_w, i18n("Cannot open the file %1 and load the string list.").arg(fileName)); return ; } @@ -1517,7 +1517,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) { file.close(); - KMessageBox::information(m_w, i18n("File %1 seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.").tqarg(fileName),i18n("Warning")); + KMessageBox::information(m_w, i18n("File %1 seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.").arg(fileName),i18n("Warning")); KFileReplaceLib::convertOldToNewKFRFormat(fileName, sv); @@ -1537,7 +1537,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName) if(searchAttribute.isNull() || searchAttribute.isEmpty()) { - int answer = KMessageBox::warningYesNo(m_w, i18n("The format of kfr files has been changed; attempting to load %1. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?").tqarg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load")); + int answer = KMessageBox::warningYesNo(m_w, i18n("The format of kfr files has been changed; attempting to load %1. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?").arg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load")); if(answer == KMessageBox::Yes) searchAttribute = "false"; @@ -1639,7 +1639,7 @@ bool KFileReplacePart::checkBeforeOperation() if(!dir.exists()) { - KMessageBox::error(m_w, i18n("The main folder of the project %1 does not exist.").tqarg(directory)); + KMessageBox::error(m_w, i18n("The main folder of the project %1 does not exist.").arg(directory)); return false; } @@ -1647,7 +1647,7 @@ bool KFileReplacePart::checkBeforeOperation() if(!(dirInfo.isReadable() && dirInfo.isExecutable()) || (!m_option->m_searchingOnlyMode && !m_option->m_simulation && !(dirInfo.isWritable()))) { - KMessageBox::error(m_w, i18n("Access denied in the main folder of the project:
%1").tqarg(directory)); + KMessageBox::error(m_w, i18n("Access denied in the main folder of the project:
%1").arg(directory)); return false; } diff --git a/kfilereplace/kfilereplaceview.cpp b/kfilereplace/kfilereplaceview.cpp index 9800f119..2de52edd 100644 --- a/kfilereplace/kfilereplaceview.cpp +++ b/kfilereplace/kfilereplaceview.cpp @@ -117,7 +117,7 @@ void KFileReplaceView::stringsInvert(bool invertAll) // Cannot invert the string when search string is empty if (replaceText.isEmpty()) { - KMessageBox::error(0, i18n("Cannot invert string %1, because the search string would be empty.").tqarg(searchText)); + KMessageBox::error(0, i18n("Cannot invert string %1, because the search string would be empty.").arg(searchText)); return; } @@ -256,7 +256,7 @@ void KFileReplaceView::slotResultEdit() if(!success) { - TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(path); + TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(path); KMessageBox::error(parentWidget(), message); } } @@ -278,7 +278,7 @@ void KFileReplaceView::slotResultDelete() if (!currItem.isEmpty()) { TQFile fi; - int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").tqarg(currItem), + int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").arg(currItem), TQString(),KStdGuiItem::del()); if(answer == KMessageBox::Continue) @@ -417,7 +417,7 @@ void KFileReplaceView::slotStringsSave() body += TQString("\n\t" "\n\t\t" "\n\t\t" - "\n\t").tqarg(lvi->text(0)).tqarg(lvi->text(1)); + "\n\t").arg(lvi->text(0)).arg(lvi->text(1)); lvi = lvi->nextSibling(); } @@ -434,7 +434,7 @@ void KFileReplaceView::slotStringsSave() TQFile file( fileName ); if(!file.open( IO_WriteOnly )) { - KMessageBox::error(0, i18n("File %1 cannot be saved.").tqarg(fileName)); + KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName)); return ; } TQTextStream oTStream( &file ); @@ -498,7 +498,7 @@ void KFileReplaceView::initGUI() - m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("fileopen")), + m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("fileopen")), i18n("&Open"), this, TQT_SLOT(slotResultOpen())); @@ -517,16 +517,16 @@ void KFileReplaceView::initGUI() TQT_SLOT(slotResultEdit())); } - m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("up")), + m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("up")), i18n("Open Parent &Folder"), this, TQT_SLOT(slotResultDirOpen())); - m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("editdelete")), + m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("editdelete")), i18n("&Delete"), this, TQT_SLOT(slotResultDelete())); m_menuResult->insertSeparator(); - m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("info")), + m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("info")), i18n("&Properties"), this, TQT_SLOT(slotResultProperties())); diff --git a/kfilereplace/kfilereplaceviewwdg.ui b/kfilereplace/kfilereplaceviewwdg.ui index bb3af48e..c8fca48d 100644 --- a/kfilereplace/kfilereplaceviewwdg.ui +++ b/kfilereplace/kfilereplaceviewwdg.ui @@ -389,7 +389,7 @@ - tqlayout7 + layout7 @@ -397,7 +397,7 @@ - tqlayout6 + layout6 @@ -407,7 +407,7 @@ m_ledGo - + 20 20 @@ -434,7 +434,7 @@ m_ledWait - + 20 20 @@ -461,7 +461,7 @@ m_ledStop - + 20 20 @@ -490,7 +490,7 @@ Expanding - + 354 20 @@ -499,7 +499,7 @@ - tqlayout1 + layout1 diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp index 21e986ad..2988f864 100644 --- a/kfilereplace/knewprojectdlg.cpp +++ b/kfilereplace/knewprojectdlg.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include //KDE diff --git a/kfilereplace/knewprojectdlgs.ui b/kfilereplace/knewprojectdlgs.ui index 7cb3b392..b3509c1d 100644 --- a/kfilereplace/knewprojectdlgs.ui +++ b/kfilereplace/knewprojectdlgs.ui @@ -27,7 +27,7 @@ - tqlayout28 + layout28 @@ -48,13 +48,13 @@ 0 - + 0 0 - + 70 32767 @@ -74,7 +74,7 @@ Expanding - + 150 20 @@ -118,7 +118,7 @@ 0 - + 70 32767 @@ -570,7 +570,7 @@ - tqlayout8 + layout8 @@ -578,7 +578,7 @@ - tqlayout18 + layout18 @@ -612,7 +612,7 @@ - tqlayout19 + layout19 @@ -718,7 +718,7 @@ Expanding - + 190 16 @@ -742,7 +742,7 @@ - tqlayout32 + layout32 @@ -750,7 +750,7 @@ - tqlayout31 + layout31 @@ -776,7 +776,7 @@ - tqlayout30 + layout30 @@ -808,7 +808,7 @@ - tqlayout31 + layout31 @@ -842,7 +842,7 @@ Expanding - + 330 16 diff --git a/kfilereplace/koptionsdlgs.ui b/kfilereplace/koptionsdlgs.ui index 2c377b15..131e01f0 100644 --- a/kfilereplace/koptionsdlgs.ui +++ b/kfilereplace/koptionsdlgs.ui @@ -208,7 +208,7 @@ - tqlayout9 + layout9 @@ -224,7 +224,7 @@ Fixed - + 16 20 @@ -281,7 +281,7 @@ Expanding - + 202 20 diff --git a/kfilereplace/report.cpp b/kfilereplace/report.cpp index 62e59173..6d485eba 100644 --- a/kfilereplace/report.cpp +++ b/kfilereplace/report.cpp @@ -38,13 +38,13 @@ void Report::createReportFile() TQFile report(xmlFileName); if (!report.open( IO_WriteOnly )) { - KMessageBox::error(0, i18n("Cannot open the file %1.").tqarg(xmlFileName)); + KMessageBox::error(0, i18n("Cannot open the file %1.").arg(xmlFileName)); return ; } // b) Write the header of the XML file - TQDateTime datetime = TQDateTime::tqcurrentDateTime(Qt::LocalTime); + TQDateTime datetime = TQDateTime::currentDateTime(Qt::LocalTime); TQString dateString = datetime.toString(Qt::LocalDate); KUser user; TQString columnTextFour, @@ -191,7 +191,7 @@ void Report::createStyleSheet() TQFile styleSheet(cssFileName); if (!styleSheet.open( IO_WriteOnly )) { - KMessageBox::error(0, i18n("Cannot open the file %1.").tqarg(cssFileName)); + KMessageBox::error(0, i18n("Cannot open the file %1.").arg(cssFileName)); return ; } diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index ba1ea48d..d6fdc2d1 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -545,7 +545,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) drawCurrent=translateFromZoom(drawCurrent); if (currentAction==DrawRectangle) { - // To avoid flicker, only tqrepaint the minimum rect + // To avoid flicker, only repaint the minimum rect TQRect oldRect=translateToZoom(currentArea->rect()); currentArea->setRect(TQRect(drawStart,drawCurrent).normalize()); TQRect newRect=translateToZoom(currentArea->selectionRect()); @@ -629,10 +629,10 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) imageMapEditor->deselectWithoutUpdate( it.current() ); } */ - // We don't have to tqrepaint the hole selection rectangle + // We don't have to repaint the hole selection rectangle // only the borders have to be repainted. // So we have to create 4 rectangles for every rectangle - // which represent the borders and then tqrepaint them. + // which represent the borders and then repaint them. TQRect lb,rb,tb,bb; createBorderRectangles(translateToZoom(r),lb,rb,tb,bb); diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h index 3934a8aa..d9b564a6 100644 --- a/kimagemapeditor/drawzone.h +++ b/kimagemapeditor/drawzone.h @@ -97,7 +97,7 @@ private: KImageMapEditor *imageMapEditor; // Only the rect of the zoomed image, perhaps redundant TQRect imageRect; - // Only for tqrepaint issues + // Only for repaint issues Area *oldArea; TQRect oldSelectionRect; diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp index 04c1908e..4489508d 100644 --- a/kimagemapeditor/imagemap.cpp +++ b/kimagemapeditor/imagemap.cpp @@ -259,7 +259,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { drawCurrent=translateFromZoom(drawCurrent); if (currentAction==DrawRectangle) { - // To avoid flicker, only tqrepaint the minimum rect + // To avoid flicker, only repaint the minimum rect TQRect oldRect=translateToZoom(currentArea->rect()); currentArea->setRect(TQRect(drawStart,drawCurrent).normalize()); TQRect newRect=translateToZoom(currentArea->rect()); diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 6dbb1a32..2c59cf3d 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -19,7 +19,7 @@ #include // QT -#include +#include #include #include #include @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -396,7 +396,7 @@ void KImageMapEditor::slotConfigChanged() } updateAllAreas(); - drawZone->viewport()->tqrepaint(); + drawZone->viewport()->repaint(); } void KImageMapEditor::openLastURL(KConfig* config) { @@ -425,7 +425,7 @@ void KImageMapEditor::saveLastURL(KConfig* config) { // kdDebug() << "writing entry lastopenurl : " << url().path() << endl; // kdDebug() << "writing entry lastactivemap : " << mapName() << endl; // kdDebug() << "writing entry lastactiveimage : " << _imageUrl.path() << endl; - //KMessageBox::information(0L, TQString("Group: %1 Saving ... %2").tqarg(config->group()).tqarg(url().path())); + //KMessageBox::information(0L, TQString("Group: %1 Saving ... %2").arg(config->group()).arg(url().path())); } void KImageMapEditor::setupActions() @@ -736,7 +736,7 @@ void KImageMapEditor::showPopupMenu(const TQPoint & pos, const TQString & name) TQPopupMenu* pop = static_cast(factory()->container(name, this)); if (!pop) { - kdWarning() << TQString("KImageMapEditorPart: Missing XML definition for %1\n").tqarg(name) << endl; + kdWarning() << TQString("KImageMapEditorPart: Missing XML definition for %1\n").arg(name) << endl; return; } @@ -794,8 +794,8 @@ void KImageMapEditor::updateStatusBar() void KImageMapEditor::slotChangeStatusCoords(int x,int y) { -// statusBar()->changeItem(TQString(" Cursor : x: %1 ,y: %2 ").tqarg(x).tqarg(y),STATUS_CURSOR); - cursorStatusText = i18n(" Cursor: x: %1, y: %2 ").tqarg(x).tqarg(y); +// statusBar()->changeItem(TQString(" Cursor : x: %1 ,y: %2 ").arg(x).arg(y),STATUS_CURSOR); + cursorStatusText = i18n(" Cursor: x: %1, y: %2 ").arg(x).arg(y); updateStatusBar(); } @@ -803,7 +803,7 @@ void KImageMapEditor::slotUpdateSelectionCoords() { if (selected()->count()>0) { TQRect r=selected()->rect(); // statusBar()->changeItem( - selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").tqarg(r.left()).tqarg(r.top()).tqarg(r.width()).tqarg(r.height()); + selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height()); // ,STATUS_SELECTION); kapp->processEvents(); @@ -816,7 +816,7 @@ void KImageMapEditor::slotUpdateSelectionCoords() { void KImageMapEditor::slotUpdateSelectionCoords( const TQRect & r ) { - selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").tqarg(r.left()).tqarg(r.top()).tqarg(r.width()).tqarg(r.height()); + selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height()); updateStatusBar(); kapp->processEvents(); } @@ -990,7 +990,7 @@ void KImageMapEditor::deleteArea( Area * area ) { if (!area) return; - // only for tqrepaint reasons + // only for repaint reasons TQRect redrawRect = area->selectionRect(); // Perhaps we've got a selection of areas @@ -1055,7 +1055,7 @@ void KImageMapEditor::deleteAllAreas() a=areas->first(); // because the current is deleted } - drawZone->viewport()->tqrepaint(); + drawZone->viewport()->repaint(); } @@ -1065,7 +1065,7 @@ void KImageMapEditor::updateAllAreas() for (Area* a=areas->first();a!=0L;a=areas->next()) { a->listViewItem()->setPixmap(1,makeListViewPix(*a)); } - drawZone->viewport()->tqrepaint(); + drawZone->viewport()->repaint(); } void KImageMapEditor::updateSelection() const { @@ -1407,10 +1407,10 @@ void KImageMapEditor::setPicture(const KURL & url) { imageUsemapAction->setEnabled(true); } else - kdError() << TQString("The image %1 could not be opened.").tqarg(url.path()) << endl; + kdError() << TQString("The image %1 could not be opened.").arg(url.path()) << endl; } else - kdError() << TQString("The image %1 does not exist.").tqarg(url.path()) << endl; + kdError() << TQString("The image %1 does not exist.").arg(url.path()) << endl; } void KImageMapEditor::setPicture(const TQImage & pix) { @@ -1519,7 +1519,7 @@ void KImageMapEditor::mapEditName() if (ok) { if (input != _mapName) { if (mapsListView->nameAlreadyExists(input)) - KMessageBox::sorry(this->widget(), i18n("The name %1 already exists.").tqarg(input)); + KMessageBox::sorry(this->widget(), i18n("The name %1 already exists.").arg(input)); else { setMapName(input); } @@ -1622,12 +1622,12 @@ void KImageMapEditor::fileSaveAs() { if ( fileInfo.exists() ) { if (KMessageBox::warningContinueCancel(widget(), - i18n("The file %1 already exists.
Do you want to overwrite it?").tqarg(fileInfo.fileName()), + i18n("The file %1 already exists.
Do you want to overwrite it?").arg(fileInfo.fileName()), i18n("Overwrite File?"), i18n("Overwrite"))==KMessageBox::Cancel) return; if(!fileInfo.isWritable()) { - KMessageBox::sorry(widget(), i18n("You do not have write permission for the file %1.").tqarg(fileInfo.fileName())); + KMessageBox::sorry(widget(), i18n("You do not have write permission for the file %1.").arg(fileInfo.fileName())); return; } } @@ -1646,14 +1646,14 @@ bool KImageMapEditor::openFile() if ( !fileInfo.exists() ) { KMessageBox::information(widget(), - i18n("The file %1 does not exist.").tqarg(fileInfo.fileName()), + i18n("The file %1 does not exist.").arg(fileInfo.fileName()), i18n("File Does Not Exist")); return false; } openHTMLFile(url()); - drawZone->viewport()->tqrepaint(); + drawZone->viewport()->repaint(); recentFilesAction->addURL(url()); setModified(false); backupFileCreated = false; @@ -2107,16 +2107,16 @@ void KImageMapEditor::saveAreasToMapTag(MapTag* map) { map->clear(); for (Area* a=areas->first();a!=0L;a=areas->next()) { TQDict *dict = new TQDict(17,false); - TQString *tqshapeStr = 0L; + TQString *shapeStr = 0L; switch (a->type()) { - case Area::Rectangle : tqshapeStr = new TQString("rect");break; - case Area::Circle : tqshapeStr = new TQString("circle");break; - case Area::Polygon : tqshapeStr = new TQString("poly");break; + case Area::Rectangle : shapeStr = new TQString("rect");break; + case Area::Circle : shapeStr = new TQString("circle");break; + case Area::Polygon : shapeStr = new TQString("poly");break; default : continue; } - dict->insert("tqshape",tqshapeStr); + dict->insert("shape",shapeStr); for (AttributeIterator it = a->firstAttribute();it!=a->lastAttribute();++it) { dict->insert(it.key(),new TQString(it.data())); @@ -2130,7 +2130,7 @@ void KImageMapEditor::saveAreasToMapTag(MapTag* map) { if (defaultArea && defaultArea->finished()) { TQDict *dict = new TQDict(17,false); - dict->insert("tqshape",new TQString("default")); + dict->insert("shape",new TQString("default")); for (AttributeIterator it = defaultArea->firstAttribute();it!=defaultArea->lastAttribute();++it) { dict->insert(it.key(),new TQString(it.data())); @@ -2159,16 +2159,16 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) { _mapName = map->name; for (AreaTag *tag=map->first();tag!=0L;tag=map->next()) { - TQString tqshape="rect"; - if (tag->find("tqshape")) - tqshape=*tag->find("tqshape"); + TQString shape="rect"; + if (tag->find("shape")) + shape=*tag->find("shape"); Area::ShapeType type=Area::Rectangle; - if (tqshape=="circle") + if (shape=="circle") type=Area::Circle; - else if (tqshape=="poly") + else if (shape=="poly") type=Area::Polygon; - else if (tqshape=="default") + else if (shape=="default") type=Area::Default; Area* a=AreaCreator::create(type); @@ -2267,7 +2267,7 @@ void KImageMapEditor::saveImageMap(const KURL & url) if (!TQFileInfo(url.directory()).isWritable()) { KMessageBox::error(widget(), - i18n("The file %1 could not be saved, because you do not have the required write permissions.").tqarg(url.path())); + i18n("The file %1 could not be saved, because you do not have the required write permissions.").arg(url.path())); return; } @@ -2556,7 +2556,7 @@ void KImageMapEditor::slotHightlightAreas() // highlightAreasAction->setChecked(b); Area::highlightArea = b; updateAllAreas(); - drawZone->viewport()->tqrepaint(); + drawZone->viewport()->repaint(); } void KImageMapEditor::slotShowAltTag() @@ -2564,7 +2564,7 @@ void KImageMapEditor::slotShowAltTag() bool b = showAltAction->isChecked(); // showAltAction->setChecked(b); Area::showAlt = b; - drawZone->viewport()->tqrepaint(); + drawZone->viewport()->repaint(); } void KImageMapEditor::mapNew() @@ -2583,7 +2583,7 @@ void KImageMapEditor::mapDelete() int result = KMessageBox::warningContinueCancel(widget(), i18n("Are you sure you want to delete the map %1?" - "
There is no way to undo this.").tqarg(selectedMap), + "
There is no way to undo this.").arg(selectedMap), i18n("Delete Map?"),KGuiItem(i18n("&Delete"),"editdelete")); if (result == KMessageBox::No) @@ -2631,7 +2631,7 @@ bool KImageMapEditor::queryClose() { return true; switch ( KMessageBox::warningYesNoCancel( widget(), - i18n("The file %1 has been modified.
Do you want to save it?").tqarg(url().fileName()), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) ) { + i18n("The file %1 has been modified.
Do you want to save it?").arg(url().fileName()), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) ) { case KMessageBox::Yes : saveFile(); return true; diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp index 52cccf9f..835cdf55 100644 --- a/kimagemapeditor/kimearea.cpp +++ b/kimagemapeditor/kimearea.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -336,10 +336,10 @@ void Area::drawAlt(TQPainter & p) { double x,y; - double scalex = p.tqworldMatrix().m11(); -// double scaley = p.tqworldMatrix().m12(); + double scalex = p.worldMatrix().m11(); +// double scaley = p.worldMatrix().m12(); - TQWMatrix oldMatrix = p.tqworldMatrix(); + TQWMatrix oldMatrix = p.worldMatrix(); p.setWorldMatrix(TQWMatrix(1,oldMatrix.m12(), oldMatrix.m21(), 1, oldMatrix.dx(), oldMatrix.dy() )); @@ -379,10 +379,10 @@ void Area::draw(TQPainter & p) { int i=0; - double scalex = p.tqworldMatrix().m11(); -// double scaley = p.tqworldMatrix().m12(); + double scalex = p.worldMatrix().m11(); +// double scaley = p.worldMatrix().m12(); - TQWMatrix oldMatrix = p.tqworldMatrix(); + TQWMatrix oldMatrix = p.worldMatrix(); p.setWorldMatrix(TQWMatrix(1,oldMatrix.m12(), oldMatrix.m21(), 1, oldMatrix.dx(), oldMatrix.dy() )); @@ -675,10 +675,10 @@ TQBitmap RectArea::getMask() const TQString RectArea::coordsToString() const { TQString retStr=TQString("%1,%2,%3,%4") - .tqarg(rect().left()) - .tqarg(rect().top()) - .tqarg(rect().right()) - .tqarg(rect().bottom()); + .arg(rect().left()) + .arg(rect().top()) + .arg(rect().right()) + .arg(rect().bottom()); return retStr; } @@ -747,7 +747,7 @@ bool RectArea::setCoords(const TQString & s) TQString RectArea::getHTMLCode() const { TQString retStr; retStr+="count()); + p.drawPolygon ( *_coords,false,0,_coords->count()); else - p.tqdrawPolyline ( *_coords,0,_coords->count()); + p.drawPolyline ( *_coords,0,_coords->count()); /* p.moveTo(_coords->point(0)); @@ -1033,8 +1033,8 @@ TQString PolyArea::coordsToString() const for (uint i=0;i<_coords->count();i++) { retStr.append(TQString("%1,%2,") - .tqarg(_coords->point(i).x()) - .tqarg(_coords->point(i).y())); + .arg(_coords->point(i).x()) + .arg(_coords->point(i).y())); } retStr.remove(retStr.length()-1,1); @@ -1224,7 +1224,7 @@ bool PolyArea::setCoords(const TQString & s) TQString PolyArea::getHTMLCode() const { TQString retStr; retStr+="setSelected( false ); _areas->remove( a ); - tqinvalidate(); + invalidate(); } void AreaSelection::reset() @@ -1375,7 +1375,7 @@ void AreaSelection::reset() } _areas->clear(); - tqinvalidate(); + invalidate(); } bool AreaSelection::contains(const TQPoint & p) const @@ -1423,7 +1423,7 @@ void AreaSelection::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p _areas->getFirst()->moveSelectionPoint(selectionPoint,p); - tqinvalidate(); + invalidate(); } @@ -1436,7 +1436,7 @@ void AreaSelection::moveBy(int dx, int dy) Area::moveBy( dx, dy ); - tqinvalidate(); + invalidate(); } TQString AreaSelection::typeString() const @@ -1474,7 +1474,7 @@ void AreaSelection::updateSelectionPoints() it.current()->updateSelectionPoints(); } - tqinvalidate(); + invalidate(); } @@ -1525,7 +1525,7 @@ void AreaSelection::setArea(const Area & copy) setAreaSelection(*selection); else { Area::setArea(copy); - tqinvalidate(); + invalidate(); } } @@ -1541,14 +1541,14 @@ void AreaSelection::setAreaSelection(const AreaSelection & copy) it.current()->setArea(*it2.current()); Area::setArea(copy); - tqinvalidate(); + invalidate(); } void AreaSelection::setAreaList( const AreaList & areas ) { delete _areas; _areas = new AreaList(areas); - tqinvalidate(); + invalidate(); } void AreaSelection::setRect(const TQRect & r) @@ -1558,7 +1558,7 @@ void AreaSelection::setRect(const TQRect & r) _areas->getFirst()->setRect(r); } - tqinvalidate(); + invalidate(); _rect=rect(); updateSelectionPoints(); } @@ -1586,7 +1586,7 @@ int AreaSelection::addCoord(const TQPoint & p) if ( _areas->count()==1 ) { return _areas->getFirst()->addCoord(p); - tqinvalidate(); + invalidate(); } return 0; @@ -1597,7 +1597,7 @@ void AreaSelection::insertCoord(int pos, const TQPoint & p) if ( _areas->count()==1 ) { _areas->getFirst()->insertCoord(pos, p); - tqinvalidate(); + invalidate(); } } @@ -1606,7 +1606,7 @@ void AreaSelection::removeCoord(int pos) if ( _areas->count()==1 ) { _areas->getFirst()->removeCoord(pos); - tqinvalidate(); + invalidate(); } } @@ -1617,7 +1617,7 @@ bool AreaSelection::removeSelectionPoint(TQRect * r) if ( _areas->count()==1 ) { result = _areas->getFirst()->removeSelectionPoint(r); - tqinvalidate(); + invalidate(); } return result; @@ -1639,7 +1639,7 @@ void AreaSelection::moveCoord(int pos,const TQPoint & p) if ( _areas->count()==1 ) { _areas->getFirst()->moveCoord(pos,p); - tqinvalidate(); + invalidate(); } } @@ -1648,7 +1648,7 @@ void AreaSelection::highlightSelectionPoint(int i) if ( _areas->count()==1 ) { _areas->getFirst()->highlightSelectionPoint(i); - tqinvalidate(); + invalidate(); } } diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h index 3274a322..0c554754 100644 --- a/kimagemapeditor/kimearea.h +++ b/kimagemapeditor/kimearea.h @@ -367,7 +367,7 @@ class AreaSelection : public Area { bool allAreasWithin(const TQRect & r) const; // makes the cache invalid - void tqinvalidate(); + void invalidate(); private : AreaList *_areas; @@ -382,7 +382,7 @@ class AreaSelection : public Area { }; -inline void AreaSelection::tqinvalidate() { +inline void AreaSelection::invalidate() { _selectionCacheValid=false; _rectCacheValid=false; } diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp index 817d8b7d..975001d9 100644 --- a/kimagemapeditor/kimecommands.cpp +++ b/kimagemapeditor/kimecommands.cpp @@ -30,7 +30,7 @@ KCommand #else KNamedCommand #endif - (i18n( "Cut %1" ).tqarg( a.typeString() )) + (i18n( "Cut %1" ).arg( a.typeString() )) { _document=document; _cutAreaSelection=new AreaSelection(); @@ -74,7 +74,7 @@ void CutCommand::unexecute() DeleteCommand::DeleteCommand(KImageMapEditor * document, const AreaSelection & a) : CutCommand(document,a) { - setName(i18n( "Delete %1" ).tqarg( a.typeString() )); + setName(i18n( "Delete %1" ).arg( a.typeString() )); } PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a) @@ -84,7 +84,7 @@ KCommand #else KNamedCommand #endif - (i18n( "Paste %1" ).tqarg( a.typeString() )) + (i18n( "Paste %1" ).arg( a.typeString() )) { _document=document; _pasteAreaSelection=new AreaSelection(); @@ -129,7 +129,7 @@ KCommand #else KNamedCommand #endif -(i18n( "Move %1" ).tqarg( a->typeString() )) +(i18n( "Move %1" ).arg( a->typeString() )) { _document=document; _areaSelection=new AreaSelection(); @@ -155,7 +155,7 @@ void MoveCommand::execute() if (!_areaSelection->allAreasWithin(_document->getDrawZone()->getImageRect())) _areaSelection->moveTo( _oldPoint.x(), _oldPoint.y() ); - _document->selected()->tqinvalidate(); + _document->selected()->invalidate(); _document->slotAreaChanged( tempArea ); @@ -174,7 +174,7 @@ void MoveCommand::unexecute() _areaSelection->moveTo( _oldPoint.x(), _oldPoint.y() ); _areaSelection->setMoving(false); - _document->selected()->tqinvalidate(); + _document->selected()->invalidate(); _document->slotAreaChanged( tempArea ); _document->slotAreaChanged( _areaSelection ); @@ -191,7 +191,7 @@ KCommand #else KNamedCommand #endif -(i18n( "Resize %1" ).tqarg( a->typeString() )) +(i18n( "Resize %1" ).arg( a->typeString() )) { _areaSelection=new AreaSelection(); _areaSelection->setAreaList( a->getAreaList() ); @@ -238,7 +238,7 @@ KCommand #else KNamedCommand #endif -(i18n( "Add point to %1" ).tqarg( a->typeString() )) +(i18n( "Add point to %1" ).arg( a->typeString() )) { if (a->type()!=Area::Polygon) { @@ -287,7 +287,7 @@ KCommand #else KNamedCommand #endif -(i18n( "Remove point from %1" ).tqarg( a->typeString() )) +(i18n( "Remove point from %1" ).arg( a->typeString() )) { if (a->type()!=Area::Polygon) { @@ -340,7 +340,7 @@ KCommand #else KNamedCommand #endif -(i18n( "Create %1" ).tqarg( area->typeString() )) +(i18n( "Create %1" ).arg( area->typeString() )) { _document=document; _area=area; diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index c2e50c7c..f825d6dc 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -19,7 +19,7 @@ //#include #include #include -#include +#include #include #include #include @@ -69,53 +69,53 @@ CoordsEdit::~CoordsEdit() RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) : CoordsEdit(parent,a) { - TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5); + TQGridLayout *layout= new TQGridLayout(this,5,2,5,5); topXSpin = new TQSpinBox(this); topXSpin->setMaxValue(INT_MAX); topXSpin->setMinValue(0); topXSpin->setValue(a->rect().left()); - tqlayout->addWidget(topXSpin,0,1); + layout->addWidget(topXSpin,0,1); connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Top &X:"),this); lbl->setBuddy(topXSpin); - tqlayout->addWidget(lbl,0,0); + layout->addWidget(lbl,0,0); topYSpin = new TQSpinBox(this); topYSpin->setMaxValue(INT_MAX); topYSpin->setMinValue(0); topYSpin->setValue(a->rect().top()); - tqlayout->addWidget(topYSpin,1,1); + layout->addWidget(topYSpin,1,1); connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Top &Y:"),this); lbl->setBuddy(topYSpin); - tqlayout->addWidget(lbl,1,0); + layout->addWidget(lbl,1,0); widthSpin = new TQSpinBox(this); widthSpin->setMaxValue(INT_MAX); widthSpin->setMinValue(0); widthSpin->setValue(a->rect().width()); - tqlayout->addWidget(widthSpin,2,1); + layout->addWidget(widthSpin,2,1); connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("&Width:"),this); lbl->setBuddy(widthSpin); - tqlayout->addWidget(lbl,2,0); + layout->addWidget(lbl,2,0); heightSpin = new TQSpinBox(this); heightSpin->setMaxValue(INT_MAX); heightSpin->setMinValue(0); heightSpin->setValue(a->rect().height()); - tqlayout->addWidget(heightSpin,3,1); + layout->addWidget(heightSpin,3,1); connect( heightSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Hei&ght:"),this); lbl->setBuddy(heightSpin); - tqlayout->addWidget(lbl,3,0); + layout->addWidget(lbl,3,0); - tqlayout->setRowStretch(4,10); + layout->setRowStretch(4,10); } void RectCoordsEdit::applyChanges() { @@ -130,44 +130,44 @@ void RectCoordsEdit::applyChanges() { CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) : CoordsEdit(parent,a) { - TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5); + TQGridLayout *layout= new TQGridLayout(this,4,2,5,5); centerXSpin = new TQSpinBox(this); centerXSpin->setMaxValue(INT_MAX); centerXSpin->setMinValue(0); centerXSpin->setValue(a->rect().center().x()); - tqlayout->addWidget(centerXSpin,0,1); + layout->addWidget(centerXSpin,0,1); connect( centerXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Center &X:"),this); lbl->setBuddy(centerXSpin); - tqlayout->addWidget(lbl,0,0); + layout->addWidget(lbl,0,0); centerYSpin = new TQSpinBox(this); centerYSpin->setMaxValue(INT_MAX); centerYSpin->setMinValue(0); centerYSpin->setValue(a->rect().center().y()); - tqlayout->addWidget(centerYSpin,1,1); + layout->addWidget(centerYSpin,1,1); connect( centerYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Center &Y:"),this); lbl->setBuddy(centerYSpin); - tqlayout->addWidget(lbl,1,0); + layout->addWidget(lbl,1,0); radiusSpin = new TQSpinBox(this); radiusSpin->setMaxValue(INT_MAX); radiusSpin->setMinValue(0); radiusSpin->setValue(a->rect().width()/2); - tqlayout->addWidget(radiusSpin,2,1); + layout->addWidget(radiusSpin,2,1); connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("&Radius:"),this); lbl->setBuddy(radiusSpin); - tqlayout->addWidget(lbl,2,0); + layout->addWidget(lbl,2,0); - tqlayout->setRowStretch(3,10); + layout->setRowStretch(3,10); } @@ -184,7 +184,7 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) : CoordsEdit(parent,a) { if (!a) return; - TQVBoxLayout *tqlayout= new TQVBoxLayout(this); + TQVBoxLayout *layout= new TQVBoxLayout(this); int numPoints=a->coords()->count(); coordsTable= new TQTable(numPoints,2,this); coordsTable->horizontalHeader()->setLabel(0,"X"); @@ -205,15 +205,15 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) // coordsTable->setMaximumHeight(400); // coordsTable->resizeContents(100,100); coordsTable->resize(coordsTable->width(),100); - tqlayout->addWidget(coordsTable); - tqlayout->setStretchFactor(coordsTable,-1); + layout->addWidget(coordsTable); + layout->setStretchFactor(coordsTable,-1); TQHBox *hbox= new TQHBox(this); TQPushButton *addBtn=new TQPushButton(i18n("Add"),hbox); connect( addBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPoint())); TQPushButton *removeBtn=new TQPushButton(i18n("Remove"),hbox); connect( removeBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemovePoint())); - tqlayout->addWidget(hbox); + layout->addWidget(hbox); slotHighlightPoint(1); } @@ -277,29 +277,29 @@ void PolyCoordsEdit::applyChanges() { SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) : CoordsEdit(parent,a) { - TQGridLayout *tqlayout= new TQGridLayout(this,2,2); + TQGridLayout *layout= new TQGridLayout(this,2,2); topXSpin = new TQSpinBox(this); topXSpin->setMaxValue(INT_MAX); topXSpin->setMinValue(0); topXSpin->setValue(a->rect().left()); - tqlayout->addWidget(topXSpin,0,1); + layout->addWidget(topXSpin,0,1); connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Top &X"),this); lbl->setBuddy(topXSpin); - tqlayout->addWidget(lbl,0,0); + layout->addWidget(lbl,0,0); topYSpin = new TQSpinBox(this); topYSpin->setMaxValue(INT_MAX); topYSpin->setMinValue(0); topYSpin->setValue(a->rect().top()); - tqlayout->addWidget(topYSpin,1,1); + layout->addWidget(topYSpin,1,1); connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Top &Y"),this); lbl->setBuddy(topYSpin); - tqlayout->addWidget(lbl,1,0); + layout->addWidget(lbl,1,0); } void SelectionCoordsEdit::applyChanges() { @@ -308,13 +308,13 @@ void SelectionCoordsEdit::applyChanges() { -TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name) +TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name) { TQLineEdit* edit=new TQLineEdit(value,parent); - tqlayout->addWidget(edit,y,2); + layout->addWidget(edit,y,2); TQLabel* lbl=new TQLabel(name,parent); lbl->setBuddy(edit); - tqlayout->addWidget(lbl,y,1); + layout->addWidget(lbl,y,1); return edit; } @@ -322,7 +322,7 @@ TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, TQWidget* AreaDialog::createGeneralPage() { TQFrame* page = new TQFrame(this); - TQGridLayout* tqlayout = new TQGridLayout(page,5,2,5,5); + TQGridLayout* layout = new TQGridLayout(page,5,2,5,5); TQHBox *hbox= new TQHBox(page); @@ -332,25 +332,25 @@ TQWidget* AreaDialog::createGeneralPage() connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref())); hbox->setMinimumHeight(hbox->height()); - tqlayout->addWidget(hbox,0,2); + layout->addWidget(hbox,0,2); TQLabel *lbl=new TQLabel(i18n( "&HREF:" ),page); lbl->setBuddy(hrefEdit); - tqlayout->addWidget(lbl,0,1); + layout->addWidget(lbl,0,1); - altEdit = createLineEdit(page,tqlayout,1,area->attribute("alt"),i18n("Alt. &Text:")); - targetEdit = createLineEdit(page,tqlayout,2,area->attribute("target"),i18n("Tar&get:")); - titleEdit = createLineEdit(page,tqlayout,3,area->attribute("title"),i18n("Tit&le:")); + altEdit = createLineEdit(page,layout,1,area->attribute("alt"),i18n("Alt. &Text:")); + targetEdit = createLineEdit(page,layout,2,area->attribute("target"),i18n("Tar&get:")); + titleEdit = createLineEdit(page,layout,3,area->attribute("title"),i18n("Tit&le:")); if (area->type()==Area::Default) { defaultAreaChk = new TQCheckBox(i18n("Enable default map"),page); if (area->finished()) defaultAreaChk->setChecked(true); - tqlayout->addWidget(defaultAreaChk,3,2); + layout->addWidget(defaultAreaChk,3,2); } - tqlayout->setRowStretch(4,10); + layout->setRowStretch(4,10); return page; } @@ -358,11 +358,11 @@ TQWidget* AreaDialog::createGeneralPage() TQWidget* AreaDialog::createCoordsPage() { TQFrame* page = new TQFrame(this); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page); - tqlayout->setMargin(5); + TQVBoxLayout *layout = new TQVBoxLayout(page); + layout->setMargin(5); coordsEdit = createCoordsEdit(page,area); - tqlayout->addWidget(coordsEdit); + layout->addWidget(coordsEdit); connect( coordsEdit, TQT_SIGNAL(update()), this, TQT_SLOT(slotUpdateArea())); return page; @@ -371,17 +371,17 @@ TQWidget* AreaDialog::createCoordsPage() TQWidget* AreaDialog::createJavascriptPage() { TQFrame* page = new TQFrame(this); - TQGridLayout* tqlayout = new TQGridLayout(page,8,2,5,5); + TQGridLayout* layout = new TQGridLayout(page,8,2,5,5); - onClickEdit = createLineEdit(page,tqlayout,0,area->attribute("onClick"),i18n("OnClick:")); - onDblClickEdit = createLineEdit(page,tqlayout,1,area->attribute("onDblClick"),i18n("OnDblClick:")); - onMouseDownEdit = createLineEdit(page,tqlayout,2,area->attribute("onMouseDown"),i18n("OnMouseDown:")); - onMouseUpEdit = createLineEdit(page,tqlayout,3,area->attribute("onMouseUp"),i18n("OnMouseUp:")); - onMouseOverEdit = createLineEdit(page,tqlayout,4,area->attribute("onMouseOver"),i18n("OnMouseOver:")); - onMouseMoveEdit = createLineEdit(page,tqlayout,5,area->attribute("onMouseMove"),i18n("OnMouseMove:")); - onMouseOutEdit = createLineEdit(page,tqlayout,6,area->attribute("onMouseOut"),i18n("OnMouseOut:")); + onClickEdit = createLineEdit(page,layout,0,area->attribute("onClick"),i18n("OnClick:")); + onDblClickEdit = createLineEdit(page,layout,1,area->attribute("onDblClick"),i18n("OnDblClick:")); + onMouseDownEdit = createLineEdit(page,layout,2,area->attribute("onMouseDown"),i18n("OnMouseDown:")); + onMouseUpEdit = createLineEdit(page,layout,3,area->attribute("onMouseUp"),i18n("OnMouseUp:")); + onMouseOverEdit = createLineEdit(page,layout,4,area->attribute("onMouseOver"),i18n("OnMouseOver:")); + onMouseMoveEdit = createLineEdit(page,layout,5,area->attribute("onMouseMove"),i18n("OnMouseMove:")); + onMouseOutEdit = createLineEdit(page,layout,6,area->attribute("onMouseOut"),i18n("OnMouseOut:")); - tqlayout->setRowStretch(7,10); + layout->setRowStretch(7,10); return page; @@ -423,44 +423,44 @@ AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a) setCaption(i18n("Area Tag Editor")); area=a; - TQString tqshape="Default"; + TQString shape="Default"; areaCopy= a->clone(); oldArea= new Area(); oldArea->setRect( a->rect() ); switch (a->type()) { - case Area::Rectangle : tqshape=i18n("Rectangle");break; - case Area::Circle : tqshape=i18n("Circle");break; - case Area::Polygon : tqshape=i18n("Polygon");break; - case Area::Selection : tqshape=i18n("Selection");break; + case Area::Rectangle : shape=i18n("Rectangle");break; + case Area::Circle : shape=i18n("Circle");break; + case Area::Polygon : shape=i18n("Polygon");break; + case Area::Selection : shape=i18n("Selection");break; default : break; } // To get a margin around everything - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); - tqlayout->setMargin(5); + layout->setMargin(5); - TQLabel *lbl = new TQLabel(""+tqshape+"",this); + TQLabel *lbl = new TQLabel(""+shape+"",this); lbl->setTextFormat(TQt::RichText); - tqlayout->addWidget(lbl); + layout->addWidget(lbl); TQFrame *line = new TQFrame(this); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFixedHeight(10); - tqlayout->addWidget(line); + layout->addWidget(line); TQTabWidget *tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); tab->addTab(createGeneralPage(),i18n("&General")); if (a->type()==Area::Default) { - tqshape=i18n("Default"); + shape=i18n("Default"); } else tab->addTab(createCoordsPage(),i18n("Coor&dinates")); @@ -470,9 +470,9 @@ AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a) line = new TQFrame(this); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFixedHeight(10); - tqlayout->addWidget(line); + layout->addWidget(line); - tqlayout->addWidget(createButtonBar()); + layout->addWidget(createButtonBar()); setMinimumHeight(360); setMinimumWidth(327); @@ -580,17 +580,17 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList *_ TQWidget *page=new TQWidget(this); setMainWidget(page); setCaption(baseUrl.fileName()); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page,5,5); + TQVBoxLayout *layout = new TQVBoxLayout(page,5,5); TQLabel *lbl= new TQLabel(i18n("Select an image and/or a map that you want to edit"),page); lbl->setFont(TQFont("Sans Serif",12, TQFont::Bold)); - tqlayout->addWidget(lbl); + layout->addWidget(lbl); TQFrame *line= new TQFrame(page); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFixedHeight(10); - tqlayout->addWidget(line,0); + layout->addWidget(line,0); - TQGridLayout *gridLayout= new TQGridLayout(tqlayout,2,3,5); + TQGridLayout *gridLayout= new TQGridLayout(layout,2,3,5); gridLayout->setRowStretch(0,0); gridLayout->setRowStretch(1,100); lbl=new TQLabel(i18n("&Maps"),page); @@ -602,7 +602,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList *_ line= new TQFrame(page); line->setFrameStyle(TQFrame::VLine | TQFrame::Sunken); line->setFixedWidth(10); -// line->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding)); +// line->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding)); gridLayout->addWidget(line,1,1); lbl=new TQLabel(i18n("Image Preview"),page); @@ -610,7 +610,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList *_ imagePreview= new TQLabel(page); imagePreview->setFixedSize(310,210); - imagePreview->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding)); + imagePreview->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding)); imagePreview->setFrameStyle(TQLabel::Panel | TQLabel::Sunken); imagePreview->setIndent(5); imagePreview->setBackgroundColor(TQColor("white")); @@ -619,12 +619,12 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList *_ // lbl= new TQLabel(i18n("&Maps"),page); // lbl->setBuddy(mapListBox); gridLayout->addWidget(imagePreview,1,2); -// tqlayout->addLayout(gridLayout,1); +// layout->addLayout(gridLayout,1); line= new TQFrame(page); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFixedHeight(10); - tqlayout->addWidget(line,0); + layout->addWidget(line,0); if (maps->isEmpty()) { @@ -669,8 +669,8 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* parent) { TQLabel *lbl= new TQLabel(i18n("&Images"),parent); lbl->setBuddy(imageListTable); - parent->tqlayout()->add(lbl); - parent->tqlayout()->add(imageListTable); + parent->layout()->add(lbl); + parent->layout()->add(imageListTable); if (images->isEmpty()) return; @@ -731,7 +731,7 @@ void ImageMapChooseDialog::slotImageChanged() pix2.convertFromImage(pix); imagePreview->setPixmap(pix2); -// imagePreview->tqrepaint(); +// imagePreview->repaint(); } void ImageMapChooseDialog::selectImageWithUsemap(const TQString & usemap) { @@ -866,8 +866,8 @@ HTMLPreviewDialog::~HTMLPreviewDialog() { void HTMLPreviewDialog::show() { KDialogBase::show(); htmlPart->openURL(KURL( tempFile->name() )); -// htmlView->tqlayout(); -// htmlView->tqrepaint(); +// htmlView->layout(); +// htmlView->repaint(); resize(800,600); } diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h index 2f4000a3..f3a245cd 100644 --- a/kimagemapeditor/kimedialogs.h +++ b/kimagemapeditor/kimedialogs.h @@ -137,7 +137,7 @@ class AreaDialog : public KDialog { void slotChooseHref(); void slotUpdateArea(); - TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name); + TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name); TQWidget* createGeneralPage(); TQWidget* createCoordsPage(); TQWidget* createJavascriptPage(); diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 70e97757..6b0311a9 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -45,7 +45,7 @@ KimeShell::KimeShell(const char *name ) KDockWidget* mainDock; mainDock = createDockWidget( "MainDockWidget", 0L, 0L, "main_dock_widget"); TQWidget *w = new TQHBox( mainDock ); -// TQLayout* tqlayout = new TQGridLayout( mainDock ); +// TQLayout* layout = new TQGridLayout( mainDock ); mainDock->setWidget( w ); // allow others to dock to the 4 sides @@ -71,7 +71,7 @@ KimeShell::KimeShell(const char *name ) //setCentralWidget(part->widget()); if (!initialGeometrySet()) - resize( TQSize(725, 525).expandedTo(tqminimumSizeHint())); + resize( TQSize(725, 525).expandedTo(minimumSizeHint())); connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), this, TQT_SLOT(slotSetStatusBarText ( const TQString & ))); diff --git a/klinkstatus/data/styles/results_stylesheet.xsl b/klinkstatus/data/styles/results_stylesheet.xsl index fac79c2f..d0b0c10d 100644 --- a/klinkstatus/data/styles/results_stylesheet.xsl +++ b/klinkstatus/data/styles/results_stylesheet.xsl @@ -30,7 +30,7 @@ URL - tqStatus + Status Label Referrers diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 62150888..3a775cf4 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -106,7 +106,7 @@ void ActionManager::initPart(KLinkStatusPart* part) // *************** Settings menu ********************* (void) new KAction(i18n("Configure KLinkStatus..."), "configure", - 0, d->part, TQT_SLOT(slotConfigureKLinktqStatus()), + 0, d->part, TQT_SLOT(slotConfigureKLinkStatus()), TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus"); // *************** Help menu ********************* diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index bf54a59b..5667735d 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -43,7 +43,7 @@ int LinkChecker::count_ = 0; -LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out, +LinkChecker::LinkChecker(LinkStatus* linkstatus, int time_out, TQObject *parent, const char *name) : TQObject(parent, name), search_manager_(0), linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), @@ -69,7 +69,7 @@ void LinkChecker::check() { Q_ASSERT(!finnished_); - KURL url(linktqStatus()->absoluteUrl()); + KURL url(linkStatus()->absoluteUrl()); Q_ASSERT(url.isValid()); if(url.hasRef()) { @@ -128,7 +128,7 @@ void LinkChecker::slotTimeOut() linkstatus_->setErrorOccurred(true); linkstatus_->setChecked(true); linkstatus_->setError(i18n("Timeout")); - linkstatus_->settqStatus(LinktqStatus::TIMEOUT); + linkstatus_->setStatus(LinkStatus::TIMEOUT); killJob(); finnish(); @@ -146,9 +146,9 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) Q_ASSERT(t_job_); - LinktqStatus* ls = 0; + LinkStatus* ls = 0; /* if(redirection_) - ls = linktqStatus()->redirection(); + ls = linkStatus()->redirection(); else*/ ls = linkstatus_; Q_ASSERT(ls); @@ -168,7 +168,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) if(!url.protocol().startsWith("http")) { ls->setStatusText("OK"); - ls->settqStatus(LinktqStatus::SUCCESSFULL); + ls->setStatus(LinkStatus::SUCCESSFULL); killJob(); finnish(); @@ -186,7 +186,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) { //kdDebug(23100) << "mimetype: " << type << endl; ls->setStatusText("OK"); - ls->settqStatus(LinktqStatus::SUCCESSFULL); + ls->setStatus(LinkStatus::SUCCESSFULL); killJob(); finnish(); @@ -206,9 +206,9 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data) Q_ASSERT(t_job_); - LinktqStatus* ls = 0; + LinkStatus* ls = 0; /* if(redirection_) - ls = linktqStatus()->redirection(); + ls = linkStatus()->redirection(); else*/ ls = linkstatus_; Q_ASSERT(ls); @@ -235,7 +235,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data) if(header_checked_) { killJob(); - linkstatus_->settqStatus(getHttptqStatus()); + linkstatus_->setStatus(getHttpStatus()); linkstatus_->setChecked(true); finnish(); return; @@ -253,7 +253,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data) if(ls->mimeType() != "text/html" && header_checked_) { //kdDebug(23100) << "mimetype of " << ls->absoluteUrl().prettyURL() << ": " << ls->mimeType() << endl; - ls->settqStatus(getHttptqStatus()); + ls->setStatus(getHttpStatus()); killJob(); finnish(); // if finnish is called before kill what you get is a segfault, don't know why return; @@ -262,7 +262,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data) { //kdDebug(23100) << "ERROR PAGE" << endl; ls->setIsErrorPage(true); - ls->settqStatus(getHttptqStatus()); + ls->setStatus(getHttpStatus()); killJob(); finnish(); return; @@ -339,9 +339,9 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) return; } - LinktqStatus* ls = 0; + LinkStatus* ls = 0; if(redirection_) - ls = linktqStatus()->redirection(); + ls = linkStatus()->redirection(); else ls = linkstatus_; Q_ASSERT(ls); @@ -366,15 +366,15 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) if(job->error() == KIO::ERR_IS_DIRECTORY) { ls->setStatusText("OK"); - ls->settqStatus(LinktqStatus::SUCCESSFULL); + ls->setStatus(LinkStatus::SUCCESSFULL); } else { ls->setErrorOccurred(true); if(job->error() == KIO::ERR_SERVER_TIMEOUT) - ls->settqStatus(LinktqStatus::TIMEOUT); + ls->setStatus(LinkStatus::TIMEOUT); else - ls->settqStatus(LinktqStatus::BROKEN); + ls->setStatus(LinkStatus::BROKEN); if(job->errorString().isEmpty()) kdWarning(23100) << "\n\nError string is empty, error = " << job->error() << "\n\n\n"; @@ -389,7 +389,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) { if(!ls->absoluteUrl().protocol().startsWith("http")) { ls->setStatusText("OK"); - ls->settqStatus(LinktqStatus::SUCCESSFULL); + ls->setStatus(LinkStatus::SUCCESSFULL); } else { @@ -402,7 +402,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) } Q_ASSERT(header_checked_); - ls->settqStatus(getHttptqStatus()); + ls->setStatus(getHttpStatus()); } if(!doc_html_.isNull() && !doc_html_.isEmpty()) @@ -449,10 +449,10 @@ bool LinkChecker::processRedirection(KURL const& toUrl) linkstatus_->setHttpHeader(getHttpHeader(t_job_, false)); linkstatus_->setIsRedirection(true); linkstatus_->setStatusText("redirection"); - linkstatus_->settqStatus(LinktqStatus::HTTP_REDIRECTION); + linkstatus_->setStatus(LinkStatus::HTTP_REDIRECTION); linkstatus_->setChecked(true); - LinktqStatus* ls_red = new LinktqStatus(*linkstatus_); + LinkStatus* ls_red = new LinkStatus(*linkstatus_); ls_red->setAbsoluteUrl(toUrl); ls_red->setRootUrl(linkstatus_->rootUrl()); @@ -534,23 +534,23 @@ HttpResponseHeader LinkChecker::getHttpHeader(KIO::Job* /*job*/, bool remember_c void LinkChecker::checkRef() { - KURL url(linktqStatus()->absoluteUrl()); + KURL url(linkStatus()->absoluteUrl()); Q_ASSERT(url.hasRef()); TQString ref = url.ref(); if(ref == "" || ref == "top") { linkstatus_->setStatusText("OK"); - linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL); + linkstatus_->setStatus(LinkStatus::SUCCESSFULL); finnish(); return; } TQString url_base; - LinktqStatus const* ls_parent = 0; + LinkStatus const* ls_parent = 0; int i_ref = -1; - if(linktqStatus()->originalUrl().startsWith("#")) - ls_parent = linktqStatus()->parent(); + if(linkStatus()->originalUrl().startsWith("#")) + ls_parent = linkStatus()->parent(); else { @@ -560,7 +560,7 @@ void LinkChecker::checkRef() Q_ASSERT(search_manager_); - ls_parent = search_manager_->linktqStatus(url_base); + ls_parent = search_manager_->linkStatus(url_base); } if(ls_parent) @@ -603,22 +603,22 @@ void LinkChecker::checkRef(KURL const& url) search_manager_->addHtmlPart(url_string, html_part); } - if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref())) + if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref())) { linkstatus_->setStatusText("OK"); - linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL); + linkstatus_->setStatus(LinkStatus::SUCCESSFULL); } else { linkstatus_->setErrorOccurred(true); linkstatus_->setError(i18n( "Link destination not found." )); - linkstatus_->settqStatus(LinktqStatus::BROKEN); + linkstatus_->setStatus(LinkStatus::BROKEN); } finnish(); } -void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent) +void LinkChecker::checkRef(LinkStatus const* linkstatus_parent) { Q_ASSERT(search_manager_); @@ -638,16 +638,16 @@ void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent) search_manager_->addHtmlPart(url_string, html_part); } - if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref())) + if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref())) { linkstatus_->setStatusText("OK"); - linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL); + linkstatus_->setStatus(LinkStatus::SUCCESSFULL); } else { linkstatus_->setErrorOccurred(true); linkstatus_->setError(i18n( "Link destination not found." )); - linkstatus_->settqStatus(LinktqStatus::BROKEN); + linkstatus_->setStatus(LinkStatus::BROKEN); } finnish(); @@ -684,20 +684,20 @@ void LinkChecker::killJob() aux->kill(true); // quietly } -LinktqStatus::tqStatus LinkChecker::getHttptqStatus() const +LinkStatus::Status LinkChecker::getHttpStatus() const { TQString status_code = TQString::number(linkstatus_->httpHeader().statusCode()); if(status_code[0] == '2') - return LinktqStatus::SUCCESSFULL; + return LinkStatus::SUCCESSFULL; else if(status_code[0] == '3') - return LinktqStatus::HTTP_REDIRECTION; + return LinkStatus::HTTP_REDIRECTION; else if(status_code[0] == '4') - return LinktqStatus::HTTP_CLIENT_ERROR; + return LinkStatus::HTTP_CLIENT_ERROR; else if(status_code[0] == '5') - return LinktqStatus::HTTP_SERVER_ERROR; + return LinkStatus::HTTP_SERVER_ERROR; else - return LinktqStatus::UNDETERMINED; + return LinkStatus::UNDETERMINED; } #include "linkchecker.moc" diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index 7eca50c8..86b01bb3 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -42,7 +42,7 @@ class LinkChecker : public TQObject Q_OBJECT TQ_OBJECT public: - LinkChecker(LinktqStatus* linkstatus, int time_out = 50, + LinkChecker(LinkStatus* linkstatus, int time_out = 50, TQObject *parent = 0, const char *name = 0); ~LinkChecker(); @@ -50,13 +50,13 @@ public: void check(); void setSearchManager(SearchManager* search_manager); - LinktqStatus const* linktqStatus() const; + LinkStatus const* linkStatus() const; static bool hasAnchor(KHTMLPart* html_part, TQString const& anchor); signals: - void transactionFinished(const LinktqStatus * linkstatus, + void transactionFinished(const LinkStatus * linkstatus, LinkChecker * checker); void jobFinnished(LinkChecker * checker); @@ -76,8 +76,8 @@ protected: private: - LinktqStatus::tqStatus getHttptqStatus() const; - void checkRef(LinktqStatus const* linkstatus_parent); + LinkStatus::Status getHttpStatus() const; + void checkRef(LinkStatus const* linkstatus_parent); void checkRef(KURL const& url); void killJob(); /** @@ -91,7 +91,7 @@ private: private: SearchManager* search_manager_; - LinktqStatus* const linkstatus_; + LinkStatus* const linkstatus_; KIO::TransferJob* t_job_; int time_out_; LinkChecker* checker_; @@ -120,7 +120,7 @@ private: static int count_; // debug attribute that counts how many links were checked }; -inline LinktqStatus const* LinkChecker::linktqStatus() const +inline LinkStatus const* LinkChecker::linkStatus() const { return linkstatus_; } diff --git a/klinkstatus/src/engine/linkfilter.cpp b/klinkstatus/src/engine/linkfilter.cpp index a626b5f8..27612600 100644 --- a/klinkstatus/src/engine/linkfilter.cpp +++ b/klinkstatus/src/engine/linkfilter.cpp @@ -22,7 +22,7 @@ #include "linkstatus.h" -LinkMatcher::LinkMatcher(TQString const& text, ResultView::tqStatus status) +LinkMatcher::LinkMatcher(TQString const& text, ResultView::Status status) : m_text(text), m_status(status) { } @@ -31,7 +31,7 @@ LinkMatcher::~LinkMatcher() { } -bool LinkMatcher::matches(LinktqStatus const& link ) const +bool LinkMatcher::matches(LinkStatus const& link ) const { /* kdDebug() << link.absoluteUrl().url() << endl; kdDebug() << link.label() << endl; @@ -39,7 +39,7 @@ bool LinkMatcher::matches(LinktqStatus const& link ) const kdDebug() << link.label().contains(m_text) << endl; */ return (link.absoluteUrl().url().contains(m_text, false) || link.label().contains(m_text, false)) && - ResultView::displayableWithtqStatus(&link, m_status); + ResultView::displayableWithStatus(&link, m_status); } diff --git a/klinkstatus/src/engine/linkfilter.h b/klinkstatus/src/engine/linkfilter.h index a47a37c8..0b5af1f6 100644 --- a/klinkstatus/src/engine/linkfilter.h +++ b/klinkstatus/src/engine/linkfilter.h @@ -28,22 +28,22 @@ class LinkMatcher { public: - LinkMatcher(TQString const& text, ResultView::tqStatus status); + LinkMatcher(TQString const& text, ResultView::Status status); ~LinkMatcher(); - bool matches(LinktqStatus const& link) const; + bool matches(LinkStatus const& link) const; void setText(const TQString& text) { m_text = text; } TQString text() const { return m_text; } - void settqStatus(ResultView::tqStatus status) { m_status = status; } - ResultView::tqStatus status() const { return m_status; } + void setStatus(ResultView::Status status) { m_status = status; } + ResultView::Status status() const { return m_status; } bool nullFilter() const { return m_text.isEmpty() && m_status == ResultView::none; } private: TQString m_text; - ResultView::tqStatus m_status; + ResultView::Status m_status; }; #endif diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp index e41bba75..bf5986f5 100644 --- a/klinkstatus/src/engine/linkstatus.cpp +++ b/klinkstatus/src/engine/linkstatus.cpp @@ -28,20 +28,20 @@ #include -LinktqStatus::~LinktqStatus() +LinkStatus::~LinkStatus() { //kdDebug(23100) << "|"; - for(uint i = 0; i != tqchildren_nodes_.size(); ++i) + for(uint i = 0; i != children_nodes_.size(); ++i) { - if(tqchildren_nodes_[i]) + if(children_nodes_[i]) { - delete tqchildren_nodes_[i]; - tqchildren_nodes_[i] = 0; + delete children_nodes_[i]; + children_nodes_[i] = 0; } } - tqchildren_nodes_.clear(); + children_nodes_.clear(); if(isRedirection()) { @@ -53,7 +53,7 @@ LinktqStatus::~LinktqStatus() } } -void LinktqStatus::reset() +void LinkStatus::reset() { depth_ = -1; external_domain_depth_ = -1; @@ -71,16 +71,16 @@ void LinktqStatus::reset() http_header_ = HttpResponseHeader(); error_ = ""; - for(uint i = 0; i != tqchildren_nodes_.size(); ++i) + for(uint i = 0; i != children_nodes_.size(); ++i) { - if(tqchildren_nodes_[i]) + if(children_nodes_[i]) { - delete tqchildren_nodes_[i]; - tqchildren_nodes_[i] = 0; + delete children_nodes_[i]; + children_nodes_[i] = 0; } } - tqchildren_nodes_.clear(); + children_nodes_.clear(); if(isRedirection()) { @@ -94,27 +94,27 @@ void LinktqStatus::reset() base_URI_ = ""; } -TQString const LinktqStatus::toString() const +TQString const LinkStatus::toString() const { TQString aux; if(!is_root_) { Q_ASSERT(parent_); - aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n"; + aux += i18n( "Parent: %1" ).arg( parent()->absoluteUrl().prettyURL() ) + "\n"; } Q_ASSERT(!original_url_.isNull()); - aux += i18n( "URL: %1" ).tqarg( absoluteUrl().prettyURL() ) + "\n"; - aux += i18n( "Original URL: %1" ).tqarg( originalUrl() ) + "\n"; + aux += i18n( "URL: %1" ).arg( absoluteUrl().prettyURL() ) + "\n"; + aux += i18n( "Original URL: %1" ).arg( originalUrl() ) + "\n"; if(node()) - aux += i18n( "Node: %1" ).tqarg( node()->content() ) + "\n"; + aux += i18n( "Node: %1" ).arg( node()->content() ) + "\n"; return aux; } -LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls) +LinkStatus* LinkStatus::lastRedirection(LinkStatus* ls) { if(ls->isRedirection()) if(ls->redirection()) @@ -125,7 +125,7 @@ LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls) return ls; } -void LinktqStatus::loadNode() +void LinkStatus::loadNode() { Q_ASSERT(node_); @@ -136,32 +136,32 @@ void LinktqStatus::loadNode() { setErrorOccurred(true); setError(i18n( "Malformed" )); - settqStatus(LinktqStatus::MALFORMED); + setStatus(LinkStatus::MALFORMED); kdDebug(23100) << "Malformed:" << endl; kdDebug(23100) << "Node: " << node()->content() << endl; //kdDebug(23100) << toString() << endl; // probable segfault } } -bool LinktqStatus::malformed() const // don't inline please (#include "node.h") +bool LinkStatus::malformed() const // don't inline please (#include "node.h") { return (malformed_ || node_->malformed()); } -void LinktqStatus::setChildrenNodes(vector const& nodes) // don't inline please (#include "node.h") +void LinkStatus::setChildrenNodes(vector const& nodes) // don't inline please (#include "node.h") { - tqchildren_nodes_.reserve(nodes.size()); - tqchildren_nodes_ = nodes; + children_nodes_.reserve(nodes.size()); + children_nodes_ = nodes; } -void LinktqStatus::setMalformed(bool flag) +void LinkStatus::setMalformed(bool flag) { malformed_ = flag; if(flag) { setErrorOccurred(true); setError(i18n( "Malformed" )); - settqStatus(LinktqStatus::MALFORMED); + setStatus(LinkStatus::MALFORMED); kdDebug(23100) << "Malformed!" << endl; kdDebug(23100) << node()->content() << endl; //kdDebug(23100) << toString() << endl; // probable segfault @@ -170,11 +170,11 @@ void LinktqStatus::setMalformed(bool flag) { setErrorOccurred(false); setError(""); - settqStatus(LinktqStatus::UNDETERMINED); + setStatus(LinkStatus::UNDETERMINED); } } -void LinktqStatus::save(TQDomElement& element) const +void LinkStatus::save(TQDomElement& element) const { TQDomElement child_element = element.ownerDocument().createElement("link"); @@ -186,7 +186,7 @@ void LinktqStatus::save(TQDomElement& element) const // tmp_1 = element.ownerDocument().createElement("status"); tmp_1.setAttribute("broken", - ResultView::displayableWithtqStatus(this, ResultView::bad) ? + ResultView::displayableWithStatus(this, ResultView::bad) ? "true" : "false"); tmp_1.appendChild(element.ownerDocument().createTextNode(statusText())); child_element.appendChild(tmp_1); diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h index 3880791f..ac49801f 100644 --- a/klinkstatus/src/engine/linkstatus.h +++ b/klinkstatus/src/engine/linkstatus.h @@ -43,11 +43,11 @@ using namespace std; class Node; -class LinktqStatus +class LinkStatus { public: - enum tqStatus { + enum Status { UNDETERMINED, SUCCESSFULL, BROKEN, @@ -59,29 +59,29 @@ public: MALFORMED }; - LinktqStatus(); - LinktqStatus(KURL const& absolute_url); - LinktqStatus(Node* node, LinktqStatus* parent); - ~LinktqStatus(); + LinkStatus(); + LinkStatus(KURL const& absolute_url); + LinkStatus(Node* node, LinkStatus* parent); + ~LinkStatus(); void save(TQDomElement& element) const; void reset(); void setRootUrl(KURL const& url); - void settqStatus(tqStatus status); + void setStatus(Status status); void setDepth(uint depth); - void setParent(LinktqStatus* parent); + void setParent(LinkStatus* parent); void setOriginalUrl(TQString const& url_original); void setLabel(TQString const& label); void setAbsoluteUrl(KURL const& url_absoluto); void setDocHtml(TQString const& doc_html); void setHttpHeader(HttpResponseHeader const& cabecalho_http); - void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus + void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status void setError(TQString const& error); void setIsRoot(bool flag); void setErrorOccurred(bool houve_error); void setIsRedirection(bool e_redirection); - void setRedirection(LinktqStatus* redirection); + void setRedirection(LinkStatus* redirection); void setNode(Node* node); void setChildrenNodes(vector const& nodes); void addChildNode(Node* node); @@ -102,25 +102,25 @@ public: void addReferrer(KURL const& url); KURL const& rootUrl() const; - tqStatus const& status() const; + Status const& status() const; uint depth() const; bool local() const; // linkstatus.paradigma.co.pt == paradigma.co.pt bool isLocalRestrict() const; // linkstatus.paradigma.co.pt != paradigma.co.pt - LinktqStatus const* parent() const; + LinkStatus const* parent() const; TQString const& originalUrl() const; TQString const& label() const; KURL const& absoluteUrl() const; TQString const& docHtml() const; HttpResponseHeader const& httpHeader() const; HttpResponseHeader& httpHeader(); - TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus + TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status TQString const& error() const; bool isRoot() const; bool errorOccurred() const; bool isRedirection() const; - LinktqStatus* redirection() const; + LinkStatus* redirection() const; Node* node() const; - vector const& tqchildrenNodes() const; + vector const& childrenNodes() const; TQString const toString() const; bool checked() const; int externalDomainDepth() const; @@ -137,7 +137,7 @@ public: TreeViewItem* treeViewItem() const; TQValueVector const& referrers() const; - static LinktqStatus* lastRedirection(LinktqStatus* ls); + static LinkStatus* lastRedirection(LinkStatus* ls); private: @@ -149,7 +149,7 @@ private: private: KURL root_url_; // The URL which made the search start - tqStatus status_; + Status status_; int depth_; int external_domain_depth_; // Para se poder escolher explorar domains diferentes ate n depth TQString original_url_; @@ -157,14 +157,14 @@ private: KURL absolute_url_; TQString doc_html_; HttpResponseHeader http_header_; - TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus + TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status TQString error_; bool is_root_; bool error_occurred_; bool is_redirection_; - vector tqchildren_nodes_; - LinktqStatus* parent_; - LinktqStatus* redirection_; + vector children_nodes_; + LinkStatus* parent_; + LinkStatus* redirection_; bool checked_; bool only_check_header_; bool malformed_; diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h index f8d6bfd5..4a2e4099 100644 --- a/klinkstatus/src/engine/linkstatus_impl.h +++ b/klinkstatus/src/engine/linkstatus_impl.h @@ -18,16 +18,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -inline LinktqStatus::LinktqStatus() - : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), +inline LinkStatus::LinkStatus() + : status_(LinkStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false), only_check_header_(true), malformed_(false), node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false), mimetype_(""), is_error_page_(false), tree_view_item_(0) {} -inline LinktqStatus::LinktqStatus(KURL const& absolute_url) - : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), +inline LinkStatus::LinkStatus(KURL const& absolute_url) + : status_(LinkStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false), only_check_header_(true), malformed_(false), node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false), @@ -36,8 +36,8 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url) setAbsoluteUrl(absolute_url); } -inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent) - : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), +inline LinkStatus::LinkStatus(Node* node, LinkStatus* parent) + : status_(LinkStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false), only_check_header_(true), malformed_(false), node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false), @@ -50,22 +50,22 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent) setRootUrl(parent->rootUrl()); } -inline void LinktqStatus::setRootUrl(KURL const& url) +inline void LinkStatus::setRootUrl(KURL const& url) { root_url_ = url; } -inline void LinktqStatus::settqStatus(tqStatus status) +inline void LinkStatus::setStatus(Status status) { status_ = status; } -inline void LinktqStatus::setDepth(uint depth) +inline void LinkStatus::setDepth(uint depth) { depth_ = depth; } -inline void LinktqStatus::setParent(LinktqStatus* parent) +inline void LinkStatus::setParent(LinkStatus* parent) { Q_ASSERT(parent); @@ -73,105 +73,105 @@ inline void LinktqStatus::setParent(LinktqStatus* parent) addReferrer(parent->absoluteUrl()); } -inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto) +inline void LinkStatus::setAbsoluteUrl(KURL const& url_absoluto) { absolute_url_ = url_absoluto; } -inline void LinktqStatus::setOriginalUrl(TQString const& url_original) +inline void LinkStatus::setOriginalUrl(TQString const& url_original) { original_url_ = url_original; } -inline void LinktqStatus::setLabel(TQString const& label) +inline void LinkStatus::setLabel(TQString const& label) { label_ = label; } -inline void LinktqStatus::setDocHtml(TQString const& doc_html) +inline void LinkStatus::setDocHtml(TQString const& doc_html) { Q_ASSERT(!doc_html.isEmpty()); doc_html_ = doc_html; } -inline void LinktqStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http) +inline void LinkStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http) { http_header_ = cabecalho_http; } -inline void LinktqStatus::setStatusText(TQString const& status) +inline void LinkStatus::setStatusText(TQString const& status) { Q_ASSERT(!status.isEmpty()); status_text_ = status; } -inline void LinktqStatus::setError(TQString const& error) +inline void LinkStatus::setError(TQString const& error) { Q_ASSERT(!error.isEmpty()); error_ = error; } -inline void LinktqStatus::setErrorOccurred(bool houve_error) +inline void LinkStatus::setErrorOccurred(bool houve_error) { error_occurred_ = houve_error; } -inline void LinktqStatus::setIsRoot(bool flag) +inline void LinkStatus::setIsRoot(bool flag) { is_root_ = flag; label_ = i18n("ROOT"); } -inline void LinktqStatus::setRedirection(LinktqStatus* redirection) +inline void LinkStatus::setRedirection(LinkStatus* redirection) { Q_ASSERT(redirection != NULL); Q_ASSERT(isRedirection()); redirection_ = redirection; } -inline void LinktqStatus::setIsRedirection(bool e_redirection) +inline void LinkStatus::setIsRedirection(bool e_redirection) { is_redirection_ = e_redirection; } -inline void LinktqStatus::addChildNode(Node* node) +inline void LinkStatus::addChildNode(Node* node) { - tqchildren_nodes_.push_back(node); + children_nodes_.push_back(node); } -inline void LinktqStatus::reserveMemoryForChildrenNodes(int n) +inline void LinkStatus::reserveMemoryForChildrenNodes(int n) { Q_ASSERT(n > 0); - tqchildren_nodes_.reserve(n); + children_nodes_.reserve(n); } -inline void LinktqStatus::setChecked(bool flag) +inline void LinkStatus::setChecked(bool flag) { checked_ = flag; } -inline void LinktqStatus::setExternalDomainDepth(int p) +inline void LinkStatus::setExternalDomainDepth(int p) { Q_ASSERT(p >= -1); external_domain_depth_ = p; } -inline void LinktqStatus::setOnlyCheckHeader(bool flag) +inline void LinkStatus::setOnlyCheckHeader(bool flag) { only_check_header_= flag; } -inline void LinktqStatus::setHasBaseURI(bool flag) +inline void LinkStatus::setHasBaseURI(bool flag) { has_base_URI_ = flag; } -inline void LinktqStatus::setHasHtmlDocTitle(bool flag) +inline void LinkStatus::setHasHtmlDocTitle(bool flag) { has_html_doc_title_ = flag; } -inline void LinktqStatus::setBaseURI(KURL const& base_url) +inline void LinkStatus::setBaseURI(KURL const& base_url) { if(!base_url.isValid()) { @@ -186,7 +186,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url) base_URI_ = base_url; } -inline void LinktqStatus::setHtmlDocTitle(TQString const& title) +inline void LinkStatus::setHtmlDocTitle(TQString const& title) { if(title.isNull() || title.isEmpty()) { @@ -199,34 +199,34 @@ inline void LinktqStatus::setHtmlDocTitle(TQString const& title) html_doc_title_ = title; } -inline void LinktqStatus::setIgnored(bool flag) +inline void LinkStatus::setIgnored(bool flag) { ignored_ = flag; } -inline void LinktqStatus::setMimeType(TQString const& mimetype) +inline void LinkStatus::setMimeType(TQString const& mimetype) { Q_ASSERT(!mimetype.isNull() && !mimetype.isEmpty()); mimetype_ = mimetype; } -inline void LinktqStatus::setIsErrorPage(bool flag) +inline void LinkStatus::setIsErrorPage(bool flag) { is_error_page_ = flag; } -inline void LinktqStatus::setIsLocalRestrict(bool flag) +inline void LinkStatus::setIsLocalRestrict(bool flag) { is_local_restrict_ = flag; } -inline void LinktqStatus::setTreeViewItem(TreeViewItem* tree_view_item) +inline void LinkStatus::setTreeViewItem(TreeViewItem* tree_view_item) { Q_ASSERT(tree_view_item); tree_view_item_ = tree_view_item; } -inline void LinktqStatus::addReferrer(KURL const& url) +inline void LinkStatus::addReferrer(KURL const& url) { Q_ASSERT(url.isValid()); @@ -236,67 +236,67 @@ inline void LinktqStatus::addReferrer(KURL const& url) -inline KURL const& LinktqStatus::rootUrl() const +inline KURL const& LinkStatus::rootUrl() const { return root_url_; } -inline LinktqStatus::tqStatus const& LinktqStatus::status() const +inline LinkStatus::Status const& LinkStatus::status() const { return status_; } -inline uint LinktqStatus::depth() const +inline uint LinkStatus::depth() const { return depth_; } -inline bool LinktqStatus::local() const +inline bool LinkStatus::local() const { return external_domain_depth_ == -1; } -inline bool LinktqStatus::isLocalRestrict() const +inline bool LinkStatus::isLocalRestrict() const { return is_local_restrict_; } -inline LinktqStatus const* LinktqStatus::parent() const +inline LinkStatus const* LinkStatus::parent() const { return parent_; } -inline TQString const& LinktqStatus::originalUrl() const +inline TQString const& LinkStatus::originalUrl() const { return original_url_; } -inline TQString const& LinktqStatus::label() const +inline TQString const& LinkStatus::label() const { return label_; } -inline KURL const& LinktqStatus::absoluteUrl() const +inline KURL const& LinkStatus::absoluteUrl() const { return absolute_url_; } -inline TQString const& LinktqStatus::docHtml() const +inline TQString const& LinkStatus::docHtml() const { return doc_html_; } -inline HttpResponseHeader const& LinktqStatus::httpHeader() const +inline HttpResponseHeader const& LinkStatus::httpHeader() const { return http_header_; } -inline HttpResponseHeader& LinktqStatus::httpHeader() +inline HttpResponseHeader& LinkStatus::httpHeader() { return http_header_; } -inline TQString LinktqStatus::statusText() const +inline TQString LinkStatus::statusText() const { if(errorOccurred()) return error(); @@ -314,103 +314,103 @@ inline TQString LinktqStatus::statusText() const } } -inline TQString const& LinktqStatus::error() const +inline TQString const& LinkStatus::error() const { return error_; } -inline bool LinktqStatus::isRoot() const +inline bool LinkStatus::isRoot() const { return is_root_; } -inline bool LinktqStatus::errorOccurred() const +inline bool LinkStatus::errorOccurred() const { return error_occurred_; } -inline bool LinktqStatus::isRedirection() const +inline bool LinkStatus::isRedirection() const { return is_redirection_; } -inline LinktqStatus* LinktqStatus::redirection() const +inline LinkStatus* LinkStatus::redirection() const { Q_ASSERT(isRedirection()); return redirection_; } -inline Node* LinktqStatus::node() const +inline Node* LinkStatus::node() const { //Q_ASSERT(node_); return node_; } -inline vector const& LinktqStatus::tqchildrenNodes() const +inline vector const& LinkStatus::childrenNodes() const { - return tqchildren_nodes_; + return children_nodes_; } -inline bool LinktqStatus::checked() const +inline bool LinkStatus::checked() const { return checked_; } -inline int LinktqStatus::externalDomainDepth() const +inline int LinkStatus::externalDomainDepth() const { return external_domain_depth_; } -inline bool LinktqStatus::onlyCheckHeader() const +inline bool LinkStatus::onlyCheckHeader() const { return only_check_header_; } -inline bool LinktqStatus::hasBaseURI() const +inline bool LinkStatus::hasBaseURI() const { return has_base_URI_; } -inline bool LinktqStatus::hasHtmlDocTitle() const +inline bool LinkStatus::hasHtmlDocTitle() const { return has_html_doc_title_; } -inline KURL const& LinktqStatus::baseURI() const +inline KURL const& LinkStatus::baseURI() const { Q_ASSERT(hasBaseURI()); return base_URI_; } -inline TQString const& LinktqStatus::htmlDocTitle() const +inline TQString const& LinkStatus::htmlDocTitle() const { Q_ASSERT(has_html_doc_title_); return html_doc_title_; } -inline bool LinktqStatus::ignored() const +inline bool LinkStatus::ignored() const { return ignored_; } -inline TQString LinktqStatus::mimeType() const +inline TQString LinkStatus::mimeType() const { Q_ASSERT(!mimetype_.isNull()); return mimetype_; } -inline bool LinktqStatus::isErrorPage() const +inline bool LinkStatus::isErrorPage() const { return is_error_page_; } -inline TreeViewItem* LinktqStatus::treeViewItem() const +inline TreeViewItem* LinkStatus::treeViewItem() const { return tree_view_item_; } -inline TQValueVector const& LinktqStatus::referrers() const +inline TQValueVector const& LinkStatus::referrers() const { return referrers_; } diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 6ca04b3a..591b3acd 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -191,8 +191,8 @@ void SearchManager::checkRoot() LinkChecker* checker = new LinkChecker(&root_, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *))); + connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); /* connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); @@ -200,11 +200,11 @@ void SearchManager::checkRoot() checker->check(); } -void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * checker) +void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * checker) { kdDebug(23100) << "SearchManager::slotRootChecked:" << endl; kdDebug(23100) << link->absoluteUrl().url() << " -> " << - LinktqStatus::lastRedirection(&root_)->absoluteUrl().url() << endl; + LinkStatus::lastRedirection(&root_)->absoluteUrl().url() << endl; Q_ASSERT(checked_links_ == 0); Q_ASSERT(search_results_.size() == 0); @@ -217,11 +217,11 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che { current_depth_ = 1; - vector no = tqchildren(LinktqStatus::lastRedirection(&root_)); + vector no = children(LinkStatus::lastRedirection(&root_)); emit signalLinksToCheckTotalSteps(no.size()); - vector< vector > nivel; + vector< vector > nivel; nivel.push_back(no); search_results_.push_back(nivel); @@ -255,14 +255,14 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che checker = 0; } -vector SearchManager::tqchildren(LinktqStatus* link) +vector SearchManager::children(LinkStatus* link) { - vector tqchildren; + vector children; if(!link || link->absoluteUrl().hasRef()) - return tqchildren; + return children; - vector const& nodes = link->tqchildrenNodes(); + vector const& nodes = link->childrenNodes(); int count = 0; for(uint i = 0; i != nodes.size(); ++i) @@ -278,12 +278,12 @@ vector SearchManager::tqchildren(LinktqStatus* link) if( (node->isLink() && checkable(url, *link) && - !Url::existUrl(url, tqchildren) && + !Url::existUrl(url, children) && !node->url().isEmpty()) || node->malformed() ) { - LinktqStatus* ls = new LinktqStatus(node, link); + LinkStatus* ls = new LinkStatus(node, link); ls->setAbsoluteUrl(url); if(localDomain(ls->absoluteUrl())) @@ -310,7 +310,7 @@ vector SearchManager::tqchildren(LinktqStatus* link) } Q_ASSERT(link->externalDomainDepth() <= external_domain_depth_); - tqchildren.push_back(ls); + children.push_back(ls); } if(count == 50) { @@ -319,7 +319,7 @@ vector SearchManager::tqchildren(LinktqStatus* link) } } - return tqchildren; + return children; } bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const @@ -331,7 +331,7 @@ bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const for(uint j = 0; j != search_results_[i].size(); ++j) for(uint l = 0; l != (search_results_[i])[j].size(); ++l) { - LinktqStatus* tmp = search_results_[i][j][l]; + LinkStatus* tmp = search_results_[i][j][l]; Q_ASSERT(tmp); if(tmp->absoluteUrl() == url) { // URL exists @@ -352,7 +352,7 @@ bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const return false; } -LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const +LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const { Q_ASSERT(!s_url.isEmpty()); @@ -366,7 +366,7 @@ LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const { ++count; - LinktqStatus* ls = search_results_[i][j][l]; + LinkStatus* ls = search_results_[i][j][l]; Q_ASSERT(ls); if(ls->absoluteUrl().url() == s_url && ls->checked()) return ls; @@ -402,7 +402,7 @@ void SearchManager::continueSearch() { Q_ASSERT(!links_being_checked_); - vector const& no = nodeToAnalize(); + vector const& no = nodeToAnalize(); if((uint)current_index_ < no.size()) checkVectorLinks(no); @@ -442,7 +442,7 @@ void SearchManager::continueSearch() } } -vector const& SearchManager::nodeToAnalize() const +vector const& SearchManager::nodeToAnalize() const { Q_ASSERT( (uint)current_depth_ == search_results_.size() ); Q_ASSERT( (uint)current_node_ < (search_results_[current_depth_ - 1]).size() ); @@ -450,14 +450,14 @@ vector const& SearchManager::nodeToAnalize() const return (search_results_[current_depth_ - 1])[current_node_]; } -void SearchManager::checkVectorLinks(vector const& links) +void SearchManager::checkVectorLinks(vector const& links) { checkLinksSimultaneously(chooseLinks(links)); } -vector SearchManager::chooseLinks(vector const& links) +vector SearchManager::chooseLinks(vector const& links) { - vector escolha; + vector escolha; for(int i = 0; i != max_simultaneous_connections_; ++i) { if((uint)current_index_ < links.size()) @@ -466,7 +466,7 @@ vector SearchManager::chooseLinks(vector const& li return escolha; } -void SearchManager::checkLinksSimultaneously(vector const& links) +void SearchManager::checkLinksSimultaneously(vector const& links) { Q_ASSERT(finished_connections_ <= max_simultaneous_connections_); finished_connections_ = 0; @@ -480,7 +480,7 @@ void SearchManager::checkLinksSimultaneously(vector const& links) for(uint i = 0; i != links.size(); ++i) { - LinktqStatus* ls(links[i]); + LinkStatus* ls(links[i]); Q_ASSERT(ls); TQString protocol = ls->absoluteUrl().protocol(); @@ -491,7 +491,7 @@ void SearchManager::checkLinksSimultaneously(vector const& links) if(ls->malformed()) { Q_ASSERT(ls->errorOccurred()); - Q_ASSERT(ls->status() == LinktqStatus::MALFORMED); + Q_ASSERT(ls->status() == LinkStatus::MALFORMED); ls->setChecked(true); slotLinkChecked(ls, 0); @@ -503,7 +503,7 @@ void SearchManager::checkLinksSimultaneously(vector const& links) ls->setIgnored(true); ls->setErrorOccurred(true); ls->setError(i18n( "Javascript not supported" )); - ls->settqStatus(LinktqStatus::NOT_SUPPORTED); + ls->setStatus(LinkStatus::NOT_SUPPORTED); ls->setChecked(true); slotLinkChecked(ls, 0); } @@ -513,8 +513,8 @@ void SearchManager::checkLinksSimultaneously(vector const& links) ++ignored_links_; ls->setIgnored(true); ls->setErrorOccurred(true); - ls->setError(i18n("Protocol %1 not supported").tqarg(protocol)); - ls->settqStatus(LinktqStatus::MALFORMED); + ls->setError(i18n("Protocol %1 not supported").arg(protocol)); + ls->setStatus(LinkStatus::MALFORMED); ls->setChecked(true); slotLinkChecked(ls, 0); } @@ -524,8 +524,8 @@ void SearchManager::checkLinksSimultaneously(vector const& links) LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *))); + connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); /* connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); @@ -535,11 +535,11 @@ void SearchManager::checkLinksSimultaneously(vector const& links) } } -void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * checker) +void SearchManager::slotLinkChecked(const LinkStatus * link, LinkChecker * checker) { kdDebug(23100) << "SearchManager::slotLinkChecked:" << endl; // kdDebug(23100) << link->absoluteUrl().url() << " -> " << -// LinktqStatus::lastRedirection((const_cast (link)))->absoluteUrl().url() << endl; +// LinkStatus::lastRedirection((const_cast (link)))->absoluteUrl().url() << endl; Q_ASSERT(link); emit signalLinkChecked(link, checker); @@ -569,8 +569,8 @@ void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * che void SearchManager::addLevel() { - search_results_.push_back(vector< vector >()); - vector< vector >& ultimo_nivel(search_results_[search_results_.size() - 2]); + search_results_.push_back(vector< vector >()); + vector< vector >& ultimo_nivel(search_results_[search_results_.size() - 2]); number_of_level_links_ = 0; number_of_links_to_check_ = 0; @@ -591,7 +591,7 @@ void SearchManager::addLevel() uint end_sub1 = ultimo_nivel[i].size(); for(uint j = 0; j != end_sub1; ++j) // links { - vector f(tqchildren( LinktqStatus::lastRedirection(((ultimo_nivel[i])[j])) )); + vector f(children( LinkStatus::lastRedirection(((ultimo_nivel[i])[j])) )); if(f.size() != 0) { search_results_[search_results_.size() - 1].push_back(f); @@ -608,7 +608,7 @@ void SearchManager::addLevel() emit signalLinksToCheckTotalSteps(number_of_links_to_check_); } -bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent) const +bool SearchManager::checkable(KURL const& url, LinkStatus const& link_parent) const { if(existUrl(url, link_parent.absoluteUrl())) return false; @@ -638,7 +638,7 @@ bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent) return true; } -bool SearchManager::checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const +bool SearchManager::checkableByDomain(KURL const& url, LinkStatus const& link_parent) const { bool result = false; if(localDomain(url)) @@ -781,7 +781,7 @@ bool SearchManager::generalDomain() const } } -bool SearchManager::onlyCheckHeader(LinktqStatus* ls) const +bool SearchManager::onlyCheckHeader(LinkStatus* ls) const { if(search_mode_ == depth) return current_depth_ == depth_; @@ -805,7 +805,7 @@ void SearchManager::slotLinkCheckerFinnished(LinkChecker * checker) kdDebug(23100) << "deleting linkchecker" << endl; Q_ASSERT(checker); - //Q_ASSERT(checker->linktqStatus()->checked()); + //Q_ASSERT(checker->linkStatus()->checked()); delete checker; checker = 0; @@ -891,7 +891,7 @@ void SearchManager::save(TQDomElement& element) const { for(uint l = 0; l != (search_results_[i])[j].size(); ++l) { - LinktqStatus* ls = ((search_results_[i])[j])[l]; + LinkStatus* ls = ((search_results_[i])[j])[l]; if(ls->checked()) ls->save(child_element); } diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index d2414cfe..39628917 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -95,12 +95,12 @@ public: SearchMode const& searchMode() const; bool checkRegularExpressions() const { return check_regular_expressions_; } bool existUrl(KURL const& url, KURL const& url_parent) const; - LinktqStatus const* linktqStatus(TQString const& s_url) const; + LinkStatus const* linkStatus(TQString const& s_url) const; int checkedLinks() const; TQTime timeElapsed() const; bool checkParentDirs() const; bool checkExternalLinks() const; - LinktqStatus const* linkStatusRoot() const; + LinkStatus const* linkStatusRoot() const; int maxSimultaneousConnections() const; int timeOut() const; @@ -110,20 +110,20 @@ public: private: void checkRoot(); - void checkVectorLinks(vector const& links); // corresponde a um no de um nivel de depth - vector tqchildren(LinktqStatus* link); + void checkVectorLinks(vector const& links); // corresponde a um no de um nivel de depth + vector children(LinkStatus* link); void startSearch(); void continueSearch(); void finnish(); void pause(); - vector const& nodeToAnalize() const; - vector chooseLinks(vector const& links); - void checkLinksSimultaneously(vector const& links); + vector const& nodeToAnalize() const; + vector chooseLinks(vector const& links); + void checkLinksSimultaneously(vector const& links); void addLevel(); - bool checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const; - bool checkable(KURL const& url, LinktqStatus const& link_parent) const; + bool checkableByDomain(KURL const& url, LinkStatus const& link_parent) const; + bool checkable(KURL const& url, LinkStatus const& link_parent) const; int maximumCurrentConnections() const; - bool onlyCheckHeader(LinktqStatus* ls) const; + bool onlyCheckHeader(LinkStatus* ls) const; /* Entende-se por domain vago um domain do tipo www.google.pt ou google.pt, pelo que, @@ -135,15 +135,15 @@ private: private slots: - void slotRootChecked(const LinktqStatus * link, LinkChecker * checker); - void slotLinkChecked(const LinktqStatus * link, LinkChecker * checker); + void slotRootChecked(const LinkStatus * link, LinkChecker * checker); + void slotLinkChecked(const LinkStatus * link, LinkChecker * checker); void slotSearchFinished(); void slotLinkCheckerFinnished(LinkChecker * checker); signals: - void signalRootChecked(const LinktqStatus * link, LinkChecker * checker); - void signalLinkChecked(const LinktqStatus * link, LinkChecker * checker); + void signalRootChecked(const LinkStatus * link, LinkChecker * checker); + void signalLinkChecked(const LinkStatus * link, LinkChecker * checker); void signalSearchFinished(); void signalSearchPaused(); void signalAddingLevelTotalSteps(uint number_of_links); @@ -155,7 +155,7 @@ private: int max_simultaneous_connections_; SearchMode search_mode_; - LinktqStatus root_; + LinkStatus root_; bool has_document_root_; KURL document_root_url_; // in case of non http protocols the document root must be explicitly given int depth_; @@ -185,7 +185,7 @@ private: bool check_regular_expressions_; uint number_of_level_links_; uint number_of_links_to_check_; - vector< vector< vector > > search_results_; + vector< vector< vector > > search_results_; KHTMLPartMap html_parts_; }; diff --git a/klinkstatus/src/engine/searchmanager_impl.h b/klinkstatus/src/engine/searchmanager_impl.h index 947e98ff..736d2c10 100644 --- a/klinkstatus/src/engine/searchmanager_impl.h +++ b/klinkstatus/src/engine/searchmanager_impl.h @@ -111,7 +111,7 @@ inline bool SearchManager::checkExternalLinks() const return check_external_links_; } -inline LinktqStatus const* SearchManager::linkStatusRoot() const +inline LinkStatus const* SearchManager::linkStatusRoot() const { return &root_; } diff --git a/klinkstatus/src/klinkstatus.lsm b/klinkstatus/src/klinkstatus.lsm index 0cc4c0c1..94221faf 100644 --- a/klinkstatus/src/klinkstatus.lsm +++ b/klinkstatus/src/klinkstatus.lsm @@ -1,5 +1,5 @@ Begin3 -Title: KLinktqStatus -- Some description +Title: KLinkStatus -- Some description Version: 0.2.1 Entered-date: Description: diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp index 814acfd2..affc35c9 100644 --- a/klinkstatus/src/parser/url.cpp +++ b/klinkstatus/src/parser/url.cpp @@ -45,7 +45,7 @@ Node::LinkType Url::resolveLinkType(TQString const& url) return Node::relative; } -KURL Url::normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root) +KURL Url::normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root) { TQString _string_url = string_url.stripWhiteSpace(); @@ -124,7 +124,7 @@ KURL Url::normalizeUrl(TQString const& string_url) } } -bool Url::existUrl(KURL const& url, vector const& v) +bool Url::existUrl(KURL const& url, vector const& v) { if(url.prettyURL().isEmpty()) return true; @@ -248,7 +248,7 @@ bool Url::hasProtocol(TQString const& url) /** http://linkstatus.paradigma.co.pt/en/index.html&bix=bix -> /en/index.html&bix=bix */ -TQString Url::convertToLocal(LinktqStatus const* ls) +TQString Url::convertToLocal(LinkStatus const* ls) { KURL url = ls->absoluteUrl(); KURL base_url = ls->rootUrl(); diff --git a/klinkstatus/src/parser/url.h b/klinkstatus/src/parser/url.h index 574f4fa5..f90f2b33 100644 --- a/klinkstatus/src/parser/url.h +++ b/klinkstatus/src/parser/url.h @@ -32,18 +32,18 @@ using namespace std; -class LinktqStatus; +class LinkStatus; namespace Url { Node::LinkType resolveLinkType(TQString const& url); -KURL normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root); +KURL normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root); KURL normalizeUrl(TQString const& string_url); bool validUrl(KURL const& url); -bool existUrl(KURL const& url, vector const& v); +bool existUrl(KURL const& url, vector const& v); bool equalHost(TQString const& host1, TQString const& host2, bool restrict = false); bool hasProtocol(TQString const& url); -TQString convertToLocal(LinktqStatus const* ls); +TQString convertToLocal(LinkStatus const* ls); bool localDomain(KURL const& url1, KURL const& url2, bool restrict = true); bool parentDir(KURL const& url1, KURL const& url2); bool externalLink(KURL const& url1, KURL const& url2, bool restrict = true); diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index b1563285..9a813211 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index b19f7764..3318132c 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -35,19 +35,19 @@ #include #include #include -#include +#include class ResultsSearchBar::ResultsSearchBarPrivate { public: ResultsSearchBarPrivate() - : tqlayout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0) + : layout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0) {} TQString searchText; TQTimer timer; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; KLineEdit* searchLine; KComboBox* searchCombo; int delay; @@ -57,31 +57,31 @@ public: ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) { - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); - d->tqlayout = new TQHBoxLayout(this); - d->tqlayout->setMargin(2); - d->tqlayout->setSpacing(5); + d->layout = new TQHBoxLayout(this); + d->layout->setMargin(2); + d->layout->setSpacing(5); TQToolButton* clearButton = new TQToolButton(this); clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); clearButton->setAutoRaise(true); - d->tqlayout->addWidget(clearButton); + d->layout->addWidget(clearButton); TQLabel* searchLabel = new TQLabel(this); searchLabel->setText(i18n("S&earch:")); - d->tqlayout->addWidget(searchLabel); + d->layout->addWidget(searchLabel); d->searchLine = new KLineEdit(this, "searchline"); connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); - d->tqlayout->addWidget(d->searchLine); + d->layout->addWidget(d->searchLine); TQLabel* statusLabel = new TQLabel(this); statusLabel->setText( i18n("Status:") ); - d->tqlayout->addWidget(statusLabel); + d->layout->addWidget(statusLabel); d->searchCombo = new KComboBox(this, "searchcombo"); TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); @@ -95,7 +95,7 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->searchCombo->insertItem(iconBroken, i18n("Broken Links")); d->searchCombo->insertItem(iconMalformed, i18n("Malformed Links")); d->searchCombo->insertItem(iconUndetermined, i18n("Undetermined Links")); - d->tqlayout->addWidget(d->searchCombo); + d->layout->addWidget(d->searchCombo); TQToolTip::add(clearButton, i18n("Clear filter")); TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list")); @@ -147,7 +147,7 @@ void ResultsSearchBar::slotClearSearch() } } -void ResultsSearchBar::slotSettqStatus(int status) +void ResultsSearchBar::slotSetStatus(int status) { d->searchCombo->setCurrentItem(status); } @@ -187,19 +187,19 @@ void ResultsSearchBar::slotActivateSearch() { kdDebug(23100) << "ResultsSearchBar::slotActivateSearch" << endl; - ResultView::tqStatus status = selectedtqStatus(); + ResultView::Status status = selectedStatus(); emit signalSearch(LinkMatcher(d->searchLine->text(), status)); } LinkMatcher ResultsSearchBar::currentLinkMatcher() const { - return LinkMatcher(d->searchLine->text(), selectedtqStatus()); + return LinkMatcher(d->searchLine->text(), selectedStatus()); } -ResultView::tqStatus ResultsSearchBar::selectedtqStatus() const +ResultView::Status ResultsSearchBar::selectedStatus() const { - ResultView::tqStatus status = ResultView::none; + ResultView::Status status = ResultView::none; if(d->searchCombo->currentItem()) { diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h index c99b1da1..1c161e99 100644 --- a/klinkstatus/src/ui/resultssearchbar.h +++ b/klinkstatus/src/ui/resultssearchbar.h @@ -52,7 +52,7 @@ signals: public slots: void slotClearSearch(); - void slotSettqStatus(int status); + void slotSetStatus(int status); void slotSetText(const TQString& text); private slots: @@ -63,7 +63,7 @@ private slots: private: - ResultView::tqStatus selectedtqStatus() const; + ResultView::Status selectedStatus() const; private: diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp index 507d06e3..fdf65099 100644 --- a/klinkstatus/src/ui/resultview.cpp +++ b/klinkstatus/src/ui/resultview.cpp @@ -69,31 +69,31 @@ void ResultView::setColumns(TQStringList const& columns) number_of_columns_ = columns.size(); } -bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status) +bool ResultView::displayableWithStatus(LinkStatus const* ls, Status const& status) { if(status == ResultView::good) { return - ls->status() == LinktqStatus::SUCCESSFULL || - ls->status() == LinktqStatus::HTTP_REDIRECTION; + ls->status() == LinkStatus::SUCCESSFULL || + ls->status() == LinkStatus::HTTP_REDIRECTION; } else if(status == ResultView::bad) { return - ls->status() == LinktqStatus::BROKEN || - ls->status() == LinktqStatus::HTTP_CLIENT_ERROR || - ls->status() == LinktqStatus::HTTP_SERVER_ERROR; + ls->status() == LinkStatus::BROKEN || + ls->status() == LinkStatus::HTTP_CLIENT_ERROR || + ls->status() == LinkStatus::HTTP_SERVER_ERROR; } else if(status == ResultView::malformed) { - return ls->status() == LinktqStatus::MALFORMED; + return ls->status() == LinkStatus::MALFORMED; } else if(status == ResultView::undetermined) { return - ls->status() == LinktqStatus::UNDETERMINED || - ls->status() == LinktqStatus::TIMEOUT || - ls->status() == LinktqStatus::NOT_SUPPORTED; + ls->status() == LinkStatus::UNDETERMINED || + ls->status() == LinkStatus::TIMEOUT || + ls->status() == LinkStatus::NOT_SUPPORTED; } else return true; @@ -102,8 +102,8 @@ bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& // ******************************* ResultViewItem ***************************** -ResultViewItem::ResultViewItem(LinktqStatus const* linkstatus, int column_index) - : ls_((LinktqStatus*)linkstatus), column_index_(column_index) +ResultViewItem::ResultViewItem(LinkStatus const* linkstatus, int column_index) + : ls_((LinkStatus*)linkstatus), column_index_(column_index) { Q_ASSERT(ls_); Q_ASSERT(column_index_ > 0); @@ -123,7 +123,7 @@ int ResultViewItem::columnIndex() const return column_index_; } -LinktqStatus const* ResultViewItem::linktqStatus() const +LinkStatus const* ResultViewItem::linkStatus() const { Q_ASSERT(ls_); return ls_; @@ -131,30 +131,30 @@ LinktqStatus const* ResultViewItem::linktqStatus() const TQColor const& ResultViewItem::textStatusColor() const { - if(linktqStatus()->errorOccurred()) + if(linkStatus()->errorOccurred()) { - //kdDebug(23100) << "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl; - if(linktqStatus()->error() == i18n( "Javascript not supported" )) + //kdDebug(23100) << "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl; + if(linkStatus()->error() == i18n( "Javascript not supported" )) return TQt::lightGray; else return TQt::red; } - else if(linktqStatus()->absoluteUrl().hasRef()) + else if(linkStatus()->absoluteUrl().hasRef()) return TQt::blue; - else if(!linktqStatus()->absoluteUrl().protocol().startsWith("http")) + else if(!linkStatus()->absoluteUrl().protocol().startsWith("http")) return TQt::darkGreen; else { - TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode())); + TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode())); if(status_code[0] == '0') { kdWarning(23100) << "status code == 0: " << endl; - kdWarning(23100) << linktqStatus()->toString() << endl; - kdWarning(23100) << linktqStatus()->httpHeader().toString() << endl; + kdWarning(23100) << linkStatus()->toString() << endl; + kdWarning(23100) << linkStatus()->httpHeader().toString() << endl; } //Q_ASSERT(status_code[0] != '0'); diff --git a/klinkstatus/src/ui/resultview.h b/klinkstatus/src/ui/resultview.h index 842ed68b..44e90390 100644 --- a/klinkstatus/src/ui/resultview.h +++ b/klinkstatus/src/ui/resultview.h @@ -27,7 +27,7 @@ class KURL; -class LinktqStatus; +class LinkStatus; class CellToolTip; @@ -43,7 +43,7 @@ public: static const TQString MARKUP_LABEL; static const TQString LINK_LABEL_LABEL; - enum tqStatus { + enum Status { none = 0, good, bad, @@ -54,14 +54,14 @@ public: ResultView(); virtual ~ResultView(); - //virtual void insertResult(LinktqStatus const* linkstatus) = 0; + //virtual void insertResult(LinkStatus const* linkstatus) = 0; virtual void clear() = 0; - virtual void show(tqStatus const& status) = 0; + virtual void show(Status const& status) = 0; virtual void showAll() = 0; //virtual void ensureCellVisible(int row, int col) = 0; virtual void setColumns(TQStringList const& columns); - static bool displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status); + static bool displayableWithStatus(LinkStatus const* ls, Status const& status); int numberOfColumns() const { return number_of_columns_; } @@ -105,7 +105,7 @@ private: class ResultViewItem { public: - ResultViewItem(LinktqStatus const* linkstatus, + ResultViewItem(LinkStatus const* linkstatus, int column_index); virtual ~ResultViewItem(); @@ -113,7 +113,7 @@ public: virtual int columnIndex() const; virtual TQString toolTip() const = 0; - LinktqStatus const* linktqStatus() const; + LinkStatus const* linkStatus() const; protected: @@ -125,7 +125,7 @@ protected: protected: - LinktqStatus* ls_; + LinkStatus* ls_; int column_index_; int alignment_; }; diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 87831ffc..15f7d631 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -154,10 +154,10 @@ void SessionWidget::newSearchManager() TQT_TQOBJECT(this), "search_manager"); Q_ASSERT(search_manager_); - connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinktqStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinktqStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *))); + connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), + this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), + this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); connect(search_manager_, TQT_SIGNAL(signalSearchFinished()), this, TQT_SLOT(slotSearchFinished())); connect(search_manager_, TQT_SIGNAL(signalSearchPaused()), @@ -356,7 +356,7 @@ bool SessionWidget::validFields() return true; } -void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal) +void SessionWidget::slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal) { slotSetTimeElapsed(); emit signalUpdateTabLabel(search_manager_->linkStatusRoot(), this); @@ -368,7 +368,7 @@ void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker //table_linkstatus->insertResult(linkstatus); TreeViewItem* tree_view_item = new TreeViewItem(tree_view, tree_view->lastItem(), linkstatus); - LinktqStatus* ls = const_cast (linkstatus); + LinkStatus* ls = const_cast (linkstatus); ls->setTreeViewItem(tree_view_item); if(linkstatus->isRedirection() && linkstatus->redirection()) @@ -378,7 +378,7 @@ void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker ActionManager::getInstance()->action("file_export_html")->setEnabled(!isEmpty()); } -void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal) +void SessionWidget::slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal) { slotSetTimeElapsed(); @@ -416,7 +416,7 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker tree_view_item->setVisible(match); } - LinktqStatus* ls = const_cast (linkstatus); + LinkStatus* ls = const_cast (linkstatus); ls->setTreeViewItem(tree_view_item); if(linkstatus->isRedirection() && linkstatus->redirection()) @@ -503,10 +503,10 @@ void SessionWidget::showBottomStatusLabel(TQListViewItem* item) TreeViewItem* _item = tree_view->myItem(item); if(_item) { - TQString status = _item->linktqStatus()->statusText(); + TQString status = _item->linkStatus()->statusText(); textlabel_status->setText(status); - if(textlabel_status->tqsizeHint().width() > textlabel_status->maximumWidth()) + if(textlabel_status->sizeHint().width() > textlabel_status->maximumWidth()) TQToolTip::add(textlabel_status, status); else TQToolTip::remove(textlabel_status); diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index d171cc37..1c288632 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -70,7 +70,7 @@ public: bool stopped() const { return stopped_; } signals: - void signalUpdateTabLabel(const LinktqStatus *, SessionWidget*); + void signalUpdateTabLabel(const LinkStatus *, SessionWidget*); void signalSearchStarted(); void signalSearchPaused(); void signalSearchFinnished(); @@ -97,8 +97,8 @@ private slots: //virtual void slotSuggestDomain(bool toogle); void slotEnableCheckButton(const TQString &); - void slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal); - void slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal); + void slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal); + void slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal); void slotSearchFinished(); void slotSearchPaused(); /** Shows the status of the clicked URL (row) for 5 seconds */ diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 43d6029e..53cdd510 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -12,7 +12,7 @@ 683 - + 0 300 @@ -41,7 +41,7 @@ - tqlayout15 + layout15 @@ -49,7 +49,7 @@ - tqlayout14 + layout14 @@ -57,7 +57,7 @@ - tqlayout13 + layout13 @@ -75,13 +75,13 @@ 0 - + 25 25 - + 25 25 @@ -109,7 +109,7 @@ URL: - + AlignVCenter|AlignLeft @@ -150,7 +150,7 @@ Maximum - + 16 20 @@ -161,7 +161,7 @@ - tqlayout10 + layout10 @@ -225,7 +225,7 @@ Expanding - + 160 20 @@ -236,7 +236,7 @@ - tqlayout11 + layout11 @@ -266,7 +266,7 @@ MinimumExpanding - + 174 20 @@ -277,7 +277,7 @@ - tqlayout11 + layout11 @@ -306,7 +306,7 @@ Maximum - + 16 20 @@ -338,7 +338,7 @@ tree_view - + 0 300 @@ -347,7 +347,7 @@ - tqlayout10 + layout10 @@ -357,7 +357,7 @@ textlabel_progressbar - + 94 0 @@ -385,7 +385,7 @@ - tqlayout11 + layout11 @@ -403,7 +403,7 @@ 0 - + 470 32767 @@ -423,7 +423,7 @@ Preferred - + 30 20 @@ -432,7 +432,7 @@ - tqlayout12_2 + layout12_2 @@ -475,7 +475,7 @@ 0 - + 80 0 diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui index 8fa3e5d7..87b73fbf 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui +++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui @@ -69,7 +69,7 @@ 0 - + 300 0 diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui index 62553ffb..72c420ca 100644 --- a/klinkstatus/src/ui/settings/configsearchdialog.ui +++ b/klinkstatus/src/ui/settings/configsearchdialog.ui @@ -39,7 +39,7 @@ 0 - + 0 0 @@ -184,7 +184,7 @@ - tqlayout21 + layout21 @@ -211,7 +211,7 @@ Maximum - + 40 20 @@ -220,7 +220,7 @@ - tqlayout20 + layout20 diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 6aef2c97..dd72dd9f 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -106,17 +106,17 @@ void TableLinkstatus::setColumns(TQStringList const& columns) horizontal_header->adjustHeaderSize(); } -void TableLinkstatus::insertResult(LinktqStatus const* linkstatus) +void TableLinkstatus::insertResult(LinkStatus const* linkstatus) { insereLinha(generateRowOfTableItems(linkstatus)); } -vector TableLinkstatus::generateRowOfTableItems(LinktqStatus const* linkstatus) +vector TableLinkstatus::generateRowOfTableItems(LinkStatus const* linkstatus) { vector items; int column = 1; - TableItem* item1 = new TableItemtqStatus(this, TQTableItem::Never, + TableItem* item1 = new TableItemStatus(this, TQTableItem::Never, linkstatus, column++); TableItem* item2 = new TableItemNome(this, TQTableItem::Never, linkstatus, column++); @@ -147,10 +147,10 @@ void TableLinkstatus::insereLinha(vector items) setItem(row, col, items[i]); } - if(items[col_url_ - 1]->tqsizeHint().width() > columnWidth(col_url_ - 1)) + if(items[col_url_ - 1]->sizeHint().width() > columnWidth(col_url_ - 1)) { setColumnStretchable(col_url_ - 1, false); - setColumnWidth(col_url_ - 1, items[col_url_ - 1]->tqsizeHint().width()); + setColumnWidth(col_url_ - 1, items[col_url_ - 1]->sizeHint().width()); } ensureCellVisible(row, 0); @@ -178,14 +178,14 @@ void TableLinkstatus::removeColunas() Q_ASSERT(numCols() == 0); } -void TableLinkstatus::show(ResultView::tqStatus const& status) +void TableLinkstatus::show(ResultView::Status const& status) { for(int i = 0; i != numRows(); ++i) { int row = i; TableItem* _item = myItem(row, col_status_); - if(!ResultView::displayableWithtqStatus(_item->linktqStatus(), status)) + if(!ResultView::displayableWithStatus(_item->linkStatus(), status)) hideRow(row); else showRow(row); @@ -230,7 +230,7 @@ bool TableLinkstatus::textFitsInCell(int row, int col) const TQTableItem* itm(myItem(row, col)); Q_ASSERT(itm); - TQSize size_hint(itm->tqsizeHint()); + TQSize size_hint(itm->sizeHint()); int visible_width = 0; if(col == numCols() - 1) @@ -261,8 +261,8 @@ void TableLinkstatus::slotPopupContextMenu(int r, int w, const TQPoint& pos) TableItem* table_item = myItem(r, w); if(table_item) { - TQValueVector referrers = table_item->linktqStatus()->referrers(); - loadContextTableMenu(referrers, table_item->linktqStatus()->isRoot()); + TQValueVector referrers = table_item->linkStatus()->referrers(); + loadContextTableMenu(referrers, table_item->linkStatus()->isRoot()); context_table_menu_.popup(pos); } } @@ -313,7 +313,7 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector const& referrers, void TableLinkstatus::slotCopyUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); - TQString content(_item->linktqStatus()->absoluteUrl().prettyURL()); + TQString content(_item->linkStatus()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->clipboard(); cb->setText(content); } @@ -321,7 +321,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const void TableLinkstatus::slotCopyParentUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); - TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); + TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->clipboard(); cb->setText(content); } @@ -336,7 +336,7 @@ void TableLinkstatus::slotCopyCellTextToClipboard() const void TableLinkstatus::slotEditReferrersWithQuanta() { TableItem* _item = myItem(currentRow(), currentColumn()); - TQValueVector referrers = _item->linktqStatus()->referrers(); + TQValueVector referrers = _item->linkStatus()->referrers(); if(Global::isQuantaAvailableViaDCOP()) { @@ -369,7 +369,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(int id) index -= 2; // The list of referrers starts on index = 2 TableItem* _item = myItem(currentRow(), currentColumn()); - TQValueVector referrers = _item->linktqStatus()->referrers(); + TQValueVector referrers = _item->linkStatus()->referrers(); Q_ASSERT(index >= 0 && (uint)index < referrers.size()); slotEditReferrerWithQuanta(referrers[index]); @@ -386,7 +386,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url) if(!success) { - TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(filePath); + TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(filePath); KMessageBox::error(parentWidget(), message); } } @@ -400,7 +400,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url) void TableLinkstatus::slotViewUrlInBrowser() { TableItem* _item = myItem(currentRow(), currentColumn()); - KURL url = _item->linktqStatus()->absoluteUrl(); + KURL url = _item->linkStatus()->absoluteUrl(); if(url.isValid()) { @@ -414,13 +414,13 @@ void TableLinkstatus::slotViewParentUrlInBrowser() { TableItem* _item = myItem(currentRow(), currentColumn()); - if(_item->linktqStatus()->isRoot()) + if(_item->linkStatus()->isRoot()) { KMessageBox::sorry(this, i18n("ROOT URL.")); } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); + LinkStatus const* ls_parent = _item->linkStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); @@ -439,11 +439,11 @@ void TableLinkstatus::slotViewParentUrlInBrowser() */ TableItem::TableItem(TQTable* table, EditType et, - LinktqStatus const* linkstatus, - int column_index, int tqalignment) + LinkStatus const* linkstatus, + int column_index, int alignment) : TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index), - /*ls_((LinktqStatus*)linkstatus), - column_index_(column_index),*/ alignment_(tqalignment) + /*ls_((LinkStatus*)linkstatus), + column_index_(column_index),*/ alignment_(alignment) { //Q_ASSERT(ls_); //Q_ASSERT(column_index_ > 0); @@ -467,17 +467,17 @@ int TableItem::columnIndex() const return ResultViewItem::columnIndex(); } -void TableItem::tqsetAlignment(int aFlags) +void TableItem::setAlignment(int aFlags) { alignment_ = aFlags; } -int TableItem::tqalignment() const +int TableItem::alignment() const { return alignment_; } /* -LinktqStatus const* const TableItem::linktqStatus() const +LinkStatus const* const TableItem::linkStatus() const { Q_ASSERT(ls_); return ls_; @@ -485,31 +485,31 @@ LinktqStatus const* const TableItem::linktqStatus() const TQColor const& TableItem::textStatusColor() const { - if(linktqStatus()->errorOccurred()) + if(linkStatus()->errorOccurred()) { - //kdDebug(23100) << "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl; - if(linktqStatus()->error() == i18n( "Javascript not supported" )) + //kdDebug(23100) << "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl; + if(linkStatus()->error() == i18n( "Javascript not supported" )) return TQt::lightGray; else return TQt::red; } - else if(linktqStatus()->absoluteUrl().hasRef()) + else if(linkStatus()->absoluteUrl().hasRef()) return TQt::blue; - else if(linktqStatus()->absoluteUrl().protocol() != "http" && - linktqStatus()->absoluteUrl().protocol() != "https") + else if(linkStatus()->absoluteUrl().protocol() != "http" && + linkStatus()->absoluteUrl().protocol() != "https") return TQt::darkGreen; else { - TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode())); + TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode())); if(status_code[0] == '0') { kdWarning(23100) << "status code == 0: " << endl; - kdWarning(23100) << linktqStatus()->toString() << endl; - kdWarning(23100) << linktqStatus()->httpHeader().toString() << endl; + kdWarning(23100) << linkStatus()->toString() << endl; + kdWarning(23100) << linkStatus()->httpHeader().toString() << endl; } //Q_ASSERT(status_code[0] != '0'); @@ -538,7 +538,7 @@ TQColor const& TableItem::textStatusColor() const */ TableItemURL::TableItemURL(TQTable* table, EditType et, - LinktqStatus const* linkstatus, int column_index) + LinkStatus const* linkstatus, int column_index) : TableItem(table, et, linkstatus, column_index) { setText(); @@ -546,17 +546,17 @@ TableItemURL::TableItemURL(TQTable* table, EditType et, void TableItemURL::setText() { - if(linktqStatus()->node() && linktqStatus()->malformed()) + if(linkStatus()->node() && linkStatus()->malformed()) { - if(linktqStatus()->node()->url().isEmpty()) - TQTableItem::setText( linktqStatus()->node()->content().simplifyWhiteSpace() ); + if(linkStatus()->node()->url().isEmpty()) + TQTableItem::setText( linkStatus()->node()->content().simplifyWhiteSpace() ); else - TQTableItem::setText( linktqStatus()->node()->url() ); + TQTableItem::setText( linkStatus()->node()->url() ); } else { - KURL url = linktqStatus()->absoluteUrl(); - TQTableItem::setText(::convertToLocal(linktqStatus())); + KURL url = linkStatus()->absoluteUrl(); + TQTableItem::setText(::convertToLocal(linkStatus())); } } @@ -583,19 +583,19 @@ TQColor const& TableItemURL::textStatusColor() const { // TODO clean this code - TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode())); + TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode())); - if(linktqStatus()->errorOccurred()) + if(linkStatus()->errorOccurred()) { - if(linktqStatus()->error().contains(i18n( "Timeout" ))) + if(linkStatus()->error().contains(i18n( "Timeout" ))) return darkMagenta; - else if(linktqStatus()->error().contains(i18n( "not supported" ))) + else if(linkStatus()->error().contains(i18n( "not supported" ))) return lightGray; else return red; } - else if(linktqStatus()->absoluteUrl().protocol() != "http" && - linktqStatus()->absoluteUrl().protocol() != "https") + else if(linkStatus()->absoluteUrl().protocol() != "http" && + linkStatus()->absoluteUrl().protocol() != "https") return black; else if(status_code[0] == '5') @@ -610,53 +610,53 @@ TQColor const& TableItemURL::textStatusColor() const /* -********************* TableItemtqStatus *************************** +********************* TableItemStatus *************************** */ -TableItemtqStatus::TableItemtqStatus(TQTable* table, EditType et, - LinktqStatus const* linkstatus, int column_index) +TableItemStatus::TableItemStatus(TQTable* table, EditType et, + LinkStatus const* linkstatus, int column_index) : TableItem(table, et, linkstatus, column_index) { - tqsetAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/); + setAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/); setText(); setPixmap(); } -void TableItemtqStatus::setText() +void TableItemStatus::setText() { - if(linktqStatus()->errorOccurred() || - linktqStatus()->status() == "OK" || - linktqStatus()->status() == "304") + if(linkStatus()->errorOccurred() || + linkStatus()->status() == "OK" || + linkStatus()->status() == "304") { TQTableItem::setText(""); } else { /* - if(linktqStatus()->httpHeader().statusCode() == 0) + if(linkStatus()->httpHeader().statusCode() == 0) { kdDebug(23100) << "TableItemStatus::setText : statusCode() == 0" << endl; - kdDebug(23100) << linktqStatus()->toString() << endl; - kdDebug(23100) << linktqStatus()->docHtml() << endl; + kdDebug(23100) << linkStatus()->toString() << endl; + kdDebug(23100) << linkStatus()->docHtml() << endl; } */ - //Q_ASSERT(linktqStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------ - //TQTableItem::setText( TQString::number(linktqStatus()->httpHeader().statusCode()) ); - TQTableItem::setText( linktqStatus()->status() ); + //Q_ASSERT(linkStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------ + //TQTableItem::setText( TQString::number(linkStatus()->httpHeader().statusCode()) ); + TQTableItem::setText( linkStatus()->status() ); } } -void TableItemtqStatus::setPixmap() +void TableItemStatus::setPixmap() { - if(linktqStatus()->errorOccurred()) + if(linkStatus()->errorOccurred()) { - if(linktqStatus()->error().contains(i18n( "Timeout" ))) + if(linkStatus()->error().contains(i18n( "Timeout" ))) { TQTableItem::setPixmap(SmallIcon("kalarm")); } - else if(linktqStatus()->error() == i18n( "Malformed" )) + else if(linkStatus()->error() == i18n( "Malformed" )) { TQTableItem::setPixmap(SmallIcon("bug")); } @@ -665,27 +665,27 @@ void TableItemtqStatus::setPixmap() TQTableItem::setPixmap(SmallIcon("no")); } } - else if(linktqStatus()->status() == "304") + else if(linkStatus()->status() == "304") TQTableItem::setPixmap(UserIcon("304")); - else if(linktqStatus()->status() == "OK") + else if(linkStatus()->status() == "OK") TQTableItem::setPixmap(SmallIcon("ok")); } -TQString TableItemtqStatus::toolTip() const +TQString TableItemStatus::toolTip() const { - if(linktqStatus()->errorOccurred() || - linktqStatus()->absoluteUrl().hasRef() || - (linktqStatus()->absoluteUrl().protocol() != "http" && - linktqStatus()->absoluteUrl().protocol() != "https")) + if(linkStatus()->errorOccurred() || + linkStatus()->absoluteUrl().hasRef() || + (linkStatus()->absoluteUrl().protocol() != "http" && + linkStatus()->absoluteUrl().protocol() != "https")) { - return i18n("%1").tqarg(linktqStatus()->status()); + return i18n("%1").arg(linkStatus()->status()); } else - return i18n("%1").tqarg(linktqStatus()->httpHeader().reasonPhrase()); + return i18n("%1").arg(linkStatus()->httpHeader().reasonPhrase()); } -void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg, +void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg, const TQRect &cr, bool selected ) { p->fillRect( 0, 0, cr.width(), cr.height(), @@ -716,7 +716,7 @@ void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg, else p->setPen( m_cg.text() ); p->drawText( x + 2, 0, w - x - 4, h, - wordWrap() ? (tqalignment() | WordBreak) : tqalignment(), text() ); + wordWrap() ? (alignment() | WordBreak) : alignment(), text() ); } /* @@ -726,7 +726,7 @@ void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg, */ TableItemNome::TableItemNome(TQTable* table, EditType et, - LinktqStatus const* linkstatus, int column_index) + LinkStatus const* linkstatus, int column_index) : TableItem(table, et, linkstatus, column_index) { setText(); @@ -734,7 +734,7 @@ TableItemNome::TableItemNome(TQTable* table, EditType et, void TableItemNome::setText() { - TQString label(linktqStatus()->label()); + TQString label(linkStatus()->label()); if(!label.isNull()) TQTableItem::setText(label.simplifyWhiteSpace()); } diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index d3113ee0..6f601508 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -58,12 +58,12 @@ public: virtual void setColumns(TQStringList const& columns); /* Insere uma nova entrada no fim da tabela */ - virtual void insertResult(LinktqStatus const* linkstatus); + virtual void insertResult(LinkStatus const* linkstatus); virtual void clear(); void removeColunas(); - virtual void show(ResultView::tqStatus const& status); + virtual void show(ResultView::Status const& status); virtual void showAll(); @@ -90,7 +90,7 @@ private slots: private: - vector generateRowOfTableItems(LinktqStatus const* linkstatus); + vector generateRowOfTableItems(LinkStatus const* linkstatus); void insereLinha(vector items); private: @@ -110,18 +110,18 @@ class TableItem: public TQTableItem, public ResultViewItem public: TableItem(TQTable* table, EditType et, - LinktqStatus const* linkstatus, - int column_index, int tqalignment = TQt::AlignLeft); + LinkStatus const* linkstatus, + int column_index, int alignment = TQt::AlignLeft); virtual ~TableItem(); virtual void setColumnIndex(int i); virtual int columnIndex() const; - void tqsetAlignment(int aFlags); - virtual int tqalignment() const; + void setAlignment(int aFlags); + virtual int alignment() const; virtual TQString toolTip() const = 0; - //LinktqStatus const* const linktqStatus() const; + //LinkStatus const* const linkStatus() const; protected: @@ -133,7 +133,7 @@ protected: private: - //LinktqStatus* ls_; + //LinkStatus* ls_; //int column_index_; int alignment_; }; @@ -144,7 +144,7 @@ class TableItemURL: public TableItem public: TableItemURL(TQTable* table, EditType et, - LinktqStatus const* linkstatus, int column_index = 3); + LinkStatus const* linkstatus, int column_index = 3); //virtual ~TableItemURL(){}; virtual TQString toolTip() const; @@ -158,13 +158,13 @@ protected: }; -class TableItemtqStatus: public TableItem +class TableItemStatus: public TableItem { public: - TableItemtqStatus(TQTable* table, EditType et, - LinktqStatus const* linkstatus, int column_index = 1); - //virtual ~TableItemtqStatus(){}; + TableItemStatus(TQTable* table, EditType et, + LinkStatus const* linkstatus, int column_index = 1); + //virtual ~TableItemStatus(){}; virtual TQString toolTip() const; @@ -181,7 +181,7 @@ class TableItemNome: public TableItem public: TableItemNome(TQTable* table, EditType et, - LinktqStatus const* linkstatus, int column_index = 2); + LinkStatus const* linkstatus, int column_index = 2); //virtual ~TableItemNome(){}; virtual TQString toolTip() const; diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 7502d58b..bc7f1492 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession() { // TODO: settings: number of connections, timeout SessionWidget* session_widget = newSessionWidget(); - connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinktqStatus *, SessionWidget*)), - this, TQT_SLOT(updateTabLabel(const LinktqStatus *, SessionWidget*))); + connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), + this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii())); @@ -166,7 +166,7 @@ SessionWidget* TabWidgetSession::newSessionWidget() return session_widget; } -void TabWidgetSession::updateTabLabel(LinktqStatus const* linkstatus, SessionWidget* page) +void TabWidgetSession::updateTabLabel(LinkStatus const* linkstatus, SessionWidget* page) { TQString label; KURL url = linkstatus->absoluteUrl(); diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h index 4c83ba49..c98adb0a 100644 --- a/klinkstatus/src/ui/tabwidgetsession.h +++ b/klinkstatus/src/ui/tabwidgetsession.h @@ -27,7 +27,7 @@ class TQToolButton; class SessionWidget; -class LinktqStatus; +class LinkStatus; /** @@ -59,7 +59,7 @@ public slots: SessionWidget* newSession(); SessionWidget* newSession(KURL const& url); void closeSession(); - void updateTabLabel(LinktqStatus const* linkstatus, SessionWidget*); + void updateTabLabel(LinkStatus const* linkstatus, SessionWidget*); void slotLoadSettings(); void slotHideSearchPanel(); diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index 21bcdf02..8bc51471 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include "treeview.h" #include "../global.h" @@ -114,16 +114,16 @@ void TreeView::removeColunas() clear(); } -void TreeView::show(ResultView::tqStatus const& status) +void TreeView::show(ResultView::Status const& status) { TQListViewItemIterator it(static_cast (this)); while(it.current()) { TreeViewItem* item = myItem(it.current()); - if(!ResultView::displayableWithtqStatus(item->linktqStatus(), status)) + if(!ResultView::displayableWithStatus(item->linkStatus(), status)) { item->setVisible(false); - //kdDebug(23100) << "Hide: " << item->linktqStatus()->absoluteUrl().url() << endl; + //kdDebug(23100) << "Hide: " << item->linkStatus()->absoluteUrl().url() << endl; } else { @@ -135,7 +135,7 @@ void TreeView::show(ResultView::tqStatus const& status) TreeViewItem* parent = myItem(item->parent()); while(parent) { - kdDebug(23100) << "Show: " << parent->linktqStatus()->absoluteUrl().url() << endl; + kdDebug(23100) << "Show: " << parent->linkStatus()->absoluteUrl().url() << endl; parent->setVisible(true); //parent->setEnabled(false); @@ -159,7 +159,7 @@ void TreeView::show(LinkMatcher link_matcher) while(it.current()) { TreeViewItem* item = myItem(it.current()); - bool match = link_matcher.matches(*(item->linktqStatus())); + bool match = link_matcher.matches(*(item->linkStatus())); if(tree_display_) item->setEnabled(match); @@ -199,7 +199,7 @@ void TreeView::resizeEvent(TQResizeEvent *e) { KListView::resizeEvent(e); resetColumns(); - clipper()->tqrepaint(); + clipper()->repaint(); } void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, int col) @@ -209,8 +209,8 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in TreeViewItem* tree_item = myItem(item); if(tree_item) { - TQValueVector referrers = tree_item->linktqStatus()->referrers(); - loadContextTableMenu(referrers, tree_item->linktqStatus()->isRoot()); + TQValueVector referrers = tree_item->linkStatus()->referrers(); + loadContextTableMenu(referrers, tree_item->linkStatus()->isRoot()); context_table_menu_.popup(pos); } } @@ -218,16 +218,16 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in void TreeView::slotCopyUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); - TQString content(_item->linktqStatus()->absoluteUrl().prettyURL()); - TQClipboard* cb = kapp->tqclipboard(); + TQString content(_item->linkStatus()->absoluteUrl().prettyURL()); + TQClipboard* cb = kapp->clipboard(); cb->setText(content); } void TreeView::slotCopyParentUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); - TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); - TQClipboard* cb = kapp->tqclipboard(); + TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL()); + TQClipboard* cb = kapp->clipboard(); cb->setText(content); } @@ -235,14 +235,14 @@ void TreeView::slotCopyCellTextToClipboard() const { TreeViewItem* _item = myItem(currentItem()); TQString cell_text(_item->text(current_column_)); - TQClipboard* cb = kapp->tqclipboard(); + TQClipboard* cb = kapp->clipboard(); cb->setText(cell_text); } void TreeView::slotEditReferrersWithQuanta() { TreeViewItem* _item = myItem(currentItem()); - TQValueVector referrers = _item->linktqStatus()->referrers(); + TQValueVector referrers = _item->linkStatus()->referrers(); if(Global::isQuantaAvailableViaDCOP()) { @@ -275,7 +275,7 @@ void TreeView::slotEditReferrerWithQuanta(int id) index -= 2; // The list of referrers starts on index = 2 TreeViewItem* _item = myItem(currentItem()); - TQValueVector referrers = _item->linktqStatus()->referrers(); + TQValueVector referrers = _item->linkStatus()->referrers(); Q_ASSERT(index >= 0 && (uint)index < referrers.size()); slotEditReferrerWithQuanta(referrers[index]); @@ -292,7 +292,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url) if(!success) { - TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(filePath); + TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(filePath); KMessageBox::error(parentWidget(), message); } } @@ -306,7 +306,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url) void TreeView::slotViewUrlInBrowser() { TreeViewItem* _item = myItem(currentItem()); - KURL url = _item->linktqStatus()->absoluteUrl(); + KURL url = _item->linkStatus()->absoluteUrl(); if(url.isValid()) { @@ -320,13 +320,13 @@ void TreeView::slotViewParentUrlInBrowser() { TreeViewItem* _item = myItem(currentItem()); - if(_item->linktqStatus()->isRoot()) + if(_item->linkStatus()->isRoot()) { KMessageBox::sorry(this, i18n("ROOT URL.")); } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); + LinkStatus const* ls_parent = _item->linkStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); @@ -393,7 +393,7 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const /* ******************************* TreeViewItem ******************************* */ TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, - LinktqStatus const* linkstatus) + LinkStatus const* linkstatus) : KListViewItem(parent, after), last_child_(0), root_(parent) { @@ -401,7 +401,7 @@ TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, } TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQListViewItem* after, - LinktqStatus const* linkstatus) + LinkStatus const* linkstatus) : KListViewItem(listview_item, after), last_child_(0), root_(root) @@ -412,7 +412,7 @@ TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQList TreeViewItem::~TreeViewItem() {} -void TreeViewItem::init(LinktqStatus const* linkstatus) +void TreeViewItem::init(LinkStatus const* linkstatus) { setOpen(true); @@ -450,15 +450,15 @@ TQString TreeViewItem::key(int column, bool) const switch(column) { case 1: // status column - return linktqStatus()->statusText(); + return linkStatus()->statusText(); } return text(column); } -LinktqStatus const* TreeViewItem::linktqStatus() const +LinkStatus const* TreeViewItem::linkStatus() const { - return column_items_[0].linktqStatus(); + return column_items_[0].linkStatus(); } void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align) @@ -478,7 +478,7 @@ void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, /* ******************************* TreeColumnViewItem ******************************* */ -TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index) +TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index) : root_(root), ls_(linkstatus), column_index_(column_index) { Q_ASSERT(ls_); @@ -501,7 +501,7 @@ int TreeColumnViewItem::columnIndex() const return column_index_; } -LinktqStatus const* TreeColumnViewItem::linktqStatus() const +LinkStatus const* TreeColumnViewItem::linkStatus() const { Q_ASSERT(ls_); return ls_; @@ -511,23 +511,23 @@ TQColor const& TreeColumnViewItem::textStatusColor() const { if(columnIndex() == root_->urlColumnIndex() || columnIndex() == root_->statusColumnIndex()) { - if(linktqStatus()->status() == LinktqStatus::BROKEN) + if(linkStatus()->status() == LinkStatus::BROKEN) return TQt::red; - else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR) + else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR) return TQt::red; - else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION) + else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION) return TQt::black; - else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR) + else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR) return TQt::darkMagenta; - else if(linktqStatus()->status() == LinktqStatus::MALFORMED) + else if(linkStatus()->status() == LinkStatus::MALFORMED) return TQt::red; - else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED) + else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED) return TQt::lightGray; - else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL) + else if(linkStatus()->status() == LinkStatus::SUCCESSFULL) return TQt::black; - else if(linktqStatus()->status() == LinktqStatus::TIMEOUT) + else if(linkStatus()->status() == LinkStatus::TIMEOUT) return TQt::darkMagenta; - else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED) + else if(linkStatus()->status() == LinkStatus::UNDETERMINED) return TQt::blue; return TQt::red; @@ -544,17 +544,17 @@ TQString TreeColumnViewItem::text(int column) const if(column == root_->urlColumnIndex()) { - if(linktqStatus()->node() && linktqStatus()->malformed()) + if(linkStatus()->node() && linkStatus()->malformed()) { - if(linktqStatus()->node()->url().isEmpty()) - return linktqStatus()->node()->content().simplifyWhiteSpace(); + if(linkStatus()->node()->url().isEmpty()) + return linkStatus()->node()->content().simplifyWhiteSpace(); else - return linktqStatus()->node()->url(); + return linkStatus()->node()->url(); } else { - KURL url = linktqStatus()->absoluteUrl(); - return Url::convertToLocal(linktqStatus()); + KURL url = linkStatus()->absoluteUrl(); + return Url::convertToLocal(linkStatus()); } } else if(column == root_->statusColumnIndex()) @@ -563,7 +563,7 @@ TQString TreeColumnViewItem::text(int column) const } else if(column == root_->labelColumnIndex()) { - TQString label(linktqStatus()->label()); + TQString label(linkStatus()->label()); if(!label.isNull()) return label.simplifyWhiteSpace(); } @@ -577,28 +577,28 @@ TQPixmap TreeColumnViewItem::pixmap(int column) const if(column == root_->statusColumnIndex()) { - if(linktqStatus()->status() == LinktqStatus::BROKEN) + if(linkStatus()->status() == LinkStatus::BROKEN) return SmallIcon("no"); - else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR) + else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR) return SmallIcon("no"); - else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION) + else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION) { - if(linktqStatus()->statusText() == "304") + if(linkStatus()->statusText() == "304") return UserIcon("304"); else return SmallIcon("redo"); } - else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR) + else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR) return SmallIcon("no"); - else if(linktqStatus()->status() == LinktqStatus::MALFORMED) + else if(linkStatus()->status() == LinkStatus::MALFORMED) return SmallIcon("editdelete"); - else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED) + else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED) return SmallIcon("help"); - else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL) + else if(linkStatus()->status() == LinkStatus::SUCCESSFULL) return SmallIcon("ok"); - else if(linktqStatus()->status() == LinktqStatus::TIMEOUT) + else if(linkStatus()->status() == LinkStatus::TIMEOUT) return SmallIcon("history_clear"); - else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED) + else if(linkStatus()->status() == LinkStatus::UNDETERMINED) return SmallIcon("help"); } diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index 6b48cc63..8735a595 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -38,7 +38,7 @@ public: virtual void setColumns(TQStringList const& columns); virtual void clear(); void removeColunas(); - virtual void show(ResultView::tqStatus const& status); + virtual void show(ResultView::Status const& status); void show(LinkMatcher link_matcher); virtual void showAll(); @@ -92,22 +92,22 @@ class TreeViewItem: public KListViewItem public: TreeViewItem(TreeView* parent, TQListViewItem* after, - LinktqStatus const* linkstatus); + LinkStatus const* linkstatus); TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after, - LinktqStatus const* linkstatus); + LinkStatus const* linkstatus); virtual ~TreeViewItem(); void setLastChild(TQListViewItem* last_child); TQListViewItem* lastChild() const; TQString key(int column, bool) const; - LinktqStatus const* linktqStatus() const; + LinkStatus const* linkStatus() const; protected: virtual void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align); private: - void init(LinktqStatus const* linkstatus); + void init(LinkStatus const* linkstatus); private: TQValueVector column_items_; @@ -124,19 +124,19 @@ public: TreeColumnViewItem() {} ; - TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index); + TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index); ~TreeColumnViewItem(); //void setColumnIndex(int i); int columnIndex() const; - LinktqStatus const* linktqStatus() const; + LinkStatus const* linkStatus() const; TQColor const& textStatusColor() const; TQString text(int column) const; TQPixmap pixmap(int column) const; private: TreeView* root_; - LinktqStatus const* ls_; + LinkStatus const* ls_; int column_index_; }; diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 4a04834b..31db321e 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe { if ( styleSheet ) { - static TQCString appPath( TQString::tqfromLatin1("\"%1\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::tqfromLatin1("styles/data") ).front() ).utf8() ); + static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() ); static const char* params[3] = { "appdata", @@ -179,7 +179,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe if ( resultString.isEmpty() ) { - resultString = i18n( "
KLinkStatus encountered the following error while parsing a message:
%1
" ).tqarg( errorMsg ); + resultString = i18n( "
KLinkStatus encountered the following error while parsing a message:
%1
" ).arg( errorMsg ); } #ifdef RAWXSL @@ -235,7 +235,7 @@ void XSLT::setXSLT( const TQString &_document ) // Actually, since we need to parse into a libxml2 document anyway, this whole // nonsense could be replaced with some simple XPath expressions - JK // - TQRegExp elementMatch( TQString::tqfromLatin1( "(.*)" ) ); + TQRegExp elementMatch( TQString::fromLatin1( "(.*)" ) ); elementMatch.setMinimal( true ); TQString document = _document; int pos; @@ -261,21 +261,21 @@ void XSLT::setXSLT( const TQString &_document ) { prependPercent = false; - if ( *it == TQString::tqfromLatin1( "TIME" ) ) + if ( *it == TQString::fromLatin1( "TIME" ) ) { - trans += TQString::tqfromLatin1( "" ); + trans += TQString::fromLatin1( "" ); } - else if ( *it == TQString::tqfromLatin1( "TIMESTAMP" ) ) + else if ( *it == TQString::fromLatin1( "TIMESTAMP" ) ) { - trans += TQString::tqfromLatin1( "" ); + trans += TQString::fromLatin1( "" ); } - else if ( *it == TQString::tqfromLatin1( "FORMATTEDTIMESTAMP" ) ) + else if ( *it == TQString::fromLatin1( "FORMATTEDTIMESTAMP" ) ) { - trans += TQString::tqfromLatin1( "" ); + trans += TQString::fromLatin1( "" ); } - else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_DISPLAYNAME" ) ) + else if ( *it == TQString::fromLatin1( "FROM_CONTACT_DISPLAYNAME" ) ) { - trans += TQString::tqfromLatin1( "" + trans += TQString::fromLatin1( "" "" "" "" @@ -290,9 +290,9 @@ void XSLT::setXSLT( const TQString &_document ) "" "" ); } - else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_DISPLAYNAME" ) ) + else if ( *it == TQString::fromLatin1( "TO_CONTACT_DISPLAYNAME" ) ) { - trans += TQString::tqfromLatin1( "" + trans += TQString::fromLatin1( "" "" "" "" @@ -307,37 +307,37 @@ void XSLT::setXSLT( const TQString &_document ) "" "" ); } - else if ( *it == TQString::tqfromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) ) + else if ( *it == TQString::fromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) ) { - trans += TQString::tqfromLatin1( "" + trans += TQString::fromLatin1( "" "" "" "" "" ); } - else if ( *it == TQString::tqfromLatin1( "TO_METACONTACT_DISPLAYNAME" ) ) + else if ( *it == TQString::fromLatin1( "TO_METACONTACT_DISPLAYNAME" ) ) { - trans += TQString::tqfromLatin1( "" + trans += TQString::fromLatin1( "" "" "" "" "" ); } - else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_ID" ) ) + else if ( *it == TQString::fromLatin1( "FROM_CONTACT_ID" ) ) { - trans += TQString::tqfromLatin1( "" + trans += TQString::fromLatin1( "" "" "" ); } - else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_ID" ) ) + else if ( *it == TQString::fromLatin1( "TO_CONTACT_ID" ) ) { - trans += TQString::tqfromLatin1( "" + trans += TQString::fromLatin1( "" "" "" ); } - else if ( *it == TQString::tqfromLatin1( "BODY" ) ) + else if ( *it == TQString::fromLatin1( "BODY" ) ) { - trans += TQString::tqfromLatin1( "" ); + trans += TQString::fromLatin1( "" ); } else { @@ -387,7 +387,7 @@ void XSLT::setXSLT( const TQString &_document ) } if( !flags.isEmpty() ) - setProperty("flags", flags.join( TQString::tqfromLatin1("|") ) ); + setProperty("flags", flags.join( TQString::fromLatin1("|") ) ); } else { diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index 52ab92a5..9f5f352c 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -16,10 +16,10 @@ \NewEntry 1 Editor

Layout of Edit Kommander Text dialog

Old ideas:

-