summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:36:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:36:38 -0600
commit9445f97b426e97c6ce46de18fba4030da45d56df (patch)
tree5199825600092081f3256a8202f035b92612b109
parent1fffbdafa12271a1a635caf46777fb8acfb6f31b (diff)
downloadtdewebdev-9445f97b426e97c6ce46de18fba4030da45d56df.tar.gz
tdewebdev-9445f97b426e97c6ce46de18fba4030da45d56df.zip
Rename old tq methods that no longer need a unique name
-rw-r--r--kfilereplace/commandengine.cpp4
-rw-r--r--kfilereplace/kaddstringdlg.cpp4
-rw-r--r--kfilereplace/kaddstringdlgs.ui10
-rw-r--r--kfilereplace/kfilereplaceview.cpp8
-rw-r--r--kfilereplace/kfilereplaceviewwdg.ui8
-rw-r--r--kfilereplace/knewprojectdlgs.ui12
-rw-r--r--kfilereplace/koptionsdlgs.ui4
-rw-r--r--kfilereplace/report.cpp2
-rw-r--r--kimagemapeditor/kimearea.cpp16
-rw-r--r--kimagemapeditor/kimedialogs.cpp4
-rw-r--r--kimagemapeditor/kimeshell.cpp2
-rw-r--r--klinkstatus/data/styles/results_stylesheet.xsl2
-rw-r--r--klinkstatus/src/actionmanager.cpp2
-rw-r--r--klinkstatus/src/engine/linkchecker.cpp80
-rw-r--r--klinkstatus/src/engine/linkchecker.h14
-rw-r--r--klinkstatus/src/engine/linkfilter.cpp6
-rw-r--r--klinkstatus/src/engine/linkfilter.h10
-rw-r--r--klinkstatus/src/engine/linkstatus.cpp26
-rw-r--r--klinkstatus/src/engine/linkstatus.h38
-rw-r--r--klinkstatus/src/engine/linkstatus_impl.h136
-rw-r--r--klinkstatus/src/engine/searchmanager.cpp68
-rw-r--r--klinkstatus/src/engine/searchmanager.h32
-rw-r--r--klinkstatus/src/engine/searchmanager_impl.h2
-rw-r--r--klinkstatus/src/klinkstatus.lsm2
-rw-r--r--klinkstatus/src/parser/url.cpp6
-rw-r--r--klinkstatus/src/parser/url.h8
-rw-r--r--klinkstatus/src/ui/resultssearchbar.cpp12
-rw-r--r--klinkstatus/src/ui/resultssearchbar.h4
-rw-r--r--klinkstatus/src/ui/resultview.cpp42
-rw-r--r--klinkstatus/src/ui/resultview.h16
-rw-r--r--klinkstatus/src/ui/sessionwidget.cpp20
-rw-r--r--klinkstatus/src/ui/sessionwidget.h6
-rw-r--r--klinkstatus/src/ui/sessionwidgetbase.ui24
-rw-r--r--klinkstatus/src/ui/settings/configidentificationdialogui.ui2
-rw-r--r--klinkstatus/src/ui/settings/configsearchdialog.ui4
-rw-r--r--klinkstatus/src/ui/tablelinkstatus.cpp146
-rw-r--r--klinkstatus/src/ui/tablelinkstatus.h26
-rw-r--r--klinkstatus/src/ui/tabwidgetsession.cpp6
-rw-r--r--klinkstatus/src/ui/tabwidgetsession.h4
-rw-r--r--klinkstatus/src/ui/treeview.cpp96
-rw-r--r--klinkstatus/src/ui/treeview.h16
-rw-r--r--klinkstatus/src/utils/xsl.cpp46
-rw-r--r--kommander/editor/actiondnd.cpp24
-rw-r--r--kommander/editor/actiondnd.h2
-rw-r--r--kommander/editor/actioneditor.ui2
-rw-r--r--kommander/editor/assoctexteditor.ui6
-rw-r--r--kommander/editor/assoctexteditorimpl.cpp2
-rw-r--r--kommander/editor/choosewidget.ui4
-rw-r--r--kommander/editor/choosewidgetimpl.cpp2
-rw-r--r--kommander/editor/command.cpp12
-rw-r--r--kommander/editor/connectioneditor.ui8
-rw-r--r--kommander/editor/connectioneditorimpl.cpp6
-rw-r--r--kommander/editor/createtemplate.ui4
-rw-r--r--kommander/editor/formsettings.ui4
-rw-r--r--kommander/editor/formwindow.cpp16
-rw-r--r--kommander/editor/functions.ui16
-rw-r--r--kommander/editor/functionsimpl.cpp4
-rw-r--r--kommander/editor/iconvieweditor.ui10
-rw-r--r--kommander/editor/layout.cpp12
-rw-r--r--kommander/editor/layout.h6
-rw-r--r--kommander/editor/listboxeditor.ui10
-rw-r--r--kommander/editor/listeditor.ui2
-rw-r--r--kommander/editor/listvieweditor.ui18
-rw-r--r--kommander/editor/mainwindow.cpp16
-rw-r--r--kommander/editor/metadatabase.cpp20
-rw-r--r--kommander/editor/metadatabase.h2
-rw-r--r--kommander/editor/multilineeditor.ui2
-rw-r--r--kommander/editor/multilineeditorimpl.cpp2
-rw-r--r--kommander/editor/newform.ui4
-rw-r--r--kommander/editor/paletteeditor.ui8
-rw-r--r--kommander/editor/paletteeditoradvanced.ui10
-rw-r--r--kommander/editor/parser.cpp2
-rw-r--r--kommander/editor/pixmapchooser.cpp2
-rw-r--r--kommander/editor/pixmapfunction.ui4
-rw-r--r--kommander/editor/preferences.ui4
-rw-r--r--kommander/editor/previewframe.cpp2
-rw-r--r--kommander/editor/previewwidget.ui4
-rw-r--r--kommander/editor/propertyeditor.cpp74
-rw-r--r--kommander/editor/propertyeditor.h2
-rw-r--r--kommander/editor/qcompletionedit.cpp4
-rw-r--r--kommander/editor/resource.cpp36
-rw-r--r--kommander/editor/sizehandle.cpp8
-rw-r--r--kommander/editor/styledbutton.cpp14
-rw-r--r--kommander/editor/styledbutton.h4
-rw-r--r--kommander/editor/tableeditor.ui18
-rw-r--r--kommander/editor/templates/Configuration_Dialog.ui2
-rw-r--r--kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui2
-rw-r--r--kommander/editor/templates/Dialog_with_Buttons_(Right).ui2
-rw-r--r--kommander/editor/templates/Tab_Dialog.ui2
-rw-r--r--kommander/editor/widgetfactory.cpp62
-rw-r--r--kommander/editor/widgetfactory.h10
-rw-r--r--kommander/editor/wizardeditor.ui4
-rwxr-xr-xkommander/examples/current/a1.kmdr8
-rwxr-xr-xkommander/examples/current/b1.kmdr4
-rwxr-xr-xkommander/examples/current/kpartpart.kmdr4
-rw-r--r--kommander/examples/current/passvariables.kmdr6
-rwxr-xr-xkommander/examples/current/tableselect.kmdr4
-rw-r--r--kommander/examples/old/execprogram.kmdr4
-rw-r--r--kommander/examples/old/resize.kmdr4
-rw-r--r--kommander/examples/old/selectedwidgettext.kmdr2
-rw-r--r--kommander/examples/old/settings.kmdr4
-rw-r--r--kommander/examples/old/tar.kmdr8
-rw-r--r--kommander/examples/old/tidy.kmdr4
-rw-r--r--kommander/examples/old/widgetgenerator.kmdr4
-rw-r--r--kommander/examples/tutorial/append.kmdr4
-rw-r--r--kommander/examples/tutorial/arrays.kmdr4
-rw-r--r--kommander/examples/tutorial/calc.kmdr14
-rw-r--r--kommander/examples/tutorial/cmdline.kmdr4
-rw-r--r--kommander/examples/tutorial/dcop.kmdr4
-rw-r--r--kommander/examples/tutorial/initialize.kmdr4
-rw-r--r--kommander/examples/tutorial/picview.kmdr4
-rw-r--r--kommander/examples/tutorial/progressbar.kmdr4
-rw-r--r--kommander/examples/tutorial/settings.kmdr8
-rw-r--r--kommander/examples/tutorial/slots.kmdr4
-rw-r--r--kommander/examples/tutorial/strings.kmdr4
-rw-r--r--kommander/examples/tutorial/table.kmdr2
-rw-r--r--kommander/factory/kommanderfactory.cpp16
-rwxr-xr-xkommander/kmdrtools/dcoptool-oldparser.kmdr6
-rwxr-xr-xkommander/kmdrtools/examples.kmdr4
-rw-r--r--kommander/plugin/specials.h2
-rw-r--r--kommander/widget/functionlib.cpp2
-rw-r--r--kommander/widget/kommanderwidget.cpp2
-rw-r--r--kommander/widgets/dialog.cpp8
-rw-r--r--kommander/widgets/execbutton.cpp6
-rw-r--r--kommander/widgets/fileselector.cpp6
-rw-r--r--kommander/widgets/progressbar.cpp4
-rw-r--r--kommander/widgets/richtexteditor.cpp6
-rw-r--r--kommander/working/plugintemplate/widget.cpp2
-rw-r--r--kxsldbg/kxsldbg.cpp2
-rw-r--r--kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp6
-rw-r--r--kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp40
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp8
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp4
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp14
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp6
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp14
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp2
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/options.cpp2
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp2
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp12
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp16
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp22
-rw-r--r--kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h8
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui20
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgcallstack.ui4
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgconfig.ui20
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgdebugger.cpp6
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgentities.ui6
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui10
-rw-r--r--kxsldbg/kxsldbgpart/xsldbglocalvariables.ui10
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui6
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgoutputview.cpp2
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgsources.ui4
-rw-r--r--kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui12
-rw-r--r--lib/compatibility/kmdi/qextmdi/kdockwidget.cpp32
-rw-r--r--lib/compatibility/kmdi/qextmdi/kdockwidget.h6
-rw-r--r--lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp54
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp6
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp36
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdichildview.h2
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp2
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp2
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp12
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp10
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp94
-rw-r--r--lib/compatibility/kmdi/qextmdi/kmultitabbar.h2
-rw-r--r--lib/compatibility/kmdi/qextmdi/ktabbar.cpp14
-rw-r--r--lib/compatibility/kmdi/qextmdi/ktabwidget.cpp8
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.cpp6
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.h2
-rw-r--r--lib/compatibility/knewstuff/entry.cpp2
-rw-r--r--quanta/components/csseditor/colorrequester.cpp2
-rw-r--r--quanta/components/csseditor/colorslider.cpp6
-rw-r--r--quanta/components/csseditor/csseditors.ui10
-rw-r--r--quanta/components/csseditor/cssselectors.ui38
-rw-r--r--quanta/components/csseditor/encodingselectors.ui2
-rw-r--r--quanta/components/csseditor/fontfamilychooser.cpp10
-rw-r--r--quanta/components/csseditor/fontfamilychoosers.ui22
-rw-r--r--quanta/components/csseditor/propertysetter.cpp2
-rw-r--r--quanta/components/csseditor/styleeditor.cpp2
-rw-r--r--quanta/components/csseditor/tlpeditors.cpp2
-rw-r--r--quanta/components/cvsservice/cvscommitdlgs.ui2
-rw-r--r--quanta/components/cvsservice/cvsupdatetodlgs.ui6
-rw-r--r--quanta/components/debugger/conditionalbreakpointdialogs.ui8
-rw-r--r--quanta/components/debugger/dbgp/dbgpsettingss.ui6
-rw-r--r--quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp40
-rw-r--r--quanta/components/debugger/dbgp/quantadebuggerdbgp.h2
-rw-r--r--quanta/components/debugger/debuggermanager.cpp10
-rw-r--r--quanta/components/debugger/debuggermanager.h2
-rw-r--r--quanta/components/debugger/debuggerui.cpp6
-rw-r--r--quanta/components/debugger/debuggerui.h6
-rw-r--r--quanta/components/debugger/debuggervariablesets.ui4
-rw-r--r--quanta/components/debugger/gubed/gubedsettingss.ui8
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.cpp50
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.h2
-rw-r--r--quanta/components/debugger/interfaces/debuggerclient.h2
-rw-r--r--quanta/components/debugger/interfaces/debuggerinterface.h2
-rw-r--r--quanta/components/debugger/pathmapper.cpp2
-rw-r--r--quanta/components/debugger/pathmapperdialog.cpp2
-rw-r--r--quanta/components/debugger/pathmapperdialogs.ui6
-rw-r--r--quanta/components/debugger/quantadebuggerinterface.cpp4
-rw-r--r--quanta/components/debugger/quantadebuggerinterface.h2
-rw-r--r--quanta/components/debugger/variableslistview.cpp6
-rw-r--r--quanta/components/framewizard/fmfpeditors.ui4
-rw-r--r--quanta/components/framewizard/fmrceditors.ui6
-rw-r--r--quanta/components/framewizard/framewizards.ui12
-rw-r--r--quanta/components/tableeditor/tableeditor.cpp2
-rw-r--r--quanta/components/tableeditor/tableeditors.ui14
-rw-r--r--quanta/components/tableeditor/tableitem.cpp4
-rw-r--r--quanta/components/tableeditor/tableitem.h6
-rw-r--r--quanta/dialogs/actionconfigdialog.cpp2
-rw-r--r--quanta/dialogs/actionconfigdialogs.ui18
-rw-r--r--quanta/dialogs/casewidget.ui2
-rw-r--r--quanta/dialogs/debuggeroptionss.ui6
-rw-r--r--quanta/dialogs/dirtydialog.ui4
-rw-r--r--quanta/dialogs/donationdialog.ui6
-rw-r--r--quanta/dialogs/dtdselectdialog.ui2
-rw-r--r--quanta/dialogs/dtepeditdlgs.ui12
-rw-r--r--quanta/dialogs/dtepstructureeditdlgs.ui8
-rw-r--r--quanta/dialogs/fourbuttonmessagebox.ui6
-rw-r--r--quanta/dialogs/loadentitydlgs.ui2
-rw-r--r--quanta/dialogs/settings/abbreviations.ui4
-rw-r--r--quanta/dialogs/settings/codetemplatedlgs.ui2
-rw-r--r--quanta/dialogs/settings/filemaskss.ui8
-rw-r--r--quanta/dialogs/settings/parseroptionsui.ui8
-rw-r--r--quanta/dialogs/settings/previewoptionss.ui4
-rw-r--r--quanta/dialogs/settings/styleoptionss.ui4
-rw-r--r--quanta/dialogs/specialchardialogs.ui8
-rw-r--r--quanta/dialogs/tagdialogs/listdlg.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagmail.ui4
-rw-r--r--quanta/dialogs/tagdialogs/tagmisc.ui2
-rw-r--r--quanta/parsers/dtd/dtdparser.cpp8
-rw-r--r--quanta/parsers/dtd/dtepcreationdlg.ui2
-rw-r--r--quanta/parts/kafka/domtreeview.cpp2
-rw-r--r--quanta/parts/kafka/htmldocumentpropertiesui.ui14
-rw-r--r--quanta/parts/kafka/kafkacommon.h4
-rw-r--r--quanta/parts/kafka/kafkadragobject.cpp4
-rw-r--r--quanta/parts/kafka/kafkadragobject.h2
-rw-r--r--quanta/parts/kafka/kafkasyncoptionsui.ui6
-rw-r--r--quanta/parts/preview/whtmlpart.cpp6
-rw-r--r--quanta/parts/preview/whtmlpart.h2
-rw-r--r--quanta/plugins/pluginconfig.ui10
-rw-r--r--quanta/plugins/plugineditor.ui4
-rw-r--r--quanta/project/eventconfigurationdlgs.ui4
-rw-r--r--quanta/project/eventeditordlgs.ui2
-rw-r--r--quanta/project/project.cpp18
-rw-r--r--quanta/project/project.h6
-rw-r--r--quanta/project/projectlist.cpp4
-rw-r--r--quanta/project/projectnewfinals.ui16
-rw-r--r--quanta/project/projectnewgenerals.ui22
-rw-r--r--quanta/project/projectnewlocals.ui14
-rw-r--r--quanta/project/projectnewwebs.ui12
-rw-r--r--quanta/project/projectoptions.ui14
-rw-r--r--quanta/project/projectprivate.cpp14
-rw-r--r--quanta/project/projectupload.cpp10
-rw-r--r--quanta/project/projectuploads.ui6
-rw-r--r--quanta/project/projecturl.h12
-rw-r--r--quanta/project/rescanprj.cpp2
-rw-r--r--quanta/project/rescanprjdir.ui8
-rw-r--r--quanta/project/teammembersdlgs.ui2
-rw-r--r--quanta/project/uploadprofiledlgs.ui6
-rw-r--r--quanta/project/uploadprofilespage.ui2
-rwxr-xr-xquanta/scripts/checkxml.kmdr6
-rwxr-xr-xquanta/scripts/dwt.kmdr4
-rwxr-xr-xquanta/scripts/gubed_install.kmdr4
-rwxr-xr-xquanta/scripts/htmlquickstart.kmdr4
-rwxr-xr-xquanta/scripts/listwizard.kmdr2
-rwxr-xr-xquanta/scripts/meinproc.kmdr6
-rwxr-xr-xquanta/scripts/picturewizard.kmdr2
-rwxr-xr-xquanta/scripts/tablewizard.kmdr2
-rwxr-xr-xquanta/scripts/tidy.kmdr6
-rwxr-xr-xquanta/scripts/xmlval.kmdr12
-rwxr-xr-xquanta/scripts/xsltproc.kmdr2
-rw-r--r--quanta/src/document.cpp10
-rw-r--r--quanta/src/document.h6
-rw-r--r--quanta/src/dtds.cpp4
-rw-r--r--quanta/src/quanta.cpp26
-rw-r--r--quanta/src/quanta.h6
-rw-r--r--quanta/src/quanta_init.cpp24
-rw-r--r--quanta/src/quantadoc.cpp16
-rw-r--r--quanta/src/quantadoc.h2
-rw-r--r--quanta/src/quantaview.cpp6
-rw-r--r--quanta/src/viewmanager.cpp8
-rw-r--r--quanta/treeviews/basetreeview.cpp4
-rw-r--r--quanta/treeviews/projecttreeview.cpp18
-rw-r--r--quanta/treeviews/projecttreeview.h8
-rw-r--r--quanta/treeviews/quantapropertiespage.ui8
-rw-r--r--quanta/treeviews/tagattributeitems.cpp8
-rw-r--r--quanta/treeviews/tagattributetree.cpp4
-rw-r--r--quanta/treeviews/templatedirform.ui6
-rw-r--r--quanta/utility/qpevents.cpp2
291 files changed, 1545 insertions, 1545 deletions
diff --git a/kfilereplace/commandengine.cpp b/kfilereplace/commandengine.cpp
index e8955556..af3cd2f2 100644
--- a/kfilereplace/commandengine.cpp
+++ b/kfilereplace/commandengine.cpp
@@ -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/kaddstringdlg.cpp b/kfilereplace/kaddstringdlg.cpp
index 9c555ee6..1ec33552 100644
--- a/kfilereplace/kaddstringdlg.cpp
+++ b/kfilereplace/kaddstringdlg.cpp
@@ -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..6eca6850 100644
--- a/kfilereplace/kaddstringdlgs.ui
+++ b/kfilereplace/kaddstringdlgs.ui
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -190,7 +190,7 @@
<property name="name">
<cstring>m_pbDel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -204,7 +204,7 @@
<property name="name">
<cstring>m_pbAdd</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -375,7 +375,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>20</height>
diff --git a/kfilereplace/kfilereplaceview.cpp b/kfilereplace/kfilereplaceview.cpp
index 9800f119..104effcb 100644
--- a/kfilereplace/kfilereplaceview.cpp
+++ b/kfilereplace/kfilereplaceview.cpp
@@ -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..907cfac5 100644
--- a/kfilereplace/kfilereplaceviewwdg.ui
+++ b/kfilereplace/kfilereplaceviewwdg.ui
@@ -407,7 +407,7 @@
<property name="name">
<cstring>m_ledGo</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
@@ -434,7 +434,7 @@
<property name="name">
<cstring>m_ledWait</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
@@ -461,7 +461,7 @@
<property name="name">
<cstring>m_ledStop</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
@@ -490,7 +490,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>354</width>
<height>20</height>
diff --git a/kfilereplace/knewprojectdlgs.ui b/kfilereplace/knewprojectdlgs.ui
index 7cb3b392..bc6c3961 100644
--- a/kfilereplace/knewprojectdlgs.ui
+++ b/kfilereplace/knewprojectdlgs.ui
@@ -48,13 +48,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>70</width>
<height>32767</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
@@ -118,7 +118,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>70</width>
<height>32767</height>
@@ -718,7 +718,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>190</width>
<height>16</height>
@@ -842,7 +842,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>330</width>
<height>16</height>
diff --git a/kfilereplace/koptionsdlgs.ui b/kfilereplace/koptionsdlgs.ui
index 2c377b15..43ed48d6 100644
--- a/kfilereplace/koptionsdlgs.ui
+++ b/kfilereplace/koptionsdlgs.ui
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>202</width>
<height>20</height>
diff --git a/kfilereplace/report.cpp b/kfilereplace/report.cpp
index 62e59173..92901a53 100644
--- a/kfilereplace/report.cpp
+++ b/kfilereplace/report.cpp
@@ -44,7 +44,7 @@ void Report::createReportFile()
// 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,
diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp
index 52cccf9f..93254d0a 100644
--- a/kimagemapeditor/kimearea.cpp
+++ b/kimagemapeditor/kimearea.cpp
@@ -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() ));
@@ -992,9 +992,9 @@ void PolyArea::draw(TQPainter & p)
if (_finished)
- p.tqdrawPolygon ( *_coords,false,0,_coords->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));
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index c2e50c7c..096f224f 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -602,7 +602,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
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<MapTag> *_
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"));
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 70e97757..25c0ada7 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -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 @@
<thead>
<tr>
<th>URL</th>
- <th>tqStatus</th>
+ <th>Status</th>
<th>Label</th>
<th>Referrers</th>
</tr>
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..8186bda8 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -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..2c31dd73 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -28,7 +28,7 @@
#include <tqdom.h>
-LinktqStatus::~LinktqStatus()
+LinkStatus::~LinkStatus()
{
//kdDebug(23100) << "|";
@@ -53,7 +53,7 @@ LinktqStatus::~LinktqStatus()
}
}
-void LinktqStatus::reset()
+void LinkStatus::reset()
{
depth_ = -1;
external_domain_depth_ = -1;
@@ -94,7 +94,7 @@ void LinktqStatus::reset()
base_URI_ = "";
}
-TQString const LinktqStatus::toString() const
+TQString const LinkStatus::toString() const
{
TQString aux;
@@ -114,7 +114,7 @@ TQString const LinktqStatus::toString() const
}
-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<Node*> const& nodes) // don't inline please (#include "node.h")
+void LinkStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
{
tqchildren_nodes_.reserve(nodes.size());
tqchildren_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
// <status>
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..693a95fc 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<Node*> const& nodes);
void addChildNode(Node* node);
@@ -102,23 +102,23 @@ 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<Node*> const& tqchildrenNodes() const;
TQString const toString() const;
@@ -137,7 +137,7 @@ public:
TreeViewItem* treeViewItem() const;
TQValueVector<KURL> 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<Node*> tqchildren_nodes_;
- LinktqStatus* parent_;
- LinktqStatus* redirection_;
+ 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..52c5d92e 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);
}
-inline void LinktqStatus::reserveMemoryForChildrenNodes(int n)
+inline void LinkStatus::reserveMemoryForChildrenNodes(int n)
{
Q_ASSERT(n > 0);
tqchildren_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<Node*> const& LinktqStatus::tqchildrenNodes() const
+inline vector<Node*> const& LinkStatus::tqchildrenNodes() const
{
return tqchildren_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<KURL> const& LinktqStatus::referrers() const
+inline TQValueVector<KURL> const& LinkStatus::referrers() const
{
return referrers_;
}
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 6ca04b3a..1070db43 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<LinktqStatus*> no = tqchildren(LinktqStatus::lastRedirection(&root_));
+ vector<LinkStatus*> no = tqchildren(LinkStatus::lastRedirection(&root_));
emit signalLinksToCheckTotalSteps(no.size());
- vector< vector<LinktqStatus*> > nivel;
+ vector< vector<LinkStatus*> > nivel;
nivel.push_back(no);
search_results_.push_back(nivel);
@@ -255,9 +255,9 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che
checker = 0;
}
-vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
+vector<LinkStatus*> SearchManager::tqchildren(LinkStatus* link)
{
- vector<LinktqStatus*> tqchildren;
+ vector<LinkStatus*> tqchildren;
if(!link || link->absoluteUrl().hasRef())
return tqchildren;
@@ -283,7 +283,7 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
||
node->malformed() )
{
- LinktqStatus* ls = new LinktqStatus(node, link);
+ LinkStatus* ls = new LinkStatus(node, link);
ls->setAbsoluteUrl(url);
if(localDomain(ls->absoluteUrl()))
@@ -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<LinktqStatus*> const& no = nodeToAnalize();
+ vector<LinkStatus*> const& no = nodeToAnalize();
if((uint)current_index_ < no.size())
checkVectorLinks(no);
@@ -442,7 +442,7 @@ void SearchManager::continueSearch()
}
}
-vector<LinktqStatus*> const& SearchManager::nodeToAnalize() const
+vector<LinkStatus*> 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<LinktqStatus*> const& SearchManager::nodeToAnalize() const
return (search_results_[current_depth_ - 1])[current_node_];
}
-void SearchManager::checkVectorLinks(vector<LinktqStatus*> const& links)
+void SearchManager::checkVectorLinks(vector<LinkStatus*> const& links)
{
checkLinksSimultaneously(chooseLinks(links));
}
-vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& links)
+vector<LinkStatus*> SearchManager::chooseLinks(vector<LinkStatus*> const& links)
{
- vector<LinktqStatus*> escolha;
+ vector<LinkStatus*> escolha;
for(int i = 0; i != max_simultaneous_connections_; ++i)
{
if((uint)current_index_ < links.size())
@@ -466,7 +466,7 @@ vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& li
return escolha;
}
-void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
+void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
{
Q_ASSERT(finished_connections_ <= max_simultaneous_connections_);
finished_connections_ = 0;
@@ -480,7 +480,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> 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<LinktqStatus*> 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<LinktqStatus*> 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);
}
@@ -514,7 +514,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
ls->setIgnored(true);
ls->setErrorOccurred(true);
ls->setError(i18n("Protocol %1 not supported").tqarg(protocol));
- ls->settqStatus(LinktqStatus::MALFORMED);
+ ls->setStatus(LinkStatus::MALFORMED);
ls->setChecked(true);
slotLinkChecked(ls, 0);
}
@@ -524,8 +524,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> 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<LinktqStatus*> 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<LinktqStatus*> (link)))->absoluteUrl().url() << endl;
+// LinkStatus::lastRedirection((const_cast<LinkStatus*> (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 <LinktqStatus*> >());
- vector< vector <LinktqStatus*> >& ultimo_nivel(search_results_[search_results_.size() - 2]);
+ search_results_.push_back(vector< vector <LinkStatus*> >());
+ vector< vector <LinkStatus*> >& 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 <LinktqStatus*> f(tqchildren( LinktqStatus::lastRedirection(((ultimo_nivel[i])[j])) ));
+ vector <LinkStatus*> f(tqchildren( 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..bef360a1 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<LinktqStatus*> const& links); // corresponde a um no de um nivel de depth
- vector<LinktqStatus*> tqchildren(LinktqStatus* link);
+ void checkVectorLinks(vector<LinkStatus*> const& links); // corresponde a um no de um nivel de depth
+ vector<LinkStatus*> tqchildren(LinkStatus* link);
void startSearch();
void continueSearch();
void finnish();
void pause();
- vector<LinktqStatus*> const& nodeToAnalize() const;
- vector<LinktqStatus*> chooseLinks(vector<LinktqStatus*> const& links);
- void checkLinksSimultaneously(vector<LinktqStatus*> const& links);
+ vector<LinkStatus*> const& nodeToAnalize() const;
+ vector<LinkStatus*> chooseLinks(vector<LinkStatus*> const& links);
+ void checkLinksSimultaneously(vector<LinkStatus*> 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 <LinktqStatus*> > > search_results_;
+ vector< vector< vector <LinkStatus*> > > 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<LinktqStatus*> const& v)
+bool Url::existUrl(KURL const& url, vector<LinkStatus*> 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<LinktqStatus*> const& v);
+bool existUrl(KURL const& url, vector<LinkStatus*> 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/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index b19f7764..4b8902e7 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -57,7 +57,7 @@ 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);
@@ -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..2303e8bb 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -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<LinktqStatus*> (linkstatus);
+ LinkStatus* ls = const_cast<LinkStatus*> (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<LinktqStatus*> (linkstatus);
+ LinkStatus* ls = const_cast<LinkStatus*> (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..75538524 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -12,7 +12,7 @@
<height>683</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
@@ -75,13 +75,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>25</width>
<height>25</height>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>174</width>
<height>20</height>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -338,7 +338,7 @@
<property name="name">
<cstring>tree_view</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>300</height>
@@ -357,7 +357,7 @@
<property name="name">
<cstring>textlabel_progressbar</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>94</width>
<height>0</height>
@@ -403,7 +403,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>470</width>
<height>32767</height>
@@ -423,7 +423,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -475,7 +475,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
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 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 62553ffb..6c305531 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -39,7 +39,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index 6aef2c97..1ca0b251 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -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<TableItem*> TableLinkstatus::generateRowOfTableItems(LinktqStatus const* linkstatus)
+vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinkStatus const* linkstatus)
{
vector<TableItem*> 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<TableItem*> 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<KURL> referrers = table_item->linktqStatus()->referrers();
- loadContextTableMenu(referrers, table_item->linktqStatus()->isRoot());
+ TQValueVector<KURL> referrers = table_item->linkStatus()->referrers();
+ loadContextTableMenu(referrers, table_item->linkStatus()->isRoot());
context_table_menu_.popup(pos);
}
}
@@ -313,7 +313,7 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> 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<KURL> referrers = _item->linktqStatus()->referrers();
+ TQValueVector<KURL> 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<KURL> referrers = _item->linktqStatus()->referrers();
+ TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
Q_ASSERT(index >= 0 && (uint)index < referrers.size());
slotEditReferrerWithQuanta(referrers[index]);
@@ -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,10 +439,10 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
*/
TableItem::TableItem(TQTable* table, EditType et,
- LinktqStatus const* linkstatus,
+ LinkStatus const* linkstatus,
int column_index, int tqalignment)
: TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index),
- /*ls_((LinktqStatus*)linkstatus),
+ /*ls_((LinkStatus*)linkstatus),
column_index_(column_index),*/ alignment_(tqalignment)
{
//Q_ASSERT(ls_);
@@ -467,7 +467,7 @@ int TableItem::columnIndex() const
return ResultViewItem::columnIndex();
}
-void TableItem::tqsetAlignment(int aFlags)
+void TableItem::setAlignment(int aFlags)
{
alignment_ = aFlags;
}
@@ -477,7 +477,7 @@ int TableItem::tqalignment() 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").tqarg(linkStatus()->status());
}
else
- return i18n("%1").tqarg(linktqStatus()->httpHeader().reasonPhrase());
+ return i18n("%1").tqarg(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(),
@@ -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..58269c98 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<TableItem*> generateRowOfTableItems(LinktqStatus const* linkstatus);
+ vector<TableItem*> generateRowOfTableItems(LinkStatus const* linkstatus);
void insereLinha(vector<TableItem*> items);
private:
@@ -110,18 +110,18 @@ class TableItem: public TQTableItem, public ResultViewItem
public:
TableItem(TQTable* table, EditType et,
- LinktqStatus const* linkstatus,
+ LinkStatus const* linkstatus,
int column_index, int tqalignment = TQt::AlignLeft);
virtual ~TableItem();
virtual void setColumnIndex(int i);
virtual int columnIndex() const;
- void tqsetAlignment(int aFlags);
+ void setAlignment(int aFlags);
virtual int tqalignment() 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..9a6302f7 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -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<KListView*> (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);
@@ -209,8 +209,8 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in
TreeViewItem* tree_item = myItem(item);
if(tree_item)
{
- TQValueVector<KURL> referrers = tree_item->linktqStatus()->referrers();
- loadContextTableMenu(referrers, tree_item->linktqStatus()->isRoot());
+ TQValueVector<KURL> referrers = tree_item->linkStatus()->referrers();
+ loadContextTableMenu(referrers, tree_item->linkStatus()->isRoot());
context_table_menu_.popup(pos);
}
}
@@ -218,7 +218,7 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in
void TreeView::slotCopyUrlToClipboard() const
{
TreeViewItem* _item = myItem(currentItem());
- TQString content(_item->linktqStatus()->absoluteUrl().prettyURL());
+ TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
TQClipboard* cb = kapp->tqclipboard();
cb->setText(content);
}
@@ -226,7 +226,7 @@ void TreeView::slotCopyUrlToClipboard() const
void TreeView::slotCopyParentUrlToClipboard() const
{
TreeViewItem* _item = myItem(currentItem());
- TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL());
+ TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
TQClipboard* cb = kapp->tqclipboard();
cb->setText(content);
}
@@ -242,7 +242,7 @@ void TreeView::slotCopyCellTextToClipboard() const
void TreeView::slotEditReferrersWithQuanta()
{
TreeViewItem* _item = myItem(currentItem());
- TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+ TQValueVector<KURL> 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<KURL> referrers = _item->linktqStatus()->referrers();
+ TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
Q_ASSERT(index >= 0 && (uint)index < referrers.size());
slotEditReferrerWithQuanta(referrers[index]);
@@ -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<TreeColumnViewItem> 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..a44ac475 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -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\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
static const char* params[3] = {
"appdata",
@@ -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( "<kopete-i18n>(.*)</kopete-i18n>" ) );
+ TQRegExp elementMatch( TQString::fromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
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( "<xsl:value-of select=\"@time\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of select=\"@time\"/>" );
}
- else if ( *it == TQString::tqfromLatin1( "TIMESTAMP" ) )
+ else if ( *it == TQString::fromLatin1( "TIMESTAMP" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
}
- else if ( *it == TQString::tqfromLatin1( "FORMATTEDTIMESTAMP" ) )
+ else if ( *it == TQString::fromLatin1( "FORMATTEDTIMESTAMP" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
}
- else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:choose>"
"<xsl:when test='from/contact/@contactId=from/contact/contactDisplayName/@text'>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/>"
@@ -290,9 +290,9 @@ void XSLT::setXSLT( const TQString &_document )
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:choose>"
"<xsl:when test='to/contact/@contactId=from/contact/contactDisplayName/@text'>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/>"
@@ -307,37 +307,37 @@ void XSLT::setXSLT( const TQString &_document )
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span>"
+ trans += TQString::fromLatin1( "<span>"
"<xsl:attribute name=\"dir\">"
"<xsl:value-of select=\"from/contact/metaContactDisplayName/@dir\"/>"
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span>"
+ trans += TQString::fromLatin1( "<span>"
"<xsl:attribute name=\"dir\">"
"<xsl:value-of select=\"to/contact/metaContactDisplayName/@dir\"/>"
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_ID" ) )
+ else if ( *it == TQString::fromLatin1( "FROM_CONTACT_ID" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/@contactId\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_ID" ) )
+ else if ( *it == TQString::fromLatin1( "TO_CONTACT_ID" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/@contactId\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "BODY" ) )
+ else if ( *it == TQString::fromLatin1( "BODY" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
}
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/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 7207da73..3fc26240 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -81,7 +81,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB
setOrientation( o );
setBackgroundMode( parent->backgroundMode() );
setBackgroundOrigin( ParentOrigin );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
}
void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
@@ -94,9 +94,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient );
}
-TQSize QDesignerToolBarSeparator::tqsizeHint() const
+TQSize QDesignerToolBarSeparator::sizeHint() const
{
- int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+ int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
if ( orient ==Qt::Horizontal )
return TQSize( extent, 0 );
@@ -113,7 +113,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
flags |= TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
- tqcolorGroup(), flags );
+ colorGroup(), flags );
}
@@ -511,11 +511,11 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
return;
TQString s;
if ( e->provides( "application/x-designer-actiongroup" ) )
- s = TQString( e->tqencodedData( "application/x-designer-actiongroup" ) );
+ s = TQString( e->encodedData( "application/x-designer-actiongroup" ) );
else if ( e->provides( "application/x-designer-separator" ) )
- s = TQString( e->tqencodedData( "application/x-designer-separator" ) );
+ s = TQString( e->encodedData( "application/x-designer-separator" ) );
else
- s = TQString( e->tqencodedData( "application/x-designer-actions" ) );
+ s = TQString( e->encodedData( "application/x-designer-actions" ) );
indicator->hide();
TQAction *a = 0;
@@ -873,7 +873,7 @@ void QDesignerMenuBar::dropEvent( TQDropEvent *e )
if ( !e->provides( "application/x-designer-menuitem" ) )
return;
e->accept();
- TQString s( e->tqencodedData( "application/x-designer-menuitem" ) );
+ TQString s( e->encodedData( "application/x-designer-menuitem" ) );
TQString s1 = s.left( s.find( "/" ) );
TQString s2 = s.mid( s.find( "/" ) + 1 );
TQPopupMenu *popup = (TQPopupMenu*)s1.toLong(); // #### huha, that is evil
@@ -895,7 +895,7 @@ TQPoint QDesignerMenuBar::calcIndicatorPos( const TQPoint &pos )
int w = frameWidth();
insertAt = count();
for ( int i = 0; i < (int)count(); ++i ) {
- TQRect r = tqitemRect( i );
+ TQRect r = itemRect( i );
if ( pos.x() < w + r.width() / 2 ) {
insertAt = i;
break;
@@ -1142,15 +1142,15 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
TQPoint p = pos();
TQAction *a = 0;
if ( e->provides( "application/x-designer-actiongroup" ) ) {
- TQString s( e->tqencodedData( "application/x-designer-actiongroup" ) );
+ TQString s( e->encodedData( "application/x-designer-actiongroup" ) );
a = (QDesignerActionGroup*)s.toLong();
} else {
TQString s;
if ( e->provides( "application/x-designer-separator" ) ) {
- s = TQString( e->tqencodedData( "application/x-designer-separator" ) );
+ s = TQString( e->encodedData( "application/x-designer-separator" ) );
a = (QSeparatorAction*)s.toLong();
} else {
- s = TQString( e->tqencodedData( "application/x-designer-actions" ) );
+ s = TQString( e->encodedData( "application/x-designer-actions" ) );
a = (QDesignerAction*)s.toLong();
}
}
diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h
index a47992cd..74df7292 100644
--- a/kommander/editor/actiondnd.h
+++ b/kommander/editor/actiondnd.h
@@ -108,7 +108,7 @@ class QDesignerToolBarSeparator : public TQWidget
public:
QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
Qt::Orientation orientation() const { return orient; }
public slots:
void setOrientation( Qt::Orientation );
diff --git a/kommander/editor/actioneditor.ui b/kommander/editor/actioneditor.ui
index 056b46cf..5d13edc7 100644
--- a/kommander/editor/actioneditor.ui
+++ b/kommander/editor/actioneditor.ui
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index d3565506..6ce23a0e 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -152,7 +152,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 1298db05..63daca20 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -314,7 +314,7 @@ TQStringList AssocTextEditor::buildWidgetList()
// There is a warning message with the property() function if it does not exist.
// Verify the property exists with the meta information first */
bool pExists = false;
- TQMetaObject *metaObj = it.current()->tqmetaObject();
+ TQMetaObject *metaObj = it.current()->metaObject();
if(metaObj)
{
int id = metaObj->findProperty("KommanderWidget", true);
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index fc9887c9..5966cdf7 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -88,7 +88,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index c9a6642d..f34e2ffd 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -103,7 +103,7 @@ void ChooseWidget::textChanged(const TQString& text)
bool ChooseWidget::isKommanderWidget(TQObject* w)
{
bool pExists = false;
- TQMetaObject *metaObj = w->tqmetaObject();
+ TQMetaObject *metaObj = w->metaObject();
if (metaObj)
{
int id = metaObj->findProperty("KommanderWidget", true);
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index c1b8db31..7e295285 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -263,8 +263,8 @@ void InsertCommand::execute()
widget->move( tqgeometry.topLeft() );
widget->adjustSize();
} else {
- TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() );
- s = s.expandedTo( widget->tqminimumSizeHint() );
+ TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() );
+ s = s.expandedTo( widget->minimumSizeHint() );
TQRect r( tqgeometry.topLeft(), s );
widget->setGeometry( r );
}
@@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c )
{
SetPropertyCommand *cmd = (SetPropertyCommand*)c;
const TQMetaProperty *p =
- widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
if ( !p ) {
if ( propName == "toolTip" || propName == "whatsThis" )
return true;
@@ -532,16 +532,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
editor->propertyList()->setCurrentProperty( propName );
const TQMetaProperty *p =
- widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
if ( !p ) {
if ( propName == "hAlign" ) {
- p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true );
+ p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true );
int align = widget->property( "tqalignment" ).toInt();
align &= ~( AlignHorizontal_Mask );
align |= p->keyToValue( currentItemText );
widget->setProperty( "tqalignment", TQVariant( align ) );
} else if ( propName == "vAlign" ) {
- p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true );
+ p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true );
int align = widget->property( "tqalignment" ).toInt();
align &= ~( AlignVertical_Mask );
align |= p->keyToValue( currentItemText );
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 63d59f49..8ff884a2 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -239,7 +239,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>21</height>
@@ -293,7 +293,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>230</width>
<height>20</height>
@@ -331,7 +331,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>231</width>
<height>20</height>
@@ -368,7 +368,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>20</height>
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 4613380b..b120c7a5 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -274,7 +274,7 @@ void ConnectionEditor::senderChanged(const TQString& s)
if (!p_object)
return;
m_sender = p_object;
- TQStrList p_sigs = m_sender->tqmetaObject()->signalNames(true);
+ TQStrList p_sigs = m_sender->metaObject()->signalNames(true);
signalBox->clear();
for (TQStrListIterator it(p_sigs); it.current(); ++it)
if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch))
@@ -293,11 +293,11 @@ void ConnectionEditor::receiverChanged(const TQString& s)
if (!p_object)
return;
m_receiver = p_object;
- int n = m_receiver->tqmetaObject()->numSlots(true);
+ int n = m_receiver->metaObject()->numSlots(true);
slotBox->clear();
for (int i = 0; i < n; ++i)
{
- const TQMetaData* md = m_receiver->tqmetaObject()->slot(i, true);
+ const TQMetaData* md = m_receiver->metaObject()->slot(i, true);
if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch))
slotBox->insertItem(md->tqt_mo_ci_name);
}
diff --git a/kommander/editor/createtemplate.ui b/kommander/editor/createtemplate.ui
index f97acfc6..e31865ef 100644
--- a/kommander/editor/createtemplate.ui
+++ b/kommander/editor/createtemplate.ui
@@ -124,7 +124,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -196,7 +196,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index 02ff5699..e6f7fc15 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 8dd01453..cbc64772 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -212,7 +212,7 @@ void FormWindow::paintGrid(TQWidget *w, TQPaintEvent *e)
grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
if(!TQPixmapCache::find(grid_name, grid)) {
grid = TQPixmap(350 + (350 % mainWindow()->grid().x()), 350 + (350 % mainWindow()->grid().y()));
- grid.fill(tqcolorGroup().color(TQColorGroup::Foreground));
+ grid.fill(colorGroup().color(TQColorGroup::Foreground));
TQBitmap mask(grid.width(), grid.height());
mask.fill(color0);
TQPainter p(&mask);
@@ -267,7 +267,7 @@ TQPoint FormWindow::gridPoint(const TQPoint &p)
void FormWindow::drawSizePreview(const TQPoint &pos, const TQString& text)
{
unclippedPainter->save();
- unclippedPainter->setPen(TQPen(tqcolorGroup().foreground(), 1 ));
+ unclippedPainter->setPen(TQPen(colorGroup().foreground(), 1 ));
unclippedPainter->setRasterOp(CopyROP);
if (!sizePreviewPixmap.isNull())
unclippedPainter->drawPixmap(sizePreviewPos, sizePreviewPixmap);
@@ -345,8 +345,8 @@ void FormWindow::insertWidget()
r = TQRect(p, r.size());
if (useSizeHint)
{
- r.setWidth(w->tqsizeHint().width());
- r.setHeight(w->tqsizeHint().height());
+ r.setWidth(w->sizeHint().width());
+ r.setHeight(w->sizeHint().height());
}
if (r.width() < 2 * grid().x())
@@ -753,7 +753,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
targetContainer = wa;
hadOwnPalette = wa->ownPalette();
restorePalette = wa->palette();
- wa->setPaletteBackgroundColor(wa->tqcolorGroup().midlight());
+ wa->setPaletteBackgroundColor(wa->colorGroup().midlight());
}
}
else if (targetContainer)
@@ -1820,11 +1820,11 @@ void FormWindow::checkAccels()
{
TQWidget *w = (TQWidget *) o;
const TQMetaProperty *text =
- w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
+ w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
const TQMetaProperty *title =
- w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+ w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
const TQMetaProperty *pageTitle =
- w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true);
+ w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
if (text)
find_accel(w->property("text").toString(), accels, w);
if (title)
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index ca35e191..31068b7a 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -42,7 +42,7 @@
<property name="name">
<cstring>descriptionText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -82,7 +82,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -119,7 +119,7 @@
<property name="name">
<cstring>groupBox1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -177,7 +177,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32</height>
@@ -530,7 +530,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -578,7 +578,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -607,7 +607,7 @@
<property name="name">
<cstring>clearButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index a898c49d..9256911f 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -147,7 +147,7 @@ void FunctionsDialog::groupChanged(int index)
if (index == m_Slots)
{
KommanderWidget* a_atw = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]);
- TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->tqmetaObject()->slotNames(true));
+ TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->metaObject()->slotNames(true));
for (uint i=0; i<pFunctions.count(); i++)
{
TQString slot = pFunctions[i];
@@ -195,7 +195,7 @@ void FunctionsDialog::functionChanged(int)
{
KommanderWidget* w = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]);
TQObject *o = w->object();
- TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").tqarg(o->tqmetaObject()->tqsuperClassName() ? TQString(o->tqmetaObject()->tqsuperClassName()) : TQString(o->className()) );
+ TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").tqarg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) );
TQString slotName = functionListBox->currentText();
TQString slot = m_slotList[slotName];
descriptionText->clear();
diff --git a/kommander/editor/iconvieweditor.ui b/kommander/editor/iconvieweditor.ui
index 26d1aa8b..90d70c4a 100644
--- a/kommander/editor/iconvieweditor.ui
+++ b/kommander/editor/iconvieweditor.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -221,7 +221,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -244,7 +244,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -301,7 +301,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index dca00c38..aadd2212 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -874,15 +874,15 @@ void Spacer::setSizeType( SizeType t )
sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
else
sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
- tqsetSizePolicy( sizeP );
+ setSizePolicy( sizeP );
}
Spacer::SizeType Spacer::sizeType() const
{
if ( orient ==Qt::Vertical )
- return (SizeType)tqsizePolicy().verData();
- return (SizeType)tqsizePolicy().horData();
+ return (SizeType)sizePolicy().verData();
+ return (SizeType)sizePolicy().horData();
}
int Spacer::tqalignment() const
@@ -892,12 +892,12 @@ int Spacer::tqalignment() const
return AlignVCenter;
}
-TQSize Spacer::tqminimumSize() const
+TQSize Spacer::minimumSize() const
{
return TQSize( 20, 20 );
}
-TQSize Spacer::tqsizeHint() const
+TQSize Spacer::sizeHint() const
{
TQSize s = sh.expandedTo( TQSize(0,0) );
if ( sizeType() == Expanding )
@@ -913,7 +913,7 @@ void Spacer::setSizeHint( const TQSize &s )
{
sh = s;
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
- resize( tqsizeHint() );
+ resize( sizeHint() );
updateGeometry();
}
diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index 14104bf7..2b33bb3b 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -118,7 +118,7 @@ class Spacer : public TQWidget
TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
Q_ENUMS( SizeType )
TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
- TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+ TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
private:
@@ -135,8 +135,8 @@ public:
Spacer( TQWidget *parent, const char *name );
- TQSize tqminimumSize() const;
- TQSize tqsizeHint() const;
+ TQSize minimumSize() const;
+ TQSize sizeHint() const;
void setSizeType( SizeType t );
SizeType sizeType() const;
int tqalignment() const;
diff --git a/kommander/editor/listboxeditor.ui b/kommander/editor/listboxeditor.ui
index fc03fa8f..506e4e1f 100644
--- a/kommander/editor/listboxeditor.ui
+++ b/kommander/editor/listboxeditor.ui
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -213,7 +213,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -244,7 +244,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -297,7 +297,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui
index 4d5b5957..f754e6c1 100644
--- a/kommander/editor/listeditor.ui
+++ b/kommander/editor/listeditor.ui
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/listvieweditor.ui b/kommander/editor/listvieweditor.ui
index 2ec9e9ba..ada4fa01 100644
--- a/kommander/editor/listvieweditor.ui
+++ b/kommander/editor/listvieweditor.ui
@@ -134,7 +134,7 @@
<property name="name">
<cstring>itemText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -195,7 +195,7 @@
<property name="name">
<cstring>itemDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -218,7 +218,7 @@
<property name="name">
<cstring>itemChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -284,7 +284,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -418,7 +418,7 @@
<property name="name">
<cstring>colDeletePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -441,7 +441,7 @@
<property name="name">
<cstring>colChoosePixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -472,7 +472,7 @@
<property name="name">
<cstring>colText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -589,7 +589,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -634,7 +634,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 22969a3b..e969b034 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -368,7 +368,7 @@ int MainWindow::currentTool() const
{
if (!actionCurrentTool)
return POINTER_TOOL;
- return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
+ return TQString::fromLatin1(actionCurrentTool->name()).toInt();
}
void MainWindow::slotCreateBackups()
@@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge
void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w)
{
- const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
+ const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
text = 0;
- const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+ const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
title = 0;
const TQMetaProperty* pagetitle =
- w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true);
+ w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
pagetitle = 0;
const TQMetaProperty* pixmap =
- w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pixmap", true), true);
+ w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true);
if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0)
pixmap = 0;
@@ -1627,8 +1627,8 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
return true;
}
- const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
- const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+ const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
+ const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
if (text && text->designable(w)) {
bool ok = false;
TQString text;
@@ -1756,7 +1756,7 @@ void MainWindow::checkTempFiles()
void MainWindow::showDialogHelp()
{
TQWidget *w = (TQWidget*)sender();
- w = w->tqtopLevelWidget();
+ w = w->topLevelWidget();
TQString link = "designer-manual-12.html#";
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 839160da..688b7c5b 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -469,8 +469,8 @@ void MetaDataBase::doConnections( TQObject *o )
TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() );
- TQStrList signalList = sender->tqmetaObject()->signalNames( true );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( true );
+ TQStrList signalList = sender->metaObject()->signalNames( true );
+ TQStrList slotList = receiver->metaObject()->slotNames( true );
// avoid warnings
if ( signalList.find( conn.signal ) == -1 ||
@@ -647,13 +647,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
}
if ( !onlyCustom ) {
- TQStrList slotList = o->tqmetaObject()->slotNames( true );
+ TQStrList slotList = o->metaObject()->slotNames( true );
if ( slotList.find( slot ) != -1 )
return true;
if ( o->inherits( "FormWindow" ) ) {
o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
- slotList = o->tqmetaObject()->slotNames( true );
+ slotList = o->metaObject()->slotNames( true );
if ( slotList.find( slot ) != -1 )
return true;
}
@@ -934,7 +934,7 @@ MetaDataBase::CustomWidget::CustomWidget()
className = "MyCustomWidget";
includeFile = "mywidget.h";
includePolicy = Local;
- tqsizeHint = TQSize( -1, -1 );
+ sizeHint = TQSize( -1, -1 );
pixmap = new TQPixmap( PixmapChooser::loadPixmap( "customwidget.xpm" ) );
id = -1;
sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -946,7 +946,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -991,7 +991,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1006,7 +1006,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
{
- TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( true );
+ TQStrList sigList = TQWidget::staticMetaObject()->signalNames( true );
if ( sigList.find( signal ) != -1 )
return true;
for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1018,7 +1018,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
{
- TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( true );
+ TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true );
if ( slotList.find( normalizeSlot( slot ) ) != -1 )
return true;
@@ -1031,7 +1031,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
{
- TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( true );
+ TQStrList propList = TQWidget::staticMetaObject()->propertyNames( true );
if ( propList.find( prop ) != -1 )
return true;
diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index 5251e793..11254f0b 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -92,7 +92,7 @@ public:
TQString className;
TQString includeFile;
IncludePolicy includePolicy;
- TQSize tqsizeHint;
+ TQSize sizeHint;
TQSizePolicy sizePolicy;
TQPixmap *pixmap;
TQValueList<TQCString> lstSignals;
diff --git a/kommander/editor/multilineeditor.ui b/kommander/editor/multilineeditor.ui
index 47ce1172..2c2c4f6d 100644
--- a/kommander/editor/multilineeditor.ui
+++ b/kommander/editor/multilineeditor.ui
@@ -128,7 +128,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp
index 074a8471..ce5efe77 100644
--- a/kommander/editor/multilineeditorimpl.cpp
+++ b/kommander/editor/multilineeditorimpl.cpp
@@ -34,7 +34,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWi
connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
mlined = (TQMultiLineEdit*)editWidget;
// #### complete list of properties here
- preview->tqsetAlignment( mlined->tqalignment() );
+ preview->setAlignment( mlined->tqalignment() );
preview->setMaxLines( mlined->maxLines() );
preview->setWordWrap( mlined->wordWrap() );
preview->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui
index fe2f5e42..860c1190 100644
--- a/kommander/editor/newform.ui
+++ b/kommander/editor/newform.ui
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index eeead240..4c8f89ad 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -92,7 +92,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -154,7 +154,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -214,7 +214,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -353,7 +353,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui
index 001a39f3..78fcb222 100644
--- a/kommander/editor/paletteeditoradvanced.ui
+++ b/kommander/editor/paletteeditoradvanced.ui
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -325,7 +325,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -477,7 +477,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -496,7 +496,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -573,7 +573,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/parser.cpp b/kommander/editor/parser.cpp
index fa264796..85446fa0 100644
--- a/kommander/editor/parser.cpp
+++ b/kommander/editor/parser.cpp
@@ -62,5 +62,5 @@ TQString Parser::cleanArgs( const TQString &func )
}
res += ")";
- return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
+ return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
}
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index e536242a..ef8636c0 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -891,7 +891,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
{
- p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) );
+ p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) );
p->drawPixmap( 0, 0, pixmap );
}
diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui
index cb34cbcc..f4b241e3 100644
--- a/kommander/editor/pixmapfunction.ui
+++ b/kommander/editor/pixmapfunction.ui
@@ -810,7 +810,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -861,7 +861,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/preferences.ui b/kommander/editor/preferences.ui
index 63ac1bb3..2cb673ed 100644
--- a/kommander/editor/preferences.ui
+++ b/kommander/editor/preferences.ui
@@ -317,7 +317,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -528,7 +528,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/previewframe.cpp b/kommander/editor/previewframe.cpp
index b3afb58b..b54d6347 100644
--- a/kommander/editor/previewframe.cpp
+++ b/kommander/editor/previewframe.cpp
@@ -31,7 +31,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
setLineWidth(1);
PreviewWorkspace * w = new PreviewWorkspace( this );
- w->setEraseColor(tqcolorGroup().dark());
+ w->setEraseColor(colorGroup().dark());
previewWidget = new PreviewWidget( w );
previewWidget->move( 10, 10 );
}
diff --git a/kommander/editor/previewwidget.ui b/kommander/editor/previewwidget.ui
index 6c93d75d..33601c58 100644
--- a/kommander/editor/previewwidget.ui
+++ b/kommander/editor/previewwidget.ui
@@ -234,7 +234,7 @@
<property name="name">
<cstring>textView</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -263,7 +263,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 50938a89..ad46f6ec 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -397,8 +397,8 @@ void PropertyItem::createResetButton()
hbox->setLineWidth( 1 );
resetButton = new TQPushButton( hbox );
resetButton->setPixmap( PixmapChooser::loadPixmap( "resetproperty.xpm", PixmapChooser::Mini ) );
- resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
- hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
+ resetButton->setFixedWidth( resetButton->sizeHint().width() );
+ hbox->tqlayout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -425,13 +425,13 @@ void PropertyItem::updateResetButtonState()
void PropertyItem::placeEditor( TQWidget *w )
{
createResetButton();
- TQRect r = listview->tqitemRect( this );
+ TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) {
listview->ensureItemVisible( this );
#if defined(TQ_WS_WIN)
listview->repaintContents( false );
#endif
- r = listview->tqitemRect( this );
+ r = listview->itemRect( this );
}
r.setX( listview->header()->sectionPos( 1 ) );
r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -439,7 +439,7 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
- resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+ resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( r.height() - 3 );
}
@@ -537,10 +537,10 @@ TQString PropertyItem::currentItemFromObject() const
void PropertyItem::setFocus( TQWidget *w )
{
- if ( !tqApp->tqfocusWidget() ||
+ if ( !tqApp->focusWidget() ||
listview->propertyEditor()->formWindow() &&
- ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
- !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
+ ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+ !tqApp->focusWidget()->inherits( "Editor" ) ) )
w->setFocus();
}
@@ -1540,8 +1540,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
box = new TQHBox( listview->viewport() );
box->hide();
pixPrev = new TQLabel( box );
- pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
- pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
+ pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+ pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
button = new TQPushButton( "...", box );
button->setFixedWidth( 20 );
box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
@@ -1605,8 +1605,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
TQPixmap pix( (!iconSet ? value().toPixmap() : value().toIconSet().pixmap()) );
if ( !pix.isNull() ) {
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
p->restore();
@@ -2198,7 +2198,7 @@ void PropertyPaletteItem::getPalette()
w = ( (TQScrollView*)w )->viewport();
TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
#if defined(TQT_NON_COMMERCIAL)
- w->backgroundMode(), listview->tqtopLevelWidget(),
+ w->backgroundMode(), listview->topLevelWidget(),
#else
w->backgroundMode(), listview,
#endif
@@ -2218,8 +2218,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
{
TQPalette pal( value().toPalette() );
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
TQRect r2( r );
r2.setX( r2.x() + 2 );
@@ -2522,7 +2522,7 @@ void PropertyList::setupProperties()
if ( !editor->widget() )
return;
bool allProperties = !editor->widget()->inherits( "Spacer" );
- TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
+ TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
PropertyItem *item = 0;
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
@@ -2533,11 +2533,11 @@ void PropertyList::setupProperties()
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
if ( !p )
continue;
- if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
+ if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
continue;
if ( editor->widget()->inherits( "QDesignerToolBar" ) || editor->widget()->inherits( "QDesignerMenuBar" ) ) {
if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
@@ -2552,12 +2552,12 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
}
- unique.insert( TQString::tqfromLatin1( it.current() ), true );
+ unique.insert( TQString::fromLatin1( it.current() ), true );
if ( editor->widget()->isWidgetType() &&
editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) {
if ( qstrcmp( p->name(), "geometry" ) == 0 )
@@ -2588,9 +2588,9 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "geometry" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
if ( qstrcmp( p->name(), "enabled" ) == 0 )
continue;
@@ -3061,21 +3061,21 @@ static void clearAlignList( TQStrList &l )
void PropertyList::setPropertyValue( PropertyItem *i )
{
const TQMetaProperty *p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( i->name(), true), true );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( i->name(), true), true );
if ( !p ) {
if ( i->name() == "hAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true );
+ p = editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true );
align &= ~AlignVertical_Mask;
TQStrList l = p->valueToKeys( align );
clearAlignList( l );
( (PropertyListItem*)i )->setCurrentItem( l.last() );
} else if ( i->name() == "vAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true );
+ p = editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true );
align &= ~AlignHorizontal_Mask;
( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
} else if ( i->name() == "wordwrap" ) {
@@ -3229,7 +3229,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( (PropertyItem*)i )->propertyParent() )
i = ( (PropertyItem*)i )->propertyParent();
- const TQMetaObject *mo = editor->widget()->tqmetaObject();
+ const TQMetaObject *mo = editor->widget()->metaObject();
TQString prop = ( (PropertyItem*)i )->name();
while ( mo ) {
TQString s;
@@ -3238,7 +3238,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
return *it;
}
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return i18n("<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
@@ -3327,7 +3327,7 @@ void EventList::setup()
#endif
}
} else {
- TQStrList sigs = editor->widget()->tqmetaObject()->signalNames( true );
+ TQStrList sigs = editor->widget()->metaObject()->signalNames( true );
sigs.remove( "destroyed()" );
TQStrListIterator it( sigs );
while ( it.current() ) {
@@ -3674,21 +3674,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
return TQString();
TQObject *o = wid;
TQString curr = currentProperty();
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
while ( mo ) {
TQStrList props = mo->propertyNames( false );
if ( props.find( curr.latin1() ) != -1 )
return mo->className();
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return TQString();
}
-TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
{
if ( !wid )
return 0;
- return wid->tqmetaObject();
+ return wid->metaObject();
}
void PropertyEditor::resetFocus()
diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h
index 61d4e4dc..b49924e2 100644
--- a/kommander/editor/propertyeditor.h
+++ b/kommander/editor/propertyeditor.h
@@ -590,7 +590,7 @@ public:
TQString currentProperty() const;
TQString classOfCurrentProperty() const;
- TQMetaObject* tqmetaObjectOfCurrentProperty() const;
+ TQMetaObject* metaObjectOfCurrentProperty() const;
void resetFocus();
diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp
index 78523a95..6a7cb2a9 100644
--- a/kommander/editor/qcompletionedit.cpp
+++ b/kommander/editor/qcompletionedit.cpp
@@ -62,8 +62,8 @@ void QCompletionEdit::placeListBox()
return;
}
- popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
- listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+ popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+ listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 93f6cc9b..c5450658 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -404,10 +404,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
if ( formwindow->tqlayout() )
formwindow->tqlayout()->activate();
if ( hadGeometry )
- formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
- expandedTo( formwindow->tqminimumSizeHint() ) ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
+ expandedTo( formwindow->minimumSizeHint() ) ) );
else
- formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
}
return true;
@@ -984,8 +984,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
changed = MetaDataBase::changedProperties( w );
if ( w->isWidgetType() ) {
if ( w->inherits( "Spacer" ) ) {
- if ( !changed.contains( "tqsizeHint" ) )
- changed << "tqsizeHint";
+ if ( !changed.contains( "sizeHint" ) )
+ changed << "sizeHint";
if ( !changed.contains( "geometry" ) )
changed << "geometry";
}
@@ -1006,15 +1006,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
- TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) );
+ TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
+ if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
continue;
- if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
+ if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
continue;
- saved << TQString::tqfromLatin1( it.current() );
- const TQMetaProperty* p = w->tqmetaObject()->
- property( w->tqmetaObject()->findProperty( it.current(), true ), true );
+ saved << TQString::fromLatin1( it.current() );
+ const TQMetaProperty* p = w->metaObject()->
+ property( w->metaObject()->findProperty( it.current(), true ), true );
if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
continue;
if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 &&
@@ -1066,7 +1066,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
TQString v;
for ( uint i = 0; i < l.count(); ++i ) {
@@ -1079,7 +1079,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
}
@@ -1644,7 +1644,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
*/
void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
{
- const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true );
+ const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS)
if ( obj->inherits( "CustomWidget" ) ) {
@@ -2090,8 +2090,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
- ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+ ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+ ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent( indent ) << "</sizehint>" << endl;
ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2147,9 +2147,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
TQDomElement n3 = n2.firstChild().toElement();
while ( !n3.isNull() ) {
if ( n3.tagName() == "width" )
- w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+ w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
else if ( n3.tagName() == "height" )
- w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+ w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
n3 = n3.nextSibling().toElement();
}
} else if ( n2.tagName() == "sizepolicy" ) {
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 72f7c38c..10b4efb3 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -236,9 +236,9 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
{
- int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+ int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
minw = TQMAX( minw, 2 * formWindow->grid().x() );
- int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+ int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
minh = TQMAX( minh, 2 * formWindow->grid().y() );
if ( TQMAX( minw, width ) > w->maximumWidth() ||
TQMAX( minh, height ) > w->maximumHeight() )
@@ -252,9 +252,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh
void SizeHandle::tryResize( TQWidget *w, int width, int height )
{
- int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+ int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
minw = TQMAX( minw, 16 );
- int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+ int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
minh = TQMAX( minh, 16 );
w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
}
diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index 37a28911..189a3ef2 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -35,7 +35,7 @@
StyledButton::StyledButton(TQWidget* parent, const char* name)
: TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false )
{
- setMinimumSize( tqminimumSizeHint() );
+ setMinimumSize( minimumSizeHint() );
setAcceptDrops( true );
connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -48,7 +48,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name
{
col = b.color();
pix = b.pixmap();
- setMinimumSize( tqminimumSizeHint() );
+ setMinimumSize( minimumSizeHint() );
}
StyledButton::~StyledButton()
@@ -111,12 +111,12 @@ void StyledButton::setScale( bool on )
scalePixmap();
}
-TQSize StyledButton::tqsizeHint() const
+TQSize StyledButton::sizeHint() const
{
return TQSize( 50, 25 );
}
-TQSize StyledButton::tqminimumSizeHint() const
+TQSize StyledButton::minimumSizeHint() const
{
return TQSize( 50, 25 );
}
@@ -145,14 +145,14 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
void StyledButton::drawButton( TQPainter *paint )
{
- tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
drawButtonLabel(paint);
if (hasFocus())
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
- tqcolorGroup(), TQStyle::Style_Default);
+ colorGroup(), TQStyle::Style_Default);
}
void StyledButton::drawButtonLabel( TQPainter *paint )
@@ -163,7 +163,7 @@ void StyledButton::drawButtonLabel( TQPainter *paint )
paint->setPen( pen );
if(!isEnabled()) {
- paint->setBrush( TQBrush( tqcolorGroup().button() ) );
+ paint->setBrush( TQBrush( colorGroup().button() ) );
}
else if ( edit == PixmapEditor && spix ) {
paint->setBrush( TQBrush( col, *spix ) );
diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h
index 883c95ad..3a8c2691 100644
--- a/kommander/editor/styledbutton.h
+++ b/kommander/editor/styledbutton.h
@@ -59,8 +59,8 @@ public:
void setScale( bool );
bool scale() const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
void setFormWindow( FormWindow *fw ) { formWindow = fw; }
diff --git a/kommander/editor/tableeditor.ui b/kommander/editor/tableeditor.ui
index b3331a98..8d503842 100644
--- a/kommander/editor/tableeditor.ui
+++ b/kommander/editor/tableeditor.ui
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -299,7 +299,7 @@
<property name="name">
<cstring>buttonDeleteColPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -322,7 +322,7 @@
<property name="name">
<cstring>buttonChooseColPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -425,7 +425,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -481,7 +481,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -566,7 +566,7 @@
<property name="name">
<cstring>buttonDeleteRowPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
@@ -589,7 +589,7 @@
<property name="name">
<cstring>buttonChooseRowPixmap</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>22</height>
diff --git a/kommander/editor/templates/Configuration_Dialog.ui b/kommander/editor/templates/Configuration_Dialog.ui
index 8d792741..cdfbdfd4 100644
--- a/kommander/editor/templates/Configuration_Dialog.ui
+++ b/kommander/editor/templates/Configuration_Dialog.ui
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
index 6278ab75..51669089 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
index 2158eabd..938590f3 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/templates/Tab_Dialog.ui b/kommander/editor/templates/Tab_Dialog.ui
index c85b3e8f..64df4236 100644
--- a/kommander/editor/templates/Tab_Dialog.ui
+++ b/kommander/editor/templates/Tab_Dialog.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 9f619c79..585d720d 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -399,7 +399,7 @@ TQMap< int, TQStringList > *changedProperties = 0;
void WidgetFactory::saveDefaultProperties( TQWidget *w, int id )
{
TQMap< TQString, TQVariant> propMap;
- TQStrList lst = w->tqmetaObject()->propertyNames( true );
+ TQStrList lst = w->metaObject()->propertyNames( true );
for ( uint i = 0; i < lst.count(); ++i ) {
TQVariant var = w->property( lst.at( i ) );
if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 )
@@ -710,21 +710,21 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
l = new TQHBoxLayout( gb->tqlayout() );
MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
- l->tqsetAlignment( AlignTop );
+ l->setAlignment( AlignTop );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l;
case VBox:
l = new TQVBoxLayout( gb->tqlayout(), spacing );
MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
- l->tqsetAlignment( AlignTop );
+ l->setAlignment( AlignTop );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l;
case Grid:
l = new QDesignerGridLayout( gb->tqlayout() );
MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
- l->tqsetAlignment( AlignTop );
+ l->setAlignment( AlignTop );
MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l;
default:
@@ -838,7 +838,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
if (init)
{
b = new QDesignerPushButton(parent, name);
- b->setText(TQString::tqfromLatin1(name));
+ b->setText(TQString::fromLatin1(name));
} else
{
b = new QDesignerPushButton(parent, name);
@@ -860,7 +860,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
if (init)
{
QDesignerCheckBox *cb = new QDesignerCheckBox(parent, name);
- cb->setText(TQString::tqfromLatin1(name));
+ cb->setText(TQString::fromLatin1(name));
return cb;
}
return new QDesignerCheckBox(parent, name);
@@ -869,19 +869,19 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
if (init)
{
QDesignerRadioButton *rb = new QDesignerRadioButton(parent, name);
- rb->setText(TQString::tqfromLatin1(name));
+ rb->setText(TQString::fromLatin1(name));
return rb;
}
return new QDesignerRadioButton(parent, name);
} else if (className == TQGROUPBOX_OBJECT_NAME_STRING)
{
if (init)
- return new TQGroupBox(TQString::tqfromLatin1(name), parent, name);
+ return new TQGroupBox(TQString::fromLatin1(name), parent, name);
return new TQGroupBox(parent, name);
} else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING)
{
if (init)
- return new TQButtonGroup(TQString::tqfromLatin1(name), parent, name);
+ return new TQButtonGroup(TQString::fromLatin1(name), parent, name);
return new TQButtonGroup(parent, name);
} else if (className == TQICONVIEW_OBJECT_NAME_STRING)
{
@@ -950,7 +950,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
QDesignerLabel *l = new QDesignerLabel(parent, name);
if (init)
{
- l->setText(TQString::tqfromLatin1(name));
+ l->setText(TQString::fromLatin1(name));
MetaDataBase::addEntry(TQT_TQOBJECT(l));
MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true);
}
@@ -1668,7 +1668,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
{
- const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
findProperty( propName, true ), true );
if (!p )
return false;
@@ -1681,7 +1681,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
int v = defaultValue( w, "tqalignment" ).toInt();
return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
} else if ( propName == "toolTip" || propName == "whatsThis" ) {
- return TQVariant( TQString::tqfromLatin1( "" ) );
+ return TQVariant( TQString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) {
return TQVariant();
} else if ( propName == "frameworkCode" ) {
@@ -1701,8 +1701,8 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
{
- const TQMetaProperty *p = w->tqmetaObject()->
- property( w->tqmetaObject()->findProperty( propName, true ), true );
+ const TQMetaProperty *p = w->metaObject()->
+ property( w->metaObject()->findProperty( propName, true ), true );
if ( !p ) {
int v = defaultValue( w, "tqalignment" ).toInt();
if ( propName == "hAlign" ) {
@@ -1751,7 +1751,7 @@ void QDesignerLabel::updateBuddy()
if ( myBuddy.isEmpty() )
return;
- TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true );
+ TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true );
if ( !l || !l->first() ) {
delete l;
return;
@@ -1800,7 +1800,7 @@ void TQLayoutWidget::updateSizePolicy()
{
TQObjectList clo = childrenListObject();
if ( clo.isEmpty() || clo.count() == 0 ) {
- sp = TQWidget::tqsizePolicy();
+ sp = TQWidget::sizePolicy();
return;
}
@@ -1844,13 +1844,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( !w->tqsizePolicy().mayGrowHorizontally() )
+ if ( !w->sizePolicy().mayGrowHorizontally() )
ht &= ~TQSizePolicy::Minimum;
- if ( !w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( !w->sizePolicy().mayShrinkHorizontally() )
ht &= ~TQSizePolicy::Maximum;
- if ( w->tqsizePolicy().mayGrowVertically() )
+ if ( w->sizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkVertically() )
+ if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
@@ -1865,13 +1865,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->tqsizePolicy().mayGrowHorizontally() )
+ if ( w->sizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( w->sizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( !w->tqsizePolicy().mayGrowVertically() )
+ if ( !w->sizePolicy().mayGrowVertically() )
vt &= ~TQSizePolicy::Minimum;
- if ( !w->tqsizePolicy().mayShrinkVertically() )
+ if ( !w->sizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum;
}
} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
@@ -1890,20 +1890,20 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->tqsizePolicy().mayGrowHorizontally() )
+ if ( w->sizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkHorizontally() )
+ if ( w->sizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( w->tqsizePolicy().mayGrowVertically() )
+ if ( w->sizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->tqsizePolicy().mayShrinkVertically() )
+ if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
}
#ifdef USE_QT4
- if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
+ if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
ht = TQSizePolicy::Expanding;
- if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
+ if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
vt = TQSizePolicy::Expanding;
#else // USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
@@ -1925,7 +1925,7 @@ void CustomWidget::paintEvent( TQPaintEvent *e )
( (FormWindow*)parentWidget() )->paintGrid( this, e );
} else {
TQPainter p( this );
- p.fillRect( rect(), tqcolorGroup().dark() );
+ p.fillRect( rect(), colorGroup().dark() );
p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2,
( height() - cusw->pixmap->height() ) / 2,
*cusw->pixmap );
diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index 9ebce67c..0480e5ae 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -230,7 +230,7 @@ class TQLayoutWidget : public TQWidget
TQ_OBJECT
public:
- TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::tqsizePolicy() ) {}
+ TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {}
TQSizePolicy sizePolicy() const;
void updateSizePolicy();
@@ -252,16 +252,16 @@ public:
CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
: TQWidget( parent, name ), cusw( cw ) {
alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
- tqsetSizePolicy( cw->sizePolicy );
+ setSizePolicy( cw->sizePolicy );
if ( !alwaysExpand )
setBackgroundMode( PaletteDark );
}
- TQSize tqsizeHint() const {
- TQSize sh = cusw->tqsizeHint;
+ TQSize sizeHint() const {
+ TQSize sh = cusw->sizeHint;
if ( sh.isValid() )
return sh;
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
TQString realClassName() { return cusw->className; }
diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui
index 31c64505..2f5c16e4 100644
--- a/kommander/editor/wizardeditor.ui
+++ b/kommander/editor/wizardeditor.ui
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr
index bf11dc78..3b81701d 100755
--- a/kommander/examples/current/a1.kmdr
+++ b/kommander/examples/current/a1.kmdr
@@ -145,7 +145,7 @@ debug("pid="+pid)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>0</height>
@@ -176,7 +176,7 @@ StatusBar8.setText("Returned: "+b)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>46</width>
<height>0</height>
@@ -209,7 +209,7 @@ StatusBar8.setText("Returned: "+b)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>0</height>
@@ -243,7 +243,7 @@ StatusBar8.setText("Returned: "+b)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>0</height>
diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr
index aac4943d..09725243 100755
--- a/kommander/examples/current/b1.kmdr
+++ b/kommander/examples/current/b1.kmdr
@@ -82,7 +82,7 @@ endif
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>0</height>
@@ -104,7 +104,7 @@ endif
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>0</height>
diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr
index 26e4171c..d6e83b95 100755
--- a/kommander/examples/current/kpartpart.kmdr
+++ b/kommander/examples/current/kpartpart.kmdr
@@ -75,7 +75,7 @@ This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>75</width>
<height>0</height>
@@ -156,7 +156,7 @@ endif
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>0</height>
diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr
index e984f567..2c29e2c8 100644
--- a/kommander/examples/current/passvariables.kmdr
+++ b/kommander/examples/current/passvariables.kmdr
@@ -272,7 +272,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>108</width>
<height>0</height>
@@ -303,7 +303,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>0</height>
@@ -368,7 +368,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>0</height>
diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr
index 6a7f0a7a..e084eb89 100755
--- a/kommander/examples/current/tableselect.kmdr
+++ b/kommander/examples/current/tableselect.kmdr
@@ -348,7 +348,7 @@ TextBrowser1.setText(result)
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
@@ -407,7 +407,7 @@ end
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr
index 252b80d9..ea7e9dad 100644
--- a/kommander/examples/old/execprogram.kmdr
+++ b/kommander/examples/old/execprogram.kmdr
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr
index 828d45f2..92f9806b 100644
--- a/kommander/examples/old/resize.kmdr
+++ b/kommander/examples/old/resize.kmdr
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>0</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>251</width>
<height>0</height>
diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr
index 01f3023c..ddb6d0ba 100644
--- a/kommander/examples/old/selectedwidgettext.kmdr
+++ b/kommander/examples/old/selectedwidgettext.kmdr
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr
index e299bced..b7037ea9 100644
--- a/kommander/examples/old/settings.kmdr
+++ b/kommander/examples/old/settings.kmdr
@@ -182,7 +182,7 @@ Items")
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -215,7 +215,7 @@ Items")
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr
index b374200a..128f324d 100644
--- a/kommander/examples/old/tar.kmdr
+++ b/kommander/examples/old/tar.kmdr
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>16</height>
@@ -414,7 +414,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>103</width>
<height>0</height>
@@ -439,7 +439,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>104</width>
<height>0</height>
@@ -464,7 +464,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>103</width>
<height>0</height>
diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr
index 53623c53..785b9dcf 100644
--- a/kommander/examples/old/tidy.kmdr
+++ b/kommander/examples/old/tidy.kmdr
@@ -1091,7 +1091,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>0</height>
@@ -1108,7 +1108,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>0</height>
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index f9551a9d..97267a62 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/kommander/examples/old/widgetgenerator.kmdr
@@ -49,7 +49,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -265,7 +265,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr
index c5fcb41f..d9c07451 100644
--- a/kommander/examples/tutorial/append.kmdr
+++ b/kommander/examples/tutorial/append.kmdr
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -100,7 +100,7 @@ dcop @dcopid KommanderIf changeWidgetText TextEdit1 "$TEXT"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr
index 4b9e9968..d0ae1d5e 100644
--- a/kommander/examples/tutorial/arrays.kmdr
+++ b/kommander/examples/tutorial/arrays.kmdr
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr
index 2f17439e..cfe7233f 100644
--- a/kommander/examples/tutorial/calc.kmdr
+++ b/kommander/examples/tutorial/calc.kmdr
@@ -66,13 +66,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>32767</height>
@@ -91,7 +91,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>32767</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>91</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>91</height>
diff --git a/kommander/examples/tutorial/cmdline.kmdr b/kommander/examples/tutorial/cmdline.kmdr
index fa140832..0db801d2 100644
--- a/kommander/examples/tutorial/cmdline.kmdr
+++ b/kommander/examples/tutorial/cmdline.kmdr
@@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>149</width>
<height>0</height>
@@ -95,7 +95,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>148</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr
index a39dcf24..a4fe69fc 100644
--- a/kommander/examples/tutorial/dcop.kmdr
+++ b/kommander/examples/tutorial/dcop.kmdr
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -124,7 +124,7 @@ dcop kmail KMailIface checkAccount @AccountListBox</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr
index 62e74b93..9dde0bfc 100644
--- a/kommander/examples/tutorial/initialize.kmdr
+++ b/kommander/examples/tutorial/initialize.kmdr
@@ -59,7 +59,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -89,7 +89,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr
index 2c51a869..c01a10e9 100644
--- a/kommander/examples/tutorial/picview.kmdr
+++ b/kommander/examples/tutorial/picview.kmdr
@@ -78,13 +78,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>200</width>
<height>32767</height>
diff --git a/kommander/examples/tutorial/progressbar.kmdr b/kommander/examples/tutorial/progressbar.kmdr
index e5ffe4d6..8365d0f0 100644
--- a/kommander/examples/tutorial/progressbar.kmdr
+++ b/kommander/examples/tutorial/progressbar.kmdr
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>0</height>
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr
index 24fb90e5..f4aaa0b1 100644
--- a/kommander/examples/tutorial/settings.kmdr
+++ b/kommander/examples/tutorial/settings.kmdr
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -104,7 +104,7 @@
<property name="name">
<cstring>ExecButton1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
@@ -129,7 +129,7 @@
<property name="name">
<cstring>CloseButton1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr
index 46d0a6b1..6bbf7d5f 100644
--- a/kommander/examples/tutorial/slots.kmdr
+++ b/kommander/examples/tutorial/slots.kmdr
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -171,7 +171,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr
index 15cfe615..0b4af608 100644
--- a/kommander/examples/tutorial/strings.kmdr
+++ b/kommander/examples/tutorial/strings.kmdr
@@ -145,7 +145,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -178,7 +178,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr
index 0c79cb66..ff8982d4 100644
--- a/kommander/examples/tutorial/table.kmdr
+++ b/kommander/examples/tutorial/table.kmdr
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 0247a814..7820c848 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -647,15 +647,15 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
switch ( type ) {
case HBox:
l = new TQHBoxLayout( gb->tqlayout() );
- l->tqsetAlignment( TQt::AlignTop );
+ l->setAlignment( TQt::AlignTop );
return l;
case VBox:
l = new TQVBoxLayout( gb->tqlayout(), spacing );
- l->tqsetAlignment( TQt::AlignTop );
+ l->setAlignment( TQt::AlignTop );
return l;
case Grid:
l = new TQGridLayout( gb->tqlayout() );
- l->tqsetAlignment( TQt::AlignTop );
+ l->setAlignment( TQt::AlignTop );
return l;
default:
return 0;
@@ -728,7 +728,7 @@ KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout )
void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
{
- const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true );
+ const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
TQVariant defVariant;
if ( e.tagName() == "font" ) {
@@ -872,7 +872,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
sizeType = TQSizePolicy::MinimumExpanding;
else if ( n.firstChild().firstChild().toText().data() == "Expanding" )
sizeType = TQSizePolicy::Expanding;
- } else if ( prop == "tqsizeHint" ) {
+ } else if ( prop == "sizeHint" ) {
w = n.firstChild().firstChild().firstChild().toText().data().toInt();
h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
}
@@ -1097,12 +1097,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() );
- TQStrList signalList = sender->tqmetaObject()->signalNames( true );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( true );
+ TQStrList signalList = sender->metaObject()->signalNames( true );
+ TQStrList slotList = receiver->metaObject()->slotNames( true );
// if this is a connection to a custom slot and we have a connector, try this as receiver
if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) {
- slotList = connector->tqmetaObject()->slotNames( true );
+ slotList = connector->metaObject()->slotNames( true );
receiver = connector;
}
diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr
index 21a13ae7..50b4a08d 100755
--- a/kommander/kmdrtools/dcoptool-oldparser.kmdr
+++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr
@@ -382,7 +382,7 @@ args(QString,QString,QString,QString)")
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>0</height>
@@ -443,7 +443,7 @@ args(QString,QString,QString,QString)")
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>120</width>
<height>0</height>
@@ -731,7 +731,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>0</height>
diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr
index e0fbe1f2..b5a5f5d7 100755
--- a/kommander/kmdrtools/examples.kmdr
+++ b/kommander/kmdrtools/examples.kmdr
@@ -99,7 +99,7 @@ end
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>0</height>
@@ -134,7 +134,7 @@ endif</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>0</height>
diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h
index ec809161..382720fb 100644
--- a/kommander/plugin/specials.h
+++ b/kommander/plugin/specials.h
@@ -40,7 +40,7 @@ namespace Kommander
{
enum {widgetText, selectedWidgetText, null, pid, dcopid, parentPid, debug,
echo, env, exec, expr, global, i18n, dialog, readSetting, setGlobal, writeSetting, dcop,
- switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, tqfocusWidget};
+ switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, focusWidget};
}
namespace Array
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 8886acab..b67c08b0 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -250,7 +250,7 @@ static ParseNode f_executeSlot(Parser* parser, const ParameterList& params)
TQObject *object = widget->object();
if (!object)
return ParseNode::error("unknown widget");
- TQStrList slotSignatures = object->tqmetaObject()->slotNames(true);
+ TQStrList slotSignatures = object->metaObject()->slotNames(true);
TQStringList slotNames = TQStringList::fromStrList(slotSignatures);
int slotNum = -1;
uint i = 0;
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index d0f9e885..533e8b9e 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -732,7 +732,7 @@ TQString KommanderWidget::fileName()
TQString KommanderWidget::widgetName() const
{
if (m_thisObject)
- return TQString::tqfromLatin1(m_thisObject->name());
+ return TQString::fromLatin1(m_thisObject->name());
else
return TQString();
}
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index 15dd7e30..f7a3fb9b 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -34,7 +34,7 @@
enum Functions {
FirstFunction = 185,
- D_tqfocusWidget,
+ D_focusWidget,
D_waitCursor,
D_restoreCursor,
LastFunction
@@ -53,7 +53,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags
m_shebang = "#!/usr/bin/kmdr-executor";
m_firstShow = true;
KommanderPlugin::setDefaultGroup(Group::DCOP);
- KommanderPlugin::registerFunction(D_tqfocusWidget, "tqfocusWidget(TQString widget)", i18n("The name of the widget having focus"), 1);
+ KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)", i18n("The name of the widget having focus"), 1);
KommanderPlugin::registerFunction(D_waitCursor, "waitCursor(TQString widget)", i18n("Set a wait cursor. CAUTION: if set more than once an equal number of calls to restore must be made to clear it."), 1);
KommanderPlugin::registerFunction(D_restoreCursor, "restoreCursor(TQString widget)", i18n("Restore normal curser. NOTE: must be called as many times as wait was."), 1);
}
@@ -207,8 +207,8 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args)
case DCOP::tqgeometry:
return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
break;
- case D_tqfocusWidget:
- return tqfocusWidget()->name();
+ case D_focusWidget:
+ return focusWidget()->name();
break;
case D_waitCursor:
TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index 549b9678..a5d9a716 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -113,7 +113,7 @@ void ExecButton::setWidgetText(const TQString& a_text)
void ExecButton::startProcess()
{
TQString at = evalAssociatedText().stripWhiteSpace();
- bool enabledtqStatus = isEnabled();
+ bool enabledStatus = isEnabled();
if (m_blockGUI != None)
setEnabled(false);
if (m_blockGUI == GUI)
@@ -128,7 +128,7 @@ void ExecButton::startProcess()
if (writeStdout())
cout << m_output << flush;
}
- setEnabled(enabledtqStatus);
+ setEnabled(enabledStatus);
}
@@ -202,7 +202,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args)
break;
case EB_setPopup:
{
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list );
TQWidget * w;
while ( (w=it.current()) != 0 ) { // for each widget...
diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp
index 51afa92a..897f85c8 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -50,9 +50,9 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name)
m_boxLayout->addWidget(m_lineEdit);
m_boxLayout->addWidget(m_selectButton);
- tqsetSizePolicy(m_lineEdit->sizePolicy());
- m_lineEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- m_selectButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+ setSizePolicy(m_lineEdit->sizePolicy());
+ m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection()));
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index f78ce62c..19e89903 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -123,7 +123,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
color.setNamedColor(args[0]);
TQPalette p = this->palette();
p.setColor(TQPalette::Active, TQColorGroup::Highlight, color);
- this->tqsetPalette( p, TRUE );
+ this->setPalette( p, TRUE );
break;
}
case PB_setHightlightTextColor:
@@ -132,7 +132,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
color.setNamedColor(args[0]);
TQPalette p = this->palette();
p.setColor(TQPalette::Active, TQColorGroup::HighlightedText, color);
- this->tqsetPalette( p, TRUE );
+ this->setPalette( p, TRUE );
break;
}
default:
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 5c6c530c..0aebf718 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -182,11 +182,11 @@ void RichTextEditor::textAlign(int a_id)
{
TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id);
if(b == m_buttonTextLeft)
- m_textedit->tqsetAlignment(TQt::AlignLeft);
+ m_textedit->setAlignment(TQt::AlignLeft);
else if(b == m_buttonTextCenter)
- m_textedit->tqsetAlignment(TQt::AlignCenter);
+ m_textedit->setAlignment(TQt::AlignCenter);
else if(b == m_buttonTextRight)
- m_textedit->tqsetAlignment(TQt::AlignRight);
+ m_textedit->setAlignment(TQt::AlignRight);
}
void RichTextEditor::fontChanged(const TQFont &a_font)
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index 0b768911..28cb5e6a 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -31,7 +31,7 @@ enum Functions {
setPixmap(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
- tqsetAlignment(TQt::AlignCenter);
+ setAlignment(TQt::AlignCenter);
}
else
setHidden(true);
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index d7298591..6a0ac10f 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -29,7 +29,7 @@ KXsldbg::KXsldbg()
// and a status bar
statusBar()->show();
- statusBar()->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+ statusBar()->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
// this routine will find and load our Part. it finds the Part by
// name which is a bad idea usually.. but it's alright in this
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
index 98c4ea95..0db9d1f0 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
@@ -27,12 +27,12 @@ XsldbgDebuggerBase *_debugger = 0L;
int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data)
{
int result = 0;
- if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED){
+ if (::getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED){
return 1;
}
/* clear the input ready flag as quickly as possible*/
- if ( ::getInputtqStatus() == XSLDBG_MSG_READ_INPUT)
+ if ( ::getInputStatus() == XSLDBG_MSG_READ_INPUT)
::setInputReady(0);
/* state of the thread */
@@ -45,7 +45,7 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data)
}
}
- if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP)
+ if (::getThreadStatus() == XSLDBG_MSG_THREAD_STOP)
::xsldbgThreadCleanup(); /* thread has died so cleanup after it */
result++; /* at the moment this function will always work */
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
index 1f997919..4fe2e02c 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
@@ -83,7 +83,7 @@ xsldbgThreadInit(void)
int result = 0;
fprintf(stderr, "mainInit()\n");
xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc);
- setThreadtqStatus(XSLDBG_MSG_THREAD_INIT);
+ setThreadStatus(XSLDBG_MSG_THREAD_INIT);
xsldbgSetAppFunc(qtNotifyXsldbgApp);
xsldbgSetAppStateFunc(qtNotifyStateXsldbgApp);
xsldbgSetTextFunc(qtNotifyTextXsldbgApp);
@@ -94,12 +94,12 @@ xsldbgThreadInit(void)
if (pthread_create(&mythread, NULL, xsldbgThreadMain, NULL) != EAGAIN) {
int counter;
for (counter = 0; counter < 11; counter++){
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT)
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT)
break;
usleep(250000); /*guess that it will take at most 2.5 seconds to startup */
}
/* xsldbg should have started by now if it can */
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){
fprintf(stderr, "Created thread\n");
result++;
}else
@@ -117,13 +117,13 @@ void
xsldbgThreadFree(void)
{
fprintf(stderr, "xsldbgThreadFree()\n");
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_DEAD)
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_DEAD)
{
int counter;
fprintf(stderr, "Killing xsldbg thread\n");
- setThreadtqStatus(XSLDBG_MSG_THREAD_STOP);
+ setThreadStatus(XSLDBG_MSG_THREAD_STOP);
for (counter = 0; counter < 11; counter++){
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_DEAD)
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_DEAD)
break;
usleep(250000); /*guess that it will take at most 2.5 seconds to stop */
}
@@ -143,7 +143,7 @@ fakeInput(const char *text)
{
int result = 0;
- if (!text || (getInputReady() == 1) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN))
+ if (!text || (getInputReady() == 1) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN))
return result;
// fprintf(stderr, "\nFaking input of \"%s\"\n", text);
@@ -172,7 +172,7 @@ qtXslDbgShellReadline(xmlChar * prompt)
static char last_read[DEBUG_BUFFER_SIZE] = { '\0' };
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
{
#ifdef HAVE_READLINE
xmlChar *line_read;
@@ -209,20 +209,20 @@ qtXslDbgShellReadline(xmlChar * prompt)
}
else{
- setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT);
+ setInputStatus(XSLDBG_MSG_AWAITING_INPUT);
notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, NULL);
while (getInputReady() == 0){
usleep(10000);
/* have we been told to die */
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP){
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_STOP){
fprintf(stderr, "About to stop thread\n");
xslDebugStatus = DEBUG_TQUIT;
return NULL;
}
}
- setInputtqStatus(XSLDBG_MSG_READ_INPUT);
+ setInputStatus(XSLDBG_MSG_READ_INPUT);
inputReadBuff = getFakeInput();
if(inputReadBuff){
notifyXsldbgApp(XSLDBG_MSG_READ_INPUT, inputReadBuff);
@@ -283,7 +283,7 @@ xsldbgThreadMain(void *)
// char *defaultArgv[2];
// int i;
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT){
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT){
fprintf(stderr, "xsldbg thread is not ready to be started. Or one is already running.\n");
return NULL; /* we can't start more than one thread of xsldbg */
}
@@ -302,8 +302,8 @@ xsldbgThreadMain(void *)
}
*/
xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupTQt);
- setThreadtqStatus(XSLDBG_MSG_THREAD_RUN);
- setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT);
+ setThreadStatus(XSLDBG_MSG_THREAD_RUN);
+ setInputStatus(XSLDBG_MSG_AWAITING_INPUT);
fprintf(stderr, "Starting thread\n");
/* call the "main of xsldbg" found in debugXSL.c */
@@ -316,8 +316,8 @@ xsldbgThreadMain(void *)
}
*/
- setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD);
- setInputtqStatus(XSLDBG_MSG_PROCESSING_INPUT);
+ setThreadStatus(XSLDBG_MSG_THREAD_DEAD);
+ setInputStatus(XSLDBG_MSG_PROCESSING_INPUT);
notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, NULL);
return NULL;
}
@@ -330,12 +330,12 @@ void
xsldbgThreadCleanupTQt(void)
{
fprintf(stderr, "Thread has finished\n");
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
{
xsldbgThreadFree();
}
- /* its safe to modify threadtqStatus as the thread is now dead */
- setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD);
+ /* its safe to modify threadStatus as the thread is now dead */
+ setThreadStatus(XSLDBG_MSG_THREAD_DEAD);
}
@@ -346,7 +346,7 @@ xsldbgThreadStdoutReader(void *data)
if (!stdoutIO)
return data;
- while (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){
+ while (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){
if (fgets(outputBuffer, sizeof(outputBuffer -1), stdoutIO)){
usleep(10000);
strcat(outputBuffer, "\n");
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
index 1e403aa6..9d53055e 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
@@ -621,7 +621,7 @@ breakPointPrint(breakPointPtr breakPtr)
};
const char *breakTemplate="";
const char *breakMode = "";
- const char *breaktqStatus;
+ const char *breakStatus;
if (!breakPtr)
@@ -634,11 +634,11 @@ breakPointPrint(breakPointPtr breakPtr)
}
- breaktqStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
+ breakStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
if (breakPtr->url)
- xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)).tqarg(xsldbgUrl(breakPtr->url)).tqarg(breakPtr->lineNo));
+ xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").tqarg(breakPtr->id).tqarg(i18n(breakStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)).tqarg(xsldbgUrl(breakPtr->url)).tqarg(breakPtr->lineNo));
else
- xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)));
+ xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breakStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)));
return ++result;
}
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
index a301aa8a..17cf01a2 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
@@ -23,7 +23,7 @@
#include <libxml/valid.h> /* needed for xmlSplitQName2 */
#include <libxml/xpathInternals.h> /* needed for xmlNSLookup */
#include <libxml/uri.h> /* needed for xmlURIEscapeStr */
-#include "xsldbgthread.h" /* for getThreadtqStatus() */
+#include "xsldbgthread.h" /* for getThreadStatus() */
#include "xsldbgmsg.h"
#include "options.h"
@@ -893,7 +893,7 @@ xslDbgShellPrintBreakPoint(void *payload, void *data,
Q_UNUSED(name);
if (payload) {
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListQueue(payload);
} else {
printCount++;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
index 54790e2c..ec081ab6 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
@@ -594,7 +594,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
ctxt->node = list->nodesetval->nodeTab[0];
/* tell the application about the new line
* number we are looking at */
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
int breakpoint = 0;
xsldbgUpdateFileDetails(ctxt->node);
@@ -640,7 +640,7 @@ xslDbgPrintCallStack(const xmlChar * arg)
callPointPtr callPointItem;
if (arg == NULL) {
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListStart(XSLDBG_MSG_CALLSTACK_CHANGED);
/* we send the oldest frame stack first */
for (depth = 1; depth <= callStackGetDepth(); depth++) {
@@ -740,7 +740,7 @@ xslDbgPrintCallStack(const xmlChar * arg)
long templateDepth = atol((char *) arg);
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
/* should never happen but just in case, when running as a
* thread always provide NO params to the where command */
#ifdef WITH_XSLDBG_DEBUG_PROCESS
@@ -1277,7 +1277,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
/* If using a thread and the thread is running then we don't need to
* send this as the application will see the XSLDBG_MSG_LINE_CHANGED message */
- if ((getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) ||
+ if ((getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) ||
(xslDebugStatus == DEBUG_TRACE)) {
TQString messageTxt;
if (!nextCommandActive && ctxt->node && ctxt->node && ctxt->node->doc
@@ -1347,7 +1347,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
}
while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) {
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
if (ctxt->node == (xmlNodePtr) ctxt->doc)
snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1,
"(xsldbg) %s > ", "/");
@@ -1548,7 +1548,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
case DEBUG_WHERE_CMD:
/* Print the current working directory as well */
xslDbgPrintCallStack(NULL);
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, NULL)){
xsldbgGenericErrorFunc((const char*)dir);
xsldbgGenericErrorFunc("\n");
@@ -1597,7 +1597,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
break;
case DEBUG_SHOWBREAK_CMD:
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListStart(XSLDBG_MSG_BREAKPOINT_CHANGED);
walkBreakPoints((xmlHashScanner)
xslDbgShellPrintBreakPoint, NULL);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
index a58d0168..3f8d2e29 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
@@ -46,7 +46,7 @@ xslDbgEntities(void)
int entityIndex;
entityInfoPtr entInfo;
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
/* notify that we are starting new list of entity names */
notifyListStart(XSLDBG_MSG_ENTITIY_CHANGED);
for (entityIndex = 0;
@@ -111,7 +111,7 @@ xslDbgSystem(const xmlChar * arg)
}
name = xmlCatalogResolveSystem(arg);
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
if (name) {
notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name);
result = 1;
@@ -158,7 +158,7 @@ xslDbgPublic(const xmlChar * arg)
}
name = xmlCatalogResolvePublic(arg);
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
if (name) {
notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name);
result = 1;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
index 67dbcbe8..759ed2ac 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
@@ -25,7 +25,7 @@
#include "arraylist.h"
#include "breakpoint.h"
#include "xsldbgmsg.h"
-#include "xsldbgthread.h" /* for getThreadtqStatus */
+#include "xsldbgthread.h" /* for getThreadStatus */
#include "files.h"
#include "options.h"
@@ -268,7 +268,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
fprintf(file,"\n");
} /* inner switch statement */
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
fclose(file);
file = NULL;
/* send the data to application */
@@ -403,7 +403,7 @@ xslDbgShellPrintNames(void *payload,
{
Q_UNUSED(payload);
Q_UNUSED(data);
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListQueue(payload);
} else if (payload && name) {
xmlChar * fullQualifiedName = nodeViewBuffer;
@@ -496,7 +496,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
/* list variables of type requested */
if (type == DEBUG_GLOBAL_VAR) {
if (styleCtxt->globalVars) {
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListStart(XSLDBG_MSG_GLOBALVAR_CHANGED);
/* list global variables */
xmlHashScan(styleCtxt->globalVars,
@@ -514,7 +514,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
if (optionsGetIntOption(OPTIONS_GDB) == 0)
xsltGenericError(xsltGenericErrorContext, "\n");
} else {
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
/* Don't show this message when running as a thread as it
* is annoying */
xsldbgGenericErrorFunc(i18n("Error: Libxslt has not initialized variables yet; try stepping to a template.\n"));
@@ -528,7 +528,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
} else {
/* list local variables */
if (styleCtxt->varsNr && styleCtxt->varsTab) {
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListStart(XSLDBG_MSG_LOCALVAR_CHANGED);
for (int i = styleCtxt->varsNr; i > styleCtxt->varsBase; i--) {
xsltStackElemPtr item = styleCtxt->varsTab[i-1];
@@ -577,7 +577,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
result = 1;
xsltGenericError(xsltGenericErrorContext, "\n");
} else {
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
/* Don't show this message when running as a thread as it
* is annoying */
xsldbgGenericErrorFunc(i18n("Error: Libxslt has not initialized variables yet; try stepping past the xsl:param elements in the template.\n"));
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
index 05ca9a4c..6f269143 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
@@ -137,7 +137,7 @@ xslDbgShellOptions(void)
const xmlChar *optionName, *optionValue;
/* Print out the integer options and thier values */
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
for (optionIndex = OPTIONS_XINCLUDE;
optionIndex <= OPTIONS_VERBOSE; optionIndex++) {
/* skip any non-user options */
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index d2d51fe5..84aa7f88 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -530,7 +530,7 @@ optionsPrintParamList(void)
int paramIndex = 0;
int itemCount = arrayListCount(optionsGetParamItemList());
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
if (itemCount > 0) {
while (result && (paramIndex < itemCount)) {
result = optionsPrintParam(paramIndex++);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
index 52563725..85c17d59 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
@@ -145,7 +145,7 @@ xslDbgShellShowParam(xmlChar * arg)
int result = 0;
static const char *errorPrompt = I18N_NOOP("Unable to print parameters");
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
int paramIndex = 0;
int itemCount = arrayListCount(optionsGetParamItemList());
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
index 1f0a3663..7283fca5 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
@@ -21,7 +21,7 @@
#include "files.h"
#include "utils.h"
#include "xsldbgmsg.h"
-#include "xsldbgthread.h" /* for getThreadtqStatus */
+#include "xsldbgthread.h" /* for getThreadStatus */
static int printCounter; /* Dangerous name think of a better one */
@@ -127,7 +127,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
} else {
xmlChar *modeTemp = NULL;
*count = *count + 1;
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListQueue(templ);
} else {
modeTemp = fullTQName(templ->modeURI, templ->mode);
@@ -196,7 +196,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt,
curStyle = NULL;
}
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListStart(XSLDBG_MSG_TEMPLATE_CHANGED);
while (curStyle) {
templ = curStyle->templates;
@@ -254,7 +254,7 @@ xslDbgShellPrintStylesheetsHelper(void *payload,
xsltStylesheetPtr style = (xsltStylesheetPtr) payload;
if (style && style->doc && style->doc->URL) {
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
notifyListQueue(payload);
else
/* display the URL of stylesheet */
@@ -283,7 +283,7 @@ xslDbgShellPrintStylesheetsHelper2(void *payload,
xmlNodePtr node = (xmlNodePtr) payload;
if (node && node->doc && node->doc->URL) {
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
notifyListQueue(payload);
else
/* display the URL of stylesheet */
@@ -307,7 +307,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg)
{
Q_UNUSED(arg);
printCounter = 0;
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
notifyListStart(XSLDBG_MSG_SOURCE_CHANGED);
walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper,
NULL, filesGetStylesheet());
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 241d9730..76981f5a 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -42,7 +42,7 @@
#include <libxml/xmlerror.h>
#include "xsldbgmsg.h"
-#include "xsldbgthread.h" /* for getThreadtqStatus */
+#include "xsldbgthread.h" /* for getThreadStatus */
#ifdef HAVE_READLINE
# include <readline/readline.h>
# ifdef HAVE_HISTORY
@@ -380,7 +380,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
if (terminalIO != NULL)
res = xsltProfileStylesheet(cur, doc, params, terminalIO);
else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) ==
- NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
+ NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
|| (filesTempFileName(1) == NULL))
res = xsltProfileStylesheet(cur, doc, params, stderr);
else {
@@ -429,7 +429,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
if (terminalIO != NULL)
xmlDebugDumpDocument(terminalIO, res);
else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) ==
- NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
+ NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
|| (filesTempFileName(1) == NULL))
xmlDebugDumpDocument(stdout, res);
else {
@@ -532,7 +532,7 @@ xsldbgMain(int argc, char **argv)
xmlDocPtr doc;
KCmdLineArgs *args = 0;
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED)
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED)
args = KCmdLineArgs::parsedArgs();
errorFile = stderr;
@@ -619,7 +619,7 @@ xsldbgMain(int argc, char **argv)
}
}
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED){
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED){
result = optionsSetIntOption(OPTIONS_SHELL, 1);
}
/* copy the volitile options over to xsldbg */
@@ -1097,7 +1097,7 @@ handler_routine(DWORD dwCtrlType)
void xsldbgStructErrorHandler(void * userData, xmlErrorPtr error)
{
if (error && error->message && (error->level >= 0) && (error->level <= 4)){
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN){
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN){
static const char *msgPrefix[4 + 1] = {"", "warning :", "error:", "fatal:"};
if (error->file)
xsltGenericError(xsltGenericErrorContext, "%s%s in file \"%s\" line %d", msgPrefix[error->level], error->message, error->file, error->line);
@@ -1240,7 +1240,7 @@ xsldbgInit()
xmlDefaultSAXHandlerInit();
xmlDefaultSAXHandler.cdataBlock = NULL;
- if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED) {
+ if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) {
initialized = 1;
return 1; /* this is all we need to do when running as a thread */
}
@@ -1310,7 +1310,7 @@ xsldbgGenericErrorFunc(void *ctx, const char *msg, ...)
Q_UNUSED(ctx);
va_start(args, msg);
- if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
vsnprintf(msgBuffer, sizeof(msgBuffer), msg, args);
notifyTextXsldbgApp(XSLDBG_MSG_TEXTOUT, msgBuffer);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
index 4fb4a6c9..c95ad640 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
@@ -25,8 +25,8 @@
#include "xsldbgthread.h"
static void (*cleanupFuncPtr)(void) = 0;
-static int threadtqStatus = XSLDBG_MSG_THREAD_NOTUSED;
-static int inputtqStatus = XSLDBG_MSG_AWAITING_INPUT;
+static int threadStatus = XSLDBG_MSG_THREAD_NOTUSED;
+static int inputStatus = XSLDBG_MSG_AWAITING_INPUT;
/* is xsldbg ready for input from the application */
static int inputReady = 0;
@@ -53,19 +53,19 @@ setAppReady(int ready)
/* the compiler will optimize this function to inline and to keep variable private*/
int
-getInputtqStatus(void)
+getInputStatus(void)
{
- return inputtqStatus;
+ return inputStatus;
}
void
-setInputtqStatus(XsldbgMessageEnum type)
+setInputStatus(XsldbgMessageEnum type)
{
switch (type) {
case XSLDBG_MSG_AWAITING_INPUT: /* Waiting for user input */
case XSLDBG_MSG_READ_INPUT: /* Read user input */
case XSLDBG_MSG_PROCESSING_INPUT: /* Processing user's request */
- inputtqStatus = type;
+ inputStatus = type;
break;
default:
@@ -76,26 +76,26 @@ setInputtqStatus(XsldbgMessageEnum type)
/* the compiler will optimize this function to inline and to keep variable private*/
int
-getThreadtqStatus(void)
+getThreadStatus(void)
{
- return threadtqStatus;
+ return threadStatus;
}
/* reset the status to @p type */
void
-setThreadtqStatus(XsldbgMessageEnum type)
+setThreadStatus(XsldbgMessageEnum type)
{
switch (type) {
case XSLDBG_MSG_THREAD_NOTUSED:
case XSLDBG_MSG_THREAD_INIT:
case XSLDBG_MSG_THREAD_RUN:
- threadtqStatus = type;
+ threadStatus = type;
break;
case XSLDBG_MSG_THREAD_STOP:
case XSLDBG_MSG_THREAD_DEAD:
xslDebugStatus = DEBUG_TQUIT;
- threadtqStatus = type;
+ threadStatus = type;
break;
default:
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
index 00802843..d83e71f3 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
@@ -40,13 +40,13 @@ extern "C" {
void setAppReady(int ready);
- int getInputtqStatus(void);
+ int getInputStatus(void);
- void setInputtqStatus(XsldbgMessageEnum type);
+ void setInputStatus(XsldbgMessageEnum type);
- int getThreadtqStatus(void);
+ int getThreadStatus(void);
- void setThreadtqStatus(XsldbgMessageEnum type);
+ void setThreadStatus(XsldbgMessageEnum type);
void *xsldbgThreadMain(void *data);
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
index c24fe29e..d7914768 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
@@ -188,7 +188,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>60</width>
<height>32767</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -243,7 +243,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>60</width>
<height>32767</height>
@@ -263,7 +263,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -330,7 +330,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -349,7 +349,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -442,7 +442,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -473,7 +473,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -498,7 +498,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
index d4fad88d..d1fdba5c 100644
--- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui
index e146a93b..4c27e52b 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui
@@ -21,7 +21,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>450</height>
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -289,7 +289,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -341,7 +341,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -360,7 +360,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -382,7 +382,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -402,7 +402,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -421,7 +421,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
index 7a4f4960..deead4fa 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
@@ -98,14 +98,14 @@ void XsldbgDebugger::timerEvent(TQTimerEvent *e)
if (e == 0L || (e->timerId() != updateTimerID))
return;
- if ((getInputReady() == 0) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
+ if ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
(commandQue.count() > 0)){
TQString msg = commandQue.first();
commandQue.remove(msg);
::fakeInput((const char*)msg.utf8());
}
- if ((!updateText.isEmpty()) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT)){
+ if ((!updateText.isEmpty()) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT)){
/* flush remainding text to message window */
TQString msgCopy = updateText;
updateText = "";
@@ -199,7 +199,7 @@ bool XsldbgDebugger::start()
bool XsldbgDebugger::stop()
{
if (initialized == true){
- setThreadtqStatus(XSLDBG_MSG_THREAD_STOP);
+ setThreadStatus(XSLDBG_MSG_THREAD_STOP);
}
/* it always succeeds at the moment */
diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui
index 627c56ff..17b847db 100644
--- a/kxsldbg/kxsldbgpart/xsldbgentities.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
index 3ae22f36..21c7cb19 100644
--- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -214,7 +214,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -239,7 +239,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
index 31831e7f..aa97d11f 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -309,7 +309,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -334,7 +334,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
index 742c9514..a69244bf 100644
--- a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
index 03584163..ae3531a5 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
@@ -56,7 +56,7 @@ XsldbgOutputView::XsldbgOutputView(TQWidget * parent)
: TQTextEdit(parent, "outputview")
{
new TQBoxLayout(this, TQBoxLayout::TopToBottom);
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
setMinimumSize(TQSize(500, 80));
setCaption(i18n("xsldbg Output"));
setText(i18n("\t\txsldbg output capture ready\n\n"));
diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui
index b2b07d6a..e31f6ea6 100644
--- a/kxsldbg/kxsldbgpart/xsldbgsources.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
index b93d24ea..60c8a82b 100644
--- a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
@@ -41,7 +41,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>60</height>
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
index f4bd138b..df4b1ef8 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
tqlayout->addWidget( closeButton );
tqlayout->activate();
d->dummy->hide();
- drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+ drag->setFixedHeight( tqlayout->minimumSize().height() );
}
void KDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -344,11 +344,11 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
tqlayout->addWidget( closeButton );
tqlayout->activate();
- kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->tqminimumSize().height()<<endl;
+ kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->minimumSize().height()<<endl;
#ifdef __GNUC__
#warning FIXME
#endif
- drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/tqsizeHint().height() );
+ drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/sizeHint().height() );
}
void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
@@ -381,7 +381,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
tqlayout->addWidget( closeButton );
tqlayout->activate();
- drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+ drag->setFixedHeight( tqlayout->minimumSize().height() );
}
void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
@@ -577,7 +577,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe);
TQPainter paint;
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -604,7 +604,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -692,7 +692,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -792,7 +792,7 @@ void KDockWidget::updateHeader()
header->setTopLevel( true );
header->show();
#ifdef BORDERLESS_WINDOWS
- tqlayout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+ tqlayout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
setMouseTracking(true);
#endif
}
@@ -1831,7 +1831,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
return 0L;
}
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
- p = p->tqtopLevelWidget();
+ p = p->topLevelWidget();
#endif
TQWidget* w = 0L;
findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -2051,7 +2051,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
{
- return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+ return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
}
@@ -2090,7 +2090,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
TQStrListIterator it(list);
for (; it.current(); ++it) {
TQDomElement subel = doc.createElement(subTagName);
- subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+ subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
el.appendChild(subel);
}
@@ -2160,7 +2160,7 @@ void KDockManager::writeConfig(TQDomElement &base)
KDockWidget *obj1;
while ( (obj1=(KDockWidget*)it.current()) ) {
if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
- mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+ mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name());
++it;
}
@@ -2225,7 +2225,7 @@ void KDockManager::writeConfig(TQDomElement &base)
}
}
- groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+ groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
if ( !obj->parent() ) {
groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2935,14 +2935,14 @@ void KDockManager::drawDragRectangle()
KDockMainWindow* pMain = 0L;
KDockWidget* pTLDockWdg = 0L;
TQWidget* topWdg;
- if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+ if (pDockWdgAtRect->topLevelWidget() == main) {
isOverMainWdg = true;
topWdg = pMain = (KDockMainWindow*) main;
unclipped = pMain->testWFlags( WPaintUnclipped );
pMain->setWFlags( WPaintUnclipped );
}
else {
- topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+ topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget();
unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
pTLDockWdg->setWFlags( WPaintUnclipped );
}
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index 82872a4c..34e5784e 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -454,7 +454,7 @@ public:
*/
KDockWidget( KDockManager* dockManager, const char* name,
const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(),
- const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
+ const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0);
/**
* Destructs a dockwidget.
@@ -1368,7 +1368,7 @@ public:
* @return a pointer to the new created dockwidget
*/
KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
- const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+ const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
/**
* Saves the current dock window tqlayout into a DOM tree below the given element.
@@ -1494,7 +1494,7 @@ public:
KDockWidget* getMainDockWidget(){ return mainDockWidget; }
KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
- const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+ const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
void writeDockConfig(TQDomElement &base);
void readDockConfig(TQDomElement &base);
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
index 331b9082..c2d2a1a8 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
@@ -180,20 +180,20 @@ void KDockSplitter::setupMinMaxSize()
// Set the minimum and maximum sizes
int minx, maxx, miny, maxy;
if (m_orientation ==Qt::Horizontal) {
- miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4;
- maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4;
- minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width();
- maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();
+ miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
+ maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
+ minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
+ maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width();
miny = (miny > 4) ? miny : 4;
maxy = (maxy < 32000) ? maxy : 32000;
minx = (minx > 2) ? minx : 2;
maxx = (maxx < 32000) ? maxx : 32000;
} else {
- minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4;
- maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4;
- miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height();
- maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();
+ minx = child0->minimumSize().width() + child1->minimumSize().width()+4;
+ maxx = child0->maximumSize().width() + child1->maximumSize().width()+4;
+ miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height();
+ maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height();
minx = (minx > 4) ? minx : 4;
maxx = (maxx < 32000) ? maxx : 32000;
@@ -351,20 +351,20 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
if (initialised) {
if (m_orientation ==Qt::Vertical) {
if (child0==overlappingWidget) {
- if (position<(child0->tqminimumSize().width()))
- position=child0->tqminimumSize().width();
+ if (position<(child0->minimumSize().width()))
+ position=child0->minimumSize().width();
if (position>width()) position=width()-4;
- } else if (position>(width()-(child1->tqminimumSize().width())-4)){
- position=width()-(child1->tqminimumSize().width())-4;
+ } else if (position>(width()-(child1->minimumSize().width())-4)){
+ position=width()-(child1->minimumSize().width())-4;
if (position<0) position=0;
}
} else {// orientation ==Qt::Horizontal
if (child0==overlappingWidget) {
- if (position<(child0->tqminimumSize().height()))
- position=child0->tqminimumSize().height();
+ if (position<(child0->minimumSize().height()))
+ position=child0->minimumSize().height();
if (position>height()) position=height()-4;
- } else if (position>(height()-(child1->tqminimumSize().height())-4)){
- position=height()-(child1->tqminimumSize().height())-4;
+ } else if (position>(height()-(child1->minimumSize().height())-4)){
+ position=height()-(child1->minimumSize().height())-4;
if (position<0) position=0;
}
@@ -378,15 +378,15 @@ int KDockSplitter::checkValue( int position ) const
{
if (initialised){
if (m_orientation ==Qt::Vertical){
- if (position < (child0->tqminimumSize().width()))
- position = child0->tqminimumSize().width();
- if ((width()-4-position) < (child1->tqminimumSize().width()))
- position = width() - (child1->tqminimumSize().width()) -4;
+ if (position < (child0->minimumSize().width()))
+ position = child0->minimumSize().width();
+ if ((width()-4-position) < (child1->minimumSize().width()))
+ position = width() - (child1->minimumSize().width()) -4;
} else {
- if (position < (child0->tqminimumSize().height()))
- position = (child0->tqminimumSize().height());
- if ((height()-4-position) < (child1->tqminimumSize().height()))
- position = height() - (child1->tqminimumSize().height()) -4;
+ if (position < (child0->minimumSize().height()))
+ position = (child0->minimumSize().height());
+ if ((height()-4-position) < (child1->minimumSize().height()))
+ position = height() - (child1->minimumSize().height()) -4;
}
}
@@ -553,7 +553,7 @@ KDockButton_Private::~KDockButton_Private()
void KDockButton_Private::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if ( moveMouse && !isDown() ){
p->setPen( white );
@@ -561,12 +561,12 @@ void KDockButton_Private::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if ( isOn() || isDown() ){
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
index bb258c6b..ae7c6bcd 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
@@ -424,10 +424,10 @@ void KMdiChildArea::cascadeMaximized()
childFrm->move( pnt );
TQSize curSize( width() - pnt.x(), height() - pnt.y() );
- if ( ( childFrm->tqminimumSize().width() > curSize.width() ) ||
- ( childFrm->tqminimumSize().height() > curSize.height() ) )
+ if ( ( childFrm->minimumSize().width() > curSize.width() ) ||
+ ( childFrm->minimumSize().height() > curSize.height() ) )
{
- childFrm->resize( childFrm->tqminimumSize() );
+ childFrm->resize( childFrm->minimumSize() );
}
else
childFrm->resize( curSize );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
index 8086e7f4..c9c8fa16 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
@@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( !m_pClient )
return;
- if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
+ if ( m_pClient->minimumSize() == m_pClient->maximumSize() )
return;
if ( m_bResizing )
@@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
// it could be the client forces the childframe to enlarge its minimum size
if ( m_pClient )
{
- minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
- minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+ minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
- maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
- maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+ maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
}
@@ -524,7 +524,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// client min / max size / tqlayout behavior don't change
// set frame max size indirectly by setting the clients max size to
// it's current value (calls setMaxSize() of frame)
- m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
+ m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
setGeometry( m_restoredRect );
break;
@@ -608,11 +608,11 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
m_pClient->m_stateChanged = true;
m_state = state;
// save client min / max size / tqlayout behavior
- m_oldClientMinSize = m_pClient->tqminimumSize();
- m_oldClientMaxSize = m_pClient->tqmaximumSize();
+ m_oldClientMinSize = m_pClient->minimumSize();
+ m_oldClientMaxSize = m_pClient->maximumSize();
if ( m_pClient->tqlayout() != 0L )
{
- m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
+ m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
}
m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 );
@@ -627,11 +627,11 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
m_pClient->m_stateChanged = true;
m_state = state;
// save client min / max size / tqlayout behavior
- m_oldClientMinSize = m_pClient->tqminimumSize();
- m_oldClientMaxSize = m_pClient->tqmaximumSize();
+ m_oldClientMinSize = m_pClient->minimumSize();
+ m_oldClientMaxSize = m_pClient->maximumSize();
if ( m_pClient->tqlayout() != 0L )
{
- m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
+ m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
}
m_restoredRect = tqgeometry();
m_pClient->setMinimumSize( 0, 0 );
@@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
{
//reparent to this widget , no flags , point , show it
TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
- TQSize mincs = w->tqminimumSize();
- TQSize maxcs = w->tqmaximumSize();
+ TQSize mincs = w->minimumSize();
+ TQSize maxcs = w->maximumSize();
w->setMinimumSize( 0, 0 );
w->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
@@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
- setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+ setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
{
- setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR );
}
}
@@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
if ( focusedChildWidget != 0 )
nameOfFocusedWidget = focusedChildWidget->name();
- TQSize mins = m_pClient->tqminimumSize();
- TQSize maxs = m_pClient->tqmaximumSize();
+ TQSize mins = m_pClient->minimumSize();
+ TQSize maxs = m_pClient->maximumSize();
m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
m_pClient->setMinimumSize( mins.width(), mins.height() );
m_pClient->setMaximumSize( maxs.width(), maxs.height() );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
index 52cca9e0..f24e3195 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
@@ -359,7 +359,7 @@ public:
*/
inline void updateTimeStamp()
{
- m_time.setDate( TQDate::tqcurrentDate() );
+ m_time.setDate( TQDate::currentDate() );
m_time.setTime( TQTime::currentTime() );
}
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index fa3394ad..b1d6d26c 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -104,7 +104,7 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
m_ws = new TQWidgetStack( this );
- m_ws->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
//tqlayout the tabbar
if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop )
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
index 0cf76c04..077f1e89 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
@@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
if ( domDocument().documentElement().isNull() )
{
- TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+ TQString completeDescription = TQString::fromLatin1( guiDescription )
.tqarg( actionListName );
setXML( completeDescription, false /*merge*/ );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
index aaa07ff8..cf2fa780 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
@@ -705,7 +705,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
#ifdef TQ_WS_X11
if ( mdiMode() == KMdi::ToplevelMode )
{
- XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+ XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
}
#endif
@@ -715,7 +715,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
#ifdef TQ_WS_X11
if ( mdiMode() == KMdi::ToplevelMode )
{
- XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+ XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
}
#endif
@@ -1663,8 +1663,8 @@ void KMdiMainFrm::finishTabPageMode()
if ( pView->isToolView() )
continue;
kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl;
- TQSize mins = pView->tqminimumSize();
- TQSize maxs = pView->tqmaximumSize();
+ TQSize mins = pView->minimumSize();
+ TQSize maxs = pView->maximumSize();
TQSize sz = pView->size();
TQWidget* pParent = pView->parentWidget();
TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
@@ -2079,8 +2079,8 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
KMdiChildView* pView = it.current();
if ( pView->isToolView() )
continue;
- TQSize mins = pView->tqminimumSize();
- TQSize maxs = pView->tqmaximumSize();
+ TQSize mins = pView->minimumSize();
+ TQSize maxs = pView->maximumSize();
TQSize sz = pView->size();
TQWidget* pParent = pView->parentWidget();
TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
index 7e775ccc..662924f3 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
@@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth )
{
TQButton::setText( m_actualText );
- int actualWidth = tqsizeHint().width();
+ int actualWidth = sizeHint().width();
int realLetterCount = origStr.length();
int newLetterCount = ( newWidth * realLetterCount ) / actualWidth;
int w = newWidth + 1;
@@ -337,16 +337,16 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
// if there's enough space, use actual width
int buttonCount = m_pButtonList->count();
int tbHandlePixel;
- tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
- int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
+ tbHandlePixel = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+ int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
{
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
{
b->setText( b->actualText() );
- if ( b->width() != b->tqsizeHint().width() )
+ if ( b->width() != b->sizeHint().width() )
{
- b->setFixedWidth( b->tqsizeHint().width() );
+ b->setFixedWidth( b->sizeHint().width() );
b->show();
}
}
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
index 3e69c674..aee5b47c 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
@@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
if (m_position==KMultiTabBar::Right)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(1,0,1,viewport()->height());
@@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
else
if (m_position==KMultiTabBar::Left)
{
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(23,0,23,viewport()->height());
paint->drawLine(22,0,22,viewport()->height());
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());
}
else
if (m_position==KMultiTabBar::Bottom)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,viewport()->width(),0);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,1,viewport()->width(),1);
}
else
{
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(0,23,viewport()->width(),23);
paint->drawLine(0,22,viewport()->width(),22);
-/* paint->setPen(tqcolorGroup().shadow());
+/* paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());*/
}
@@ -457,7 +457,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
}
-TQSize KMultiTabBarButton::tqsizeHint() const
+TQSize KMultiTabBarButton::sizeHint() const
{
constPolish();
@@ -473,7 +473,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
}
#endif
if ( isMenuButton() )
- w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
@@ -483,7 +483,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
TQString s( text() );
bool empty = s.isEmpty();
if ( empty )
- s = TQString::tqfromLatin1("XXXX");
+ s = TQString::fromLatin1("XXXX");
TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s );
if(!empty || !w)
@@ -578,12 +578,12 @@ void KMultiTabBarTab::updateState()
if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
setFixedWidth(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
- setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
+ setFixedHeight(KMultiTabBarButton::sizeHint().width());
} else setFixedHeight(36);
} else {
setFixedHeight(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
- setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
+ setFixedWidth(KMultiTabBarButton::sizeHint().width());
} else setFixedWidth(36);
}
} else {
@@ -634,7 +634,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
const int height = 24;
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
- sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
+ sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
else sh=TQSize(this->width(),this->height());
}
else
@@ -651,8 +651,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
if (isOn()) st|=TQStyle::Style_On;
- tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
- tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+ tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+ tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
switch (m_position) {
case KMultiTabBar::Left:
@@ -668,8 +668,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
paint->drawPixmap(0,0,pixmap);
break;
}
-// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-// tqcolorGroup(),TQStyle::Style_Enabled);
+// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+// colorGroup(),TQStyle::Style_Enabled);
}
@@ -679,58 +679,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap pixmap;
if ( iconSet())
pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
- paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
+ paint->fillRect(0, 0, 24, 24, colorGroup().background());
if (!isOn())
{
if (m_position==KMultiTabBar::Right)
{
- paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
+ paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
- paint->setPen(tqcolorGroup().background().dark(150));
+ paint->setPen(colorGroup().background().dark(150));
paint->drawLine(0,22,23,22);
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,23);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(1,0,1,23);
}
else
if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
{
- paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
+ paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(23,0,23,23);
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(0,22,23,22);
paint->drawLine(0,23,23,23);
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,23,0);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,1,23,1);
}
else
{
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,23,23,23);
- paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
+ paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(23,0,23,23);
paint->drawLine(22,0,22,23);
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,23);
}
@@ -741,12 +741,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{
if (m_position==KMultiTabBar::Right)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2);
paint->drawLine(23,0,23,height()-1);
paint->drawLine(22,0,22,height()-1);
- paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
@@ -756,9 +756,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap);
- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
- painter.setPen(tqcolorGroup().text());
+ painter.setPen(colorGroup().text());
painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(90);
@@ -770,25 +770,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
else
if (m_position==KMultiTabBar::Top)
{
- paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
- paint->setPen(tqcolorGroup().text());
+ paint->setPen(colorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
}
}
else
if (m_position==KMultiTabBar::Bottom)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,23,width()-1,23);
paint->drawLine(0,22,width()-1,22);
- paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
- paint->setPen(tqcolorGroup().text());
+ paint->setPen(colorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
}
@@ -797,10 +797,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2);
- paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
@@ -810,9 +810,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap);
- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
- painter.setPen(tqcolorGroup().text());
+ painter.setPen(colorGroup().text());
painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(-90);
@@ -839,13 +839,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
if (bm==Vertical)
{
m_l=new TQVBoxLayout(this);
- tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+ setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
// setFixedWidth(24);
}
else
{
m_l=new TQHBoxLayout(this);
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
// setFixedHeight(24);
}
m_l->setMargin(0);
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
index fc246b1f..e4a30a4b 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
@@ -181,7 +181,7 @@ public slots:
*/
void setText(const TQString &);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
KMultiTabBar::KMultiTabBarPosition m_position;
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
index 26a1c5e4..4b112f71 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
@@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
int xoff = 0, yoff = 0;
// The additional offsets were found by try and error, TODO: find the rational behind them
if ( t == tab( currentTab() ) ) {
- xoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
- yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+ xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+ yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
}
else {
xoff = 7;
@@ -302,7 +302,7 @@ const TQColor &KTabBar::tabColor( int id ) const
if ( mTabColors.contains( id ) )
return mTabColors[id];
- return tqcolorGroup().foreground();
+ return colorGroup().foreground();
}
int KTabBar::insertTab( TQTab *t, int index )
@@ -340,8 +340,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
r.setLeft( r.left() + pixw + 4 );
r.setRight( r.right() + 2 );
- int inactiveXShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
- int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+ int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+ int inactiveYShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
@@ -357,11 +357,11 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
if ( has_focus )
flags |= TQStyle::Style_HasFocus;
- TQColorGroup cg( tqcolorGroup() );
+ TQColorGroup cg( colorGroup() );
if ( mTabColors.contains( t->identifier() ) )
cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
- tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r,
+ tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
t->isEnabled() ? cg : tqpalette().disabled(),
flags, TQStyleOption(t) );
}
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
index 55fdcaf8..9453c182 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
@@ -160,8 +160,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
- hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
- overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+ hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+ overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -250,7 +250,7 @@ void KTabWidget::resizeTabs( int changeTabIndex )
newMaxLength=d->m_maxLength;
uint lcw=0, rcw=0;
- int tabBarHeight = tabBar()->tqsizeHint().height();
+ int tabBarHeight = tabBar()->sizeHint().height();
if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -445,7 +445,7 @@ void KTabWidget::removePage( TQWidget * w ) {
bool KTabWidget::isEmptyTabbarSpace( const TQPoint &p ) const
{
TQPoint point( p );
- TQSize size( tabBar()->tqsizeHint() );
+ TQSize size( tabBar()->sizeHint() );
if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) {
TQWidget *rightcorner = cornerWidget( TopRight );
if ( rightcorner ) {
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 87c35918..c548f400 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -321,7 +321,7 @@ void DownloadDialog::slotResult(KIO::Job *job)
m_data[job] = "";
}
-int DownloadDialog::installtqStatus(Entry *entry)
+int DownloadDialog::installStatus(Entry *entry)
{
TQDate date;
TQString datestring;
@@ -357,7 +357,7 @@ void DownloadDialog::addEntry(Entry *entry)
slotPage(m_frame);
}
}*/
- installed = installtqStatus(entry);
+ installed = installStatus(entry);
if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small);
@@ -524,7 +524,7 @@ void DownloadDialog::slotSelected()
e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(tmp).tqarg(e->summary(lang)).tqarg(e->license()));
}
- if(installtqStatus(e) == 1) enabled = false;
+ if(installStatus(e) == 1) enabled = false;
else enabled = true;
TQPushButton *de, *in;
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index b5c1de0a..99fb82a9 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -208,7 +208,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
Entry *getEntry();
void loadProvider(Provider *p);
void install(Entry *e);
- int installtqStatus(Entry *e);
+ int installStatus(Entry *e);
ProviderLoader *m_loader;
TQString m_entryname;
diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index 0f3b98b4..b7149428 100644
--- a/lib/compatibility/knewstuff/entry.cpp
+++ b/lib/compatibility/knewstuff/entry.cpp
@@ -26,7 +26,7 @@
using namespace KNS;
Entry::Entry() :
- mRelease( 0 ), mReleaseDate( TQDate::tqcurrentDate() ), mRating( 0 ),
+ mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ),
mDownloads( 0 )
{
}
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 1e2a1b8b..7538ebe9 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -56,7 +56,7 @@ void colorRequester::init()
d->edit = new KLineEdit( this, "line edit" );
myButton = new KPushButton( this, "kfile button");
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
myButton->setIconSet( iconSet );
myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp
index 58e67d0f..411f056c 100644
--- a/quanta/components/csseditor/colorslider.cpp
+++ b/quanta/components/csseditor/colorslider.cpp
@@ -37,9 +37,9 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,
TQLabel *leftLabel = new TQLabel("<b>" + l +"</b>",leftBox);
TQLabel *centerLabel = new TQLabel(("<b>" + c +"</b>"),centerBox);
TQLabel *rightLabel = new TQLabel(("<b>" + r +"</b>"),rightBox);
- leftLabel->tqsetAlignment(TQt::AlignHCenter);
- centerLabel->tqsetAlignment(TQt::AlignHCenter);
- rightLabel->tqsetAlignment(TQt::AlignHCenter);
+ leftLabel->setAlignment(TQt::AlignHCenter);
+ centerLabel->setAlignment(TQt::AlignHCenter);
+ rightLabel->setAlignment(TQt::AlignHCenter);
leftLabel->setTextFormat (TQt::RichText ) ;
centerLabel->setTextFormat ( TQt::RichText ) ;
rightLabel->setTextFormat (TQt::RichText ) ;
diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index d1fe0993..f47d5edd 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>280</width>
<height>20</height>
@@ -117,13 +117,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>33</width>
<height>7</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>290</width>
<height>32767</height>
@@ -338,7 +338,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>200</height>
@@ -363,7 +363,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32766</width>
<height>32766</height>
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index dd899b1b..c4e8c4f5 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -220,7 +220,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>24</height>
@@ -266,7 +266,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -329,7 +329,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -403,7 +403,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -428,7 +428,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -478,7 +478,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -521,7 +521,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -597,7 +597,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -622,7 +622,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -672,7 +672,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -715,7 +715,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -791,7 +791,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -816,7 +816,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -866,7 +866,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -917,7 +917,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -939,7 +939,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>380</width>
<height>20</height>
diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui
index 6ac64343..38123b7f 100644
--- a/quanta/components/csseditor/encodingselectors.ui
+++ b/quanta/components/csseditor/encodingselectors.ui
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 273c5a4c..ce2ccde1 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -36,7 +36,7 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF
TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black );
lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() );
- lePreview->tqsetAlignment(TQt::AlignCenter);
+ lePreview->setAlignment(TQt::AlignCenter);
TQFont font;
font.setPointSize(20);
lePreview->setFont(font);
@@ -52,20 +52,20 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF
if( families.count() != 0 ) lbAvailable->insertStringList(families);
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
pbAdd->setIconSet(iconSet);
pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
- iconSet = SmallIconSet(TQString::tqfromLatin1("back"));
+ iconSet = SmallIconSet(TQString::fromLatin1("back"));
pbRemove->setIconSet(iconSet);
pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
- iconSet = SmallIconSet(TQString::tqfromLatin1("up"));
+ iconSet = SmallIconSet(TQString::fromLatin1("up"));
pbMoveUp->setIconSet(iconSet);
pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
- iconSet = SmallIconSet(TQString::tqfromLatin1("down"));
+ iconSet = SmallIconSet(TQString::fromLatin1("down"));
pbMoveDown->setIconSet(iconSet);
pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 86a109d9..ded1d6e1 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -219,13 +219,13 @@
<property name="name">
<cstring>pbMoveUp</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -239,13 +239,13 @@
<property name="name">
<cstring>pbAdd</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -259,13 +259,13 @@
<property name="name">
<cstring>pbRemove</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -279,13 +279,13 @@
<property name="name">
<cstring>pbMoveDown</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -307,7 +307,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -374,7 +374,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>313</width>
<height>20</height>
diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp
index f1e1c101..922c7dbe 100644
--- a/quanta/components/csseditor/propertysetter.cpp
+++ b/quanta/components/csseditor/propertysetter.cpp
@@ -113,7 +113,7 @@ void propertySetter::addButton(){
m_pb = new KPushButton(this);
TQToolTip::add(m_pb, i18n( "More..." ));
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("2rightarrow"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("2rightarrow"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_pb->setIconSet(iconSet);
m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp
index b94bdbcd..c62cc7a7 100644
--- a/quanta/components/csseditor/styleeditor.cpp
+++ b/quanta/components/csseditor/styleeditor.cpp
@@ -42,7 +42,7 @@
StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){
connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor()));
setToolTip(i18n("Open css dialog"));
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("stylesheet"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_pb->setIconSet(iconSet);
m_iconWidth = pixMap.width();
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 7a35ee23..994876a3 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){
}
void TLPEditor::setButtonIcon(TQString s){
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1(s.ascii()));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s.ascii()));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_pb->setIconSet(iconSet);
m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index 3eb19d7a..5f43c131 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index 4b85c5d2..98f2b159 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>295</width>
<height>20</height>
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index dd94f4ae..4b43fefb 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -163,13 +163,13 @@
<property name="name">
<cstring>ledWarning</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index b8ab40bd..93b5199a 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -621,7 +621,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 4ee2bceb..6e47fdb4 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -57,7 +57,7 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS
m_supportsasync = false;
m_defaultExecutionState = Starting;
setExecutionState(m_defaultExecutionState);
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&)));
connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool)));
@@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active)
setExecutionState(m_defaultExecutionState);
if(active)
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
else
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
}
@@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
debuggerInterface()->setActiveLine("", 0);
if(connected)
- emit updatetqStatus(DebuggerUI::Connected);
+ emit updateStatus(DebuggerUI::Connected);
else
{
setExecutionState(m_defaultExecutionState);
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
profilerOpen(false);
}
@@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log)
{
- debuggerInterface()->showtqStatus(errormsg, log);
+ debuggerInterface()->showStatus(errormsg, log);
}
@@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state)
if(state == "starting")
{
setExecutionState(Starting);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
}
else if(state == "stopping")
{
setExecutionState(Stopping);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
}
else if(state == "stopped")
{
setExecutionState(Stopped);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
}
else if(state == "running")
{
setExecutionState(Running);
- emit updatetqStatus(DebuggerUI::Running);
+ emit updateStatus(DebuggerUI::Running);
}
else if(state == "break")
{
setExecutionState(Break);
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
}
}
@@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
TQDomNode response = data.elementsByTagName("response").item(0);
TQString command = attribute(response, "command");
- // tqStatus command
+ // Status command
if(command == "status")
setExecutionState(attribute(response, "status"));
@@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
}
else
{
- debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
+ debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
kdDebug(24002) << datas << endl;
}
@@ -338,7 +338,7 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket)
{
if(attribute(initpacket, "protocol_version") != protocolversion)
{
- debuggerInterface()->showtqStatus(
+ debuggerInterface()->showStatus(
i18n("The debugger for %1 uses an unsupported protocol version (%2)")
.tqarg(attribute(initpacket, "language"))
.tqarg(attribute(initpacket, "protocol_version"))
@@ -869,7 +869,7 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
if(forceopen)
KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error"));
else
- debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false);
+ debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false);
}
}
else
@@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode)
{
if(attribute(setnode, "success") == "0")
{
- debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true);
+ debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true);
}
}
@@ -1021,16 +1021,16 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode )
}
else
{
- emit updatetqStatus(DebuggerUI::HaltedOnError);
- debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
+ emit updateStatus(DebuggerUI::HaltedOnError);
+ debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
}
break;
}
else
{
// Fatal error
- emit updatetqStatus(DebuggerUI::HaltedOnError);
- debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
+ emit updateStatus(DebuggerUI::HaltedOnError);
+ debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
}
}
errornode = errornode.nextSibling();
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
index 8e5b667f..668fbe30 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
@@ -161,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient
void processCommand(const TQString&);
signals:
- void updatetqStatus(DebuggerUI::DebuggertqStatus);
+ void updateStatus(DebuggerUI::DebuggerStatus);
};
#endif
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 0e65ee5c..9c24ba29 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
if(m_client)
{
- disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+ disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
delete m_client;
m_client = NULL;
@@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
// recreate UI
m_debuggerui = new DebuggerUI(this, "debuggerui");
- connect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+ connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
// Load saved breakpoints
if(Project::ref()->debuggerPersistentBreakpoints())
@@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager()
if(m_client)
{
- disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+ disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
delete m_client;
m_client = 0L;
@@ -605,7 +605,7 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line )
quantaApp->gotoFileAndLine(filename, line, 0);
else
{
- showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true);
+ showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true);
}
// Add new active line mark
@@ -659,7 +659,7 @@ void DebuggerManager::disconnectBreakpointSignals(Document* qdoc)
}
// Show a status message and optionally put it on the log
-bool DebuggerManager::showtqStatus(const TQString& a_message, bool log)
+bool DebuggerManager::showStatus(const TQString& a_message, bool log)
{
TQString message = a_message;
quantaApp->slotStatusMsg(m_client->getName() + ": " + message);
diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h
index 8fae5864..de032937 100644
--- a/quanta/components/debugger/debuggermanager.h
+++ b/quanta/components/debugger/debuggermanager.h
@@ -71,7 +71,7 @@ class DebuggerManager : public TQObject
void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey);
// Public help functions
- bool showtqStatus(const TQString& message, bool log);
+ bool showStatus(const TQString& message, bool log);
bool setActiveLine (const TQString& file, int line);
void setMark(const TQString& filename, long line, bool set, int mark);
diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp
index d2f710b6..fdf32a5c 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -109,7 +109,7 @@ void DebuggerUI::showMenu()
else
m_debuggerMenuID = 0;
- // tqStatus indicator
+ // Status indicator
quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER);
}
@@ -124,7 +124,7 @@ void DebuggerUI::hideMenu()
}
m_debuggerMenuID = 0;
- // tqStatus indicator
+ // Status indicator
quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER);
}
@@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url)
m_preview->openURL(url);
}
-void DebuggerUI::slottqStatus( DebuggertqStatus status )
+void DebuggerUI::slotStatus( DebuggerStatus status )
{
switch(status)
{
diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h
index de939315..c7e7d145 100644
--- a/quanta/components/debugger/debuggerui.h
+++ b/quanta/components/debugger/debuggerui.h
@@ -38,7 +38,7 @@ class DebuggerUI : public TQObject
TQ_OBJECT
public:
- enum DebuggertqStatus
+ enum DebuggerStatus
{
NoSession = 0,
AwaitingConnection,
@@ -83,8 +83,8 @@ class DebuggerUI : public TQObject
WHTMLPart *m_preview;
public slots:
- // tqStatus indication
- void slottqStatus(DebuggerUI::DebuggertqStatus status);
+ // Status indication
+ void slotStatus(DebuggerUI::DebuggerStatus status);
};
diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui
index 09a3873c..00ca41e8 100644
--- a/quanta/components/debugger/debuggervariablesets.ui
+++ b/quanta/components/debugger/debuggervariablesets.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index ccca567c..82501178 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -487,7 +487,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>50</height>
@@ -530,7 +530,7 @@
<property name="name">
<cstring>sliderDisplayDelay</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>27</height>
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index d083739a..61e1c8eb 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -57,7 +57,7 @@ QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, co
m_defaultExecutionState = Pause;
setExecutionState(m_defaultExecutionState);
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
m_datalen = -1;
}
@@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed ()
delete m_server;
m_server = NULL;
}
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
}
// Try to make a connection to the gubed server
@@ -109,7 +109,7 @@ void QuantaDebuggerGubed::startSession()
debuggerInterface()->enableAction("debug_request", false);
kdDebug(24002) << k_funcinfo << ", proxy:" << m_serverHost << ", " << m_serverPort.toUInt() << endl;
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
}
}
else
@@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession()
if(m_server->listen())
{
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
debuggerInterface()->enableAction("debug_connect", false);
debuggerInterface()->enableAction("debug_disconnect", true);
debuggerInterface()->enableAction("debug_request", true);
}
else
{
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
delete m_server;
m_server = NULL;
debuggerInterface()->enableAction("debug_connect", true);
@@ -174,7 +174,7 @@ void QuantaDebuggerGubed::endSession()
debuggerInterface()->enableAction("debug_leap", false);
debuggerInterface()->enableAction("debug_pause", false);
- emit updatetqStatus(DebuggerUI::NoSession);
+ emit updateStatus(DebuggerUI::NoSession);
}
// Change executionstate of the script
@@ -185,7 +185,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
sendCommand("pause", (char*)0L);
sendCommand("sendactiveline", (char*)0L);
if(isActive())
- emit updatetqStatus(DebuggerUI::Paused);
+ emit updateStatus(DebuggerUI::Paused);
}
else if(newstate == Run)
{
@@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
sendCommand("run", (char*)0L);
if(isActive())
- emit updatetqStatus(DebuggerUI::Running);
+ emit updateStatus(DebuggerUI::Running);
}
else if(newstate == Trace)
{
@@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
sendCommand("trace", (char*)0L);
if(isActive())
- emit updatetqStatus(DebuggerUI::Tracing);
+ emit updateStatus(DebuggerUI::Tracing);
}
m_executionState = newstate;
@@ -259,14 +259,14 @@ void QuantaDebuggerGubed::slotError(int)
if(m_socket->error())
{
kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl;
- debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false);
+ debuggerInterface()->showStatus(m_socket->KSocketBase::errorString(), false);
}
}
if(m_server && m_server->error())
{
kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
- debuggerInterface()->showtqStatus(m_server->errorString(), false);
+ debuggerInterface()->showStatus(m_server->errorString(), false);
}
}
@@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
connected();
- emit updatetqStatus(DebuggerUI::Connected);
+ emit updateStatus(DebuggerUI::Connected);
}
else
{
@@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
// Connection established
void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &)
{
- emit updatetqStatus(DebuggerUI::Connected);
+ emit updateStatus(DebuggerUI::Connected);
connected();
}
@@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed()
debuggerInterface()->setActiveLine("", 0);
- emit updatetqStatus(DebuggerUI::AwaitingConnection);
+ emit updateStatus(DebuggerUI::AwaitingConnection);
m_active = false;
}
@@ -447,7 +447,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
for(int cnt = 1; cnt <= argcnt; cnt++)
msg.replace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]);
- debuggerInterface()->showtqStatus(msg, false);
+ debuggerInterface()->showStatus(msg, false);
}
// New current line
else if(m_command == "setactiveline")
@@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
// Parsing failed
else if(m_command == "parsefailed")
{
- debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true);
+ debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true);
return;
}
// A debugging session is running
@@ -479,7 +479,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
else if(m_command == "error")
{
// Put the line number first so double clicking will jump to the corrrect line
- debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true);
+ debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true);
// Filter to get error code only and match it with out mask
long error = args["errnum"].toLong();
@@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
else
setExecutionState(Pause);
- emit updatetqStatus(DebuggerUI::HaltedOnError);
+ emit updateStatus(DebuggerUI::HaltedOnError);
}
// We came across a hard coded breakpoint
else if(m_command == "forcebreak")
{
setExecutionState(Pause);
- emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
- debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true);
+ emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
+ debuggerInterface()->showStatus(i18n("Breakpoint reached"), true);
}
// A conditional breakpoint was fulfilled
else if(m_command == "conditionalbreak")
{
setExecutionState(Pause);
- emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
- debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true);
+ emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
+ debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true);
}
// There is a breakpoint set in this file/line
else if(m_command == "removebreakpoint")
@@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
// We're about to debug a file..
else if(m_command == "initialize")
{
- debuggerInterface()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false);
+ debuggerInterface()->showStatus(i18n("Established connection to %1").tqarg(args["filename"]), false);
sendCommand("sendprotocolversion", (char*)0L);
debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0);
@@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
// Reached en of an include
else if(m_command == "end")
{
- //debuggerInterface()->showtqStatus(i18n("At end of include %1").tqarg(data), true);
+ //debuggerInterface()->showStatus(i18n("At end of include %1").tqarg(data), true);
return;
}
// Check protocol version
@@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
{
if(args["version"] != protocolversion)
{
- debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
+ debuggerInterface()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
sendCommand("die", (char*)0L);
}
return;
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h
index 4663d9fa..d041e90d 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.h
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.h
@@ -148,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient
void slotReadyAccept();
signals:
- void updatetqStatus(DebuggerUI::DebuggertqStatus);
+ void updateStatus(DebuggerUI::DebuggerStatus);
};
#endif
diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h
index 317ff3e3..69ba5650 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.h
+++ b/quanta/components/debugger/interfaces/debuggerclient.h
@@ -109,7 +109,7 @@ class DebuggerClient : public TQObject
DebuggerInterface *debuggerInterface();
signals:
- void updatetqStatus(DebuggerUI::DebuggertqStatus);
+ void updateStatus(DebuggerUI::DebuggerStatus);
};
diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h
index dabd685d..cf634884 100644
--- a/quanta/components/debugger/interfaces/debuggerinterface.h
+++ b/quanta/components/debugger/interfaces/debuggerinterface.h
@@ -44,7 +44,7 @@ class DebuggerInterface : public TQObject
virtual void havenoBreakpoint (const TQString& file, int line) = 0;
// Public help functions
- virtual bool showtqStatus(const TQString& message, bool log) = 0;
+ virtual bool showStatus(const TQString& message, bool log) = 0;
virtual bool setActiveLine (const TQString& file, int line) = 0;
virtual void enableAction(const TQString& action, bool enable) = 0;
diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp
index 96e4f628..c38e2fec 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -43,7 +43,7 @@ TQString PathMapper::translate(const TQString & path, const TQString & from, con
TQString translated = path;
// Check if this dir is matched by the maps
- if(path.tqstartsWith(from, false))
+ if(path.startsWith(from, false))
{
translated.remove(0, from.length());
translated = to + translated;
diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp
index 671bb871..7f6f4027 100644
--- a/quanta/components/debugger/pathmapperdialog.cpp
+++ b/quanta/components/debugger/pathmapperdialog.cpp
@@ -69,7 +69,7 @@ void PathMapperDialog::slotPathsChanged()
translated = m_path;
// Check if this dir is matched by the maps
- if(m_path.tqstartsWith(from, false))
+ if(m_path.startsWith(from, false))
{
translated.remove(0, from.length());
translated = to + translated;
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index c0f27c04..58a79167 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -109,7 +109,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local
<property name="name">
<cstring>ledTranslationExists</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index 385849a5..af70da0a 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line)
}
// Public help functions
-bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log)
+bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log)
{
- return m_manager->showtqStatus(message, log);
+ return m_manager->showStatus(message, log);
}
bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line)
diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h
index 9c2ba724..5b9b5480 100644
--- a/quanta/components/debugger/quantadebuggerinterface.h
+++ b/quanta/components/debugger/quantadebuggerinterface.h
@@ -43,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface
void refreshBreakpoints();
// Public help functions
- bool showtqStatus(const TQString& message, bool log);
+ bool showStatus(const TQString& message, bool log);
bool setActiveLine (const TQString& file, int line) ;
void enableAction(const TQString& action, bool enable);
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 72e4afa3..ec63c23f 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -39,7 +39,7 @@ namespace VariablesListViewColumns
enum Columns
{
Name = 0,
- tqStatus,
+ Status,
Value,
Type,
Size
@@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
item = oldvar->item();
if(oldvar->value() != newvar->value())
- item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok"));
+ item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok"));
else
- item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap());
+ item->setPixmap(VariablesListViewColumns::Status, KPixmap());
oldvar->copy(newvar, false);
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index 46a5354a..3e024de5 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>55</width>
<height>0</height>
@@ -510,7 +510,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui
index e0a8926c..c977d86f 100644
--- a/quanta/components/framewizard/fmrceditors.ui
+++ b/quanta/components/framewizard/fmrceditors.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>150</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>300</width>
<height>150</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>0</height>
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index cde1611f..3a3a1efd 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>16</height>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index a94c15e4..dcc570b7 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -1284,7 +1284,7 @@ void TableEditor::configureCell(int row, int col, Node * node)
flags = TQt::AlignHCenter; // TH is centered by default
else
flags = TQt::AlignLeft;
- item->tqsetAlignment(flags);
+ item->setAlignment(flags);
//Qt::Vertical tqalignment
TQString valign = node->tag->attributeValue("valign", true);
if (valign == "top")
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index f74a2620..29511351 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>276</width>
<height>20</height>
@@ -159,7 +159,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>276</width>
<height>20</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>340</width>
<height>20</height>
@@ -392,7 +392,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -528,7 +528,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>340</width>
<height>20</height>
@@ -555,7 +555,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp
index c2f4e298..a994b650 100644
--- a/quanta/components/tableeditor/tableitem.cpp
+++ b/quanta/components/tableeditor/tableitem.cpp
@@ -84,9 +84,9 @@ void TableItem::paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bo
p->drawText(4, 4, cr0.width()-8, cr0.height()-8, m_halign | m_valign | WordBreak, text());
}
-TQSize TableItem::tqsizeHint() const
+TQSize TableItem::sizeHint() const
{
- TQSize size = TQTableItem::tqsizeHint();
+ TQSize size = TQTableItem::sizeHint();
size.setWidth(size.width()+8);
size.setHeight(size.height()+8);
return size;
diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h
index 12e2b4b0..ac9a3777 100644
--- a/quanta/components/tableeditor/tableitem.h
+++ b/quanta/components/tableeditor/tableitem.h
@@ -37,14 +37,14 @@ public:
virtual void setContentFromEditor(TQWidget *w);
// Paint cell - handle tqalignment (horizontal and vertical) and bold for header
virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected);
- // Return A bit larger tqsizeHint because TQTextEdit has some margin around
- virtual TQSize tqsizeHint() const;
+ // Return A bit larger sizeHint because TQTextEdit has some margin around
+ virtual TQSize sizeHint() const;
// Get and set vertical aligment
TQt::AlignmentFlags vAlignment() {return m_valign;}
void setVAlignment(TQt::AlignmentFlags flags) {m_valign = flags;}
// Get and set horizontal aligment
TQt::AlignmentFlags tqalignment() {return m_halign;}
- void tqsetAlignment(TQt::AlignmentFlags flags) {m_halign = flags;}
+ void setAlignment(TQt::AlignmentFlags flags) {m_halign = flags;}
// Get and set header status (use true for TH, false for TD)
bool header() {return m_header;}
void setHeader(bool h) {m_header = h;}
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index d5cace16..2e695b36 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction()
p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance());
}
TQWidget *toolBar = tb->page(i);
- if (toolBar->tqminimumSizeHint().height() > 20)
+ if (toolBar->minimumSizeHint().height() > 20)
{
toolBar->adjustSize();
toolBar->setGeometry(0,0, tb->width(), toolBar->height());
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index d834bea7..6f1da45d 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="name">
<cstring>buttonOk</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -265,7 +265,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -311,13 +311,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -521,7 +521,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>64</width>
<height>20</height>
@@ -740,7 +740,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>55</width>
<height>20</height>
diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui
index f3370603..6670afb0 100644
--- a/quanta/dialogs/casewidget.ui
+++ b/quanta/dialogs/casewidget.ui
@@ -12,7 +12,7 @@
<height>158</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>100</height>
diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui
index 3bca0951..597fbcd6 100644
--- a/quanta/dialogs/debuggeroptionss.ui
+++ b/quanta/dialogs/debuggeroptionss.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>220</height>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui
index 50783723..982bef50 100644
--- a/quanta/dialogs/dirtydialog.ui
+++ b/quanta/dialogs/dirtydialog.ui
@@ -29,7 +29,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>220</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui
index c06a9c2f..ca0135df 100644
--- a/quanta/dialogs/donationdialog.ui
+++ b/quanta/dialogs/donationdialog.ui
@@ -86,7 +86,7 @@ is the future of software, but it is no guarantee of success. How many open sour
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>365</width>
<height>20</height>
@@ -108,13 +108,13 @@ is the future of software, but it is no guarantee of success. How many open sour
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>40</height>
diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui
index b2455cf7..88337d9c 100644
--- a/quanta/dialogs/dtdselectdialog.ui
+++ b/quanta/dialogs/dtdselectdialog.ui
@@ -21,7 +21,7 @@
<height>161</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>440</width>
<height>160</height>
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index ef7e47c7..38879afa 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -505,7 +505,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -535,7 +535,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -1097,7 +1097,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -1647,7 +1647,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>270</height>
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index 059c783d..4f918427 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -76,13 +76,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>50</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>50</height>
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -482,7 +482,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>340</width>
<height>20</height>
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui
index e5066449..0ec00485 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui
+++ b/quanta/dialogs/fourbuttonmessagebox.ui
@@ -21,7 +21,7 @@
<height>150</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@@ -35,7 +35,7 @@
<property name="name">
<cstring>pixmapLabel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui
index 007fbba4..10950ae7 100644
--- a/quanta/dialogs/loadentitydlgs.ui
+++ b/quanta/dialogs/loadentitydlgs.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index 0c9c232a..b73e902b 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -255,7 +255,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui
index 82d1976f..7a1367b9 100644
--- a/quanta/dialogs/settings/codetemplatedlgs.ui
+++ b/quanta/dialogs/settings/codetemplatedlgs.ui
@@ -21,7 +21,7 @@
<height>72</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>70</height>
diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui
index e4c408d3..a7f7e243 100644
--- a/quanta/dialogs/settings/filemaskss.ui
+++ b/quanta/dialogs/settings/filemaskss.ui
@@ -29,7 +29,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -146,7 +146,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>153</width>
<height>20</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui
index 2637e71d..14095623 100644
--- a/quanta/dialogs/settings/parseroptionsui.ui
+++ b/quanta/dialogs/settings/parseroptionsui.ui
@@ -29,7 +29,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>122</width>
<height>20</height>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>122</width>
<height>20</height>
@@ -282,7 +282,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui
index 02bdc979..7019795b 100644
--- a/quanta/dialogs/settings/previewoptionss.ui
+++ b/quanta/dialogs/settings/previewoptionss.ui
@@ -21,7 +21,7 @@
<height>512</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>220</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui
index e14cfda6..06d9e91b 100644
--- a/quanta/dialogs/settings/styleoptionss.ui
+++ b/quanta/dialogs/settings/styleoptionss.ui
@@ -29,7 +29,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>410</width>
<height>250</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index e45807c8..3d187437 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -34,7 +34,7 @@
<property name="name">
<cstring>buttonOk</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -54,7 +54,7 @@
<property name="name">
<cstring>buttonChar</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>112</width>
<height>20</height>
@@ -85,7 +85,7 @@
<property name="name">
<cstring>buttonCancel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index 0d6de8ed..713ccf2c 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name )
}
listbox->setMinimumSize(350,150);
adjustSize();
- resize(tqsizeHint());
+ resize(sizeHint());
connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk()));
}
diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui
index 84be37bc..e7a71fa1 100644
--- a/quanta/dialogs/tagdialogs/tagmail.ui
+++ b/quanta/dialogs/tagdialogs/tagmail.ui
@@ -39,7 +39,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui
index 24db77c7..f4842d4c 100644
--- a/quanta/dialogs/tagdialogs/tagmisc.ui
+++ b/quanta/dialogs/tagdialogs/tagmisc.ui
@@ -21,7 +21,7 @@
<height>61</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>60</height>
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index b384e456..07941236 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -86,16 +86,16 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
xmlErrorPtr errorPtr = xmlGetLastError();
if (errorPtr != NULL)
{
- TQString s = TQString::tqfromLatin1(errorPtr->message);
+ TQString s = TQString::fromLatin1(errorPtr->message);
if (!s.isEmpty())
errorStr = s;
- s = TQString::tqfromLatin1(errorPtr->str1);
+ s = TQString::fromLatin1(errorPtr->str1);
if (!s.isEmpty())
errorStr += "<br>" + s;
- s = TQString::tqfromLatin1(errorPtr->str2);
+ s = TQString::fromLatin1(errorPtr->str2);
if (!s.isEmpty())
errorStr += "<br>" + s;
- s = TQString::tqfromLatin1(errorPtr->str2);
+ s = TQString::fromLatin1(errorPtr->str2);
if (!s.isEmpty())
errorStr += "<br>" + s;
errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2);
diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui
index db29d504..8c55bbcd 100644
--- a/quanta/parsers/dtd/dtepcreationdlg.ui
+++ b/quanta/parsers/dtd/dtepcreationdlg.ui
@@ -21,7 +21,7 @@
<height>285</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>200</height>
diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index c8d4c6c9..5ed55a1b 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -140,7 +140,7 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item)
KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
: TQDialog(parent, name, modal, fl)
{
- tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
DialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "DialogLayout");
domview = new DOMTreeView(this, part, name);
domview->setTitle(i18n( "Debugging KafkaWidget DOM Tree " ));
diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui
index de2293dd..c826dd73 100644
--- a/quanta/parts/kafka/htmldocumentpropertiesui.ui
+++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui
@@ -42,7 +42,7 @@
<property name="name">
<cstring>listView1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>0</width>
<height>0</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>86</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>84</height>
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>226</width>
<height>21</height>
@@ -220,7 +220,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -374,7 +374,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -393,7 +393,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h
index 80a82122..60d8971c 100644
--- a/quanta/parts/kafka/kafkacommon.h
+++ b/quanta/parts/kafka/kafkacommon.h
@@ -588,7 +588,7 @@ public:
/**
* An enumeration of all the possible return states of DTDExtractNode
*/
- enum extractNodetqStatus
+ enum extractNodeStatus
{
//The node to extract was not found.
nothingExtracted = 0,
@@ -619,7 +619,7 @@ public:
* @param cursorOffset The offset of the cursor inside cursorNode.
* </TEMPORARY>
* @param modifs The usual modifs to log the modifications made for the undo/redo system.
- * @return Returns a kafkaCommon::extractNodetqStatus.
+ * @return Returns a kafkaCommon::extractNodeStatus.
*/
static int DTDExtractNode(const TQString &nodeName, Document *doc, Node *startNode,
int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset,
diff --git a/quanta/parts/kafka/kafkadragobject.cpp b/quanta/parts/kafka/kafkadragobject.cpp
index 40aeac9a..ed01ed44 100644
--- a/quanta/parts/kafka/kafkadragobject.cpp
+++ b/quanta/parts/kafka/kafkadragobject.cpp
@@ -51,7 +51,7 @@ KafkaDragObject::KafkaDragObject(Node const* item, TQWidget* dragSource, const c
KafkaDragObject::~KafkaDragObject()
{}
-TQByteArray KafkaDragObject::tqencodedData(const char* mimetype) const
+TQByteArray KafkaDragObject::encodedData(const char* mimetype) const
{
if(m_mimetype == mimetype)
return m_array;
@@ -74,7 +74,7 @@ bool KafkaDragObject::decode(TQMimeSource* e, Node* node)
if(!node || !e->provides(m_mimetype))
return false;
- TQByteArray data = e->tqencodedData(m_mimetype);
+ TQByteArray data = e->encodedData(m_mimetype);
//kdDebug(25001) << TQString(data) << endl;
TQDomDocument doc;
doc.setContent(data, false);
diff --git a/quanta/parts/kafka/kafkadragobject.h b/quanta/parts/kafka/kafkadragobject.h
index 65cf24a5..cc371b45 100644
--- a/quanta/parts/kafka/kafkadragobject.h
+++ b/quanta/parts/kafka/kafkadragobject.h
@@ -35,7 +35,7 @@ public:
KafkaDragObject(Node const* item, TQWidget* dragSource = 0, const char* name = 0);
~KafkaDragObject();
- TQByteArray tqencodedData(const char* c) const;
+ TQByteArray encodedData(const char* c) const;
Node const* getItem() const;
static bool canDecode(TQMimeSource*);
diff --git a/quanta/parts/kafka/kafkasyncoptionsui.ui b/quanta/parts/kafka/kafkasyncoptionsui.ui
index 509ab551..d82aa14f 100644
--- a/quanta/parts/kafka/kafkasyncoptionsui.ui
+++ b/quanta/parts/kafka/kafkasyncoptionsui.ui
@@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>120</width>
<height>31</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>27</width>
<height>31</height>
@@ -175,7 +175,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>167</height>
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 0e91fce0..42af2d0c 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -103,7 +103,7 @@ void WHTMLPart::forward()
hpos++;
openURL( KURL( history.at(hpos) ) );
- emit updatetqStatus( backEnable() , forwardEnable() );
+ emit updateStatus( backEnable() , forwardEnable() );
}
}
@@ -115,7 +115,7 @@ void WHTMLPart::back()
hpos--;
openURL(KURL(history.at(hpos)));
- emit updatetqStatus(backEnable(), forwardEnable());
+ emit updateStatus(backEnable(), forwardEnable());
}
}
@@ -133,7 +133,7 @@ void WHTMLPart::addToHistory(const TQString &url)
hpos = history.count()-1;
- emit updatetqStatus( backEnable() , forwardEnable() );
+ emit updateStatus( backEnable() , forwardEnable() );
}
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 2ec05dfe..bcf0af53 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -54,7 +54,7 @@ public slots:
virtual bool eventFilter(TQObject *watched, TQEvent *e);
signals:
- void updatetqStatus( bool back, bool forward );
+ void updateStatus( bool back, bool forward );
void previewHasFocus(bool focus);
void showPreview(bool show);
void openFile(const KURL&, const TQString&, bool);
diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui
index 17f1d8f0..a82e6806 100644
--- a/quanta/plugins/pluginconfig.ui
+++ b/quanta/plugins/pluginconfig.ui
@@ -23,7 +23,7 @@
<height>281</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>560</width>
<height>280</height>
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>247</width>
<height>20</height>
@@ -117,13 +117,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
@@ -190,7 +190,7 @@
<property name="name">
<cstring>locationButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>28</width>
<height>32767</height>
diff --git a/quanta/plugins/plugineditor.ui b/quanta/plugins/plugineditor.ui
index d464cadb..f50908ab 100644
--- a/quanta/plugins/plugineditor.ui
+++ b/quanta/plugins/plugineditor.ui
@@ -22,7 +22,7 @@
<height>306</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>224</height>
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>67</height>
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index 98aadf20..82dbc51c 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>172</width>
<height>20</height>
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui
index d93b1336..ac6efe68 100644
--- a/quanta/project/eventeditordlgs.ui
+++ b/quanta/project/eventeditordlgs.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index ebc16264..1ce01241 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -150,10 +150,10 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
d->dom.firstChild().firstChild().appendChild( el );
KURL u = url.upURL();
ProjectURL *parentURL = d->m_projectFiles.find(u);
- int uploadtqStatus = 1;
+ int uploadStatus = 1;
if (parentURL)
- uploadtqStatus = parentURL->uploadtqStatus;
- d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) );
+ uploadStatus = parentURL->uploadStatus;
+ d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) );
}
url.setPath(url.directory(false));
}
@@ -162,7 +162,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
if ( tqrepaint )
{
emit reloadTree( &(d->m_projectFiles), false, TQStringList());
- emit newtqStatus();
+ emit newStatus();
}
}
@@ -384,7 +384,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL)
setModified(); // there happens more than setting the flag !
emit reloadTree(&(d->m_projectFiles), false, TQStringList());
- emit newtqStatus();
+ emit newStatus();
}
@@ -422,7 +422,7 @@ void Project::slotRemove(const KURL& urlToRemove)
if (d->m_modified)
setModified(); // there happens more than setting the flag !
emit reloadTree( &(d->m_projectFiles), false, TQStringList() );
- emit newtqStatus();
+ emit newStatus();
TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
TQString nice = urlPath;
@@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
{
if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr)
{
- it.current()->uploadtqStatus = status;
+ it.current()->uploadStatus = status;
el = it.current()->domElement;
el.setAttribute("uploadstatus", status);
}
@@ -960,7 +960,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
setModified();
}
-void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status)
+void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status)
{
ProjectURL *proUrl = d->m_projectFiles.find(url);
if (! proUrl)
@@ -1280,7 +1280,7 @@ bool Project::queryClose()
reloadTree( &(d->m_projectFiles), true, TQStringList());
d->adjustActions();
d->m_projectRecent->setCurrentItem(-1);
- newtqStatus();
+ newStatus();
// kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
}
}
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 8c25ccf9..ec36b377 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -174,7 +174,7 @@ public slots:
void slotRescanPrjDir();
void slotFileDescChanged(const KURL& url, const TQString& desc);
void slotUploadStatusChanged(const KURL& url, int status);
- void slotChangeDocumentFoldertqStatus(const KURL& url, bool status);
+ void slotChangeDocumentFolderStatus(const KURL& url, bool status);
void slotReloadProjectDocs();
@@ -194,7 +194,7 @@ signals:
void messages(const TQString& );
void enableMessageWidget();
- void newtqStatus();
+ void newStatus();
void statusMsg(const TQString &);
/** No descriptions */
void newProjectLoaded(const TQString &, const KURL &, const KURL &);
@@ -204,7 +204,7 @@ signals:
void getUserToolbarFiles(KURL::List *);
void loadToolbarFile(const KURL &);
/** ask for the tree status for saving in project */
- void getTreetqStatus(TQStringList *);
+ void getTreeStatus(TQStringList *);
void eventHappened(const TQString&, const TQString&, const TQString& );
private:
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index ec46ecb9..d0e5b942 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -80,8 +80,8 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
} else
{
bool docFolder = (el.attribute("documentFolder", "false") == "true");
- int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt();
- if (uploadtqStatus == -1)
+ int uploadStatus = el.attribute("uploadstatus", "-1").toInt();
+ if (uploadStatus == -1)
el.setAttribute("uploadstatus", 1);
//remove non-existent local files
if ( url.isLocalFile() )
diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui
index 136245bb..a37bc1af 100644
--- a/quanta/project/projectnewfinals.ui
+++ b/quanta/project/projectnewfinals.ui
@@ -29,13 +29,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>620</width>
<height>410</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32000</width>
<height>32000</height>
@@ -61,13 +61,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>115</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>115</width>
<height>480</height>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -141,7 +141,7 @@
<property name="name">
<cstring>TextLabel3_2_3</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -160,7 +160,7 @@
<property name="name">
<cstring>TextLabel3_2_2_2</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui
index 8176cb04..b3ee4047 100644
--- a/quanta/project/projectnewgenerals.ui
+++ b/quanta/project/projectnewgenerals.ui
@@ -32,13 +32,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>620</width>
<height>410</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32000</width>
<height>32000</height>
@@ -64,13 +64,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>115</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>115</width>
<height>480</height>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -141,13 +141,13 @@
<property name="name">
<cstring>buttonToolbar</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
@@ -174,13 +174,13 @@
<property name="name">
<cstring>buttonTmpl</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
@@ -202,7 +202,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
@@ -359,7 +359,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui
index 5b737924..8b9b2d70 100644
--- a/quanta/project/projectnewlocals.ui
+++ b/quanta/project/projectnewlocals.ui
@@ -29,13 +29,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>620</width>
<height>410</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32000</width>
<height>32000</height>
@@ -61,13 +61,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>115</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>115</width>
<height>480</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>85</width>
<height>20</height>
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>89</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui
index 4711434a..8237519c 100644
--- a/quanta/project/projectnewwebs.ui
+++ b/quanta/project/projectnewwebs.ui
@@ -29,13 +29,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>620</width>
<height>410</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32000</width>
<height>32000</height>
@@ -61,13 +61,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>115</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>115</width>
<height>480</height>
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>309</width>
<height>16</height>
@@ -202,7 +202,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>228</width>
<height>20</height>
diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui
index 9a577bdd..5d2e8cc8 100644
--- a/quanta/project/projectoptions.ui
+++ b/quanta/project/projectoptions.ui
@@ -40,13 +40,13 @@
<property name="name">
<cstring>buttonToolbar</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
@@ -60,13 +60,13 @@
<property name="name">
<cstring>buttonTmpl</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
@@ -88,7 +88,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -162,7 +162,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
@@ -302,7 +302,7 @@
<property name="name">
<cstring>TextLabel3_2_2_2</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 52879849..070179c4 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -351,7 +351,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
progressBar->setTextEnabled(false);
parent->reloadTree(&(m_projectFiles), false, TQStringList());
- parent->newtqStatus();
+ parent->newStatus();
parent->statusMsg(TQString());
}
@@ -699,7 +699,7 @@ void ProjectPrivate::loadProjectXML()
parent->statusMsg(TQString());
parent->newProjectLoaded(projectName, baseURL, templateURL);
parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML());
- parent->newtqStatus();
+ parent->newStatus();
adjustActions();
}
@@ -1099,7 +1099,7 @@ void ProjectPrivate::getStatusFromTree()
i--;
}
TQStringList folderList;
- parent->getTreetqStatus( &folderList );
+ parent->getTreeStatus( &folderList );
// toplevel folder is always open in a project and QExtFileInfo::toRelative
// creates strange output -> we remove the toplevel folder
if (folderList.count() > 0)
@@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject()
{
TQWizard *wiz = new TQWizard(m_mainWindow, "new", true);
wiz->setCaption(i18n("New Project Wizard"));
- wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
png = new ProjectNewGeneral(0L);
@@ -1197,7 +1197,7 @@ void ProjectPrivate::slotNewProject()
delete wiz;
adjustActions();
- parent->newtqStatus();
+ parent->newStatus();
}
/** close project and edited files */
@@ -1230,8 +1230,8 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success)
parent->reloadTree( &(m_projectFiles), true, TQStringList());
adjustActions();
m_projectRecent->setCurrentItem(-1);
- parent->newtqStatus();
- kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ parent->newStatus();
+ kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
}
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index ba267753..ef1be5f9 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -211,15 +211,15 @@ void ProjectUpload::slotBuildTree()
uploadedTime = m_uploadTimeList[s];
int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
el.setAttribute("modified_time", modifiedTime);
- int uploadtqStatus = el.attribute("uploadstatus", "1").toInt();
- if (m_quickUpload || (forceUpload && uploadtqStatus == 0))
- uploadtqStatus = 1;
- if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0))
+ int uploadStatus = el.attribute("uploadstatus", "1").toInt();
+ if (m_quickUpload || (forceUpload && uploadStatus == 0))
+ uploadStatus = 1;
+ if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0))
{
modified.append( u );
it->setSelected(true);
}
- if (uploadtqStatus == 2)
+ if (uploadStatus == 2)
it->setConfirmUpload(true);
totalProgress->setValue(i);
}
diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui
index 3bc4e83a..4f1fddbc 100644
--- a/quanta/project/projectuploads.ui
+++ b/quanta/project/projectuploads.ui
@@ -30,7 +30,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -88,7 +88,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>400</width>
<height>20</height>
diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h
index 02232234..cf3eae66 100644
--- a/quanta/project/projecturl.h
+++ b/quanta/project/projecturl.h
@@ -32,26 +32,26 @@ class ProjectURL : public KURL
{
public:
TQString fileDesc;
- int uploadtqStatus; ///< The upload state, see UploadtqStatus
+ int uploadStatus; ///< The upload state, see UploadStatus
bool documentFolder;
TQDomElement domElement;
ProjectURL()
- : KURL(), uploadtqStatus(1), documentFolder(false) {}
+ : KURL(), uploadStatus(1), documentFolder(false) {}
ProjectURL(const KURL& url)
- : KURL(url), uploadtqStatus(1), documentFolder(false) {}
+ : KURL(url), uploadStatus(1), documentFolder(false) {}
ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder)
- : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {}
+ : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {}
ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el)
- : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {}
+ : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {}
virtual ~ProjectURL() {}
/** The default state for a file when uploading */
- enum UploadtqStatus
+ enum UploadStatus
{
NeverUpload = 0, ///< the files is not selected for upload, even if it was modified
AlwaysUpload, ///< the file is automatically selected for upload if it was modified
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index 9904cdf2..855657c2 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t )
{
RescanPrjDir::resizeEvent(t);
// listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20);
-// MainLayout->setGeometry(tqchildrenRect());
+// MainLayout->setGeometry(childrenRect());
}
void RescanPrj::slotSelect()
diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui
index 019f40a7..8fb4b774 100644
--- a/quanta/project/rescanprjdir.ui
+++ b/quanta/project/rescanprjdir.ui
@@ -29,7 +29,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>620</width>
<height>540</height>
@@ -83,13 +83,13 @@
<property name="name">
<cstring>Line2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>4</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>4</height>
@@ -148,7 +148,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>144</height>
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index eba26cf6..2d4cc6a2 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui
index 40fbd905..4a910a32 100644
--- a/quanta/project/uploadprofiledlgs.ui
+++ b/quanta/project/uploadprofiledlgs.ui
@@ -122,7 +122,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -144,7 +144,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -167,7 +167,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>445</width>
<height>20</height>
diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui
index 466dbc27..d17e1dff 100644
--- a/quanta/project/uploadprofilespage.ui
+++ b/quanta/project/uploadprofilespage.ui
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr
index 07d72ddd..c6e1f98e 100755
--- a/quanta/scripts/checkxml.kmdr
+++ b/quanta/scripts/checkxml.kmdr
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -207,7 +207,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -237,7 +237,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>89</width>
<height>0</height>
diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr
index 7a9b3ff6..c0141550 100755
--- a/quanta/scripts/dwt.kmdr
+++ b/quanta/scripts/dwt.kmdr
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>80</height>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>225</width>
<height>0</height>
diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr
index 73047ad1..ace8e554 100755
--- a/quanta/scripts/gubed_install.kmdr
+++ b/quanta/scripts/gubed_install.kmdr
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>332</width>
<height>0</height>
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>175</height>
diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr
index fb7b4336..45542703 100755
--- a/quanta/scripts/htmlquickstart.kmdr
+++ b/quanta/scripts/htmlquickstart.kmdr
@@ -89,7 +89,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>33</width>
<height>0</height>
@@ -108,7 +108,7 @@ fi
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr
index ad0673cc..7e1459c4 100755
--- a/quanta/scripts/listwizard.kmdr
+++ b/quanta/scripts/listwizard.kmdr
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>296</width>
<height>0</height>
diff --git a/quanta/scripts/meinproc.kmdr b/quanta/scripts/meinproc.kmdr
index 9b564df2..66f30040 100755
--- a/quanta/scripts/meinproc.kmdr
+++ b/quanta/scripts/meinproc.kmdr
@@ -95,7 +95,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>292</width>
<height>0</height>
@@ -172,7 +172,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -216,7 +216,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr
index ff48ed9e..f8e544cf 100755
--- a/quanta/scripts/picturewizard.kmdr
+++ b/quanta/scripts/picturewizard.kmdr
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>342</width>
<height>0</height>
diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr
index b0176e88..a88cbaf1 100755
--- a/quanta/scripts/tablewizard.kmdr
+++ b/quanta/scripts/tablewizard.kmdr
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>0</height>
diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr
index 6bea7b90..472750ab 100755
--- a/quanta/scripts/tidy.kmdr
+++ b/quanta/scripts/tidy.kmdr
@@ -985,7 +985,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>0</height>
@@ -1002,7 +1002,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>0</height>
@@ -1019,7 +1019,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>125</width>
<height>0</height>
diff --git a/quanta/scripts/xmlval.kmdr b/quanta/scripts/xmlval.kmdr
index b9eb408d..494ca294 100755
--- a/quanta/scripts/xmlval.kmdr
+++ b/quanta/scripts/xmlval.kmdr
@@ -121,7 +121,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -165,7 +165,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -219,7 +219,7 @@ fi</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -343,7 +343,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -384,7 +384,7 @@ fi
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -448,7 +448,7 @@ xmllint $CMDLINE 2&gt;&amp;1
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>228</width>
<height>0</height>
diff --git a/quanta/scripts/xsltproc.kmdr b/quanta/scripts/xsltproc.kmdr
index 2f5ee689..3d2227eb 100755
--- a/quanta/scripts/xsltproc.kmdr
+++ b/quanta/scripts/xsltproc.kmdr
@@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 0f0d9933..963e27a0 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted()
}
/** Ask for user confirmation if the file was changed outside. */
-void Document::checkDirtytqStatus()
+void Document::checkDirtyStatus()
{
TQString fileName;
if (url().isLocalFile())
@@ -2576,9 +2576,9 @@ bool Document::hasChanged()
return b;
}
-void Document::setChanged(bool newtqStatus)
+void Document::setChanged(bool newStatus)
{
- changed = newtqStatus;
+ changed = newStatus;
}
void Document::paste()
@@ -3056,10 +3056,10 @@ void Document::slotFileDirty(const TQString& fileName)
{
if ( url().path() == fileName && !dirty() )
{
- setDirtytqStatus(true);
+ setDirtyStatus(true);
if (this == ViewManager::ref()->activeDocument())
{
- checkDirtytqStatus();
+ checkDirtyStatus();
}
}
}
diff --git a/quanta/src/document.h b/quanta/src/document.h
index ff76fbb3..d4a6f4c7 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -143,9 +143,9 @@ work correctly. */
void codeCompletionHintRequested();
/** Returns the dirty status. */
bool dirty() const {return m_dirty;};
- void setDirtytqStatus(bool status) {m_dirty = status;};
+ void setDirtyStatus(bool status) {m_dirty = status;};
/** Ask for user confirmation if the file was changed outside. */
- void checkDirtytqStatus();
+ void checkDirtyStatus();
/** Save the document and reset the dirty status. */
void save();
/** Save the document under a new name and calculate the new md5sum. */
@@ -159,7 +159,7 @@ work correctly. */
/** Returns the changed status since the last query. Resets changed.*/
bool hasChanged();
/** Sets the changed status.*/
- void setChanged(bool newtqStatus);
+ void setChanged(bool newStatus);
/** Paste the contents of clipboard into the document */
void paste();
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 7a6538f6..055114d2 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -272,10 +272,10 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
TQString dirName = dirURL.path(1);
if (TQFile::exists(dirName + "common.tag"))
readTagFile(dirName + "common.tag", dtd, 0L);
- //bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+ //bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
emit enableIdleTimer(false);
KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
- //quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+ //quantaApp->slotEnableIdleTimer(idleTimerStatus);
emit enableIdleTimer(true);
TQString tmpStr;
KURL::List::ConstIterator end_f = files.constEnd();
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index ee054cbe..495848aa 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -258,7 +258,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
m_parserEnabled = true;
cursorLine = 0;
cursorCol = 0;
- emit eventHappened("quanta_start", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
+ emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString());
setAcceptDrops(true);
tabWidget()->installEventFilter(this);
}
@@ -433,7 +433,7 @@ void QuantaApp::slotFileSave()
Document *w = view->document();
if (w)
{
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
if (w->isUntitled())
slotFileSaveAs();
else
@@ -457,7 +457,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave)
if (w)
{
KURL oldURL = w->url();
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
if (!w->isUntitled() && oldURL.isLocalFile())
{
fileWatcher->removeFile(oldURL.path());
@@ -557,7 +557,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
KURL url;
int query;
KURL projectTemplateURL;
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
TQString localTemplateDir = locateLocal("data", resourceDir + "templates/");
do {
@@ -684,7 +684,7 @@ void QuantaApp::slotFileCloseAll()
part->write(" ");
part->end();
- slotNewtqStatus();
+ slotNewStatus();
}
void QuantaApp::slotFileQuit()
@@ -711,7 +711,7 @@ void QuantaApp::slotStatusMsg(const TQString &msg)
statusbarTimer->stop();
statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS);
statusBar()->tqrepaint();
- kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
statusbarTimer->start(10000, true);
}
@@ -915,7 +915,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
}
}
-void QuantaApp::slotNewtqStatus()
+void QuantaApp::slotNewStatus()
{
fileRecent->setEnabled(true);
actionCollection()->action("project_open_recent")->setEnabled(true);
@@ -1356,7 +1356,7 @@ void QuantaApp::slotOptions()
m_htmlPart->end();
reparse(true);
- slotNewtqStatus();
+ slotNewStatus();
}
m_config->sync();
@@ -1437,7 +1437,7 @@ void QuantaApp::slotShowPreviewWidget(bool show)
}
}
-void QuantaApp::slotChangePreviewtqStatus()
+void QuantaApp::slotChangePreviewStatus()
{
if (qConfig.previewPosition == "Editor")
{
@@ -1525,7 +1525,7 @@ void QuantaApp::newDebuggerPosition(const TQString &file, int lineNumber)
void QuantaApp::openFile(const TQString &file, int lineNumber, int columnNumber)
{
gotoFileAndLine(file, lineNumber, columnNumber);
- slotNewtqStatus();
+ slotNewStatus();
}
void QuantaApp::slotNewLineColumn()
@@ -1795,7 +1795,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii());
QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true);
tb->loadState(element);
- tb->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+ tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
//kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl;
if (toolbarTab->iconText() == KToolBar::IconTextBottom)
@@ -3122,7 +3122,7 @@ void QuantaApp::focusInEvent(TQFocusEvent* e)
if (w)
{
w->view()->setFocus();
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
}
}
@@ -4160,7 +4160,7 @@ bool QuantaApp::queryClose()
{
saveOptions();
// kdDebug(24000) << "Quanta will exit" << endl;
- emit eventHappened("quanta_exit", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
+ emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString());
} else
slotFileNew();
return canExit;
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index 1b7231e4..ade90e54 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -282,9 +282,9 @@ public slots:
unexpected things may happen. */
void slotStatusMsg(const TQString &text);
- void slotNewtqStatus();
+ void slotNewStatus();
void slotNewLineColumn();
-// void slotUpdatetqStatus(TQWidget*);FIXME:
+// void slotUpdateStatus(TQWidget*);FIXME:
/** tqrepaint preview */
void slotRepaintPreview();
@@ -298,7 +298,7 @@ public slots:
- hide if the preview was in the editor area
- update if the preview is in a toolview
*/
- void slotChangePreviewtqStatus();
+ void slotChangePreviewStatus();
/** Called when the preview widget got or lost the focus */
void slotPreviewHasFocus(bool focus);
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 5239c8de..47d3cd9a 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -268,7 +268,7 @@ void QuantaInit::initQuanta()
TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
m_quanta->slotFileNew();
- m_quanta->slotNewtqStatus();
+ m_quanta->slotNewStatus();
initToolBars();
Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown());
Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject());
@@ -356,16 +356,16 @@ void QuantaInit::initStatusBar()
void QuantaInit::initDocument()
{
m_quanta->m_doc = new QuantaDoc(0L);
- connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()),
- TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
+ connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()),
+ TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
}
void QuantaInit::initProject()
{
Project *m_project = Project::ref(m_quanta);
- connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)),
- pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *)));
+ connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)),
+ pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *)));
connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)),
TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &)));
connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)),
@@ -424,8 +424,8 @@ void QuantaInit::initProject()
connect(m_project, TQT_SIGNAL(messages(const TQString&)),
m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&)));
- connect(m_project, TQT_SIGNAL(newtqStatus()),
- TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
+ connect(m_project, TQT_SIGNAL(newStatus()),
+ TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
@@ -438,10 +438,10 @@ void QuantaInit::initProject()
connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)),
m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&)));
- connect(pTab, TQT_SIGNAL(changeUploadtqStatus(const KURL&, int)),
+ connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)),
m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int)));
- connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)),
- m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool)));
+ connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)),
+ m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool)));
connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
@@ -679,7 +679,7 @@ void QuantaInit::openLastFiles()
if (w) //w==0 might happen on quick close on startup
{
m_quanta->setTitle(w->url().prettyURL(0, KURL::StripFileProtocol) );
-// m_quanta->slotUpdatetqStatus(w);//FIXME:
+// m_quanta->slotUpdateStatus(w);//FIXME:
}
}
@@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas()
int i = 0;
for (QCStringList::iterator it = list.begin(); it != list.end(); ++it)
{
- if (TQString(*it).tqstartsWith("quanta", false))
+ if (TQString(*it).startsWith("quanta", false))
++i;
}
return i;
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 797c1172..53a54598 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
else // select opened
if (switchToExisting)
{
- view->document()->checkDirtytqStatus();
+ view->document()->checkDirtyStatus();
if (view != ViewManager::ref()->activeView())
{
view->activate();
@@ -147,7 +147,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
bool switchToExisting, bool readOnly)
{
- bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+ bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
KURL url = urlToOpen;
if (url.isLocalFile())
{
@@ -158,7 +158,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
TQString encoding = a_encoding;
if (!newDocument(url, switchToExisting))
{
- quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+ quantaApp->slotEnableIdleTimer(idleTimerStatus);
return;
}
Document *w = ViewManager::ref()->activeDocument();
@@ -211,15 +211,15 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
highlightIf->setHlMode(htmlIdx);
}
}
- emit newtqStatus();
+ emit newStatus();
}
- quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+ quantaApp->slotEnableIdleTimer(idleTimerStatus);
}
void QuantaDoc::slotOpeningFailed(const KURL &url)
{
Q_UNUSED(url);
- bool signaltqStatus = signalsBlocked();
+ bool signalStatus = signalsBlocked();
blockSignals(false);
emit hideSplash();
//Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified
@@ -227,7 +227,7 @@ void QuantaDoc::slotOpeningFailed(const KURL &url)
KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
*/
ViewManager::ref()->removeActiveView();
- blockSignals(signaltqStatus);
+ blockSignals(signalStatus);
}
void QuantaDoc::slotOpeningCompleted(const KURL &url)
@@ -240,7 +240,7 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url)
quantaApp->reparse(true);
if (url.isLocalFile())
quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol));
- quantaApp->slotNewtqStatus();
+ quantaApp->slotNewStatus();
quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol));
Project::ref()->loadCursorPosition(w->url(), dynamic_cast<KTextEditor::ViewCursorInterface*>(w->view()));
emit eventHappened("after_open", url.url(), TQString());
diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h
index 0da3ff5e..ac7069d9 100644
--- a/quanta/src/quantadoc.h
+++ b/quanta/src/quantadoc.h
@@ -48,7 +48,7 @@ public slots:
void slotOpeningFailed(const KURL &url);
signals:
- void newtqStatus();
+ void newStatus();
void hideSplash();
void eventHappened(const TQString&, const TQString&, const TQString& );
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index cb4c8ef9..4bb46717 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -1021,7 +1021,7 @@ void QuantaView::activated()
ToolbarTabWidget::ref()->reparent(this, 0, TQPoint(), qConfig.enableDTDToolbar);
m_viewLayout->addWidget(ToolbarTabWidget::ref(), 0 , 0);
quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view());
- m_document->checkDirtytqStatus();
+ m_document->checkDirtyStatus();
StructTreeView::ref()->useOpenLevelSetting = true;
quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier());
@@ -1125,7 +1125,7 @@ bool QuantaView::saveDocument(const KURL& url)
return false; //saving to a local file failed
} else //successful saving to a local file
{
- m_document->setDirtytqStatus(false);
+ m_document->setDirtyStatus(false);
m_document->removeBackup(quantaApp->config());
fileWatcher->addFile(m_document->url().path());
// kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl;
@@ -1176,7 +1176,7 @@ void QuantaView::slotSavingFailed(const TQString &error)
void QuantaView::slotSavingCompleted()
{
m_saveResult = true;
- m_document->setDirtytqStatus(false);
+ m_document->setDirtyStatus(false);
m_document->removeBackup(quantaApp->config());
if (m_eventLoopStarted)
tqApp->exit_loop();
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 6a6294e3..23fbb063 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -95,7 +95,7 @@ QuantaView* ViewManager::createView(const TQString &caption)
connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn()));
connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn()));
connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *)));
- connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewtqStatus()));
+ connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus()));
disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 );
connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*)));
connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&)));
@@ -139,7 +139,7 @@ void ViewManager::createNewDocument()
quantaApp->setFocusProxy(w->view());
w->view()->setFocusPolicy(TQ_WheelFocus);
- connect( v, TQT_SIGNAL(newtqStatus()), quantaApp, TQT_SLOT(slotNewtqStatus()));
+ connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus()));
quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active
view->addDocument(w);
@@ -226,7 +226,7 @@ void ViewManager::slotViewActivated(KMdiChildView *view)
parser->clearGroups();
parser->setSAParserEnabled(true);
quantaApp->reparse(true); //FIXME
- quantaApp->slotNewtqStatus();
+ quantaApp->slotNewStatus();
quantaApp->slotNewLineColumn();
typingInProgress = false; //need to reset, as it's set to true in the above slots
m_lastActiveView = qView;
@@ -528,7 +528,7 @@ bool ViewManager::closeAll(bool createNew)
if (createNew)
{
createNewDocument();
- quantaApp->slotNewtqStatus();
+ quantaApp->slotNewStatus();
}
emit filesClosed(true);
return true;
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index baf6bbe5..04bd3460 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -106,7 +106,7 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos )
text.append( "<br>" + item->text(1));
}
if ( !text.isEmpty() )
- tip(m_view->tqitemRect(item), text);
+ tip(m_view->itemRect(item), text);
}
@@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder()
while (item) {
if (item->isDir() && item->isOpen()) {
updateDirectory( item->url() );
- kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
// dive into the tree first
newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild());
if (newItem) {
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index dcfab886..38aa26d9 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -154,7 +154,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
m_folderMenu->insertSeparator();
- m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFoldertqStatus()));
+ m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
@@ -527,7 +527,7 @@ void ProjectTreeView::slotAlwaysUpload()
url.adjustPath(+1);
if (m_projectFiles->contains(url) || url == m_projectBaseURL)
{
- emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload);
+ emit changeUploadStatus(url, ProjectURL::AlwaysUpload);
}
}
@@ -541,7 +541,7 @@ void ProjectTreeView::slotNeverUpload()
url.adjustPath(+1);
if (m_projectFiles->contains(url) || url == m_projectBaseURL)
{
- emit changeUploadtqStatus(url, ProjectURL::NeverUpload);
+ emit changeUploadStatus(url, ProjectURL::NeverUpload);
}
}
@@ -555,7 +555,7 @@ void ProjectTreeView::slotConfirmUpload()
url.adjustPath(+1);
if (m_projectFiles->contains(url) || url == m_projectBaseURL)
{
- emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload);
+ emit changeUploadStatus(url, ProjectURL::ConfirmUpload);
}
}
@@ -573,7 +573,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow()
ProjectURL *proUrl = m_projectFiles->find( url );
if (proUrl)
{
- switch (proUrl->uploadtqStatus)
+ switch (proUrl->uploadStatus)
{
case ProjectURL::NeverUpload:
{
@@ -595,7 +595,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow()
}
}
-void ProjectTreeView::slotChangeDocumentFoldertqStatus()
+void ProjectTreeView::slotChangeDocumentFolderStatus()
{
KFileTreeViewItem *kftvi = currentKFileTreeViewItem();
if (! kftvi)
@@ -606,12 +606,12 @@ void ProjectTreeView::slotChangeDocumentFoldertqStatus()
if (!m_documentFolderList.contains(currentURL()))
{
m_documentFolderList.append(currentURL());
- emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload);
- emit changeDocumentFoldertqStatus(url, true);
+ emit changeUploadStatus(url, ProjectURL::AlwaysUpload);
+ emit changeDocumentFolderStatus(url, true);
} else
{
m_documentFolderList.remove(currentURL());
- emit changeUploadtqStatus(url, false);
+ emit changeUploadStatus(url, false);
}
currentItem()->tqrepaint();
}
diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h
index 1e290328..b5dfa5a5 100644
--- a/quanta/treeviews/projecttreeview.h
+++ b/quanta/treeviews/projecttreeview.h
@@ -83,7 +83,7 @@ public slots: // Public slots
/** makes the url visible in the tree */
void slotViewActivated(const KURL&);
/** fills the list with the url's of the open folder */
- void slotGetTreetqStatus(TQStringList *folderToOpen)
+ void slotGetTreeStatus(TQStringList *folderToOpen)
{
m_projectDir->addOpenFolder(folderToOpen);
}
@@ -107,8 +107,8 @@ signals: // Signals
void loadToolbarFile(const KURL&);
void uploadProject();
void changeFileDescription(const KURL& url, const TQString& desc);
- void changeUploadtqStatus(const KURL& url, int status);
- void changeDocumentFoldertqStatus(const KURL& url, bool status);
+ void changeUploadStatus(const KURL& url, int status);
+ void changeDocumentFolderStatus(const KURL& url, bool status);
void reloadProject();
private:
@@ -170,7 +170,7 @@ private slots: // Private slots
void slotNeverUpload();
void slotConfirmUpload();
void slotUploadMenuAboutToShow();
- void slotChangeDocumentFoldertqStatus();
+ void slotChangeDocumentFolderStatus();
};
#endif
diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui
index 109caf2f..d70a6f6e 100644
--- a/quanta/treeviews/quantapropertiespage.ui
+++ b/quanta/treeviews/quantapropertiespage.ui
@@ -29,7 +29,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>400</height>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>92</width>
<height>20</height>
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>93</width>
<height>20</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index 50e4825e..776ac366 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -81,11 +81,11 @@ ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent)
{
m_listView = listView;
comboBox = new TQComboBox(false, m_listView->viewport() );
- TQRect r = m_listView->tqitemRect( this );
+ TQRect r = m_listView->itemRect( this );
if ( !r.size().isValid() )
{
m_listView->ensureItemVisible( this );
- r = m_listView->tqitemRect( this );
+ r = m_listView->itemRect( this );
}
r.setX( m_listView->header()->sectionPos( 0 ) + 20);
r.setWidth( m_listView->header()->sectionSize( 0 ) - 20);
@@ -262,11 +262,11 @@ void AttributeItem::hideEditor(int column)
void AttributeItem::placeEditor( TQWidget *w, int column)
{
- TQRect r = m_listView->tqitemRect( this );
+ TQRect r = m_listView->itemRect( this );
if ( !r.size().isValid() )
{
m_listView->ensureItemVisible( this );
- r = m_listView->tqitemRect( this );
+ r = m_listView->itemRect( this );
}
if(column == 1)
{
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 0ef63151..9473d2d8 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -458,11 +458,11 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char
widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout");
attrTree = new TagAttributeTree(this, "TagAttributeTree");
- attrTree->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+ attrTree->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
widgetLayout->addMultiCellWidget( attrTree, 1, 1, 0, 3 );
nodeName = new TQLabel(this, i18n( "Node Name" ).ascii());
- nodeName->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) );
+ nodeName->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) );
widgetLayout->addWidget( nodeName, 0, 0 );
deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii());
diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui
index d08f6b28..524e6fbf 100644
--- a/quanta/treeviews/templatedirform.ui
+++ b/quanta/treeviews/templatedirform.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>38</width>
<height>20</height>
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>38</width>
<height>20</height>
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index b4d43f48..f7597225 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8);
//Note: the log text should not be translated.
- TQString s = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + ": ";
+ TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": ";
s.append( "Event : " + m_eventName + " : ");
s.append( "Action: " + ev.action + " : ");
if (ev.arguments[1] == "full")