From e985f7e545f4739493965aad69bbecb136dc9346 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 19:02:47 +0000 Subject: TQt4 port kdewebdev This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/Quanta-3.3-plan.kno | 16 +- quanta/components/csseditor/colorrequester.cpp | 12 +- quanta/components/csseditor/colorrequester.h | 3 +- quanta/components/csseditor/colorslider.cpp | 18 +- quanta/components/csseditor/colorslider.h | 9 +- quanta/components/csseditor/csseditor.cpp | 96 ++-- quanta/components/csseditor/csseditor.h | 15 +- quanta/components/csseditor/csseditor_globals.cpp | 8 +- quanta/components/csseditor/csseditor_globals.h | 9 +- quanta/components/csseditor/csseditors.ui | 56 +-- quanta/components/csseditor/cssselector.cpp | 26 +- quanta/components/csseditor/cssselector.h | 5 +- quanta/components/csseditor/cssselectors.ui | 144 +++--- .../components/csseditor/cssshpropertyparser.cpp | 12 +- quanta/components/csseditor/data/config.xml | 8 +- quanta/components/csseditor/doubleeditors.cpp | 8 +- quanta/components/csseditor/doubleeditors.h | 12 +- quanta/components/csseditor/encodingselector.cpp | 2 +- quanta/components/csseditor/encodingselector.h | 3 +- quanta/components/csseditor/encodingselectors.ui | 26 +- quanta/components/csseditor/fontfamilychooser.cpp | 22 +- quanta/components/csseditor/fontfamilychooser.h | 3 +- quanta/components/csseditor/fontfamilychoosers.ui | 84 ++-- quanta/components/csseditor/minieditor.h | 4 +- quanta/components/csseditor/percentageeditor.cpp | 2 +- quanta/components/csseditor/percentageeditor.h | 3 +- quanta/components/csseditor/propertysetter.cpp | 4 +- quanta/components/csseditor/propertysetter.h | 5 +- quanta/components/csseditor/qmyhighlighter.cpp | 6 +- quanta/components/csseditor/qmyhighlighter.h | 10 +- quanta/components/csseditor/shorthandformer.cpp | 132 +++--- quanta/components/csseditor/specialsb.cpp | 10 +- quanta/components/csseditor/specialsb.h | 15 +- quanta/components/csseditor/styleeditor.cpp | 6 +- quanta/components/csseditor/styleeditor.h | 3 +- quanta/components/csseditor/stylesheetparser.cpp | 38 +- quanta/components/csseditor/stylesheetparser.h | 11 +- quanta/components/csseditor/tlpeditors.cpp | 14 +- quanta/components/csseditor/tlpeditors.h | 9 +- quanta/components/cvsservice/Makefile.am | 2 + quanta/components/cvsservice/cvscommitdlgs.ui | 14 +- quanta/components/cvsservice/cvsservice.cpp | 16 +- quanta/components/cvsservice/cvsservice.h | 1 + quanta/components/cvsservice/cvsupdatetodlgs.ui | 20 +- quanta/components/debugger/backtracelistview.cpp | 6 +- quanta/components/debugger/backtracelistview.h | 3 +- .../debugger/conditionalbreakpointdialog.cpp | 2 +- .../debugger/conditionalbreakpointdialog.h | 1 + .../debugger/conditionalbreakpointdialogs.ui | 52 +-- quanta/components/debugger/dbgp/dbgpnetwork.cpp | 14 +- quanta/components/debugger/dbgp/dbgpnetwork.h | 5 +- quanta/components/debugger/dbgp/dbgpsettings.cpp | 2 +- quanta/components/debugger/dbgp/dbgpsettings.h | 1 + quanta/components/debugger/dbgp/dbgpsettingss.ui | 92 ++-- quanta/components/debugger/dbgp/qbytearrayfifo.cpp | 18 +- quanta/components/debugger/dbgp/qbytearrayfifo.h | 6 +- .../debugger/dbgp/quantadebuggerdbgp.cpp | 120 ++--- .../components/debugger/dbgp/quantadebuggerdbgp.h | 7 +- .../components/debugger/debuggerbreakpointlist.cpp | 8 +- .../components/debugger/debuggerbreakpointlist.h | 2 +- .../components/debugger/debuggerbreakpointview.cpp | 6 +- .../components/debugger/debuggerbreakpointview.h | 3 +- quanta/components/debugger/debuggermanager.cpp | 24 +- quanta/components/debugger/debuggermanager.h | 7 +- quanta/components/debugger/debuggerui.cpp | 14 +- quanta/components/debugger/debuggerui.h | 11 +- quanta/components/debugger/debuggervariable.cpp | 6 +- quanta/components/debugger/debuggervariablesets.ui | 24 +- quanta/components/debugger/gubed/gubedsettings.cpp | 2 +- quanta/components/debugger/gubed/gubedsettings.h | 1 + quanta/components/debugger/gubed/gubedsettingss.ui | 108 ++--- .../debugger/gubed/quantadebuggergubed.cpp | 190 ++++---- .../debugger/gubed/quantadebuggergubed.h | 7 +- .../debugger/interfaces/debuggerclient.cpp | 16 +- .../debugger/interfaces/debuggerclient.h | 7 +- .../debugger/interfaces/debuggerinterface.cpp | 4 +- .../debugger/interfaces/debuggerinterface.h | 7 +- quanta/components/debugger/pathmapper.cpp | 12 +- quanta/components/debugger/pathmapper.h | 5 +- quanta/components/debugger/pathmapperdialog.cpp | 8 +- quanta/components/debugger/pathmapperdialog.h | 1 + quanta/components/debugger/pathmapperdialogs.ui | 44 +- .../debugger/quantadebuggerinterface.cpp | 28 +- .../components/debugger/quantadebuggerinterface.h | 5 +- quanta/components/debugger/variableslistview.cpp | 22 +- quanta/components/debugger/variableslistview.h | 3 +- quanta/components/framewizard/areaattributedb.h | 9 +- quanta/components/framewizard/fmfpeditor.h | 1 + quanta/components/framewizard/fmfpeditors.ui | 92 ++-- quanta/components/framewizard/fmrceditor.h | 1 + quanta/components/framewizard/fmrceditors.ui | 22 +- quanta/components/framewizard/framewizard.cpp | 6 +- quanta/components/framewizard/framewizard.h | 3 +- quanta/components/framewizard/framewizards.ui | 46 +- quanta/components/framewizard/selectablearea.cpp | 4 +- quanta/components/framewizard/selectablearea.h | 3 +- quanta/components/framewizard/treenode.cpp | 32 +- quanta/components/framewizard/treenode.h | 30 +- .../components/framewizard/visualframeeditor.cpp | 142 +++--- quanta/components/framewizard/visualframeeditor.h | 9 +- quanta/components/tableeditor/tableeditor.cpp | 72 +-- quanta/components/tableeditor/tableeditor.h | 5 +- quanta/components/tableeditor/tableeditors.ui | 74 +-- quanta/components/tableeditor/tableitem.cpp | 16 +- quanta/components/tableeditor/tableitem.h | 26 +- quanta/data/chars | 8 +- quanta/data/doc/faq.html | 6 +- quanta/data/doc/templates.html | 2 +- quanta/data/doc/tips.html | 2 +- quanta/data/dtep/cffunct/bitmaskset.tag | 2 +- quanta/data/dtep/cffunct/datetime.tag | 2 +- quanta/data/dtep/cfml/cfldap.tag | 2 +- quanta/data/dtep/cfml/cftreeitem.tag | 2 +- quanta/data/dtep/css/table-layout.tag | 2 +- quanta/data/dtep/css/unicode-bidi.tag | 2 +- quanta/data/dtep/docbook-4.2/a.tag | 4 +- quanta/data/dtep/docbook-4.2/l.tag | 2 +- quanta/data/dtep/docbook-4.2/s.tag | 2 +- quanta/data/dtep/dtd-description.txt | 4 +- quanta/data/dtep/html-frameset/font.tag | 4 +- quanta/data/dtep/html-frameset/frame.tag | 4 +- quanta/data/dtep/html-frameset/frameset.tag | 4 +- quanta/data/dtep/html-strict/a.tag | 20 +- quanta/data/dtep/html-strict/b.tag | 24 +- quanta/data/dtep/html-strict/c.tag | 24 +- quanta/data/dtep/html-strict/d.tag | 24 +- quanta/data/dtep/html-strict/e.tag | 4 +- quanta/data/dtep/html-strict/f.tag | 8 +- quanta/data/dtep/html-strict/h.tag | 32 +- quanta/data/dtep/html-strict/i.tag | 8 +- quanta/data/dtep/html-strict/k.tag | 4 +- quanta/data/dtep/html-strict/l.tag | 12 +- quanta/data/dtep/html-strict/m.tag | 4 +- quanta/data/dtep/html-strict/n.tag | 4 +- quanta/data/dtep/html-strict/o.tag | 12 +- quanta/data/dtep/html-strict/p.tag | 8 +- quanta/data/dtep/html-strict/q.tag | 4 +- quanta/data/dtep/html-strict/s.tag | 36 +- quanta/data/dtep/html-strict/t.tag | 40 +- quanta/data/dtep/html-strict/u.tag | 8 +- quanta/data/dtep/html-strict/v.tag | 4 +- quanta/data/dtep/html/a.tag | 20 +- quanta/data/dtep/html/b.tag | 24 +- quanta/data/dtep/html/c.tag | 28 +- quanta/data/dtep/html/d.tag | 24 +- quanta/data/dtep/html/e.tag | 4 +- quanta/data/dtep/html/f.tag | 12 +- quanta/data/dtep/html/h.tag | 32 +- quanta/data/dtep/html/i.tag | 12 +- quanta/data/dtep/html/k.tag | 4 +- quanta/data/dtep/html/l.tag | 12 +- quanta/data/dtep/html/m.tag | 4 +- quanta/data/dtep/html/n.tag | 4 +- quanta/data/dtep/html/o.tag | 12 +- quanta/data/dtep/html/p.tag | 8 +- quanta/data/dtep/html/q.tag | 4 +- quanta/data/dtep/html/s.tag | 32 +- quanta/data/dtep/html/strong.tag | 4 +- quanta/data/dtep/html/t.tag | 40 +- quanta/data/dtep/html/u.tag | 8 +- quanta/data/dtep/html/v.tag | 4 +- quanta/data/dtep/kde-docbook-4.1.2/l.tag | 2 +- quanta/data/dtep/php/dba.tag | 2 +- quanta/data/dtep/php/dbm.tag | 2 +- quanta/data/dtep/php/dbplus.tag | 4 +- quanta/data/dtep/php/domxml.tag | 2 +- quanta/data/dtep/php/fam.tag | 2 +- quanta/data/dtep/php/filesystem.tag | 2 +- quanta/data/dtep/php/http.tag | 2 +- quanta/data/dtep/php/hw.tag | 14 +- quanta/data/dtep/php/hwapi.tag | 8 +- quanta/data/dtep/php/hyperwave.tag | 14 +- quanta/data/dtep/php/ircg.tag | 2 +- quanta/data/dtep/php/ldap.tag | 4 +- quanta/data/dtep/php/mbstring.tag | 6 +- quanta/data/dtep/php/memcache.tag | 2 +- quanta/data/dtep/php/ming.tag | 38 +- quanta/data/dtep/php/mnogosearch.tag | 2 +- quanta/data/dtep/php/msession.tag | 2 +- quanta/data/dtep/php/ncurses.tag | 6 +- quanta/data/dtep/php/pcre.tag | 2 +- quanta/data/dtep/php/pdf.tag | 2 +- quanta/data/dtep/php/regex.tag | 4 +- quanta/data/dtep/php/simplexml.tag | 2 +- quanta/data/dtep/php/strings.tag | 10 +- quanta/data/dtep/php/swf.tag | 26 +- quanta/data/dtep/php/tidy.tag | 2 +- quanta/data/dtep/php/xslt.tag | 2 +- quanta/data/dtep/relaxng/anyName.tag | 4 +- quanta/data/dtep/relaxng/attribute.tag | 6 +- quanta/data/dtep/relaxng/choice.tag | 6 +- quanta/data/dtep/relaxng/data.tag | 4 +- quanta/data/dtep/relaxng/define.tag | 6 +- quanta/data/dtep/relaxng/div.tag | 4 +- quanta/data/dtep/relaxng/element.tag | 6 +- quanta/data/dtep/relaxng/except.tag | 6 +- quanta/data/dtep/relaxng/grammar.tag | 4 +- quanta/data/dtep/relaxng/group.tag | 6 +- quanta/data/dtep/relaxng/include.tag | 4 +- quanta/data/dtep/relaxng/interleave.tag | 6 +- quanta/data/dtep/relaxng/list.tag | 6 +- quanta/data/dtep/relaxng/mixed.tag | 6 +- quanta/data/dtep/relaxng/nsName.tag | 4 +- quanta/data/dtep/relaxng/oneOrMore.tag | 6 +- quanta/data/dtep/relaxng/optional.tag | 6 +- quanta/data/dtep/relaxng/parentRef.tag | 2 +- quanta/data/dtep/relaxng/start.tag | 6 +- quanta/data/dtep/relaxng/zeroOrMore.tag | 6 +- quanta/data/dtep/schema/all.tag | 4 +- quanta/data/dtep/schema/annotation.tag | 4 +- quanta/data/dtep/schema/any.tag | 4 +- quanta/data/dtep/schema/anyAttribute.tag | 4 +- quanta/data/dtep/schema/attribute.tag | 4 +- quanta/data/dtep/schema/attributeGroup.tag | 4 +- quanta/data/dtep/schema/choice.tag | 4 +- quanta/data/dtep/schema/complexContent.tag | 4 +- quanta/data/dtep/schema/complexType.tag | 4 +- quanta/data/dtep/schema/element.tag | 8 +- quanta/data/dtep/schema/enumeration.tag | 4 +- quanta/data/dtep/schema/extension.tag | 4 +- quanta/data/dtep/schema/field.tag | 4 +- quanta/data/dtep/schema/fractionDigits.tag | 4 +- quanta/data/dtep/schema/group.tag | 4 +- quanta/data/dtep/schema/import.tag | 4 +- quanta/data/dtep/schema/include.tag | 4 +- quanta/data/dtep/schema/key.tag | 4 +- quanta/data/dtep/schema/keyref.tag | 4 +- quanta/data/dtep/schema/length.tag | 4 +- quanta/data/dtep/schema/list.tag | 4 +- quanta/data/dtep/schema/maxExclusive.tag | 4 +- quanta/data/dtep/schema/maxInclusive.tag | 4 +- quanta/data/dtep/schema/maxLength.tag | 4 +- quanta/data/dtep/schema/minExclusive.tag | 4 +- quanta/data/dtep/schema/minInclusive.tag | 4 +- quanta/data/dtep/schema/minLength.tag | 4 +- quanta/data/dtep/schema/notation.tag | 4 +- quanta/data/dtep/schema/pattern.tag | 4 +- quanta/data/dtep/schema/redefine.tag | 4 +- quanta/data/dtep/schema/restriction.tag | 4 +- quanta/data/dtep/schema/schema.tag | 4 +- quanta/data/dtep/schema/selector.tag | 4 +- quanta/data/dtep/schema/sequence.tag | 4 +- quanta/data/dtep/schema/simpleContent.tag | 4 +- quanta/data/dtep/schema/simpleType.tag | 4 +- quanta/data/dtep/schema/totalDigits.tag | 4 +- quanta/data/dtep/schema/union.tag | 4 +- quanta/data/dtep/schema/unique.tag | 4 +- quanta/data/dtep/schema/whiteSpace.tag | 6 +- quanta/data/dtep/tagxml/attr.tag | 4 +- quanta/data/dtep/tagxml/nonparams.tag | 8 +- quanta/data/dtep/tagxml/spacer.tag | 2 +- quanta/data/dtep/xhtml-basic/a.tag | 4 +- quanta/data/dtep/xhtml-basic/blockquote.tag | 4 +- quanta/data/dtep/xhtml-basic/body.tag | 4 +- quanta/data/dtep/xhtml-basic/div.tag | 4 +- quanta/data/dtep/xhtml-basic/form.tag | 4 +- quanta/data/dtep/xhtml-basic/head.tag | 4 +- quanta/data/dtep/xhtml-basic/headings.tag | 24 +- quanta/data/dtep/xhtml-basic/html.tag | 4 +- quanta/data/dtep/xhtml-basic/input.tag | 4 +- quanta/data/dtep/xhtml-basic/li.tag | 4 +- quanta/data/dtep/xhtml-basic/ol.tag | 4 +- quanta/data/dtep/xhtml-basic/p.tag | 4 +- quanta/data/dtep/xhtml-basic/select.tag | 4 +- quanta/data/dtep/xhtml-basic/table.tag | 4 +- quanta/data/dtep/xhtml-basic/td.tag | 4 +- quanta/data/dtep/xhtml-basic/textarea.tag | 4 +- quanta/data/dtep/xhtml-basic/th.tag | 4 +- quanta/data/dtep/xhtml-basic/tr.tag | 4 +- quanta/data/dtep/xhtml-basic/ul.tag | 4 +- quanta/data/dtep/xhtml-frameset/a.tag | 6 +- quanta/data/dtep/xhtml-frameset/abbr.tag | 4 +- quanta/data/dtep/xhtml-frameset/acronym.tag | 4 +- quanta/data/dtep/xhtml-frameset/address.tag | 4 +- quanta/data/dtep/xhtml-frameset/applet.tag | 4 +- quanta/data/dtep/xhtml-frameset/area.tag | 2 +- quanta/data/dtep/xhtml-frameset/b.tag | 4 +- quanta/data/dtep/xhtml-frameset/bdo.tag | 4 +- quanta/data/dtep/xhtml-frameset/big.tag | 4 +- quanta/data/dtep/xhtml-frameset/blockquote.tag | 4 +- quanta/data/dtep/xhtml-frameset/body.tag | 4 +- quanta/data/dtep/xhtml-frameset/button.tag | 4 +- quanta/data/dtep/xhtml-frameset/caption.tag | 4 +- quanta/data/dtep/xhtml-frameset/center.tag | 4 +- quanta/data/dtep/xhtml-frameset/cite.tag | 4 +- quanta/data/dtep/xhtml-frameset/code.tag | 4 +- quanta/data/dtep/xhtml-frameset/colgroup.tag | 4 +- quanta/data/dtep/xhtml-frameset/dd.tag | 4 +- quanta/data/dtep/xhtml-frameset/del.tag | 4 +- quanta/data/dtep/xhtml-frameset/dfn.tag | 4 +- quanta/data/dtep/xhtml-frameset/dir.tag | 4 +- quanta/data/dtep/xhtml-frameset/div.tag | 4 +- quanta/data/dtep/xhtml-frameset/dl.tag | 4 +- quanta/data/dtep/xhtml-frameset/dt.tag | 4 +- quanta/data/dtep/xhtml-frameset/em.tag | 4 +- quanta/data/dtep/xhtml-frameset/fieldset.tag | 4 +- quanta/data/dtep/xhtml-frameset/font.tag | 4 +- quanta/data/dtep/xhtml-frameset/form.tag | 4 +- quanta/data/dtep/xhtml-frameset/frameset.tag | 4 +- quanta/data/dtep/xhtml-frameset/head.tag | 4 +- quanta/data/dtep/xhtml-frameset/headings.tag | 24 +- quanta/data/dtep/xhtml-frameset/html.tag | 4 +- quanta/data/dtep/xhtml-frameset/i.tag | 4 +- quanta/data/dtep/xhtml-frameset/iframe.tag | 4 +- quanta/data/dtep/xhtml-frameset/ins.tag | 4 +- quanta/data/dtep/xhtml-frameset/kbd.tag | 4 +- quanta/data/dtep/xhtml-frameset/label.tag | 4 +- quanta/data/dtep/xhtml-frameset/legend.tag | 4 +- quanta/data/dtep/xhtml-frameset/li.tag | 4 +- quanta/data/dtep/xhtml-frameset/map.tag | 4 +- quanta/data/dtep/xhtml-frameset/menu.tag | 4 +- quanta/data/dtep/xhtml-frameset/noframes.tag | 4 +- quanta/data/dtep/xhtml-frameset/noscript.tag | 4 +- quanta/data/dtep/xhtml-frameset/object.tag | 4 +- quanta/data/dtep/xhtml-frameset/ol.tag | 4 +- quanta/data/dtep/xhtml-frameset/optgroup.tag | 4 +- quanta/data/dtep/xhtml-frameset/p.tag | 4 +- quanta/data/dtep/xhtml-frameset/pre.tag | 4 +- quanta/data/dtep/xhtml-frameset/q.tag | 4 +- quanta/data/dtep/xhtml-frameset/s.tag | 4 +- quanta/data/dtep/xhtml-frameset/samp.tag | 4 +- quanta/data/dtep/xhtml-frameset/select.tag | 4 +- quanta/data/dtep/xhtml-frameset/small.tag | 4 +- quanta/data/dtep/xhtml-frameset/span.tag | 4 +- quanta/data/dtep/xhtml-frameset/strike.tag | 4 +- quanta/data/dtep/xhtml-frameset/strong.tag | 4 +- quanta/data/dtep/xhtml-frameset/style.tag | 4 +- quanta/data/dtep/xhtml-frameset/sub.tag | 4 +- quanta/data/dtep/xhtml-frameset/sup.tag | 4 +- quanta/data/dtep/xhtml-frameset/table.tag | 4 +- quanta/data/dtep/xhtml-frameset/tbody.tag | 4 +- quanta/data/dtep/xhtml-frameset/td.tag | 4 +- quanta/data/dtep/xhtml-frameset/textarea.tag | 4 +- quanta/data/dtep/xhtml-frameset/tfoot.tag | 4 +- quanta/data/dtep/xhtml-frameset/th.tag | 4 +- quanta/data/dtep/xhtml-frameset/thead.tag | 4 +- quanta/data/dtep/xhtml-frameset/title.tag | 4 +- quanta/data/dtep/xhtml-frameset/tr.tag | 4 +- quanta/data/dtep/xhtml-frameset/tt.tag | 4 +- quanta/data/dtep/xhtml-frameset/u.tag | 4 +- quanta/data/dtep/xhtml-frameset/ul.tag | 4 +- quanta/data/dtep/xhtml-frameset/var.tag | 4 +- quanta/data/dtep/xhtml-strict/a.tag | 6 +- quanta/data/dtep/xhtml-strict/abbr.tag | 4 +- quanta/data/dtep/xhtml-strict/acronym.tag | 4 +- quanta/data/dtep/xhtml-strict/address.tag | 4 +- quanta/data/dtep/xhtml-strict/area.tag | 2 +- quanta/data/dtep/xhtml-strict/b.tag | 4 +- quanta/data/dtep/xhtml-strict/bdo.tag | 4 +- quanta/data/dtep/xhtml-strict/big.tag | 4 +- quanta/data/dtep/xhtml-strict/blockquote.tag | 4 +- quanta/data/dtep/xhtml-strict/body.tag | 4 +- quanta/data/dtep/xhtml-strict/button.tag | 4 +- quanta/data/dtep/xhtml-strict/caption.tag | 4 +- quanta/data/dtep/xhtml-strict/cite.tag | 4 +- quanta/data/dtep/xhtml-strict/code.tag | 4 +- quanta/data/dtep/xhtml-strict/colgroup.tag | 4 +- quanta/data/dtep/xhtml-strict/dd.tag | 4 +- quanta/data/dtep/xhtml-strict/del.tag | 4 +- quanta/data/dtep/xhtml-strict/dfn.tag | 4 +- quanta/data/dtep/xhtml-strict/div.tag | 4 +- quanta/data/dtep/xhtml-strict/dl.tag | 4 +- quanta/data/dtep/xhtml-strict/dt.tag | 4 +- quanta/data/dtep/xhtml-strict/em.tag | 4 +- quanta/data/dtep/xhtml-strict/fieldset.tag | 4 +- quanta/data/dtep/xhtml-strict/form.tag | 4 +- quanta/data/dtep/xhtml-strict/head.tag | 4 +- quanta/data/dtep/xhtml-strict/headings.tag | 24 +- quanta/data/dtep/xhtml-strict/html.tag | 4 +- quanta/data/dtep/xhtml-strict/i.tag | 4 +- quanta/data/dtep/xhtml-strict/ins.tag | 4 +- quanta/data/dtep/xhtml-strict/kbd.tag | 4 +- quanta/data/dtep/xhtml-strict/label.tag | 4 +- quanta/data/dtep/xhtml-strict/legend.tag | 4 +- quanta/data/dtep/xhtml-strict/li.tag | 4 +- quanta/data/dtep/xhtml-strict/map.tag | 4 +- quanta/data/dtep/xhtml-strict/noscript.tag | 4 +- quanta/data/dtep/xhtml-strict/object.tag | 4 +- quanta/data/dtep/xhtml-strict/ol.tag | 4 +- quanta/data/dtep/xhtml-strict/optgroup.tag | 4 +- quanta/data/dtep/xhtml-strict/p.tag | 4 +- quanta/data/dtep/xhtml-strict/pre.tag | 4 +- quanta/data/dtep/xhtml-strict/q.tag | 4 +- quanta/data/dtep/xhtml-strict/samp.tag | 4 +- quanta/data/dtep/xhtml-strict/select.tag | 4 +- quanta/data/dtep/xhtml-strict/small.tag | 4 +- quanta/data/dtep/xhtml-strict/span.tag | 4 +- quanta/data/dtep/xhtml-strict/strong.tag | 4 +- quanta/data/dtep/xhtml-strict/style.tag | 4 +- quanta/data/dtep/xhtml-strict/sub.tag | 4 +- quanta/data/dtep/xhtml-strict/sup.tag | 4 +- quanta/data/dtep/xhtml-strict/table.tag | 4 +- quanta/data/dtep/xhtml-strict/tbody.tag | 4 +- quanta/data/dtep/xhtml-strict/td.tag | 4 +- quanta/data/dtep/xhtml-strict/textarea.tag | 4 +- quanta/data/dtep/xhtml-strict/tfoot.tag | 4 +- quanta/data/dtep/xhtml-strict/th.tag | 4 +- quanta/data/dtep/xhtml-strict/thead.tag | 4 +- quanta/data/dtep/xhtml-strict/title.tag | 4 +- quanta/data/dtep/xhtml-strict/tr.tag | 4 +- quanta/data/dtep/xhtml-strict/tt.tag | 4 +- quanta/data/dtep/xhtml-strict/ul.tag | 4 +- quanta/data/dtep/xhtml-strict/var.tag | 4 +- quanta/data/dtep/xhtml/a.tag | 6 +- quanta/data/dtep/xhtml/abbr.tag | 4 +- quanta/data/dtep/xhtml/acronym.tag | 4 +- quanta/data/dtep/xhtml/address.tag | 4 +- quanta/data/dtep/xhtml/applet.tag | 4 +- quanta/data/dtep/xhtml/area.tag | 2 +- quanta/data/dtep/xhtml/b.tag | 4 +- quanta/data/dtep/xhtml/bdo.tag | 4 +- quanta/data/dtep/xhtml/big.tag | 4 +- quanta/data/dtep/xhtml/blockquote.tag | 4 +- quanta/data/dtep/xhtml/body.tag | 4 +- quanta/data/dtep/xhtml/button.tag | 4 +- quanta/data/dtep/xhtml/caption.tag | 4 +- quanta/data/dtep/xhtml/center.tag | 4 +- quanta/data/dtep/xhtml/cite.tag | 4 +- quanta/data/dtep/xhtml/code.tag | 4 +- quanta/data/dtep/xhtml/colgroup.tag | 4 +- quanta/data/dtep/xhtml/dd.tag | 4 +- quanta/data/dtep/xhtml/del.tag | 4 +- quanta/data/dtep/xhtml/dfn.tag | 4 +- quanta/data/dtep/xhtml/dir.tag | 4 +- quanta/data/dtep/xhtml/div.tag | 4 +- quanta/data/dtep/xhtml/dl.tag | 4 +- quanta/data/dtep/xhtml/dt.tag | 4 +- quanta/data/dtep/xhtml/em.tag | 4 +- quanta/data/dtep/xhtml/fieldset.tag | 4 +- quanta/data/dtep/xhtml/font.tag | 4 +- quanta/data/dtep/xhtml/form.tag | 4 +- quanta/data/dtep/xhtml/head.tag | 4 +- quanta/data/dtep/xhtml/headings.tag | 24 +- quanta/data/dtep/xhtml/html.tag | 4 +- quanta/data/dtep/xhtml/i.tag | 4 +- quanta/data/dtep/xhtml/iframe.tag | 4 +- quanta/data/dtep/xhtml/ins.tag | 4 +- quanta/data/dtep/xhtml/kbd.tag | 4 +- quanta/data/dtep/xhtml/label.tag | 4 +- quanta/data/dtep/xhtml/legend.tag | 4 +- quanta/data/dtep/xhtml/li.tag | 4 +- quanta/data/dtep/xhtml/map.tag | 4 +- quanta/data/dtep/xhtml/menu.tag | 4 +- quanta/data/dtep/xhtml/noframes.tag | 4 +- quanta/data/dtep/xhtml/noscript.tag | 4 +- quanta/data/dtep/xhtml/object.tag | 4 +- quanta/data/dtep/xhtml/ol.tag | 4 +- quanta/data/dtep/xhtml/optgroup.tag | 4 +- quanta/data/dtep/xhtml/p.tag | 4 +- quanta/data/dtep/xhtml/pre.tag | 4 +- quanta/data/dtep/xhtml/q.tag | 4 +- quanta/data/dtep/xhtml/s.tag | 4 +- quanta/data/dtep/xhtml/samp.tag | 4 +- quanta/data/dtep/xhtml/select.tag | 4 +- quanta/data/dtep/xhtml/small.tag | 4 +- quanta/data/dtep/xhtml/span.tag | 4 +- quanta/data/dtep/xhtml/strike.tag | 4 +- quanta/data/dtep/xhtml/strong.tag | 4 +- quanta/data/dtep/xhtml/style.tag | 4 +- quanta/data/dtep/xhtml/sub.tag | 4 +- quanta/data/dtep/xhtml/sup.tag | 4 +- quanta/data/dtep/xhtml/table.tag | 4 +- quanta/data/dtep/xhtml/tbody.tag | 4 +- quanta/data/dtep/xhtml/td.tag | 4 +- quanta/data/dtep/xhtml/textarea.tag | 4 +- quanta/data/dtep/xhtml/tfoot.tag | 4 +- quanta/data/dtep/xhtml/th.tag | 4 +- quanta/data/dtep/xhtml/thead.tag | 4 +- quanta/data/dtep/xhtml/title.tag | 4 +- quanta/data/dtep/xhtml/tr.tag | 4 +- quanta/data/dtep/xhtml/tt.tag | 4 +- quanta/data/dtep/xhtml/u.tag | 4 +- quanta/data/dtep/xhtml/ul.tag | 4 +- quanta/data/dtep/xhtml/var.tag | 4 +- quanta/data/dtep/xhtml11/a.tag | 6 +- quanta/data/dtep/xhtml11/abbr.tag | 4 +- quanta/data/dtep/xhtml11/acronym.tag | 4 +- quanta/data/dtep/xhtml11/address.tag | 4 +- quanta/data/dtep/xhtml11/applet.tag | 4 +- quanta/data/dtep/xhtml11/area.tag | 4 +- quanta/data/dtep/xhtml11/b.tag | 4 +- quanta/data/dtep/xhtml11/bdo.tag | 4 +- quanta/data/dtep/xhtml11/big.tag | 4 +- quanta/data/dtep/xhtml11/blockquote.tag | 4 +- quanta/data/dtep/xhtml11/body.tag | 4 +- quanta/data/dtep/xhtml11/button.tag | 4 +- quanta/data/dtep/xhtml11/caption.tag | 4 +- quanta/data/dtep/xhtml11/cite.tag | 4 +- quanta/data/dtep/xhtml11/code.tag | 4 +- quanta/data/dtep/xhtml11/col.tag | 4 +- quanta/data/dtep/xhtml11/colgroup.tag | 8 +- quanta/data/dtep/xhtml11/dd.tag | 4 +- quanta/data/dtep/xhtml11/del.tag | 4 +- quanta/data/dtep/xhtml11/dfn.tag | 4 +- quanta/data/dtep/xhtml11/div.tag | 4 +- quanta/data/dtep/xhtml11/dl.tag | 4 +- quanta/data/dtep/xhtml11/dt.tag | 4 +- quanta/data/dtep/xhtml11/em.tag | 4 +- quanta/data/dtep/xhtml11/fieldset.tag | 4 +- quanta/data/dtep/xhtml11/form.tag | 4 +- quanta/data/dtep/xhtml11/head.tag | 4 +- quanta/data/dtep/xhtml11/headings.tag | 24 +- quanta/data/dtep/xhtml11/html.tag | 4 +- quanta/data/dtep/xhtml11/i.tag | 4 +- quanta/data/dtep/xhtml11/ins.tag | 4 +- quanta/data/dtep/xhtml11/kbd.tag | 4 +- quanta/data/dtep/xhtml11/label.tag | 4 +- quanta/data/dtep/xhtml11/legend.tag | 4 +- quanta/data/dtep/xhtml11/li.tag | 4 +- quanta/data/dtep/xhtml11/map.tag | 4 +- quanta/data/dtep/xhtml11/noscript.tag | 4 +- quanta/data/dtep/xhtml11/object.tag | 4 +- quanta/data/dtep/xhtml11/ol.tag | 4 +- quanta/data/dtep/xhtml11/optgroup.tag | 4 +- quanta/data/dtep/xhtml11/p.tag | 4 +- quanta/data/dtep/xhtml11/pre.tag | 4 +- quanta/data/dtep/xhtml11/q.tag | 4 +- quanta/data/dtep/xhtml11/rbc.tag | 4 +- quanta/data/dtep/xhtml11/rtc.tag | 4 +- quanta/data/dtep/xhtml11/ruby.tag | 4 +- quanta/data/dtep/xhtml11/samp.tag | 4 +- quanta/data/dtep/xhtml11/select.tag | 4 +- quanta/data/dtep/xhtml11/small.tag | 4 +- quanta/data/dtep/xhtml11/span.tag | 4 +- quanta/data/dtep/xhtml11/strong.tag | 4 +- quanta/data/dtep/xhtml11/style.tag | 4 +- quanta/data/dtep/xhtml11/sub.tag | 4 +- quanta/data/dtep/xhtml11/sup.tag | 4 +- quanta/data/dtep/xhtml11/table.tag | 4 +- quanta/data/dtep/xhtml11/tbody.tag | 4 +- quanta/data/dtep/xhtml11/td.tag | 4 +- quanta/data/dtep/xhtml11/textarea.tag | 4 +- quanta/data/dtep/xhtml11/tfoot.tag | 4 +- quanta/data/dtep/xhtml11/th.tag | 4 +- quanta/data/dtep/xhtml11/thead.tag | 4 +- quanta/data/dtep/xhtml11/title.tag | 4 +- quanta/data/dtep/xhtml11/tr.tag | 4 +- quanta/data/dtep/xhtml11/tt.tag | 4 +- quanta/data/dtep/xhtml11/ul.tag | 4 +- quanta/data/dtep/xhtml11/var.tag | 4 +- .../pages/docbook/kde-doc-template.docbook | 44 +- .../data/templates/scripts/javascript/overlib.js | 6 +- quanta/data/tips | 4 +- quanta/dialogs/actionconfigdialog.cpp | 100 ++-- quanta/dialogs/actionconfigdialog.h | 3 +- quanta/dialogs/actionconfigdialogs.ui | 102 ++--- quanta/dialogs/casewidget.ui | 22 +- quanta/dialogs/copyto.cpp | 8 +- quanta/dialogs/copyto.h | 3 +- quanta/dialogs/debuggeroptionss.ui | 18 +- quanta/dialogs/dirtydialog.ui | 22 +- quanta/dialogs/dirtydlg.cpp | 6 +- quanta/dialogs/dirtydlg.h | 3 +- quanta/dialogs/donationdialog.ui | 14 +- quanta/dialogs/dtdselectdialog.ui | 26 +- quanta/dialogs/dtepeditdlg.cpp | 38 +- quanta/dialogs/dtepeditdlg.h | 5 +- quanta/dialogs/dtepeditdlgs.ui | 162 +++---- quanta/dialogs/dtepstructureeditdlgs.ui | 76 ++-- quanta/dialogs/filecombo.cpp | 22 +- quanta/dialogs/filecombo.h | 5 +- quanta/dialogs/fourbuttonmessagebox.ui | 22 +- quanta/dialogs/fourbuttonmessagebox.ui.h | 2 +- quanta/dialogs/loadentitydlgs.ui | 10 +- quanta/dialogs/settings/abbreviation.cpp | 18 +- quanta/dialogs/settings/abbreviation.h | 3 +- quanta/dialogs/settings/abbreviations.ui | 38 +- quanta/dialogs/settings/codetemplatedlgs.ui | 18 +- quanta/dialogs/settings/filemasks.cpp | 14 +- quanta/dialogs/settings/filemasks.h | 5 +- quanta/dialogs/settings/filemaskss.ui | 70 +-- quanta/dialogs/settings/parseroptions.cpp | 8 +- quanta/dialogs/settings/parseroptions.h | 3 +- quanta/dialogs/settings/parseroptionsui.ui | 46 +- quanta/dialogs/settings/previewoptions.cpp | 16 +- quanta/dialogs/settings/previewoptions.h | 5 +- quanta/dialogs/settings/previewoptionss.ui | 52 +-- quanta/dialogs/settings/styleoptionss.ui | 34 +- quanta/dialogs/specialchardialog.cpp | 10 +- quanta/dialogs/specialchardialog.h | 3 +- quanta/dialogs/specialchardialogs.ui | 28 +- quanta/dialogs/tagdialogs/colorcombo.cpp | 46 +- quanta/dialogs/tagdialogs/colorcombo.h | 7 +- quanta/dialogs/tagdialogs/corewidgetdlg.cpp | 16 +- quanta/dialogs/tagdialogs/listdlg.cpp | 6 +- quanta/dialogs/tagdialogs/listdlg.h | 3 +- quanta/dialogs/tagdialogs/pictureview.cpp | 4 +- quanta/dialogs/tagdialogs/pictureview.h | 3 +- quanta/dialogs/tagdialogs/tagattr.cpp | 8 +- quanta/dialogs/tagdialogs/tagattr.h | 18 +- quanta/dialogs/tagdialogs/tagdialog.cpp | 36 +- quanta/dialogs/tagdialogs/tagdialog.h | 15 +- quanta/dialogs/tagdialogs/tagimgdlg.cpp | 24 +- quanta/dialogs/tagdialogs/tagimgdlg.h | 17 +- quanta/dialogs/tagdialogs/tagimgdlgdata.cpp | 44 +- quanta/dialogs/tagdialogs/tagmail.ui | 22 +- quanta/dialogs/tagdialogs/tagmaildlg.cpp | 14 +- quanta/dialogs/tagdialogs/tagmaildlg.h | 3 +- quanta/dialogs/tagdialogs/tagmisc.ui | 12 +- quanta/dialogs/tagdialogs/tagmiscdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagmiscdlg.h | 3 +- quanta/dialogs/tagdialogs/tagquicklistdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagquicklistdlg.h | 11 +- quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp | 16 +- quanta/dialogs/tagdialogs/tagwidget.cpp | 12 +- quanta/dialogs/tagdialogs/tagwidget.h | 2 +- quanta/dialogs/tagdialogs/tagxml.cpp | 42 +- quanta/dialogs/tagdialogs/tagxml.h | 9 +- quanta/messages/annotationoutput.cpp | 52 +-- quanta/messages/annotationoutput.h | 7 +- quanta/messages/messageitem.cpp | 6 +- quanta/messages/messageitem.h | 2 +- quanta/messages/messageoutput.cpp | 16 +- quanta/messages/messageoutput.h | 3 +- quanta/parsers/dtd/dtd.cpp | 72 +-- quanta/parsers/dtd/dtd.h | 2 +- quanta/parsers/dtd/dtdparser.cpp | 44 +- quanta/parsers/dtd/dtdparser.h | 2 +- quanta/parsers/dtd/dtepcreationdlg.ui | 34 +- quanta/parsers/node.cpp | 60 +-- quanta/parsers/node.h | 24 +- quanta/parsers/parser.cpp | 286 ++++++------ quanta/parsers/parser.h | 1 + quanta/parsers/parsercommon.cpp | 54 +-- quanta/parsers/parsercommon.h | 10 +- quanta/parsers/qtag.cpp | 70 +-- quanta/parsers/qtag.h | 30 +- quanta/parsers/sagroupparser.cpp | 62 +-- quanta/parsers/sagroupparser.h | 5 +- quanta/parsers/saparser.cpp | 94 ++-- quanta/parsers/saparser.h | 9 +- quanta/parsers/tag.cpp | 54 +-- quanta/parts/kafka/domtreeview.cpp | 8 +- quanta/parts/kafka/domtreeview.h | 8 +- quanta/parts/kafka/htmldocumentproperties.cpp | 36 +- quanta/parts/kafka/htmldocumentproperties.h | 3 +- quanta/parts/kafka/htmldocumentpropertiesui.ui | 42 +- quanta/parts/kafka/htmlenhancer.cpp | 24 +- quanta/parts/kafka/htmlenhancer.h | 4 +- quanta/parts/kafka/kafkacommon.cpp | 414 ++++++++--------- quanta/parts/kafka/kafkacommon.h | 148 +++--- quanta/parts/kafka/kafkadragobject.cpp | 4 +- quanta/parts/kafka/kafkadragobject.h | 5 +- quanta/parts/kafka/kafkahtmlpart.cpp | 64 +-- quanta/parts/kafka/kafkahtmlpart.h | 15 +- quanta/parts/kafka/kafkasyncoptions.cpp | 4 +- quanta/parts/kafka/kafkasyncoptions.h | 3 +- quanta/parts/kafka/kafkasyncoptionsui.ui | 34 +- quanta/parts/kafka/nodeenhancer.h | 4 +- quanta/parts/kafka/undoredo.cpp | 52 +-- quanta/parts/kafka/undoredo.h | 14 +- quanta/parts/kafka/wkafkapart.cpp | 174 +++---- quanta/parts/kafka/wkafkapart.h | 21 +- quanta/parts/preview/whtmlpart.cpp | 28 +- quanta/parts/preview/whtmlpart.h | 11 +- quanta/plugins/pluginconfig.ui | 46 +- quanta/plugins/plugineditor.ui | 26 +- quanta/plugins/quantaplugin.cpp | 10 +- quanta/plugins/quantaplugin.h | 5 +- quanta/plugins/quantapluginconfig.cpp | 2 +- quanta/plugins/quantapluginconfig.h | 1 + quanta/plugins/quantaplugineditor.cpp | 12 +- quanta/plugins/quantaplugineditor.h | 3 +- quanta/plugins/quantaplugininterface.cpp | 14 +- quanta/plugins/quantaplugininterface.h | 9 +- quanta/project/eventconfigurationdlg.cpp | 12 +- quanta/project/eventconfigurationdlg.h | 3 +- quanta/project/eventconfigurationdlgs.ui | 16 +- quanta/project/eventeditordlg.cpp | 52 +-- quanta/project/eventeditordlg.h | 3 +- quanta/project/eventeditordlgs.ui | 22 +- quanta/project/membereditdlg.cpp | 8 +- quanta/project/membereditdlg.h | 3 +- quanta/project/membereditdlgs.ui | 20 +- quanta/project/project.cpp | 138 +++--- quanta/project/project.h | 19 +- quanta/project/projectlist.cpp | 36 +- quanta/project/projectlist.h | 12 +- quanta/project/projectnewfinal.cpp | 6 +- quanta/project/projectnewfinal.h | 3 +- quanta/project/projectnewfinals.ui | 60 +-- quanta/project/projectnewgeneral.cpp | 26 +- quanta/project/projectnewgeneral.h | 3 +- quanta/project/projectnewgenerals.ui | 104 ++--- quanta/project/projectnewlocal.cpp | 52 +-- quanta/project/projectnewlocal.h | 3 +- quanta/project/projectnewlocals.ui | 64 +-- quanta/project/projectnewweb.cpp | 22 +- quanta/project/projectnewweb.h | 3 +- quanta/project/projectnewwebs.ui | 46 +- quanta/project/projectoptions.ui | 84 ++-- quanta/project/projectoptions.ui.h | 2 +- quanta/project/projectprivate.cpp | 244 +++++----- quanta/project/projectprivate.h | 7 +- quanta/project/projectupload.cpp | 56 +-- quanta/project/projectupload.h | 3 +- quanta/project/projectuploads.ui | 52 +-- quanta/project/projecturl.h | 12 +- quanta/project/rescanprj.cpp | 18 +- quanta/project/rescanprj.h | 3 +- quanta/project/rescanprjdir.ui | 32 +- quanta/project/subprojecteditdlgs.ui | 10 +- quanta/project/teammembersdlg.cpp | 12 +- quanta/project/teammembersdlg.h | 3 +- quanta/project/teammembersdlgs.ui | 20 +- quanta/project/uploadprofiledlgs.ui | 40 +- quanta/project/uploadprofiles.cpp | 4 +- quanta/project/uploadprofiles.h | 2 +- quanta/project/uploadprofilespage.ui | 20 +- quanta/project/uploadprofilespage.ui.h | 2 +- quanta/quanta_uml.xmi | 490 ++++++++++---------- quanta/scripts/TemplateMagic.pl | 6 +- quanta/scripts/checkxml.kmdr | 16 +- quanta/scripts/docbook_table.kmdr | 14 +- quanta/scripts/dwt.kmdr | 18 +- quanta/scripts/dwt.pl | 8 +- quanta/scripts/gubed_install.kmdr | 16 +- quanta/scripts/htmlquickstart.kmdr | 22 +- quanta/scripts/listwizard.kmdr | 14 +- quanta/scripts/meinproc.kmdr | 14 +- quanta/scripts/picturewizard.kmdr | 18 +- quanta/scripts/scriptinfo.kmdr | 26 +- quanta/scripts/tablewizard.kmdr | 20 +- quanta/scripts/tidy.kmdr | 28 +- quanta/scripts/xmlval.kmdr | 30 +- quanta/scripts/xsltproc.kmdr | 20 +- quanta/src/dcopquanta.cpp | 12 +- quanta/src/dcopsettings.cpp | 6 +- quanta/src/document.cpp | 290 ++++++------ quanta/src/document.h | 45 +- quanta/src/dtds.cpp | 122 ++--- quanta/src/dtds.h | 29 +- quanta/src/kqapp.cpp | 40 +- quanta/src/kqapp.h | 27 +- quanta/src/main.cpp | 6 +- quanta/src/quanta.cpp | 388 ++++++++-------- quanta/src/quanta.h | 47 +- quanta/src/quanta_init.cpp | 506 ++++++++++----------- quanta/src/quanta_init.h | 5 +- quanta/src/quantadoc.cpp | 42 +- quanta/src/quantadoc.h | 9 +- quanta/src/quantaview.cpp | 80 ++-- quanta/src/quantaview.h | 13 +- quanta/src/viewmanager.cpp | 58 +-- quanta/src/viewmanager.h | 11 +- quanta/treeviews/basetreeview.cpp | 112 ++--- quanta/treeviews/basetreeview.h | 20 +- quanta/treeviews/docfolder.cpp | 8 +- quanta/treeviews/docfolder.h | 4 +- quanta/treeviews/docitem.cpp | 8 +- quanta/treeviews/docitem.h | 4 +- quanta/treeviews/doctreeview.cpp | 16 +- quanta/treeviews/doctreeview.h | 3 +- quanta/treeviews/fileinfodlg.ui | 20 +- quanta/treeviews/filestreeview.cpp | 38 +- quanta/treeviews/filestreeview.h | 3 +- quanta/treeviews/newtemplatedirdlg.cpp | 2 +- quanta/treeviews/newtemplatedirdlg.h | 3 +- quanta/treeviews/projecttreeview.cpp | 76 ++-- quanta/treeviews/projecttreeview.h | 21 +- quanta/treeviews/quantapropertiespage.ui | 44 +- quanta/treeviews/scripttreeview.cpp | 10 +- quanta/treeviews/scripttreeview.h | 9 +- quanta/treeviews/servertreeview.cpp | 30 +- quanta/treeviews/servertreeview.h | 11 +- quanta/treeviews/structtreetag.cpp | 54 +-- quanta/treeviews/structtreetag.h | 8 +- quanta/treeviews/structtreeview.cpp | 106 ++--- quanta/treeviews/structtreeview.h | 15 +- quanta/treeviews/tagattributeitems.cpp | 62 +-- quanta/treeviews/tagattributeitems.h | 24 +- quanta/treeviews/tagattributetree.cpp | 62 +-- quanta/treeviews/tagattributetree.h | 14 +- quanta/treeviews/templatedirform.ui | 38 +- quanta/treeviews/templatestreeview.cpp | 92 ++-- quanta/treeviews/templatestreeview.h | 15 +- quanta/treeviews/uploadtreefile.cpp | 12 +- quanta/treeviews/uploadtreefile.h | 6 +- quanta/treeviews/uploadtreefolder.cpp | 16 +- quanta/treeviews/uploadtreefolder.h | 6 +- quanta/treeviews/uploadtreeview.cpp | 46 +- quanta/treeviews/uploadtreeview.h | 3 +- quanta/utility/myprocess.h | 1 + quanta/utility/newstuff.cpp | 44 +- quanta/utility/newstuff.h | 41 +- quanta/utility/qpevents.cpp | 48 +- quanta/utility/qpevents.h | 17 +- quanta/utility/quantabookmarks.cpp | 28 +- quanta/utility/quantabookmarks.h | 7 +- quanta/utility/quantacommon.cpp | 76 ++-- quanta/utility/quantacommon.h | 14 +- quanta/utility/quantanetaccess.cpp | 18 +- quanta/utility/resource.h | 4 +- quanta/utility/tagaction.cpp | 150 +++--- quanta/utility/tagaction.h | 5 +- quanta/utility/tagactionmanager.cpp | 14 +- quanta/utility/tagactionmanager.h | 2 +- quanta/utility/tagactionset.cpp | 74 +-- quanta/utility/tagactionset.h | 19 +- quanta/utility/toolbartabwidget.cpp | 64 +-- quanta/utility/toolbartabwidget.h | 12 +- 801 files changed, 7077 insertions(+), 6939 deletions(-) (limited to 'quanta') diff --git a/quanta/Quanta-3.3-plan.kno b/quanta/Quanta-3.3-plan.kno index fc22ca65..eb2837b7 100644 --- a/quanta/Quanta-3.3-plan.kno +++ b/quanta/Quanta-3.3-plan.kno @@ -22,24 +22,24 @@ \NewEntry 1 Toolbars -

Toolbars need serious attention!
Phase 1:
1) Clean up for current usage
2) Create quick "add this tag to a toolbar" RMB function
3) Make toolbars abide by tag relationships like auto complete

Phase 2:
1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags
2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, layout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings.

The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static layout the layout and presentation become dynamic. This will require balance and good icons to be more productive.

+

Toolbars need serious attention!
Phase 1:
1) Clean up for current usage
2) Create quick "add this tag to a toolbar" RMB function
3) Make toolbars abide by tag relationships like auto complete

Phase 2:
1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags
2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, tqlayout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings.

The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static tqlayout the tqlayout and presentation become dynamic. This will require balance and good icons to be more productive.

\NewEntry 2 Phase 2 explanation

> - Phase 2/2 sounds a little complicated to me and I'm also not sure that I understood it completely.

Think of it as personalities. The idea is that Quanta could interpret some aspects of what I am doing and offer toolbar presentations based on that. How to best go about it is not totally clear. Initially I had thought to have Quanta offer the relevent toolbar so the user didn't have to select it, but this is not completely effective it you think about it. Another possibility is to construct a toolbar on the fly from relevent tags... intriguing but probably not very fast or fluid. The advantage to the toolbars we have is that you know where the icons are. The disadvantage is you could end up switching between 3-4 of them building a formatted data form, which is not intuitive.

-

In balancing these several concepts seem to offer counterpoints.
familiar layout <-> specifically applicable actions
pre-made toolbars <-> dynamicly created toolbars
feature oriented toolbars <-> task oriented toolbars

+

In balancing these several concepts seem to offer counterpoints.
familiar tqlayout <-> specifically applicable actions
pre-made toolbars <-> dynamicly created toolbars
feature oriented toolbars <-> task oriented toolbars

Currently Quanta is solidly to the left and only to the left on all three of these points. I began considering adding task oriented toolbars. Which is better? If you could be certain that the toolbar would do the following you would have perfection:

-

1) orient correctly to every task
2) retain familiarity of layout for variations and segue to next task
3) offer only proper tag relationships

-

Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard layout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).

+

1) orient correctly to every task
2) retain familiarity of tqlayout for variations and segue to next task
3) offer only proper tag relationships

+

Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard tqlayout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).

So we can say this about the ultimate solution:

1) I don't think anybody is really anal enough to already be doing it.

2) If it could be accomplished it would be very very cool and get a lot of press.

3) It cannot be a single solution, thus it's multiple "personalities"

-

4) Basic structure and layout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.

+

4) Basic structure and tqlayout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.

5) No single solution is possible so it must allow for easy user extensibility

-

Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar layout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.

+

Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar tqlayout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.

My vision is not just someone saving a toolbar for a task, but saving a whole personality. Imagine these as dowloadable resources. ;-)

@@ -56,7 +56,7 @@ \NewEntry 1 VPL -

Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.

1) Visual Table editor
2) Integration of visual CSS using our dialogs and tools
3) XSLT translation layer for XML
4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the layout or CSS visually in data layout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.

+

Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.

1) Visual Table editor
2) Integration of visual CSS using our dialogs and tools
3) XSLT translation layer for XML
4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the tqlayout or CSS visually in data tqlayout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.

\NewEntry 0 New Features @@ -94,7 +94,7 @@ \NewEntry 1 RAD Site -

This has largely been under wraps except a few teasers. It's going to be my baby.

RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.

1) Based on templates - this allows the user to develop the framework in layers
2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it
3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning
4) New abstract interface - the key to integrate this is an interface that uses "set"definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or layout which assist in painting an even interface.
5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as
- physical layout
- conceptual group
- style grouping
- layout grouping
Level views would include
- overview
- concept/style/layout group
- page elements/relationships
- element definitions
- various configuration dialogs

The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.

Some aspects:
* moving files automatically manages links
* Minimal application speeds development and manages framework
* Page component templates function dynamically
* Would use comment system and or generated file to manage elements
* would be able to offer limited functionaliy directly importing existing sites
* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)

+

This has largely been under wraps except a few teasers. It's going to be my baby.

RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.

1) Based on templates - this allows the user to develop the framework in layers
2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it
3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning
4) New abstract interface - the key to integrate this is an interface that uses "set"definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or tqlayout which assist in painting an even interface.
5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as
- physical tqlayout
- conceptual group
- style grouping
- tqlayout grouping
Level views would include
- overview
- concept/style/tqlayout group
- page elements/relationships
- element definitions
- various configuration dialogs

The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.

Some aspects:
* moving files automatically manages links
* Minimal application speeds development and manages framework
* Page component templates function dynamically
* Would use comment system and or generated file to manage elements
* would be able to offer limited functionaliy directly importing existing sites
* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)

\NewEntry 0 Plug Ins diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index d2164b06..fc4399bb 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -34,7 +34,7 @@ class colorRequester::colorRequesterPrivate{ void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); } }; -colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){ +colorRequester::colorRequester(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){ d = new colorRequesterPrivate; init(); } @@ -56,7 +56,7 @@ void colorRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -67,12 +67,12 @@ void colorRequester::init() TQWidget *widget = (TQWidget*) d->edit; setFocusProxy( widget ); - d->connectSignals( this ); + d->connectSignals( TQT_TQOBJECT(this) ); connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() )); connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) )); KAccel *accel = new KAccel( this ); - accel->insert( KStdAccel::Open, this, TQT_SLOT( openColorDialog() )); + accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() )); accel->readSettings(); } @@ -93,7 +93,7 @@ KLineEdit * colorRequester::lineEdit() const{ void colorRequester::setInitialValue(/*const TQString& s*/){ TQString temp = d->edit->text(); temp.remove(" "); - if( temp.contains("#") != 0){ + if( temp.tqcontains("#") != 0){ temp.remove("#"); if(temp.length() == 3) { TQString temp2; @@ -113,7 +113,7 @@ void colorRequester::setInitialValue(/*const TQString& s*/){ } else - if( temp.contains("rgb(") != 0){ + if( temp.tqcontains("rgb(") != 0){ temp.remove("rgb(").remove(")"); TQStringList rgbValues = TQStringList::split(",",temp); // bool ok; diff --git a/quanta/components/csseditor/colorrequester.h b/quanta/components/csseditor/colorrequester.h index baf95d86..ceb28f6b 100644 --- a/quanta/components/csseditor/colorrequester.h +++ b/quanta/components/csseditor/colorrequester.h @@ -25,8 +25,9 @@ class KLineEdit; class KColorDialog; class colorRequester : public miniEditor{ Q_OBJECT + TQ_OBJECT public: - colorRequester(TQWidget *parent, const char* name=0); + colorRequester(TQWidget *tqparent, const char* name=0); ~colorRequester(); KLineEdit * lineEdit() const; KPushButton * button() const { return myButton; } diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index 98019f23..b57649bd 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -29,7 +29,7 @@ -colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *parent, const char *name) : miniEditor(parent,name) { +colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *tqparent, const char *name) : miniEditor(tqparent,name) { m_functionName = fn; TQVBox *leftBox = new TQVBox(this); TQVBox *centerBox = new TQVBox(this); @@ -37,12 +37,12 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, TQLabel *leftLabel = new TQLabel("" + l +"",leftBox); TQLabel *centerLabel = new TQLabel(("" + c +""),centerBox); TQLabel *rightLabel = new TQLabel(("" + r +""),rightBox); - leftLabel->setAlignment(Qt::AlignHCenter); - centerLabel->setAlignment(Qt::AlignHCenter); - rightLabel->setAlignment(Qt::AlignHCenter); - leftLabel->setTextFormat (Qt::RichText ) ; - centerLabel->setTextFormat ( Qt::RichText ) ; - rightLabel->setTextFormat (Qt::RichText ) ; + leftLabel->tqsetAlignment(TQt::AlignHCenter); + centerLabel->tqsetAlignment(TQt::AlignHCenter); + rightLabel->tqsetAlignment(TQt::AlignHCenter); + leftLabel->setTextFormat (TQt::RichText ) ; + centerLabel->setTextFormat ( TQt::RichText ) ; + rightLabel->setTextFormat (TQt::RichText ) ; m_leftValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , leftBox); m_centerValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , centerBox); m_rightValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , rightBox); @@ -74,11 +74,11 @@ void colorSlider::convertRightValue(int i){ emit valueChanged(m_functionName + "(" + TQString::number(m_leftValue->value(),10) + "," + TQString::number(m_centerValue->value(),10) + "," + TQString::number(i,10) +")"); } -RGBcolorSlider::RGBcolorSlider(TQWidget *parent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),parent,name){ +RGBcolorSlider::RGBcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),tqparent,name){ } //FOR CSS3 -/*HSLcolorSlider::HSLcolorSlider(TQWidget *parent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),parent,name){ +/*HSLcolorSlider::HSLcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),tqparent,name){ } */ diff --git a/quanta/components/csseditor/colorslider.h b/quanta/components/csseditor/colorslider.h index d2e0b11b..202020a6 100644 --- a/quanta/components/csseditor/colorslider.h +++ b/quanta/components/csseditor/colorslider.h @@ -30,6 +30,7 @@ class colorSlider : public miniEditor { Q_OBJECT + TQ_OBJECT private : TQString m_functionName; protected: @@ -37,7 +38,7 @@ class colorSlider : public miniEditor { *m_centerValue, *m_rightValue; public: - colorSlider(const TQString& functionName,const TQString& l=TQString::null,const TQString& c=TQString::null,const TQString& r=TQString::null,TQWidget *parent=0, const char *name=0); + colorSlider(const TQString& functionName,const TQString& l=TQString(),const TQString& c=TQString(),const TQString& r=TQString(),TQWidget *tqparent=0, const char *name=0); virtual ~colorSlider(); virtual void connectToPropertySetter(propertySetter* p); @@ -52,16 +53,18 @@ class colorSlider : public miniEditor { class RGBcolorSlider : public colorSlider { Q_OBJECT + TQ_OBJECT public: - RGBcolorSlider(TQWidget *parent=0, const char *name=0); + RGBcolorSlider(TQWidget *tqparent=0, const char *name=0); ~RGBcolorSlider(){} }; //FOR CSS3 /*class HSLcolorSlider : public colorSlider { Q_OBJECT + TQ_OBJECT public: - HSLcolorSlider(TQWidget *parent=0, const char *name=0); + HSLcolorSlider(TQWidget *tqparent=0, const char *name=0); ~HSLcolorSlider(); };*/ diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index 5393d875..afe90315 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -47,11 +47,11 @@ -myCheckListItem::myCheckListItem(TQListView * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ +myCheckListItem::myCheckListItem(TQListView * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ m_sig = new TQSignal; } -myCheckListItem::myCheckListItem(TQCheckListItem * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ +myCheckListItem::myCheckListItem(TQCheckListItem * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ m_sig = new TQSignal; } @@ -85,8 +85,8 @@ void myCheckListItem::stateChange (bool b){ m_checkedChildren = 0; } else { - if(parent()){ - myCheckListItem *p = static_cast(parent()); + if(tqparent()){ + myCheckListItem *p = static_cast(tqparent()); while( p ) { if( p->m_checkedChildren != 1) { p->m_checkedChildren--; @@ -99,7 +99,7 @@ void myCheckListItem::stateChange (bool b){ m_sig->activate(); p->setOn(false); } - p = static_cast(p->parent()); + p = static_cast(p->tqparent()); } } else { @@ -109,7 +109,7 @@ void myCheckListItem::stateChange (bool b){ } } else { - if(parent()) static_cast(parent())->addCheckedChild(); + if(tqparent()) static_cast(tqparent())->addCheckedChild(); } } @@ -117,7 +117,7 @@ void CSSEditor::appendSub(TQDomNodeList l, myCheckListItem *cli){ unsigned int i; for(i=0;iconnect(this,TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") appendSub(l.item(i).childNodes(),item); } @@ -127,7 +127,7 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ unsigned int i; for(i=0;iconnect(this,TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") { TQDomNodeList listSub = l.item(i).childNodes(); appendSub(listSub,item); @@ -136,26 +136,26 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ } void CSSEditor::setCurrentPropOn(const TQString& s){ - if( (m_currentProp = static_cast(lvVisual->findItem( s,0 )) )) + if( (m_currentProp = static_cast(lvVisual->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast(lvAll->findItem( s,0 )) )) + if( (m_currentProp = static_cast(lvAll->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast(lvAural->findItem( s,0 )) )) + if( (m_currentProp = static_cast(lvAural->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast(lvInteractive->findItem( s,0 )) )) + if( (m_currentProp = static_cast(lvInteractive->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast(lvPaged->findItem( s,0 )) )) + if( (m_currentProp = static_cast(lvPaged->tqfindItem( s,0 )) )) m_currentProp->setOn(true); if( m_currentProp && m_currentProp->depth() ) { - myCheckListItem *p = static_cast(m_currentProp->parent()); + myCheckListItem *p = static_cast(m_currentProp->tqparent()); while(p) { p->setOn(true); - p=static_cast(p->parent()); + p=static_cast(p->tqparent()); } } } @@ -167,14 +167,14 @@ void CSSEditor::setCurrentPropOn(const TQString& s){ } void CSSEditor::setSidesOfPropertyBorderOn(const TQString& s){ - static_cast(lvVisual->findItem( "border-top",0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-right",0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-bottom",0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-left",0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-top-"+s,0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-right-"+s,0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-bottom-"+s,0 ))->setOn(true); - static_cast(lvVisual->findItem( "border-left-"+s,0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-top",0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-right",0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-bottom",0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-left",0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-top-"+s,0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-right-"+s,0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-bottom-"+s,0 ))->setOn(true); + static_cast(lvVisual->tqfindItem( "border-left-"+s,0 ))->setOn(true); } void CSSEditor::hidePreviewer(){ @@ -190,7 +190,7 @@ void CSSEditor::initialize(){ TQString configFile = locate("appdata", "csseditor/config.xml"); - m_myhi = new QMyHighlighter(display); + m_myhi = new TQMyHighlighter(display); TQBoxLayout *fPreviewLayout = new TQBoxLayout(fPreview,TQBoxLayout::LeftToRight); m_previewer=new KHTMLPart(fPreview); @@ -266,7 +266,7 @@ void CSSEditor::initialize(){ const TQString propertyName((*it).section(":",0,0).stripWhiteSpace()); const TQString propertyValue((*it).section(":",1)); - if( ShorthandFormer::SHFormList().contains(propertyName)==0 ) { + if( ShorthandFormer::SHFormList().tqcontains(propertyName)==0 ) { temp+= propertyName + " : " + propertyValue +";\n\t"; addAndSetPropertyOn(propertyName,propertyValue); } @@ -296,7 +296,7 @@ void CSSEditor::toggleShortendForm() m_config->sync(); } -CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *parent, const char *name) : CSSEditorS(parent, name){ +CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *tqparent, const char *name) : CSSEditorS(tqparent, name){ m_selectorName = i->text(0); m_initialProperties = i->text(1); } @@ -323,12 +323,12 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ m_ps->setComboBox(); TQStringList values = TQStringList::split(",",curr.attribute("value")); m_ps->ComboBox()->insertStringList(values); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) - if( values.contains(m_currentProp->text(0))) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + if( values.tqcontains(m_currentProp->text(0))) m_ps->ComboBox()->setCurrentText(m_properties[m_currentProp->text(0)]); if(curr.attribute("editable") == "yes"){ m_ps->ComboBox()->setEditable(true); - /*if(m_properties.contains(m_currentProp->text(0)) !=0 ) + /*if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) m_ps->ComboBox()->setEditText(m_properties[m_currentProp->text(0)]); */ } } @@ -344,7 +344,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "number") m_ps->setLineEdit(); else if( valueTypeName == "integer") { - if(m_properties.contains(m_currentProp->text(0)) !=0 ) { + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) { if(!curr.attribute("minValue").isNull()) m_ps->setSpinBox(m_properties[m_currentProp->text(0)],curr.attribute("minValue")); else @@ -359,15 +359,15 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "length") { lengthEditor *editor = new lengthEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "percentage") { - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ percentageEditor *editor = new percentageEditor(m_properties[m_currentProp->text(0)],m_ps); m_ps->installMiniEditor(editor); } @@ -380,55 +380,55 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "doubleLength") { doubleLengthEditor *editor = new doubleLengthEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()), sx(temp.section(" ",0,0)), dx(temp.section(" ",1,1)); editor->setInitialValue(sx,dx); } - else editor->setInitialValue(TQString::null,TQString::null); + else editor->setInitialValue(TQString(),TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "doublePercentage") { doublePercentageEditor *editor = new doublePercentageEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()), sx(temp.section(" ",0,0)), dx(temp.section(" ",1,1)); editor->setInitialValue(sx,dx); } - else editor->setInitialValue(TQString::null,TQString::null); + else editor->setInitialValue(TQString(),TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "frequency") { frequencyEditor *editor = new frequencyEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "time") { timeEditor *editor = new timeEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "angle") { angleEditor *editor = new angleEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else @@ -454,7 +454,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "colors") { RGBcolorSlider *RGBeditor = new RGBcolorSlider(m_ps); colorRequester *CReditor = new colorRequester(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ CReditor->lineEdit()->setText(m_properties[m_currentProp->text(0)]); CReditor->setInitialValue(); @@ -474,10 +474,10 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "fontDialog" ){ fontEditor *editor = new fontEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ editor->setInitialValue(m_properties[m_currentProp->text(0)]); } - else editor->setInitialValue(TQString::null); + else editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } } @@ -491,10 +491,10 @@ void CSSEditor::checkProperty(const TQString& v){ m_currentProp->setOn(true); if( m_currentProp->depth() ){ - myCheckListItem *p = static_cast(m_currentProp->parent()); + myCheckListItem *p = static_cast(m_currentProp->tqparent()); while(p){ p->setOn(true); - p=static_cast(p->parent()); + p=static_cast(p->tqparent()); } } diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index e54667f5..d1f2ec7f 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -31,18 +31,18 @@ class KHTMLPart; class TQListViewItem; class TQDomNodeList; class TQVariant; -class QMyHighlighter; +class TQMyHighlighter; -class myCheckListItem : public QCheckListItem +class myCheckListItem : public TQCheckListItem { private: TQSignal *m_sig; unsigned int m_checkedChildren; public : - myCheckListItem(TQCheckListItem * parent, const TQString & text); - myCheckListItem(TQListView * parent, const TQString & text); + myCheckListItem(TQCheckListItem * tqparent, const TQString & text); + myCheckListItem(TQListView * tqparent, const TQString & text); ~myCheckListItem(); void connect( TQObject *receiver, const char *member ); void addCheckedChild(); @@ -56,8 +56,9 @@ class myCheckListItem : public QCheckListItem class CSSEditor : public CSSEditorS { Q_OBJECT + TQ_OBJECT private: - QMyHighlighter *m_myhi; + TQMyHighlighter *m_myhi; propertySetter *m_ps; myCheckListItem *m_currentProp; KHTMLPart *m_previewer; @@ -97,8 +98,8 @@ class CSSEditor : public CSSEditorS public: - CSSEditor(TQWidget* parent=0, const char *name=0): CSSEditorS(parent, name), m_config(0L){} - CSSEditor( TQListViewItem * i, TQWidget* parent=0, const char *name=0); + CSSEditor(TQWidget* tqparent=0, const char *name=0): CSSEditorS(tqparent, name), m_config(0L){} + CSSEditor( TQListViewItem * i, TQWidget* tqparent=0, const char *name=0); ~CSSEditor(); void initialize(); void setSelectors( const TQString& s) { m_Selectors = s; } diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index c2be79c0..3e9e1ca2 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -18,12 +18,12 @@ #include #include "csseditor_globals.h" -mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, name){ +mySpinBox::mySpinBox(TQWidget * tqparent , const char * name ) : TQSpinBox (tqparent, name){ connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); } -mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,name ){ +mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * tqparent, const char * name ) : TQSpinBox( minValue, maxValue, step, tqparent,name ){ connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); } @@ -34,12 +34,12 @@ void mySpinBox::checkSuffix(const TQString&){// check if the suffix is present a if(!suffix().isEmpty()){ const TQString suf(suffix()); TQString t(editor()->text()); - if( t.contains(suf) ==0 ) { + if( t.tqcontains(suf) ==0 ) { editor()->setText( t + suf); editor()->setCursorPosition(editor()->cursorPosition() - 1); } else - if( t.contains(suf) >1 ) { + if( t.tqcontains(suf) >1 ) { editor()->setText( t.remove(suf) + suf); editor()->setCursorPosition(editor()->cursorPosition() - 1); } diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h index b577981e..edf9add3 100644 --- a/quanta/components/csseditor/csseditor_globals.h +++ b/quanta/components/csseditor/csseditor_globals.h @@ -34,7 +34,7 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu "lightskyblue,lightslategray,lightsteelblue,lightyellow,lime,limegreen,linen,magenta," "maroon,mediumaquamarine,mediumblue,mediumorchid,mediumpurple,mediumseagreen," "mediumslateblue,mediumspringgreen,mediumturquoise,mediumvioletred,midnightblue," - "mintcream,mistyrose,moccasin,navajowhite,navy,oldlace,olive,olivedrab,orange," + "mintcream,mistyrose,tqmoccasin,navajowhite,navy,oldlace,olive,olivedrab,orange," "orangered,orchid,palegoldenrod,palegreen,paleturquoise,palevioletred,papayawhip," "peachpuff,peru,pink,plum,powderblue,purple,red,rosybrown,royalblue,saddlebrown," "salmon,sandybrown,seagreen,seashell,sienna,silver,skyblue,slateblue,slategray,snow," @@ -49,11 +49,12 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu } -class mySpinBox : public QSpinBox{ +class mySpinBox : public TQSpinBox{ Q_OBJECT + TQ_OBJECT public: - mySpinBox(TQWidget * parent = 0, const char * name = 0 ); - mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * parent = 0, const char * name = 0 ); + mySpinBox(TQWidget * tqparent = 0, const char * name = 0 ); + mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * tqparent = 0, const char * name = 0 ); ~mySpinBox(); public slots: void checkSuffix(const TQString&); diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui index de99118f..cc7f94f3 100644 --- a/quanta/components/csseditor/csseditors.ui +++ b/quanta/components/csseditor/csseditors.ui @@ -1,6 +1,6 @@ CSSEditorS - + CSSEditorS @@ -32,22 +32,22 @@ Expanding - + 280 20 - + - layout6 + tqlayout6 unnamed - + pbOk @@ -63,7 +63,7 @@ &OK - + pbCancel @@ -81,7 +81,7 @@ - + SHckb @@ -92,7 +92,7 @@ false - + splitter3 @@ -105,7 +105,7 @@ Horizontal - + twMediaGroup @@ -117,19 +117,19 @@ 0 - + 33 7 - + 290 32767 - + tab @@ -143,7 +143,7 @@ 0 - + Properties @@ -167,7 +167,7 @@ - + tab @@ -181,7 +181,7 @@ 0 - + Properties @@ -202,7 +202,7 @@ - + tab @@ -216,7 +216,7 @@ 0 - + Properties @@ -237,7 +237,7 @@ - + tab @@ -251,7 +251,7 @@ 0 - + Properties @@ -272,7 +272,7 @@ - + tab @@ -286,7 +286,7 @@ 0 - + Properties @@ -308,14 +308,14 @@ - + splitter3 Vertical - + fEditing @@ -326,7 +326,7 @@ Raised - + fPreview @@ -338,7 +338,7 @@ 0 - + 0 200 @@ -351,7 +351,7 @@ Raised - + display @@ -363,7 +363,7 @@ 0 - + 32766 32766 @@ -404,7 +404,7 @@ accept() - + kpushbutton.h diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 458c8d13..2598336c 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -39,7 +39,7 @@ #include "stylesheetparser.h" -CSSSelector::CSSSelector(TQWidget *parent, const char* name) : CSSSelectorS (parent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) { +CSSSelector::CSSSelector(TQWidget *tqparent, const char* name) : CSSSelectorS (tqparent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) { m_currentItem = 0L; @@ -174,7 +174,7 @@ void CSSSelector::addTag(){ TQListViewItem *item = new TQListViewItem(lvTags); if(!cbTag->currentText().isEmpty()){ item->setText(0,cbTag->currentText()); - QPair tmp(TQString::null,++m_orderNumber); + TQPair tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } } @@ -183,7 +183,7 @@ void CSSSelector::addClass(){ TQListViewItem *item = new TQListViewItem(lvClasses); if(!leClass->text().isEmpty()){ item->setText(0,leClass->text()); - QPair tmp(TQString::null,++m_orderNumber); + TQPair tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } } @@ -192,7 +192,7 @@ void CSSSelector::addID(){ TQListViewItem *item = new TQListViewItem(lvIDs); if(!leID->text().isEmpty()){ item->setText(0,leID->text()); - QPair tmp(TQString::null,++m_orderNumber); + TQPair tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } } @@ -200,7 +200,7 @@ void CSSSelector::addID(){ void CSSSelector::addPseudo(){ TQListViewItem *item = new TQListViewItem(lvPseudo); item->setText(0,(lePseudoSelector->text()+":"+cbPseudo->currentText()).stripWhiteSpace()); - QPair tmp(TQString::null,++m_orderNumber); + TQPair tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } @@ -283,7 +283,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ if(dlg.exec()) { i->setText(1,dlg.generateProperties()); - QPair tmp(m_currentStylesheetStructure[i->text(0)]); + TQPair tmp(m_currentStylesheetStructure[i->text(0)]); tmp.first = dlg.generateProperties(); m_currentStylesheetStructure[i->text(0)] = tmp; } @@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ void CSSSelector::setCurrentListView(TQWidget* w){ TQObjectList *l = w->queryList( TQLISTVIEW_OBJECT_NAME_STRING ); - m_currentListView = static_cast(l->first()); + m_currentListView = static_cast(TQT_TQWIDGET(l->first())); } void CSSSelector::removeAll(){ @@ -319,20 +319,20 @@ void CSSSelector::loadCSSContent(const TQString& s){ p.parse(); m_orderNumber = p.orderNumber(); - TQMap >::Iterator it; + TQMap >::Iterator it; m_currentStylesheetStructure = p.stylesheetStructure(); for ( it = m_currentStylesheetStructure.begin(); it != m_currentStylesheetStructure.end(); ++it ) { if(!it.key().startsWith("@rule") && !it.key().startsWith("/*")){ TQListViewItem *item; - if(it.key().contains(":")){ + if(it.key().tqcontains(":")){ item = new TQListViewItem(lvPseudo); } else - if(it.key().contains("#")){ + if(it.key().tqcontains("#")){ item = new TQListViewItem(lvIDs); } else - if(it.key().contains(".")){ + if(it.key().tqcontains(".")){ item = new TQListViewItem(lvClasses); } else { @@ -347,7 +347,7 @@ void CSSSelector::loadCSSContent(const TQString& s){ } TQString CSSSelector::generateFormattedStyleSection(){ - TQMap< TQString,QPair >::Iterator it; + TQMap< TQString,TQPair >::Iterator it; TQString styleSection,tmpStr; unsigned int indentWidth, indentDisplacement = 2; @@ -374,7 +374,7 @@ TQString CSSSelector::generateFormattedStyleSection(){ } indentStr.fill(' ', indentDisplacement); styleSection += tmpStr + indentStr + "}\n\n"; - tmpStr = TQString::null; + tmpStr = TQString(); } } } diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h index 2c0fe426..7d5c40da 100644 --- a/quanta/components/csseditor/cssselector.h +++ b/quanta/components/csseditor/cssselector.h @@ -30,6 +30,7 @@ class TQStringList; class CSSSelector : public CSSSelectorS { Q_OBJECT + TQ_OBJECT private: TQListViewItem *m_currentItem; @@ -38,14 +39,14 @@ class CSSSelector : public CSSSelectorS { m_footer, m_callingFrom, m_fileToPreview; - TQMap > m_currentStylesheetStructure; + TQMap > m_currentStylesheetStructure; unsigned int m_orderNumber; bool m_stopProcessingStylesheet; void Connect(); public: - CSSSelector(TQWidget *parent=0, const char* name=0); + CSSSelector(TQWidget *tqparent=0, const char* name=0); ~CSSSelector(); void loadCSSContent(const TQString& s); void setHeader(const TQString& h) { m_header = h; } diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui index 1119ccdb..09356a70 100644 --- a/quanta/components/csseditor/cssselectors.ui +++ b/quanta/components/csseditor/cssselectors.ui @@ -1,6 +1,6 @@ CSSSelectorS - + CSSSelectorS @@ -22,15 +22,15 @@ unnamed - + - layout11 + tqlayout11 unnamed - + tlApplyToFile @@ -61,22 +61,22 @@ Expanding - + 20 40 - + - layout1 + tqlayout1 unnamed - + pbOk @@ -84,7 +84,7 @@ &OK - + pbCancel @@ -94,11 +94,11 @@ - + twSelectors - + tab @@ -109,9 +109,9 @@ unnamed - + - layout13 + tqlayout13 @@ -127,14 +127,14 @@ Expanding - + 20 16 - + groupBox1 @@ -153,7 +153,7 @@ unnamed - + pbRemoveSelectedTag @@ -165,7 +165,7 @@ Selected - + pbRemoveAllTags @@ -185,14 +185,14 @@ Expanding - + 20 16 - + groupBox2 @@ -203,7 +203,7 @@ unnamed - + cbDTD @@ -220,14 +220,14 @@ Expanding - + 20 24 - + groupBox3 @@ -238,7 +238,7 @@ unnamed - + cbTag @@ -246,7 +246,7 @@ true - + pbAddTag @@ -266,7 +266,7 @@ Expanding - + 20 16 @@ -275,7 +275,7 @@ - + Selector @@ -329,7 +329,7 @@ Minimum - + 40 20 @@ -338,7 +338,7 @@ - + tab @@ -349,7 +349,7 @@ unnamed - + Selector @@ -403,16 +403,16 @@ Expanding - + 40 20 - + - layout14 + tqlayout14 @@ -428,14 +428,14 @@ Expanding - + 20 40 - + groupBox4_2 @@ -446,7 +446,7 @@ unnamed - + pbRemoveSelectedID @@ -458,7 +458,7 @@ Selected - + pbRemoveAllIDs @@ -478,14 +478,14 @@ Expanding - + 20 40 - + groupBox7_2 @@ -496,12 +496,12 @@ unnamed - + leID - + pbAddID @@ -521,7 +521,7 @@ Expanding - + 20 40 @@ -532,7 +532,7 @@ - + tab @@ -543,7 +543,7 @@ unnamed - + Selector @@ -597,16 +597,16 @@ Expanding - + 40 20 - + - layout13 + tqlayout13 @@ -622,14 +622,14 @@ Expanding - + 20 40 - + groupBox4_3 @@ -640,7 +640,7 @@ unnamed - + pbRemoveSelectedClass @@ -652,7 +652,7 @@ Selected - + pbRemoveAllClasses @@ -672,14 +672,14 @@ Expanding - + 20 40 - + groupBox7 @@ -690,12 +690,12 @@ unnamed - + leClass - + pbAddClass @@ -715,7 +715,7 @@ Expanding - + 20 40 @@ -726,7 +726,7 @@ - + tab @@ -737,7 +737,7 @@ unnamed - + Selector @@ -791,16 +791,16 @@ Expanding - + 40 20 - + - layout17 + tqlayout17 @@ -816,14 +816,14 @@ Expanding - + 20 40 - + groupBox4 @@ -834,7 +834,7 @@ unnamed - + pbRemoveAllPseudo @@ -842,7 +842,7 @@ All - + pbRemoveSelectedPseudo @@ -866,14 +866,14 @@ Expanding - + 20 40 - + groupBox7_3 @@ -884,12 +884,12 @@ unnamed - + lePseudoSelector - + cbPseudo @@ -897,7 +897,7 @@ true - + pbAddPseudo @@ -917,7 +917,7 @@ Expanding - + 20 40 @@ -939,7 +939,7 @@ Expanding - + 380 20 @@ -975,7 +975,7 @@ reject() - + kurlrequester.h klineedit.h diff --git a/quanta/components/csseditor/cssshpropertyparser.cpp b/quanta/components/csseditor/cssshpropertyparser.cpp index d117b5f5..b523a1b4 100644 --- a/quanta/components/csseditor/cssshpropertyparser.cpp +++ b/quanta/components/csseditor/cssshpropertyparser.cpp @@ -61,7 +61,7 @@ TQString CSSSHPropertyParser::extractQuotedStringList(){ unsigned int i=0; while(!stop && i - + - + @@ -503,9 +503,9 @@ - + - + diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp index e877e2ac..0bc85eee 100644 --- a/quanta/components/csseditor/doubleeditors.cpp +++ b/quanta/components/csseditor/doubleeditors.cpp @@ -23,7 +23,7 @@ -doubleEditorBase::doubleEditorBase(TQWidget *parent, const char *name) : miniEditor(parent,name){ +doubleEditorBase::doubleEditorBase(TQWidget *tqparent, const char *name) : miniEditor(tqparent,name){ } void doubleEditorBase::sxValueSlot(const TQString& v){ @@ -36,7 +36,7 @@ void doubleEditorBase::dxValueSlot(const TQString& v){ emit valueChanged( m_sxValue +" " + m_dxValue); } - doubleLengthEditor::doubleLengthEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ + doubleLengthEditor::doubleLengthEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ m_ssbSx = new specialSB(this); m_ssbSx->insertItem("cm"); @@ -76,7 +76,7 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx) m_ssbDx->setInitialValue(dx); } -doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ +doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ m_cbSx = new TQComboBox(this); m_cbDx = new TQComboBox(this); connect(m_cbSx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(sxValueSlot(const TQString&))); @@ -92,7 +92,7 @@ void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){ connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); } -doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ +doublePercentageEditor::doublePercentageEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ m_sbSx = new mySpinBox(this); m_sbDx = new mySpinBox(this); m_sbSx->setSuffix("%"); diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h index 4797f7c7..3bae8456 100644 --- a/quanta/components/csseditor/doubleeditors.h +++ b/quanta/components/csseditor/doubleeditors.h @@ -25,12 +25,13 @@ class doubleEditorBase : public miniEditor { Q_OBJECT + TQ_OBJECT protected: TQString m_sxValue, m_dxValue; public: - doubleEditorBase(TQWidget *parent=0, const char *name=0); + doubleEditorBase(TQWidget *tqparent=0, const char *name=0); virtual ~doubleEditorBase(){} virtual void setInitialValue(){} virtual void connectToPropertySetter(propertySetter* /*p*/){} @@ -45,12 +46,13 @@ class doubleEditorBase : public miniEditor { class doublePercentageEditor : public doubleEditorBase { Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sbSx, *m_sbDx; public: - doublePercentageEditor(TQWidget *parent=0, const char *name=0); + doublePercentageEditor(TQWidget *tqparent=0, const char *name=0); virtual ~doublePercentageEditor(); virtual void setInitialValue(const TQString& sx, const TQString& dx); virtual void connectToPropertySetter(propertySetter* p); @@ -58,12 +60,13 @@ class doublePercentageEditor : public doubleEditorBase { class doubleComboBoxEditor : public doubleEditorBase { Q_OBJECT + TQ_OBJECT private: TQComboBox *m_cbSx, *m_cbDx; public: - doubleComboBoxEditor(TQWidget *parent=0, const char *name=0); + doubleComboBoxEditor(TQWidget *tqparent=0, const char *name=0); virtual ~doubleComboBoxEditor(); TQComboBox* cbSx() const { return m_cbSx;} TQComboBox* cbDx() const { return m_cbDx;} @@ -72,12 +75,13 @@ class doubleComboBoxEditor : public doubleEditorBase { class doubleLengthEditor : public doubleEditorBase { Q_OBJECT + TQ_OBJECT private: specialSB *m_ssbSx, *m_ssbDx; public: - doubleLengthEditor(TQWidget *parent=0, const char *name=0); + doubleLengthEditor(TQWidget *tqparent=0, const char *name=0); virtual ~doubleLengthEditor(); virtual void setInitialValue(const TQString& sx, const TQString& dx); virtual void connectToPropertySetter(propertySetter* p); diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index f8ba4ac6..fb0272a0 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -26,7 +26,7 @@ *@author gulmini luciano */ -encodingSelector::encodingSelector(TQWidget *parent, const char* name) : encodingSelectorS(parent,name){ +encodingSelector::encodingSelector(TQWidget *tqparent, const char* name) : encodingSelectorS(tqparent,name){ TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { diff --git a/quanta/components/csseditor/encodingselector.h b/quanta/components/csseditor/encodingselector.h index f53dca27..9c2db48c 100644 --- a/quanta/components/csseditor/encodingselector.h +++ b/quanta/components/csseditor/encodingselector.h @@ -28,9 +28,10 @@ class encodingSelector : public encodingSelectorS { Q_OBJECT + TQ_OBJECT public: - encodingSelector(TQWidget *parent=0, const char* name=0); + encodingSelector(TQWidget *tqparent=0, const char* name=0); ~encodingSelector(); TQString encodingSet() const { return cbEncoding->currentText();} diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui index 45d269de..532cc137 100644 --- a/quanta/components/csseditor/encodingselectors.ui +++ b/quanta/components/csseditor/encodingselectors.ui @@ -1,6 +1,6 @@ encodingSelectorS - + encodingSelectorS @@ -19,23 +19,23 @@ unnamed - + - layout3 + tqlayout3 unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -43,22 +43,22 @@ Select encoding: - + cbEncoding - + - layout2 + tqlayout2 unnamed - + pbOk @@ -76,14 +76,14 @@ Expanding - + 40 20 - + pbCancel @@ -111,5 +111,5 @@ reject() - + diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 9f8da65d..08f24ed5 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -32,40 +32,40 @@ #include -fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontFamilyChooserS(parent,name){ +fontFamilyChooser::fontFamilyChooser(TQWidget* tqparent, const char *name) : fontFamilyChooserS(tqparent,name){ TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); - lePreview->setAlignment(Qt::AlignCenter); + lePreview->tqsetAlignment(TQt::AlignCenter); TQFont font; font.setPointSize(20); lePreview->setFont(font); lePreview->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); TQFontDatabase fdb; - TQStringList families = fdb.families(); + TQStringList families = fdb.tqfamilies(); for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) { - if( (*it).contains('[') !=0 ) + if( (*it).tqcontains('[') !=0 ) it = families.remove(it); } if( families.count() != 0 ) lbAvailable->insertStringList(families); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); pbAdd->setIconSet(iconSet); pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::fromLatin1("back")); + iconSet = SmallIconSet(TQString::tqfromLatin1("back")); pbRemove->setIconSet(iconSet); pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::fromLatin1("up")); + iconSet = SmallIconSet(TQString::tqfromLatin1("up")); pbMoveUp->setIconSet(iconSet); pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::fromLatin1("down")); + iconSet = SmallIconSet(TQString::tqfromLatin1("down")); pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -100,9 +100,9 @@ void fontFamilyChooser::updatePreview(const TQString& s){ void fontFamilyChooser::addFont(){ lbSelected->insertItem( m_currentSelectedFont ); switch(m_fontOrigin) { - case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->findItem(m_currentSelectedFont))); + case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->tqfindItem(m_currentSelectedFont))); break; - case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->findItem(m_currentSelectedFont))); + case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->tqfindItem(m_currentSelectedFont))); break; } } @@ -156,7 +156,7 @@ TQStringList fontFamilyChooser::fontList(){ TQStringList list; TQListBoxItem *item = lbSelected->firstItem(); while( item != 0 ){ - if( item->text().contains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" ); + if( item->text().tqcontains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" ); else list.append( item->text() ); item = item->next(); } diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h index d67ce92d..9cb8af54 100644 --- a/quanta/components/csseditor/fontfamilychooser.h +++ b/quanta/components/csseditor/fontfamilychooser.h @@ -24,6 +24,7 @@ class TQStringList; class fontFamilyChooser : public fontFamilyChooserS { Q_OBJECT + TQ_OBJECT private: enum FontOrigin { available, generic }; TQString m_currentSelectedFont; @@ -43,7 +44,7 @@ class fontFamilyChooser : public fontFamilyChooserS void moveFontDown(); public: - fontFamilyChooser(TQWidget* parent, const char *name=0); + fontFamilyChooser(TQWidget* tqparent, const char *name=0); ~fontFamilyChooser(); TQStringList fontList(); void setInitialValue(const TQString& s); diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index 1b846446..11d3bfe8 100644 --- a/quanta/components/csseditor/fontfamilychoosers.ui +++ b/quanta/components/csseditor/fontfamilychoosers.ui @@ -1,6 +1,6 @@ fontFamilyChooserS - + fontFamilyChooserS @@ -30,47 +30,47 @@ unnamed - + - layout42 + tqlayout42 unnamed - + - layout40 + tqlayout40 unnamed - + - layout39 + tqlayout39 unnamed - + - layout36 + tqlayout36 unnamed - + - layout20 + tqlayout20 unnamed - + textLabel1 @@ -78,22 +78,22 @@ Available system font families: - + lbAvailable - + - layout15 + tqlayout15 unnamed - + textLabel3 @@ -101,7 +101,7 @@ Generic family: - + cursive @@ -143,9 +143,9 @@ - + - layout38 + tqlayout38 @@ -164,14 +164,14 @@ Expanding - + 20 40 - + buttonGroup1 @@ -193,7 +193,7 @@ - + AlignCenter @@ -219,13 +219,13 @@ pbMoveUp - + 22 22 - + 22 22 @@ -239,13 +239,13 @@ pbAdd - + 22 22 - + 22 22 @@ -259,13 +259,13 @@ pbRemove - + 22 22 - + 22 22 @@ -279,13 +279,13 @@ pbMoveDown - + 22 22 - + 22 22 @@ -307,7 +307,7 @@ Expanding - + 20 40 @@ -316,15 +316,15 @@ - + - layout6 + tqlayout6 unnamed - + textLabel2 @@ -332,7 +332,7 @@ Selected font families: - + lbSelected @@ -349,16 +349,16 @@ - + lePreview - + - layout41 + tqlayout41 @@ -374,16 +374,16 @@ Expanding - + 313 20 - + - layout9 + tqlayout9 @@ -429,7 +429,7 @@ accept() - + kpushbutton.h kpushbutton.h diff --git a/quanta/components/csseditor/minieditor.h b/quanta/components/csseditor/minieditor.h index 1f5c25ef..0d668529 100644 --- a/quanta/components/csseditor/minieditor.h +++ b/quanta/components/csseditor/minieditor.h @@ -26,9 +26,9 @@ class propertySetter; -class miniEditor : public QHBox{ +class miniEditor : public TQHBox{ public: - miniEditor(TQWidget *parent=0, const char *name=0):TQHBox(parent,name){} + miniEditor(TQWidget *tqparent=0, const char *name=0):TQHBox(tqparent,name){} ~miniEditor(){} virtual void connectToPropertySetter(propertySetter* p)=0; }; diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp index b02a1615..cd0eec23 100644 --- a/quanta/components/csseditor/percentageeditor.cpp +++ b/quanta/components/csseditor/percentageeditor.cpp @@ -17,7 +17,7 @@ #include "percentageeditor.h" #include "propertysetter.h" -percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *parent, const char *name) : miniEditor(parent,name) +percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *tqparent, const char *name) : miniEditor(tqparent,name) { TQString temp(initialValue); m_sb = new mySpinBox(0,9999,1,this); diff --git a/quanta/components/csseditor/percentageeditor.h b/quanta/components/csseditor/percentageeditor.h index a6aecb8c..31a0d6ef 100644 --- a/quanta/components/csseditor/percentageeditor.h +++ b/quanta/components/csseditor/percentageeditor.h @@ -38,10 +38,11 @@ class propertySetter; class percentageEditor : public miniEditor { Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sb; public: - percentageEditor(const TQString& initialValue="0",TQWidget *parent=0, const char *name=0); + percentageEditor(const TQString& initialValue="0",TQWidget *tqparent=0, const char *name=0); ~percentageEditor(); virtual void connectToPropertySetter(propertySetter* p); signals: diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index 922c7dbe..894a9562 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -36,7 +36,7 @@ #include "csseditor_globals.h" #include "minieditor.h" -propertySetter::propertySetter(TQWidget *parent, const char *name ) : TQHBox(parent,name) { +propertySetter::propertySetter(TQWidget *tqparent, const char *name ) : TQHBox(tqparent,name) { m_ind = 0; m_cb = 0L; m_list.setAutoDelete(true); @@ -113,7 +113,7 @@ void propertySetter::addButton(){ m_pb = new KPushButton(this); TQToolTip::add(m_pb, i18n( "More..." )); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("2rightarrow")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("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/propertysetter.h b/quanta/components/csseditor/propertysetter.h index 2f0a90af..df9c29bc 100644 --- a/quanta/components/csseditor/propertysetter.h +++ b/quanta/components/csseditor/propertysetter.h @@ -33,6 +33,7 @@ class KPushButton; class propertySetter : public TQHBox { Q_OBJECT + TQ_OBJECT private: unsigned int m_ind; @@ -41,13 +42,13 @@ class propertySetter : public TQHBox { KPushButton *m_pb; public: - propertySetter(TQWidget *parent=0, const char *name=0); + propertySetter(TQWidget *tqparent=0, const char *name=0); ~propertySetter(); void installMiniEditor(miniEditor *m); void setComboBox(); - void setSpinBox(const TQString& initialValue="0", const TQString& min="0", const TQString& max="9999", const TQString& s=TQString::null); + void setSpinBox(const TQString& initialValue="0", const TQString& min="0", const TQString& max="9999", const TQString& s=TQString()); void setLineEdit(); void setPredefinedColorListEditor(); void reset(); diff --git a/quanta/components/csseditor/qmyhighlighter.cpp b/quanta/components/csseditor/qmyhighlighter.cpp index dad1fe24..ce81aedc 100644 --- a/quanta/components/csseditor/qmyhighlighter.cpp +++ b/quanta/components/csseditor/qmyhighlighter.cpp @@ -17,14 +17,14 @@ #include "qmyhighlighter.h" #include -QMyHighlighter::QMyHighlighter(TQTextEdit* Qtxt):TQSyntaxHighlighter(Qtxt){ +TQMyHighlighter::TQMyHighlighter(TQTextEdit* TQtxt):TQSyntaxHighlighter(TQtxt){ } /*****************************************************************************/ -QMyHighlighter::~QMyHighlighter(){ +TQMyHighlighter::~TQMyHighlighter(){ } /*****************************************************************************/ -int QMyHighlighter::highlightParagraph( const TQString & text, int /*endStateOfLastPara*/ ) +int TQMyHighlighter::highlightParagraph( const TQString & text, int /*endStateOfLastPara*/ ) { //TQRegExp pattern("\\s*\\{([\\w\\s\\d:;-\"]*)\\}\\s*"); TQRegExp pattern("([#:\\.\\w]*)\\s*\\{"); diff --git a/quanta/components/csseditor/qmyhighlighter.h b/quanta/components/csseditor/qmyhighlighter.h index 60e767f5..8d7b6a67 100644 --- a/quanta/components/csseditor/qmyhighlighter.h +++ b/quanta/components/csseditor/qmyhighlighter.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef QMYHIGHLIGHTER_H -#define QMYHIGHLIGHTER_H +#ifndef TQMYHIGHLIGHTER_H +#define TQMYHIGHLIGHTER_H #include @@ -24,11 +24,11 @@ *@author Emiliano Gulmini */ -class QMyHighlighter : public TQSyntaxHighlighter { +class TQMyHighlighter : public TQSyntaxHighlighter { public: - QMyHighlighter(TQTextEdit* Qtxt); + TQMyHighlighter(TQTextEdit* TQtxt); - ~QMyHighlighter(); + ~TQMyHighlighter(); int highlightParagraph ( const TQString & text, int endStateOfLastPara ); }; diff --git a/quanta/components/csseditor/shorthandformer.cpp b/quanta/components/csseditor/shorthandformer.cpp index 08acc819..4843986c 100644 --- a/quanta/components/csseditor/shorthandformer.cpp +++ b/quanta/components/csseditor/shorthandformer.cpp @@ -52,167 +52,167 @@ static const TQStringList backgroundRepeatValueList = TQStringList::split(",",ba ShorthandFormer::ShorthandFormer( TQMap m){ m_properties = m; - if(m_properties.contains("cue-after")){ + if(m_properties.tqcontains("cue-after")){ cue_after= m_properties["cue-after"]; m_properties.remove("cue-after"); } - if(m_properties.contains("cue-before")){ + if(m_properties.tqcontains("cue-before")){ cue_before = m_properties["cue-before"]; m_properties.remove("cue-before"); } - if(m_properties.contains("pause-before")){ + if(m_properties.tqcontains("pause-before")){ pause_before= m_properties["pause-before"]; m_properties.remove("pause-before"); } - if(m_properties.contains("pause-after")){ + if(m_properties.tqcontains("pause-after")){ pause_after = m_properties["pause-after"]; m_properties.remove("pause-after"); } - if(m_properties.contains("background-color")){ + if(m_properties.tqcontains("background-color")){ background_color = m_properties["background-color"]; m_properties.remove("background-color"); } - if(m_properties.contains("background-image")){ + if(m_properties.tqcontains("background-image")){ background_image = m_properties["background-image"]; m_properties.remove("background-image"); } - if(m_properties.contains("background-repeat")){ + if(m_properties.tqcontains("background-repeat")){ background_repeat = m_properties["background-repeat"]; m_properties.remove("background-repeat"); } - if(m_properties.contains("background-attachment")){ + if(m_properties.tqcontains("background-attachment")){ background_attachment = m_properties["background-attachment"]; m_properties.remove("background-attachment"); } - if(m_properties.contains("background-position")){ + if(m_properties.tqcontains("background-position")){ background_position = m_properties["background-position"]; m_properties.remove("background-position"); } - if(m_properties.contains("border-top-style")){ + if(m_properties.tqcontains("border-top-style")){ border_top_style = m_properties["border-top-style"]; m_properties.remove("border-top-style"); } - if(m_properties.contains("border-top-color")){ + if(m_properties.tqcontains("border-top-color")){ border_top_color = m_properties["border-top-color"]; m_properties.remove("border-top-color"); } - if(m_properties.contains("border-top-width")){ + if(m_properties.tqcontains("border-top-width")){ border_top_width = m_properties["border-top-width"]; m_properties.remove("border-top-width"); } - if(m_properties.contains("border-left-style")){ + if(m_properties.tqcontains("border-left-style")){ border_left_style = m_properties["border-left-style"]; m_properties.remove("border-left-style"); } - if(m_properties.contains("border-left-color")){ + if(m_properties.tqcontains("border-left-color")){ border_left_color = m_properties["border-left-color"]; m_properties.remove("border-left-color"); } - if(m_properties.contains("border-left-width")){ + if(m_properties.tqcontains("border-left-width")){ border_left_width = m_properties["border-left-width"]; m_properties.remove("border-left-width"); } - if(m_properties.contains("border-right-style")){ + if(m_properties.tqcontains("border-right-style")){ border_right_style = m_properties["border-right-style"]; m_properties.remove("border-right-style"); } - if(m_properties.contains("border-right-color")){ + if(m_properties.tqcontains("border-right-color")){ border_right_color = m_properties["border-right-color"]; m_properties.remove("border-right-color"); } - if(m_properties.contains("border-right-width")){ + if(m_properties.tqcontains("border-right-width")){ border_right_width= m_properties["border-right-width"]; m_properties.remove("border-right-width"); } - if(m_properties.contains("border-bottom-style")){ + if(m_properties.tqcontains("border-bottom-style")){ border_bottom_style = m_properties["border-bottom-style"]; m_properties.remove("border-bottom-style"); } - if(m_properties.contains("border-bottom-color")){ + if(m_properties.tqcontains("border-bottom-color")){ border_bottom_color = m_properties["border-bottom-color"]; m_properties.remove("border-bottom-color"); } - if(m_properties.contains("border-bottom-width")){ + if(m_properties.tqcontains("border-bottom-width")){ border_bottom_width = m_properties["border-bottom-width"]; m_properties.remove("border-bottom-width"); } - if(m_properties.contains("outline-style")){ + if(m_properties.tqcontains("outline-style")){ outline_style = m_properties["outline-style"]; m_properties.remove("outline-style"); } - if(m_properties.contains("outline-color")){ + if(m_properties.tqcontains("outline-color")){ outline_color = m_properties["outline-color"]; m_properties.remove("outline-color"); } - if(m_properties.contains("outline-width")){ + if(m_properties.tqcontains("outline-width")){ outline_width = m_properties["outline-width"]; m_properties.remove("outline-width"); } - if(m_properties.contains("list-style-type")){ + if(m_properties.tqcontains("list-style-type")){ list_style_type= m_properties["list-style-type"]; m_properties.remove("list-style-type"); } - if(m_properties.contains("list-style-image")){ + if(m_properties.tqcontains("list-style-image")){ list_style_image = m_properties["list-style-image"]; m_properties.remove("list-style-image"); } - if(m_properties.contains("list-style-position")){ + if(m_properties.tqcontains("list-style-position")){ list_style_position = m_properties["list-style-position"]; m_properties.remove("list-style-position"); } - if(m_properties.contains("font-style")){ + if(m_properties.tqcontains("font-style")){ font_style = m_properties["font-style"]; m_properties.remove("font-style"); } - if(m_properties.contains("font-variant")){ + if(m_properties.tqcontains("font-variant")){ font_variant = m_properties["font-variant"]; m_properties.remove("font-variant"); } - if(m_properties.contains("font-weight")){ + if(m_properties.tqcontains("font-weight")){ font_weight = m_properties["font-weight"]; m_properties.remove("font-weight"); } - if(m_properties.contains("font-size")){ + if(m_properties.tqcontains("font-size")){ font_size = m_properties["font-size"]; m_properties.remove("font-size"); } - if(m_properties.contains("line-height")){ + if(m_properties.tqcontains("line-height")){ line_height= m_properties["line-height"]; m_properties.remove("line-height"); } - if(m_properties.contains("font-family")){ + if(m_properties.tqcontains("font-family")){ font_family = m_properties["font-family"]; m_properties.remove("font-family"); } - if(m_properties.contains("margin-top")){ + if(m_properties.tqcontains("margin-top")){ margin_top = m_properties["margin-top"]; m_properties.remove("margin-top"); } - if(m_properties.contains("margin-bottom")){ + if(m_properties.tqcontains("margin-bottom")){ margin_bottom = m_properties["margin-bottom"]; m_properties.remove("margin-bottom"); } - if(m_properties.contains("margin-left")){ + if(m_properties.tqcontains("margin-left")){ margin_left = m_properties["margin-left"]; m_properties.remove("margin-left"); } - if(m_properties.contains("margin-right")){ + if(m_properties.tqcontains("margin-right")){ margin_right = m_properties["margin-right"]; m_properties.remove("margin-right"); } - if(m_properties.contains("padding-top")){ + if(m_properties.tqcontains("padding-top")){ padding_top = m_properties["padding-top"]; m_properties.remove("padding-top"); } - if(m_properties.contains("padding-bottom")){ + if(m_properties.tqcontains("padding-bottom")){ padding_bottom = m_properties["padding-bottom"]; m_properties.remove("padding-bottom"); } - if(m_properties.contains("padding-left")){ + if(m_properties.tqcontains("padding-left")){ padding_left = m_properties["padding-left"]; m_properties.remove("padding-left"); } - if(m_properties.contains("padding-right")){ + if(m_properties.tqcontains("padding-right")){ padding_right = m_properties["padding-right"]; m_properties.remove("padding-right"); } @@ -384,7 +384,7 @@ TQString ShorthandFormer::compressBackgroundProp(){ if( !background_attachment.isEmpty() ) backgroundProp += (" " + background_attachment ); if( !background_position.isEmpty() ) backgroundProp += (" " + background_position ); if( !backgroundProp.isEmpty() ) return ( "background :" + backgroundProp + "; "); - return TQString::null; + return TQString(); } TQString ShorthandFormer::compressPaddingProp(){ @@ -408,7 +408,7 @@ TQString ShorthandFormer::compressImplementation3( const TQString& prop, const T if( !p2.isEmpty() ) props += (" " + p2 ); if( !p3.isEmpty() ) props += (" " + p3 ); if( !props.isEmpty() ) return ( prop + " :" + props + "; "); - return TQString::null; + return TQString(); } TQString ShorthandFormer::compressImplementation2( const TQString& prop, const TQString& after, const TQString& before, const TQString& defValue){ @@ -440,7 +440,7 @@ TQString ShorthandFormer::compressImplementation( const TQString& prop, const TQ if( top == defValue && bottom == defValue && right == defValue && left == defValue) - return TQString::null; + return TQString(); if( top == bottom && bottom == right && right == left ) return ( prop +" : " + top + "; "); @@ -517,11 +517,11 @@ TQMap ShorthandFormer::expandBackgroundProp(const TQStringLi while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( (*it).contains("url(") || temp == "none" || temp == "inherit" ){ + if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ){ expandedProps["background-image"] = (*it); } else - if( backgroundRepeatValueList.contains(temp)!=0 ) { + if( backgroundRepeatValueList.tqcontains(temp)!=0 ) { expandedProps["background-repeat"] = (*it); } else @@ -529,12 +529,12 @@ TQMap ShorthandFormer::expandBackgroundProp(const TQStringLi expandedProps["background-attachment"] = (*it); } else - if( (*it).contains("rgb(") || (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit" ){ + if( (*it).tqcontains("rgb(") || (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit" ){ expandedProps["background-color"] = (*it); } else - if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).contains(globalPercentagePattern) || (*it).contains(globalLengthPattern) || temp == "inherit"){ - if( expandedProps.contains("background-position") ) + if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).tqcontains(globalPercentagePattern) || (*it).tqcontains(globalLengthPattern) || temp == "inherit"){ + if( expandedProps.tqcontains("background-position") ) expandedProps["background-position"] = ( expandedProps["background-position"] + " " + (*it) ); else expandedProps["background-position"] = (*it); @@ -590,7 +590,7 @@ TQMap ShorthandFormer::expandFontProp(const TQStringList& l) fontPseudoSHFormValues.append("message-box"); fontPseudoSHFormValues.append("small-caption"); fontPseudoSHFormValues.append("status-bar"); - if( l.count()==1 && fontPseudoSHFormValues.contains(l[0]) != 0) { + if( l.count()==1 && fontPseudoSHFormValues.tqcontains(l[0]) != 0) { expandedProps["font"] = l[0]; return expandedProps; } @@ -599,18 +599,18 @@ TQMap ShorthandFormer::expandFontProp(const TQStringList& l) while ( it != l.end() ) { TQString currentIt = (*it); TQString temp(currentIt.stripWhiteSpace()); - if( fontStyleValueList.contains(temp)!=0 ) expandedProps["font-style"] = (*it); + if( fontStyleValueList.tqcontains(temp)!=0 ) expandedProps["font-style"] = (*it); else - if( fontVariantValueList.contains(temp)!=0 ) expandedProps["font-variant"] = currentIt ; + if( fontVariantValueList.tqcontains(temp)!=0 ) expandedProps["font-variant"] = currentIt ; else - if( fontWeightValueList.contains(temp)!=0) expandedProps["font-weight"] = currentIt; + if( fontWeightValueList.tqcontains(temp)!=0) expandedProps["font-weight"] = currentIt; else - if( (fontSizeValueList.contains(temp)!=0 || currentIt.contains(globalPercentagePattern)!=0 || currentIt.contains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() ) + if( (fontSizeValueList.tqcontains(temp)!=0 || currentIt.tqcontains(globalPercentagePattern)!=0 || currentIt.tqcontains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() ) { expandedProps["font-size"] = currentIt; } else - if( currentIt.contains(percentagePattern)!=0 || currentIt.contains(numberPattern)!=0 || currentIt.contains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" ) + if( currentIt.tqcontains(percentagePattern)!=0 || currentIt.tqcontains(numberPattern)!=0 || currentIt.tqcontains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" ) { expandedProps["line-height"] = (currentIt.remove('/')); } @@ -640,7 +640,7 @@ TQMap ShorthandFormer::expandListstyleProp( const TQStringLis TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( listTypeValueList.contains(temp)!=0) { + if( listTypeValueList.tqcontains(temp)!=0) { expandedProps["list-style-type"] = (*it) ; } else @@ -648,7 +648,7 @@ TQMap ShorthandFormer::expandListstyleProp( const TQStringLis expandedProps["list-style-position"] = (*it); } else - if( (*it).contains("url(") || temp == "none" || temp == "inherit" ) + if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ) expandedProps["list-style-image"] = (*it); ++it; @@ -661,12 +661,12 @@ TQMap ShorthandFormer::expandOutlineProp( const TQStringList TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.contains(temp)!=0 ) expandedProps["outline-style"] = (*it); + if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps["outline-style"] = (*it); else - if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "invert" || temp == "inherit") + if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "invert" || temp == "inherit") expandedProps["outline-color"] = (*it) ; else - if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0) + if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0) expandedProps["outline-width"] = (*it); ++it; } @@ -679,12 +679,12 @@ TQMap ShorthandFormer::expandBoxSide(const TQString& subProp TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.contains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it); + if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it); else - if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit") + if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit") expandedProps[subPropName + "-color"] = (*it) ; else - if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0) + if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0) expandedProps[subPropName + "-width"] = (*it); ++it; } @@ -696,21 +696,21 @@ TQMap ShorthandFormer::expandBorderProp(const TQStringList& TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.contains(temp)!=0 ){ + if( borderStyleValueList.tqcontains(temp)!=0 ){ expandedProps["border-top-style"] = (*it); expandedProps["border-left-style"] = (*it); expandedProps["border-right-style"] = (*it); expandedProps["border-bottom-style"] = (*it); } else - if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit"){ + if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit"){ expandedProps["border-top-color"] = (*it); expandedProps["border-left-color"] = (*it); expandedProps["border-right-color"] = (*it); expandedProps["border-bottom-color"] = (*it); } else - if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0){ + if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0){ expandedProps["border-top-width"] = (*it); expandedProps["border-left-width"] = (*it); expandedProps["border-right-width"] = (*it); diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp index 6edf110c..e59fca51 100644 --- a/quanta/components/csseditor/specialsb.cpp +++ b/quanta/components/csseditor/specialsb.cpp @@ -21,7 +21,7 @@ #include -specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : miniEditor(parent,name) { +specialSB::specialSB(TQWidget *tqparent, const char *name, bool useLineEdit ) : miniEditor(tqparent,name) { if (useLineEdit) { m_lineEdit = new KLineEdit(this); @@ -87,13 +87,13 @@ TQStringList specialSB::cbValueList(){ return l; } -frequencyEditor::frequencyEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) { +frequencyEditor::frequencyEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) { m_cb->insertItem("Hz"); m_cb->insertItem("kHz"); m_sb->setMaxValue(9999); } -angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent,name){ +angleEditor::angleEditor(TQWidget *tqparent, const char *name) : specialSB(tqparent,name){ m_cb->insertItem("deg"); m_cb->insertItem("grad"); m_cb->insertItem("rad"); @@ -101,13 +101,13 @@ angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent, m_sb->setMaxValue(400); } -timeEditor::timeEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) { +timeEditor::timeEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) { m_cb->insertItem("ms"); m_cb->insertItem("s"); m_sb->setMaxValue(99999); } -lengthEditor::lengthEditor(TQWidget *parent, const char *name ) : specialSB(parent,name, true) { +lengthEditor::lengthEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name, true) { m_cb->insertItem("px"); m_cb->insertItem("em"); m_cb->insertItem("ex"); diff --git a/quanta/components/csseditor/specialsb.h b/quanta/components/csseditor/specialsb.h index bca3d9fa..6df3fc9d 100644 --- a/quanta/components/csseditor/specialsb.h +++ b/quanta/components/csseditor/specialsb.h @@ -29,13 +29,14 @@ class KLineEdit; class specialSB : public miniEditor { Q_OBJECT + TQ_OBJECT protected: TQComboBox *m_cb; mySpinBox *m_sb; KLineEdit *m_lineEdit; public: - specialSB(TQWidget *parent=0, const char *name=0, bool useLineEdit = false); + specialSB(TQWidget *tqparent=0, const char *name=0, bool useLineEdit = false); ~specialSB(); void insertItem(const TQString& s){ m_cb->insertItem(s); } void setInitialValue(const TQString& s); @@ -54,26 +55,30 @@ class specialSB : public miniEditor { class angleEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - angleEditor(TQWidget *parent=0, const char *name=0); + angleEditor(TQWidget *tqparent=0, const char *name=0); }; class frequencyEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - frequencyEditor(TQWidget *parent=0, const char *name=0); + frequencyEditor(TQWidget *tqparent=0, const char *name=0); }; class timeEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - timeEditor(TQWidget *parent=0, const char *name=0); + timeEditor(TQWidget *tqparent=0, const char *name=0); }; class lengthEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - lengthEditor(TQWidget *parent=0, const char *name=0); + lengthEditor(TQWidget *tqparent=0, const char *name=0); }; #endif diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index 31f6788b..fff108d1 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -39,10 +39,10 @@ #include "viewmanager.h" #include "csseditor.h" -StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ +StyleEditor::StyleEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){ connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_iconWidth = pixMap.width(); @@ -92,7 +92,7 @@ void StyleEditor::openCSSEditor(){ temp = tempTag.toString(); } else { - dlg->setInlineStyleContent(TQString::null); + dlg->setInlineStyleContent(TQString()); temp = styleNode->tag->toString(); } diff --git a/quanta/components/csseditor/styleeditor.h b/quanta/components/csseditor/styleeditor.h index bef9146f..49f4fd3c 100644 --- a/quanta/components/csseditor/styleeditor.h +++ b/quanta/components/csseditor/styleeditor.h @@ -25,11 +25,12 @@ class propertySetter; class StyleEditor : public TLPEditor{ Q_OBJECT + TQ_OBJECT private: int m_iconWidth, m_iconHeight; public: - StyleEditor(TQWidget *parent=0, const char* name=0); + StyleEditor(TQWidget *tqparent=0, const char* name=0); virtual void setButtonIcon(int width, int height); public slots: diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp index db36ea4c..7374ce9a 100644 --- a/quanta/components/csseditor/stylesheetparser.cpp +++ b/quanta/components/csseditor/stylesheetparser.cpp @@ -20,7 +20,7 @@ #include static const TQString msg1(i18n("has not been closed")), - msg2(i18n("needs an opening parenthesis ")); + msg2(i18n("needs an opening tqparenthesis ")); stylesheetParser::stylesheetParser(const TQString& s){ m_styleSheet = s; @@ -74,7 +74,7 @@ void stylesheetParser::parseComment(){ if(stopProcessingComment){ int ws=whiteSpaces(k); - QPair tmp(m_styleSheet.left(k+ws),++m_orderNumber); + TQPair tmp(m_styleSheet.left(k+ws),++m_orderNumber); m_stylesheetStructure["/*"+TQString::number(m_orderNumber,10)]=tmp; m_styleSheet=m_styleSheet.right(m_styleSheet.length()-k-ws); parse(); @@ -87,7 +87,7 @@ void stylesheetParser::parseComment(){ } } -unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b){ +unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b){ TQChar searchFor = '{'; if (p == closed) searchFor = '}'; @@ -151,24 +151,24 @@ void stylesheetParser::parseSelector(){ int closingParentheses = 1, openingParentheses = 0; while(true){ - openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).contains("{"); + openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).tqcontains("{"); if(openingParentheses==closingParentheses){ - TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/).stripWhiteSpace(), - selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/+1, closingParenthesisPos - m_styleSheet.find("{") -1); + TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/).stripWhiteSpace(), + selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/+1, closingParenthesisPos - m_styleSheet.tqfind("{") -1); selectorName.remove("\n").remove("\t"); selectorValue.remove("\n").remove("\t"); - QPair tmp(selectorValue,++m_orderNumber); + TQPair tmp(selectorValue,++m_orderNumber); - if (m_stylesheetStructure.contains(selectorName)) + if (m_stylesheetStructure.tqcontains(selectorName)) { uint i = 2; - TQString s = selectorName + TQString("-v%1").arg(i); - while (m_stylesheetStructure.contains(s)) + TQString s = selectorName + TQString("-v%1").tqarg(i); + while (m_stylesheetStructure.tqcontains(s)) { i++; - s = selectorName + TQString("-v%1").arg(i); + s = selectorName + TQString("-v%1").tqarg(i); } selectorName = s; } @@ -176,7 +176,7 @@ void stylesheetParser::parseSelector(){ break; } else { - closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.find("}",closingParenthesisPos+1)*/; + closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.tqfind("}",closingParenthesisPos+1)*/; closingParentheses++; } } @@ -188,13 +188,13 @@ void stylesheetParser::parseSelector(){ void stylesheetParser::parseAtRules1(){ //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs - if(m_styleSheet.find("{") == -1) { + if(m_styleSheet.tqfind("{") == -1) { m_stopProcessing = true; emit errorOccurred(m_styleSheet.mid(0,20) + "...\n " + msg2); return; } - int closingParenthesisPos = m_styleSheet.find("}"), + int closingParenthesisPos = m_styleSheet.tqfind("}"), closingParentheses = 0; if(closingParenthesisPos==-1) return; @@ -202,12 +202,12 @@ void stylesheetParser::parseAtRules1(){ int openingParentheses=0; while(true){ - openingParentheses = m_styleSheet.left(closingParenthesisPos+1).contains("{"); + openingParentheses = m_styleSheet.left(closingParenthesisPos+1).tqcontains("{"); if(openingParentheses==closingParentheses) break; else { - closingParenthesisPos = m_styleSheet.find("}",closingParenthesisPos+1); + closingParenthesisPos = m_styleSheet.tqfind("}",closingParenthesisPos+1); if( closingParenthesisPos!= -1 ) closingParentheses++; else { @@ -219,7 +219,7 @@ void stylesheetParser::parseAtRules1(){ } int ws=whiteSpaces(closingParenthesisPos+1); - QPair tmp(m_styleSheet.left(closingParenthesisPos+1+ws),++m_orderNumber); + TQPair tmp(m_styleSheet.left(closingParenthesisPos+1+ws),++m_orderNumber); m_stylesheetStructure["@rule"+TQString::number(m_orderNumber,10)]=tmp; m_styleSheet=m_styleSheet.right(m_styleSheet.length()-closingParenthesisPos-1-ws); parse(); @@ -227,7 +227,7 @@ void stylesheetParser::parseAtRules1(){ void stylesheetParser::parseAtRules2(){ //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs - int semicolonPos = m_styleSheet.find(";"); + int semicolonPos = m_styleSheet.tqfind(";"); if(semicolonPos==-1) { m_stopProcessing = true; @@ -236,7 +236,7 @@ void stylesheetParser::parseAtRules2(){ } int ws=whiteSpaces(semicolonPos+1); - QPair tmp(m_styleSheet.left(semicolonPos+1+ws),++m_orderNumber); + TQPair tmp(m_styleSheet.left(semicolonPos+1+ws),++m_orderNumber); m_stylesheetStructure["@rule"+TQString::number(m_orderNumber,10)]=tmp; m_styleSheet=m_styleSheet.right(m_styleSheet.length()-semicolonPos-1-ws); parse(); diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h index 06ad1f86..9fc0716d 100644 --- a/quanta/components/csseditor/stylesheetparser.h +++ b/quanta/components/csseditor/stylesheetparser.h @@ -26,28 +26,29 @@ *@author gulmini luciano */ -class stylesheetParser : public QObject{ +class stylesheetParser : public TQObject{ Q_OBJECT + TQ_OBJECT private: - enum parenthesisKind { opened, closed }; + enum tqparenthesisKind { opened, closed }; TQString m_styleSheet; bool m_stopProcessing; unsigned int m_orderNumber; - TQMap > m_stylesheetStructure; + TQMap > m_stylesheetStructure; void parseComment(); void parseSelector(); void parseAtRules1(); void parseAtRules2(); int whiteSpaces(int); - unsigned int numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b); + unsigned int numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b); public: stylesheetParser(const TQString& s); ~stylesheetParser(){} void parse(); - TQMap > stylesheetStructure() { return m_stylesheetStructure; } + TQMap > stylesheetStructure() { return m_stylesheetStructure; } unsigned int orderNumber() const {return m_orderNumber; } signals: diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 057083e1..6b796cf7 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -34,7 +34,7 @@ #include "fontfamilychooser.h" #include "project.h" -TLPEditor::TLPEditor(TQWidget *parent, const char* name) : miniEditor(parent,name){ +TLPEditor::TLPEditor(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){ m_label = new TQLabel(this); m_le = new TQLineEdit(this); m_pb = new KPushButton(this); @@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){ } void TLPEditor::setButtonIcon(TQString s){ - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s.ascii())); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1(s.ascii())); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -66,7 +66,7 @@ void TLPEditor::setWhatsThis(TQString s){ TQWhatsThis::add(m_le,s); } -URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ +URIEditor::URIEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){ TQString whatsthis =i18n("With this line edit you can insert the URI of the resource you want to reach"); setWhatsThis(whatsthis); setLabelText(" Uri :"); @@ -92,7 +92,7 @@ void URIEditor::setMode(const mode& m) { void URIEditor::selectedURI(const TQString & s){ KURL u; u.setPath(s); - emit valueChanged("url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); + emit valueChanged("url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); } void URIEditor::selectedURIs(const TQStringList& s){ @@ -101,7 +101,7 @@ void URIEditor::selectedURIs(const TQStringList& s){ selectedFilesWithURLFormat; for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){ u.setPath(*it); - selectedFilesWithURLFormat.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); + selectedFilesWithURLFormat.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); } emit valueChanged(selectedFilesWithURLFormat.join(",")); } @@ -143,14 +143,14 @@ void URIEditor::openFileDialog(){ KURL u; for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){ u.setPath(*it); - m_sFiles.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); + m_sFiles.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); } emit valueChanged(m_sFiles.join(","));*/ } } } -fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name), m_initialValue(TQString::null){ +fontEditor::fontEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name), m_initialValue(TQString()){ TQString whatsthis =i18n("With this line edit you can insert the name of the font you want to use"); setWhatsThis(whatsthis); setLabelText(i18n("Font family:")); diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h index 8388c6b6..80d5899b 100644 --- a/quanta/components/csseditor/tlpeditors.h +++ b/quanta/components/csseditor/tlpeditors.h @@ -31,6 +31,7 @@ class TQLabel; class TLPEditor : public miniEditor { //editor with a line text and a button calling a dialog Q_OBJECT + TQ_OBJECT protected: TQLineEdit *m_le; @@ -38,7 +39,7 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal KPushButton *m_pb; public: - TLPEditor(TQWidget *parent, const char* name=0); + TLPEditor(TQWidget *tqparent, const char* name=0); virtual ~TLPEditor(); virtual void setButtonIcon(TQString); void setToolTip(TQString); @@ -55,11 +56,12 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal class fontEditor : public TLPEditor{ Q_OBJECT + TQ_OBJECT private: TQString m_initialValue; public: - fontEditor(TQWidget *parent, const char* name=0); + fontEditor(TQWidget *tqparent, const char* name=0); virtual void setInitialValue(const TQString& s) { m_initialValue = s; } virtual void connectToPropertySetter(propertySetter* p); @@ -69,6 +71,7 @@ class fontEditor : public TLPEditor{ class URIEditor : public TLPEditor { Q_OBJECT + TQ_OBJECT public: enum mode{ Multi, Single }; enum URIResourceType{ audio, image, mousePointer }; @@ -78,7 +81,7 @@ class URIEditor : public TLPEditor { URIResourceType m_resourceType; public: - URIEditor(TQWidget *parent, const char* name=0); + URIEditor(TQWidget *tqparent, const char* name=0); void setMode(const mode& m); void setResourceType(const URIResourceType& r) { m_resourceType = r ; } virtual void setInitialValue(const TQString& /*s*/){} diff --git a/quanta/components/cvsservice/Makefile.am b/quanta/components/cvsservice/Makefile.am index 79429348..eb381581 100644 --- a/quanta/components/cvsservice/Makefile.am +++ b/quanta/components/cvsservice/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES = $(all_includes) -I$(kde_includes)/kde + noinst_LTLIBRARIES = libcvsservice.la libcvsservice_la_SOURCES = cvsservice.cpp cvscommitdlgs.ui \ diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index ce2c9fd0..a2ce167e 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2004 Andras Mantia <amantia@kde.org> - + CVSCommitDlgS @@ -33,7 +33,7 @@ fileList - + textLabel1 @@ -49,7 +49,7 @@ false - + textLabel2 @@ -60,7 +60,7 @@ messageCombo - + textLabel3 @@ -71,7 +71,7 @@ logEdit - + logEdit @@ -105,7 +105,7 @@ Expanding - + 80 20 @@ -143,7 +143,7 @@ okButton cancelButton - + klistbox.h diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 4849ea72..33386cb3 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -176,11 +176,11 @@ void CVSService::slotUpdateToTag(const TQStringList &files) if (m_updateToDlg->tagRadioButton->isChecked()) { extraOpts = "-r " + m_updateToDlg->tagCombo->currentText(); - commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText()); + commandStr = i18n("Updating to revision %1 ...").tqarg(m_updateToDlg->tagCombo->currentText()); } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false); @@ -430,7 +430,7 @@ void CVSService::slotAddToCVSIgnore() line = str.readLine().stripWhiteSpace(); if (line == fInfo.fileName()) { - emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); found = true; break; } @@ -438,7 +438,7 @@ void CVSService::slotAddToCVSIgnore() if (!found) { str << fInfo.fileName() << endl; - emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" added to the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -477,7 +477,7 @@ void CVSService::slotRemoveFromCVSIgnore() } if (!found) { - emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -486,7 +486,7 @@ void CVSService::slotRemoveFromCVSIgnore() TQTextStream str(&f); str.setEncoding(TQTextStream::UnicodeUTF8); str << content; - emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); f.close(); } @@ -501,7 +501,7 @@ void CVSService::slotJobExited(bool normalExit, int exitStatus) { if (!normalExit) { - KMessageBox::sorry(0, i18n("The CVS command %1 has failed. The error code was %2.").arg(m_cvsCommand).arg(exitStatus), i18n("Command Failed")); + KMessageBox::sorry(0, i18n("The CVS command %1 has failed. The error code was %2.").tqarg(m_cvsCommand).tqarg(exitStatus), i18n("Command Failed")); } if (exitStatus == 0) { @@ -529,7 +529,7 @@ void CVSService::slotReceivedStderr(TQString output) void CVSService::notInRepository() { emit clearMessages(); - emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false); + emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false); } void CVSService::startService() diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h index 9cfc1328..e9f0945c 100644 --- a/quanta/components/cvsservice/cvsservice.h +++ b/quanta/components/cvsservice/cvsservice.h @@ -41,6 +41,7 @@ class CVSUpdateToDlgS; class CVSService : public TQObject, public CVSServiceDCOPIf { Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui index ef646f92..d5e116a4 100644 --- a/quanta/components/cvsservice/cvsupdatetodlgs.ui +++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2005 Andras Mantia <amantia@kde.org> - + CVSUpdateToDlgS @@ -28,7 +28,7 @@ unnamed - + buttonGroup1 @@ -45,7 +45,7 @@ unnamed - + dateRadioButton @@ -53,7 +53,7 @@ Update to &date ('yyyy-mm-dd'): - + tagRadioButton @@ -82,7 +82,7 @@ Fixed - + 40 20 @@ -104,7 +104,7 @@ Fixed - + 40 20 @@ -113,9 +113,9 @@ - + - layout5 + tqlayout5 @@ -147,7 +147,7 @@ Expanding - + 295 20 @@ -194,5 +194,5 @@ accept() - + diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 202e86e0..6c2d8679 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -49,8 +49,8 @@ BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view) } -BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) - : KListView(parent, name) +BacktraceListview::BacktraceListview(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { int charwidth = this->fontMetrics().width("0"); // If you change the order here, change the BacktraceListviewColumns enums above @@ -91,7 +91,7 @@ void BacktraceListview::backtraceShow(int level, BacktraceType type, const TQStr void BacktraceListview::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Enter) + if(e->key() != TQt::Key_Enter) { e->ignore(); return; diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 21b72d3d..495130f0 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -71,10 +71,11 @@ class BacktraceListviewItem : public KListViewItem class BacktraceListview : public KListView { Q_OBJECT + TQ_OBJECT public: - BacktraceListview(TQWidget *parent = 0, const char *name = 0); + BacktraceListview(TQWidget *tqparent = 0, const char *name = 0); ~BacktraceListview(); void backtraceShow(int level, BacktraceType type, const TQString& filename, long line, const TQString& func); diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 055512da..9dfeb5a6 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -56,7 +56,7 @@ ConditionalBreakpointDialog::~ConditionalBreakpointDialog() void ConditionalBreakpointDialog::slotExpressionChanged() { - if(comboExpression->currentText().find( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) + if(comboExpression->currentText().tqfind( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) ledWarning->on(); else ledWarning->off(); diff --git a/quanta/components/debugger/conditionalbreakpointdialog.h b/quanta/components/debugger/conditionalbreakpointdialog.h index cad4adeb..ca67814e 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.h +++ b/quanta/components/debugger/conditionalbreakpointdialog.h @@ -23,6 +23,7 @@ class ConditionalBreakpointDialog : public ConditionalBreakpointDialogS { Q_OBJECT + TQ_OBJECT public: enum Break diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index 8e4a1bf2..9c397431 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -1,6 +1,6 @@ ConditionalBreakpointDialogS - + ConditionalBreakpointDialogS @@ -22,7 +22,7 @@ unnamed - + lblExpression @@ -38,7 +38,7 @@ Expression: - + Layout1 @@ -62,14 +62,14 @@ Expanding - + 20 20 - + buttonOk @@ -86,7 +86,7 @@ true - + buttonCancel @@ -102,7 +102,7 @@ - + buttonGroup1 @@ -113,7 +113,7 @@ unnamed - + radioOnTrue @@ -121,7 +121,7 @@ When expression is true - + radioOnChange @@ -144,7 +144,7 @@ Expanding - + 30 20 @@ -163,13 +163,13 @@ ledWarning - + 22 22 - + 22 22 @@ -189,7 +189,7 @@ Lit when a finding a single equal sign in expression (common error) - + groupBox10 @@ -200,7 +200,7 @@ unnamed - + lblValue @@ -215,11 +215,11 @@ File: - + AlignVCenter - + lblValue_2 @@ -234,11 +234,11 @@ Objects of class: - + AlignVCenter - + lblValue_3 @@ -253,21 +253,21 @@ Function: - + AlignVCenter - + lineFile - + lineFunction - + buttonClearFile @@ -275,7 +275,7 @@ x - + buttonClearFunction @@ -283,7 +283,7 @@ x - + buttonClearClass @@ -291,7 +291,7 @@ x - + lineClass @@ -320,7 +320,7 @@ buttonOk buttonCancel - + kcombobox.h klineedit.h diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 62b0daa0..d5ce7b86 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_server->listen()) { emit active(true); - emit networkError(i18n("Listening on port %1").arg(service), true); + emit networkError(i18n("Listening on port %1").tqarg(service), true); } else { delete m_server; m_server = NULL; emit active(false); - emit networkError(i18n("Unable to listen on port %1").arg(service), true); + emit networkError(i18n("Unable to listen on port %1").tqarg(service), true); } } } @@ -118,7 +118,7 @@ void DBGpNetwork::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl; + kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) { slotConnectionClosed(); @@ -128,7 +128,7 @@ void DBGpNetwork::slotError(int) if(m_socket->error()) { - emit networkError(m_socket->errorString(), true); + emit networkError(m_socket->KSocketBase::errorString(), true); } } @@ -262,7 +262,7 @@ void DBGpNetwork::slotReadyRead() // If datalen == -1, we didnt read the size yet, otherwise we're reading data. if(m_datalen == -1) { - bytes = m_fifo.find('\0'); + bytes = m_fifo.tqfind('\0'); if(bytes < 0) break; @@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen return false; m_transaction_id++; - TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; + TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl; @@ -304,7 +304,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen long DBGpNetwork::sendCommand( const TQString & command, const TQString & arguments, const TQString & data ) { - QByteArrayFifo buffer; + TQByteArrayFifo buffer; buffer.append(data.ascii(), data.length()); return sendCommand(command, arguments + " -- " + buffer.base64Encoded()); } diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 96faca06..a6f64a69 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -28,14 +28,15 @@ //using namespace KNetwork; class KResolverEntry; -class DBGpNetwork : public QObject +class DBGpNetwork : public TQObject { Q_OBJECT + TQ_OBJECT private: KNetwork::KStreamSocket *m_socket; KNetwork::KServerSocket *m_server; - QByteArrayFifo m_fifo; + TQByteArrayFifo m_fifo; bool m_useproxy; long m_datalen; long m_transaction_id; diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index e9bbc249..c76e00c2 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -23,7 +23,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { - textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); } diff --git a/quanta/components/debugger/dbgp/dbgpsettings.h b/quanta/components/debugger/dbgp/dbgpsettings.h index bdf8c2f0..6ec8e73b 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.h +++ b/quanta/components/debugger/dbgp/dbgpsettings.h @@ -22,6 +22,7 @@ class DBGpSettings : public DBGpSettingsS { Q_OBJECT + TQ_OBJECT public: DBGpSettings(const TQString &protocolversion); diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 2b846a7e..98da70f1 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -1,6 +1,6 @@ DBGpSettingsS - + DBGpSettingsS @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -46,14 +46,14 @@ Expanding - + 20 20 - + buttonOk @@ -70,7 +70,7 @@ true - + buttonCancel @@ -83,7 +83,7 @@ - + tabWidget2 @@ -98,7 +98,7 @@ 1 - + tab @@ -109,7 +109,7 @@ unnamed - + groupBox2 @@ -120,7 +120,7 @@ unnamed - + lblDebuggerServerListenPort @@ -136,7 +136,7 @@ Listen port: - + lineServerListenPort @@ -149,7 +149,7 @@ - + lblRequest @@ -165,7 +165,7 @@ Request URL: - + lineStartSession @@ -207,14 +207,14 @@ Expanding - + 21 40 - + groupBox1 @@ -225,7 +225,7 @@ unnamed - + lineServerBasedir @@ -238,7 +238,7 @@ - + lblDebuggerServerBasedir @@ -254,7 +254,7 @@ Server basedir: - + lineLocalBasedir @@ -270,7 +270,7 @@ - + checkLocalProject @@ -289,7 +289,7 @@ - + lblDebuggerLocalBasedir @@ -305,7 +305,7 @@ Local basedir: - + lblLocalProject @@ -323,7 +323,7 @@ - + groupBox3_2 @@ -334,7 +334,7 @@ unnamed - + lineProfilerFilename @@ -355,7 +355,7 @@ %c - CRC32 of the initial filepath - + lblRequest_2 @@ -371,7 +371,7 @@ Profiler output: - + lblLocalProject_2 @@ -387,7 +387,7 @@ Map profiler output: - + checkProfilerMapFilename @@ -409,7 +409,7 @@ If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files. - + lblLocalProject_2_2 @@ -425,7 +425,7 @@ Open automatically: - + checkProfilerAutoOpen @@ -451,7 +451,7 @@ - + tab @@ -462,7 +462,7 @@ unnamed - + groupBox4 @@ -473,7 +473,7 @@ unnamed - + checkBreakOnUserError @@ -489,18 +489,18 @@ User errors - + lblBreakOn Break on: - + AlignTop - + checkBreakOnUserWarning @@ -516,7 +516,7 @@ User warnings - + checkBreakOnUserNotice @@ -532,7 +532,7 @@ User notices - + checkBreakOnNotice @@ -548,7 +548,7 @@ Notices - + checkBreakOnWarning @@ -566,7 +566,7 @@ - + groupBox5 @@ -577,7 +577,7 @@ unnamed - + Pause @@ -598,14 +598,14 @@ comboDefaultExecutionState - + lblDefaultExecutionMode Default mode: - + AlignVCenter @@ -621,7 +621,7 @@ Expanding - + 21 40 @@ -630,7 +630,7 @@ - + TabPage @@ -641,7 +641,7 @@ unnamed - + textLabel1 @@ -716,12 +716,12 @@ buttonOk buttonCancel - + slotLocalProjectToggled(bool) checkLocalProject_toggled(bool) slotLocalProjectToggle(bool) - - + + ktextbrowser.h diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 4f8e72d8..6a52ac39 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -21,13 +21,13 @@ #include #include -QByteArrayFifo::QByteArrayFifo( ) +TQByteArrayFifo::TQByteArrayFifo( ) { m_size = 0; m_array.resize(0); } -TQString QByteArrayFifo::retrieve( ) +TQString TQByteArrayFifo::retrieve( ) { // See if there's a null teminator somewhere TQString str(m_array); @@ -38,16 +38,16 @@ TQString QByteArrayFifo::retrieve( ) for(size_t cnt = 0; cnt < m_size; cnt++) m_array[cnt] = m_array[cnt + size]; - // Resize array, needed for find() to work + // Resize array, needed for tqfind() to work m_array.resize(m_size); return str; } -bool QByteArrayFifo::append(const char * chars, size_t size ) +bool TQByteArrayFifo::append(const char * chars, size_t size ) { // Resize the array, fail if not possible - if(!m_array.resize(m_size + size )) + if(!m_array.tqresize(m_size + size )) return false; // Copy the elements @@ -60,16 +60,16 @@ bool QByteArrayFifo::append(const char * chars, size_t size ) return true; } -long QByteArrayFifo::find( char character ) +long TQByteArrayFifo::tqfind( char character ) { - // If size is 0, find() outputs a warning for some reason + // If size is 0, tqfind() outputs a warning for some reason if(m_size == 0) return -1; - return m_array.find(character); + return m_array.tqfind(character); } -TQString QByteArrayFifo::base64Encoded() +TQString TQByteArrayFifo::base64Encoded() { return KCodecs::base64Encode(m_array); } diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.h b/quanta/components/debugger/dbgp/qbytearrayfifo.h index 851c7f34..2f46df76 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.h +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.h @@ -23,15 +23,15 @@ #include #include -class QByteArrayFifo +class TQByteArrayFifo { public: - QByteArrayFifo(); + TQByteArrayFifo(); bool append(const char * chars, size_t size); TQString retrieve(); TQString base64Encoded(); - long find(char character); + long tqfind(char character); size_t length() { return m_size; } private: diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 481c8d61..ba1c7c44 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -49,15 +49,15 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp, const char QuantaDebuggerDBGp::protocolversion[] = "1.0"; -QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&) - : DebuggerClient (parent, "DBGp") +QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&) + : DebuggerClient (tqparent, "DBGp") { // Create a socket object and set up its signals - m_errormask = 1794; + m_errortqmask = 1794; m_supportsasync = false; m_defaultExecutionState = Starting; setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(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 updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); else - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } @@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) debuggerInterface()->setActiveLine("", 0); if(connected) - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); else { setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); profilerOpen(false); } @@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log) { - debuggerInterface()->showStatus(errormsg, log); + debuggerInterface()->showtqStatus(errormsg, log); } @@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state) if(state == "starting") { setExecutionState(Starting); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } else if(state == "stopping") { setExecutionState(Stopping); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "stopped") { setExecutionState(Stopped); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "running") { setExecutionState(Running); - emit updateStatus(DebuggerUI::Running); + emit updatetqStatus(DebuggerUI::Running); } else if(state == "break") { setExecutionState(Break); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } } @@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) TQDomNode response = data.elementsByTagName("response").item(0); TQString command = attribute(response, "command"); - // Status command + // tqStatus command if(command == "status") setExecutionState(attribute(response, "status")); @@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) } else { - debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true); + debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true); kdDebug(24002) << datas << endl; } @@ -338,10 +338,10 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket) { if(attribute(initpacket, "protocol_version") != protocolversion) { - debuggerInterface()->showStatus( + debuggerInterface()->showtqStatus( i18n("The debugger for %1 uses an unsupported protocol version (%2)") - .arg(attribute(initpacket, "language")) - .arg(attribute(initpacket, "protocol_version")) + .tqarg(attribute(initpacket, "language")) + .tqarg(attribute(initpacket, "protocol_version")) , true); endSession(); @@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node) // Type isnt currently correct with xdebug // type = (attribute(child, "type") == "file" ? File : Eval); typestr = attribute(child, "filename"); - if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) + if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) type = Eval; else type = File; @@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint) " -n " + TQString::number(breakpoint->line() + 1) , breakpoint->condition()); - breakpoint->setKey(TQString("id %1").arg(id)); + breakpoint->setKey(TQString("id %1").tqarg(id)); } void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) @@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) id = attribute(response, "transaction_id").toLong(); if(id > 0) { - TQString oldkey = TQString("id %1").arg(id); + TQString oldkey = TQString("id %1").tqarg(id); DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey); if(bp) debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id")); @@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerDBGp::addWatch(const TQString & variable) { - if(m_watchlist.find(variable) == m_watchlist.end()) + if(m_watchlist.tqfind(variable) == m_watchlist.end()) m_watchlist.append(variable); m_network.sendCommand("property_get", "-n " + variable); } // Remove watch void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.find(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.find(variable->name())); + if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.tqfind(variable->name())); } // Show conditional breakpoint state @@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node) valuenode = node.namedItem("useproxy"); m_useproxy = valuenode.firstChild().nodeValue() == "1"; - valuenode = node.namedItem("errormask"); - m_errormask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + valuenode = node.namedItem("errortqmask"); + m_errortqmask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; // Profiler valuenode = node.namedItem("profilerfilename"); @@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) else set.comboDefaultExecutionState->setCurrentItem(1); - set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask); set.lineProfilerFilename->setText(m_profilerFilename); if(m_profilerAutoOpen) @@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("localproject").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localproject"); node.appendChild( el ); if(set.checkLocalProject->isChecked()) @@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("localbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localbasedir"); node.appendChild( el ); el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) ); @@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("serverbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverbasedir"); node.appendChild( el ); if(debuggerInterface()) @@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("listenport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("listenport"); node.appendChild( el ); m_listenPort = set.lineServerListenPort->text(); @@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("startsession").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("startsession"); node.appendChild( el ); m_startsession = set.lineStartSession->text(); @@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("defaultexecutionstate").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("defaultexecutionstate"); node.appendChild( el ); if(set.comboDefaultExecutionState->currentItem() == 0) @@ -774,23 +774,23 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) } - el = node.namedItem("errormask").toElement(); + el = node.namedItem("errortqmask").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errormask"); + el.tqparentNode().removeChild(el); + el = node.ownerDocument().createElement("errortqmask"); node.appendChild( el ); - m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); // Profiler el = node.namedItem("profilerfilename").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profilerfilename"); node.appendChild( el ); m_profilerFilename = set.lineProfilerFilename->text(); @@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("profilerfilename_map").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profilerfilename_map"); node.appendChild( el ); m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false); @@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("profiler_autoopen").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profiler_autoopen"); node.appendChild( el ); m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false); @@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen() void QuantaDebuggerDBGp::profilerOpen(bool forceopen) { TQString profileroutput = m_profilerFilename; - profileroutput.replace("%a", m_appid); - profileroutput.replace("%c", m_initialscript); + profileroutput.tqreplace("%a", m_appid); + profileroutput.tqreplace("%c", m_initialscript); if(m_profilerMapFilename) profileroutput = mapServerPathToLocal( profileroutput); @@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen) else { if(forceopen) - KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error")); + KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error")); else - debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false); + debuggerInterface()->showtqStatus(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()->showStatus(i18n("Unable to set value of variable."), true); + debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true); } } @@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen { /* Sample: - + - + @@ -1015,22 +1015,22 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode ) { // Managable error long error = attribute(errornode, "code").toLong(); - if(!(error & m_errormask)) + if(!(error & m_errortqmask)) { setExecutionState(Running); } else { - emit updateStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); + emit updatetqStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); } break; } else { // Fatal error - emit updateStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); + emit updatetqStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); } } errornode = errornode.nextSibling(); diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 7c9601ad..52ec17bc 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -32,9 +32,10 @@ typedef TQMap StringMap; class QuantaDebuggerDBGp : public DebuggerClient { Q_OBJECT + TQ_OBJECT public: - QuantaDebuggerDBGp(TQObject *parent, const char* name, const TQStringList&); + QuantaDebuggerDBGp(TQObject *tqparent, const char* name, const TQStringList&); ~QuantaDebuggerDBGp(); // Execution states @@ -121,7 +122,7 @@ class QuantaDebuggerDBGp : public DebuggerClient bool m_profilerAutoOpen; bool m_profilerMapFilename; State m_executionState, m_defaultExecutionState; - long m_errormask; + long m_errortqmask; long m_displaydelay; bool m_supportsasync; @@ -160,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient void processCommand(const TQString&); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp index 6a47d296..2d18309f 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.cpp +++ b/quanta/components/debugger/debuggerbreakpointlist.cpp @@ -50,7 +50,7 @@ void DebuggerBreakpointList::add(DebuggerBreakpoint* bp) void DebuggerBreakpointList::remove(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = find(*bp); + BreakpointList_t::iterator it = tqfind(*bp); if(it == m_breakpointList->end()) return; @@ -113,7 +113,7 @@ void DebuggerBreakpointList::clear() bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = find(*bp); + BreakpointList_t::iterator it = tqfind(*bp); if(it == m_breakpointList->end()) return false; @@ -124,7 +124,7 @@ bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) } -BreakpointList_t::iterator DebuggerBreakpointList::find(const DebuggerBreakpoint &bp) +BreakpointList_t::iterator DebuggerBreakpointList::tqfind(const DebuggerBreakpoint &bp) { BreakpointList_t::iterator it; @@ -180,7 +180,7 @@ void DebuggerBreakpointList::updateBreakpointKey( const DebuggerBreakpoint & bp, { //DebuggerBreakpoint *bpp = new DebuggerBreakpoint(bp); BreakpointList_t::iterator it; - it = find(bp); + it = tqfind(bp); if(it != m_breakpointList->end()) { (*it)->setKey(newkey); diff --git a/quanta/components/debugger/debuggerbreakpointlist.h b/quanta/components/debugger/debuggerbreakpointlist.h index aa6cd803..ef9233bc 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.h +++ b/quanta/components/debugger/debuggerbreakpointlist.h @@ -31,7 +31,7 @@ class DebuggerBreakpointList private: BreakpointList_t* m_breakpointList; BreakpointList_t::iterator m_current; - BreakpointList_t::iterator find(const DebuggerBreakpoint &bp); + BreakpointList_t::iterator tqfind(const DebuggerBreakpoint &bp); public: DebuggerBreakpointList(); diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 8614bc28..bf4911ad 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -52,8 +52,8 @@ DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* v } -DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name) - : KListView(parent, name) +DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { // If you change here, change the DebuggerBreakpointViewColumns enums above addColumn(i18n("Expression")); @@ -154,7 +154,7 @@ void DebuggerBreakpointView::slotRemoveSelected() void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Delete) + if(e->key() != TQt::Key_Delete) { e->ignore(); return; diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index 196cd451..e593a815 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -44,9 +44,10 @@ class DebuggerBreakpointViewItem : public KListViewItem class DebuggerBreakpointView : public KListView { Q_OBJECT + TQ_OBJECT public: - DebuggerBreakpointView(TQWidget *parent = 0, const char *name = 0); + DebuggerBreakpointView(TQWidget *tqparent = 0, const char *name = 0); ~DebuggerBreakpointView(); void showBreakpoint(const DebuggerBreakpoint& bp); diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index b62b3e3b..60fd68ef 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -49,8 +49,8 @@ // dialogs #include "debuggervariablesets.h" -DebuggerManager::DebuggerManager(TQObject *myparent) - : TQObject(myparent) +DebuggerManager::DebuggerManager(TQObject *mytqparent) + : TQObject(mytqparent) { initActions(); @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); delete m_client; m_client = NULL; @@ -108,7 +108,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(!m_client) { emit hideSplash(); - KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } break; } @@ -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(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + connect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -212,7 +212,7 @@ void DebuggerManager::initActions() return; //Debugger, breakpoint - newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), Qt::CTRL+Qt::SHIFT+Qt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); delete m_client; m_client = 0L; @@ -601,11 +601,11 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line ) return true; // Find new position in editor - if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, true, 0L)) + if(ViewManager::ref()->isOpened(filename) || TQExtFileInfo::exists(filename, true, 0L)) quantaApp->gotoFileAndLine(filename, line, 0); else { - showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(filename), true); + showtqStatus(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::showStatus(const TQString& a_message, bool log) +bool DebuggerManager::showtqStatus(const TQString& a_message, bool log) { TQString message = a_message; quantaApp->slotStatusMsg(m_client->getName() + ": " + message); @@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( ) // (Re)create breakpoints section TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints"); if(!nodeBreakpoints.isNull()) - nodeBreakpoints.parentNode().removeChild(nodeBreakpoints); + nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints); if(m_breakpointList->count() > 0) { @@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( ) // (Re)create watches section TQDomNode nodeWatches = nodeDbg.namedItem("watches"); if(!nodeWatches.isNull()) - nodeWatches.parentNode().removeChild(nodeWatches); + nodeWatches.tqparentNode().removeChild(nodeWatches); if(m_debuggerui->watches()->first()) { diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index 5a88b156..ad3c8739 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -30,9 +30,10 @@ class DebuggerBreakpoint; class PathMapper; class Document; -class DebuggerManager : public QObject +class DebuggerManager : public TQObject { Q_OBJECT + TQ_OBJECT private: // client DebuggerClient *m_client; @@ -53,7 +54,7 @@ class DebuggerManager : public QObject long m_currentLine; public: - DebuggerManager(TQObject *myparent); + DebuggerManager(TQObject *mytqparent); ~DebuggerManager(); // Access to memebers @@ -70,7 +71,7 @@ class DebuggerManager : public QObject void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey); // Public help functions - bool showStatus(const TQString& message, bool log); + bool showtqStatus(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 fdf32a5c..ae88b3e9 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -36,8 +36,8 @@ #include "resource.h" #include "whtmlpart.h" -DebuggerUI::DebuggerUI(TQObject *parent, const char *name) - : TQObject(parent, name), m_variablesListView(0) +DebuggerUI::DebuggerUI(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), m_variablesListView(0) { // Variable watch tree @@ -69,9 +69,9 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name) // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), tqparent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), tqparent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } @@ -109,7 +109,7 @@ void DebuggerUI::showMenu() else m_debuggerMenuID = 0; - // Status indicator + // tqStatus indicator quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER); } @@ -124,7 +124,7 @@ void DebuggerUI::hideMenu() } m_debuggerMenuID = 0; - // Status indicator + // tqStatus indicator quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER); } @@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url) m_preview->openURL(url); } -void DebuggerUI::slotStatus( DebuggerStatus status ) +void DebuggerUI::slottqStatus( DebuggertqStatus status ) { switch(status) { diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 767facad..3a438f11 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -32,12 +32,13 @@ class DebuggerVariable; class WHTMLPart; class KURL; -class DebuggerUI : public QObject +class DebuggerUI : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum DebuggerStatus + enum DebuggertqStatus { NoSession = 0, AwaitingConnection, @@ -49,7 +50,7 @@ class DebuggerUI : public QObject HaltedOnBreakpoint }; - DebuggerUI(TQObject *parent = 0, const char *name = 0); + DebuggerUI(TQObject *tqparent = 0, const char *name = 0); ~DebuggerUI(); // Watches @@ -82,8 +83,8 @@ class DebuggerUI : public QObject WHTMLPart *m_preview; public slots: - // Status indication - void slotStatus(DebuggerUI::DebuggerStatus status); + // tqStatus indication + void slottqStatus(DebuggerUI::DebuggertqStatus status); }; diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp index 390290a7..46f827cb 100644 --- a/quanta/components/debugger/debuggervariable.cpp +++ b/quanta/components/debugger/debuggervariable.cpp @@ -258,17 +258,17 @@ DebuggerVariable* DebuggerVariable::findItem( TQListViewItem * item, bool traver return NULL; } -void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren ) +void DebuggerVariable::copy( DebuggerVariable * v, bool copytqchildren ) { m_name = v->name(); - m_size = (v->isScalar() || copychildren ? v->size() : m_valueList.count()); + m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count()); m_value = v->value(); m_type = v->type(); m_isReference = v->isReference(); // We cant just assign m_valuelist to v->values(), it would make a shallow copy... // - if(copychildren) + if(copytqchildren) { m_valueList.clear(); for(DebuggerVariable * v2 = v->values().first(); v2; v2 = v->values().next()) diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index 70440ff4..76689e57 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -1,6 +1,6 @@ DebuggerVariableSetS - + DebuggerVariableSetS @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -46,14 +46,14 @@ Expanding - + 20 20 - + buttonOk @@ -70,7 +70,7 @@ true - + buttonCancel @@ -86,7 +86,7 @@ - + lineVariable @@ -94,7 +94,7 @@ - + lblVariable @@ -110,7 +110,7 @@ Variable: - + lblValue @@ -125,7 +125,7 @@ New value: - + AlignTop @@ -139,14 +139,14 @@ Expanding - + 30 20 - + lineValue @@ -181,5 +181,5 @@ buttonOk buttonCancel - + diff --git a/quanta/components/debugger/gubed/gubedsettings.cpp b/quanta/components/debugger/gubed/gubedsettings.cpp index 9464dc81..b6df9b25 100644 --- a/quanta/components/debugger/gubed/gubedsettings.cpp +++ b/quanta/components/debugger/gubed/gubedsettings.cpp @@ -22,7 +22,7 @@ GubedSettings::GubedSettings(const TQString &protocolversion) : GubedSettingsS(0, "GubedSettings", false, 0) { - textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); } GubedSettings::~GubedSettings() diff --git a/quanta/components/debugger/gubed/gubedsettings.h b/quanta/components/debugger/gubed/gubedsettings.h index 73232e06..b8fef421 100644 --- a/quanta/components/debugger/gubed/gubedsettings.h +++ b/quanta/components/debugger/gubed/gubedsettings.h @@ -22,6 +22,7 @@ class GubedSettings : public GubedSettingsS { Q_OBJECT + TQ_OBJECT public slots: virtual void slotUseProxyToggle( bool useproxy); diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index 12125c93..7697a337 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -1,6 +1,6 @@ GubedSettingsS - + GubedSettingsS @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -46,14 +46,14 @@ Expanding - + 20 20 - + buttonOk @@ -70,7 +70,7 @@ true - + buttonCancel @@ -83,7 +83,7 @@ - + tabWidget2 @@ -95,7 +95,7 @@ 1 - + tab @@ -116,14 +116,14 @@ Expanding - + 21 40 - + groupBox1 @@ -134,7 +134,7 @@ unnamed - + lblDebuggerServerBasedir @@ -150,7 +150,7 @@ Server basedir: - + lblDebuggerLocalBasedir @@ -166,12 +166,12 @@ Local basedir: - + lineServerBasedir - + lineLocalBasedir @@ -181,7 +181,7 @@ - + groupBox2 @@ -192,7 +192,7 @@ unnamed - + lineServerListenPort @@ -205,7 +205,7 @@ - + lineServerPort @@ -221,7 +221,7 @@ - + lineServerHost @@ -229,7 +229,7 @@ false - + checkUseProxy @@ -237,7 +237,7 @@ - + lblDebuggerUseProxe @@ -253,7 +253,7 @@ Use proxy - + lblDebuggerServerHost @@ -269,7 +269,7 @@ Proxy host: - + lblDebuggerServerPort @@ -285,7 +285,7 @@ Proxy port: - + lblDebuggerServerListenPort @@ -303,7 +303,7 @@ - + groupBox3 @@ -314,7 +314,7 @@ unnamed - + lineStartSession @@ -336,7 +336,7 @@ %add - Document root of current script - + optAddInclude @@ -347,7 +347,7 @@ &Add include - + optStartSession @@ -362,7 +362,7 @@ - + tab @@ -373,7 +373,7 @@ unnamed - + groupBox4 @@ -384,7 +384,7 @@ unnamed - + checkBreakOnUserError @@ -400,18 +400,18 @@ User errors - + lblBreakOn Break on: - + AlignTop - + checkBreakOnUserWarning @@ -427,7 +427,7 @@ User warnings - + checkBreakOnUserNotice @@ -443,7 +443,7 @@ User notices - + checkBreakOnNotice @@ -459,7 +459,7 @@ Notices - + checkBreakOnWarning @@ -487,14 +487,14 @@ Expanding - + 21 50 - + groupBox5 @@ -505,7 +505,7 @@ unnamed - + lblDelayFast @@ -526,11 +526,11 @@ Fast - + sliderDisplayDelay - + 0 27 @@ -546,7 +546,7 @@ Below - + lblDelaySlow @@ -566,11 +566,11 @@ Slow - + AlignVCenter|AlignRight - + Pause @@ -599,25 +599,25 @@ comboDefaultExecutionState - + lblDefaultExecutionMode Default mode: - + AlignVCenter - + lblDisplayDelay Run speed: - + AlignVCenter @@ -625,7 +625,7 @@ - + TabPage @@ -636,7 +636,7 @@ unnamed - + textLabel1 @@ -652,7 +652,7 @@ <h4>Gubed PHP Debugger Plugin for Quanta +</h4> - + pixmapLabel1 @@ -670,7 +670,7 @@ false - + AlignCenter @@ -752,10 +752,10 @@ buttonOk buttonCancel - + slotUseProxyToggle( bool ) - - + + ktextbrowser.h diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 8c2ab1b5..58f949a1 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -47,17 +47,17 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggergubed, const char QuantaDebuggerGubed::protocolversion[] = "0.0.12"; -QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, const TQStringList&) - : DebuggerClient (parent, name) +QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *tqparent, const char* name, const TQStringList&) + : DebuggerClient (tqparent, name) { // Create a socket object and set up its signals m_socket = NULL; m_server = NULL; - m_errormask = 1794; + m_errortqmask = 1794; m_defaultExecutionState = Pause; setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); m_datalen = -1; } @@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed () delete m_server; m_server = NULL; } - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(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 updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); } } else @@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession() if(m_server->listen()) { - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); debuggerInterface()->enableAction("debug_connect", false); debuggerInterface()->enableAction("debug_disconnect", true); debuggerInterface()->enableAction("debug_request", true); } else { - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(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 updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(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 updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } else if(newstate == Run) { @@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("run", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Running); + emit updatetqStatus(DebuggerUI::Running); } else if(newstate == Trace) { @@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("trace", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Tracing); + emit updatetqStatus(DebuggerUI::Tracing); } m_executionState = newstate; @@ -258,15 +258,15 @@ void QuantaDebuggerGubed::slotError(int) if(m_socket->error()) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl; - debuggerInterface()->showStatus(m_socket->errorString(), false); + kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; + debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false); } } if(m_server && m_server->error()) { kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl; - debuggerInterface()->showStatus(m_server->errorString(), false); + debuggerInterface()->showtqStatus(m_server->errorString(), false); } } @@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept() connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); connected(); - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); } else { @@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept() // Connection established void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &) { - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); connected(); } @@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() debuggerInterface()->setActiveLine("", 0); - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); m_active = false; } @@ -383,13 +383,13 @@ void QuantaDebuggerGubed::slotReadyRead() // If datalen == -1, we didnt read the command yet, otherwise were reading data. if(m_datalen == -1) { - bytes = m_buffer.find(";"); + bytes = m_buffer.tqfind(";"); if(bytes < 0) break; data = m_buffer.left(bytes); m_buffer.remove(0, bytes + 1); - bytes = data.find(":"); + bytes = data.tqfind(":"); m_command = data.left(bytes); data.remove(0, bytes + 1); m_datalen = data.toLong(); @@ -437,7 +437,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_executionState == Trace) sendCommand("trace", (char*)0L); - sendCommand("seterrormask", "errormask", TQString::number(m_errormask).ascii(), (char*)0L); + sendCommand("seterrortqmask", "errortqmask", TQString::number(m_errortqmask).ascii(), (char*)0L); } // Just some status info, display on status line else if(m_command == "status") @@ -445,9 +445,9 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) long argcnt = args["args"].toLong(); TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) - msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]); + msg.tqreplace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); - debuggerInterface()->showStatus(msg, false); + debuggerInterface()->showtqStatus(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()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true); + debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true); return; } // A debugging session is running @@ -479,11 +479,11 @@ 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()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").arg(args["line"]).arg(args["errnum"]).arg(args["errmsg"]).arg(args["filename"]), true); + 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); - // Filter to get error code only and match it with out mask + // Filter to get error code only and match it with out tqmask long error = args["errnum"].toLong(); - if(m_errormask & error) + if(m_errortqmask & error) setExecutionState(Pause); else if(m_executionState == Trace) setExecutionState(Trace); @@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnError); + emit updatetqStatus(DebuggerUI::HaltedOnError); } // We came across a hard coded breakpoint else if(m_command == "forcebreak") { setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showStatus(i18n("Breakpoint reached"), true); + emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true); } // A conditional breakpoint was fulfilled else if(m_command == "conditionalbreak") { setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true); + emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showtqStatus(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()->showStatus(i18n("Established connection to %1").arg(args["filename"]), false); + debuggerInterface()->showtqStatus(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()->showStatus(i18n("At end of include %1").arg(data), true); + //debuggerInterface()->showtqStatus(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()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); + debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); sendCommand("die", (char*)0L); } return; @@ -603,7 +603,7 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args) TQString buffer = phpSerialize(args); - buffer = TQString(command + ":%1;" + buffer).arg(buffer.length()); + buffer = TQString(command + ":%1;" + buffer).tqarg(buffer.length()); m_socket->writeBlock(buffer.ascii(), buffer.length()); return true; } @@ -768,15 +768,15 @@ void QuantaDebuggerGubed::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerGubed::addWatch(const TQString &variable) { - if(m_watchlist.find(variable) == m_watchlist.end()) + if(m_watchlist.tqfind(variable) == m_watchlist.end()) m_watchlist.append(variable); sendCommand("getwatch", "variable", variable.ascii(), (char*)0L); } // Remove watch void QuantaDebuggerGubed::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.find(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.find(variable->name())); + if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.tqfind(variable->name())); //sendCommand("unwatchvariable", var->name()); } @@ -843,9 +843,9 @@ void QuantaDebuggerGubed::readConfig(TQDomNode node) valuenode = node.namedItem("displaydelay"); m_displaydelay = valuenode.firstChild().nodeValue().toLong(); - valuenode = node.namedItem("errormask"); - m_errormask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + valuenode = node.namedItem("errortqmask"); + m_errortqmask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; } @@ -866,11 +866,11 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) set.lineStartSession->setText(m_startsession); set.comboDefaultExecutionState->setCurrentItem((int)m_defaultExecutionState); - set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errormask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errormask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errormask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errormask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errormask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errortqmask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errortqmask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errortqmask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errortqmask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errortqmask); if(set.exec() == TQDialog::Accepted ) { @@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverhost").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverhost"); node.appendChild( el ); m_serverHost = set.lineServerHost->text(); @@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverport"); node.appendChild( el ); m_serverPort = set.lineServerPort->text(); @@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("localbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localbasedir"); node.appendChild( el ); m_localBasedir = set.lineLocalBasedir->text(); @@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverbasedir"); node.appendChild( el ); m_serverBasedir = set.lineServerBasedir->text(); @@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("useproxy").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("useproxy"); node.appendChild( el ); m_useproxy = set.checkUseProxy->isChecked(); @@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("listenport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("listenport"); node.appendChild( el ); m_listenPort = set.lineServerListenPort->text(); @@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("startsession").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("startsession"); node.appendChild( el ); m_startsession = set.lineStartSession->text(); @@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("defaultexecutionstate").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("defaultexecutionstate"); node.appendChild( el ); m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem(); @@ -947,24 +947,24 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("displaydelay").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("displaydelay"); node.appendChild( el ); m_displaydelay = set.sliderDisplayDelay->value(); el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_displaydelay))); - el = node.namedItem("errormask").toElement(); + el = node.namedItem("errortqmask").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errormask"); + el.tqparentNode().removeChild(el); + el = node.ownerDocument().createElement("errortqmask"); node.appendChild( el ); - m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerGubed::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerGubed::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerGubed::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerGubed::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); } } @@ -995,7 +995,7 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) { StringMap::Iterator it; // a:2:{s:4:"name";s:7:"Jessica";s:3:"age";s:2:"26";s:4:"test";i:1;} - TQString ret = TQString("a:%1:{").arg(args.size()); + TQString ret = TQString("a:%1:{").tqarg(args.size()); for( it = args.begin(); it != args.end(); ++it ) { bool isNumber; @@ -1003,15 +1003,15 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) it.data().toInt(&isNumber); if(isNumber && !it.data().isEmpty()) ret += TQString("s:%1:\"%2\";i:%3;") - .arg(it.key().length()) - .arg(it.key()) - .arg(it.data()); + .tqarg(it.key().length()) + .tqarg(it.key()) + .tqarg(it.data()); else ret += TQString("s:%1:\"%2\";s:%3:\"%4\";") - .arg(it.key().length()) - .arg(it.key()) - .arg(it.data().length()) - .arg(it.data()); + .tqarg(it.key().length()) + .tqarg(it.key()) + .tqarg(it.data().length()) + .tqarg(it.data()); } @@ -1038,13 +1038,13 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) return ca; } - cnt = args.mid(2, args.find("{") - 3).toLong(); - TQString data = args.mid(args.find("{") + 1); + cnt = args.mid(2, args.tqfind("{") - 3).toLong(); + TQString data = args.mid(args.tqfind("{") + 1); TQString tmp, func; while(cnt > 0) { - tmp = data.left(data.find("\"")); + tmp = data.left(data.tqfind("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); func = data.mid(tmp.length() + 1, length); @@ -1053,8 +1053,8 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) if(data.left(1) == "i") { // Integer data - tmp = data.mid(data.find(":") + 1); - tmp = tmp.left(tmp.find(";")); + tmp = data.mid(data.tqfind(":") + 1); + tmp = tmp.left(tmp.tqfind(";")); ca[func] = tmp; data = data.mid(tmp.length() + 3); // kdDebug(24002) << k_funcinfo << "**i " << func << ": " << ca[func] << endl; @@ -1062,7 +1062,7 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) else { // String data - tmp = data.left(data.find("\"")); + tmp = data.left(data.tqfind("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); ca[func] = data.mid(tmp.length() + 1, length); @@ -1098,8 +1098,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) if(type == "s") { // Get length of key - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 1); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 1); length = tempstring.toUInt(); key = str.left(length + 1); @@ -1108,8 +1108,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) } else if(type == "i") { - key = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + key = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); } @@ -1122,8 +1122,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:4:"$row";i:6; */ - data = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + data = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Integer); } @@ -1132,9 +1132,9 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:8:"$boolvar";b:1; */ - data = str.left(str.find(';')); + data = str.left(str.tqfind(';')); data = (data == "0" ? i18n("False"): i18n("True")); - str.remove(0, str.find(';') + 1); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Boolean); } else if(type == "N") @@ -1151,8 +1151,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of string - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 1); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 1); length = tempstring.toUInt(); data = str.left(length + 1); @@ -1168,8 +1168,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 2); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 2); length = tempstring.toUInt(); TQPtrList vars ; @@ -1193,13 +1193,13 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 2); - tempstring = str.mid(str.find(':') + 1); - tempstring = tempstring.left(tempstring.find(':')); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 2); + tempstring = str.mid(str.tqfind(':') + 1); + tempstring = tempstring.left(tempstring.tqfind(':')); length = tempstring.toUInt(); - str.remove(0, str.find('{') + 1); + str.remove(0, str.tqfind('{') + 1); TQPtrList vars ; while(length > 0) @@ -1220,8 +1220,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:9:"$floatvar";d:12.5600000000000004973799150320701301097869873046875;" */ - data = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + data = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Float); } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 624a8ae8..b30bbe5c 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -31,9 +31,10 @@ typedef TQMap StringMap; class QuantaDebuggerGubed : public DebuggerClient { Q_OBJECT + TQ_OBJECT public: - QuantaDebuggerGubed(TQObject *parent, const char* name, const TQStringList&); + QuantaDebuggerGubed(TQObject *tqparent, const char* name, const TQStringList&); ~QuantaDebuggerGubed(); // Execution states @@ -109,7 +110,7 @@ class QuantaDebuggerGubed : public DebuggerClient TQString m_listenPort; bool m_useproxy; State m_executionState, m_defaultExecutionState; - long m_errormask; + long m_errortqmask; long m_displaydelay; WatchList m_watchlist; @@ -147,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient void slotReadyAccept(); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp index 97140dbb..03b024f0 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.cpp +++ b/quanta/components/debugger/interfaces/debuggerclient.cpp @@ -23,8 +23,8 @@ // CTor -DebuggerClient::DebuggerClient(TQObject *parent, const char* name) - : TQObject(parent, name) +DebuggerClient::DebuggerClient(TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { m_active = false; } @@ -32,7 +32,7 @@ DebuggerClient::DebuggerClient(TQObject *parent, const char* name) DebuggerInterface* DebuggerClient::debuggerInterface() { - return static_cast( parent()->child( 0, "DebuggerInterface" ) ); + return static_cast( tqparent()->child( 0, "DebuggerInterface" ) ); } // Active state of session @@ -43,7 +43,7 @@ bool DebuggerClient::isActive() void DebuggerClient::unSupportedAction(const TQString &action) { - KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(action), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function")); } @@ -129,7 +129,7 @@ void DebuggerClient::removeBreakpoint(DebuggerBreakpoint*) // Unimplemented defaults void DebuggerClient::showConfig(TQDomNode) { - KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(this->getName()), i18n("Settings")); + KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").tqarg(this->getName()), i18n("Settings")); } // Unimplemented defaults @@ -141,20 +141,20 @@ void DebuggerClient::readConfig(TQDomNode) // Unimplemented defaults: add watch void DebuggerClient::addWatch(const TQString &) { - KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: Remove watch void DebuggerClient::removeWatch(DebuggerVariable *) { // Giving an error seems pointless, since you shouldnt be able to add a watch in the first place... - KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: set value of varialbe void DebuggerClient::variableSetValue(const DebuggerVariable &) { - KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } #include "debuggerclient.moc" diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index 1966039f..20d5b604 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -60,13 +60,14 @@ namespace DebuggerClientCapabilities }; } -class DebuggerClient : public QObject +class DebuggerClient : public TQObject { Q_OBJECT + TQ_OBJECT private: protected: - DebuggerClient(TQObject *parent, const char* name); + DebuggerClient(TQObject *tqparent, const char* name); bool m_active; @@ -108,7 +109,7 @@ class DebuggerClient : public QObject DebuggerInterface *debuggerInterface(); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; diff --git a/quanta/components/debugger/interfaces/debuggerinterface.cpp b/quanta/components/debugger/interfaces/debuggerinterface.cpp index 4d7beda6..013aeb15 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.cpp +++ b/quanta/components/debugger/interfaces/debuggerinterface.cpp @@ -17,8 +17,8 @@ #include "debuggerinterface.h" -DebuggerInterface::DebuggerInterface (TQObject *parent, const char* name) - : TQObject(parent, name) +DebuggerInterface::DebuggerInterface (TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { } diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index 1540a616..a93fee50 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -28,22 +28,23 @@ class PathMapper; -class DebuggerInterface : public QObject +class DebuggerInterface : public TQObject { Q_OBJECT + TQ_OBJECT private: public: - DebuggerInterface(TQObject *parent, const char* name); + DebuggerInterface(TQObject *tqparent, const char* name); // Breakpoints virtual void haveBreakpoint (const TQString& file, int line) = 0; virtual void havenoBreakpoint (const TQString& file, int line) = 0; // Public help functions - virtual bool showStatus(const TQString& message, bool log) = 0; + virtual bool showtqStatus(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 c38e2fec..e1d74875 100644 --- a/quanta/components/debugger/pathmapper.cpp +++ b/quanta/components/debugger/pathmapper.cpp @@ -27,8 +27,8 @@ #include #include -PathMapper::PathMapper(TQObject *parent, const char *name) - : TQObject(parent, name) +PathMapper::PathMapper(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -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.startsWith(from, false)) + if(path.tqstartsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; @@ -110,21 +110,21 @@ TQString PathMapper::mapServerPathToLocal(const TQString &serverpath) newpath = translate(serverpath, m_serverBasedir, m_localBasedir); // Check if this dir is matched by the basedirs - if(QExtFileInfo::exists(newpath, true, 0L)) + if(TQExtFileInfo::exists(newpath, true, 0L)) return newpath; // Check if any previous mappings fit... for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ ) { newpath = translate(serverpath, m_serverlist[cnt], m_locallist[cnt]); - if(QExtFileInfo::exists(newpath, true, 0L)) + if(TQExtFileInfo::exists(newpath, true, 0L)) return newpath; } // If the basedirs didnt match, check if the file exists, // otherwise scan through the mapping history or show the // mapping dialog - if(!QExtFileInfo::exists(serverpath, true, 0L)) + if(!TQExtFileInfo::exists(serverpath, true, 0L)) { PathMapperDialog pmdlg(serverpath, PathMapperDialog::ServerToLocal); for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ ) diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h index fd48e3ab..92a761ac 100644 --- a/quanta/components/debugger/pathmapper.h +++ b/quanta/components/debugger/pathmapper.h @@ -25,12 +25,13 @@ class KURL; -class PathMapper : public QObject +class PathMapper : public TQObject { Q_OBJECT + TQ_OBJECT public: - PathMapper(TQObject *parent = 0, const char *name = 0); + PathMapper(TQObject *tqparent = 0, const char *name = 0); PathMapper(); virtual TQString mapLocalPathToServer(const TQString &localpath); virtual TQString mapServerPathToLocal(const TQString &serverpath); diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 74e01956..8cc385d5 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.startsWith(from, false)) + if(m_path.tqstartsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; @@ -78,10 +78,10 @@ void PathMapperDialog::slotPathsChanged() // Indicate wether local file exists if(m_direction == ServerToLocal) { - if(QExtFileInfo::exists(translated, true, this)) - ledTranslationExists->setColor(Qt::green); + if(TQExtFileInfo::exists(translated, true, this)) + ledTranslationExists->setColor(TQt::green); else - ledTranslationExists->setColor(Qt::red); + ledTranslationExists->setColor(TQt::red); ledTranslationExists->on(); } diff --git a/quanta/components/debugger/pathmapperdialog.h b/quanta/components/debugger/pathmapperdialog.h index 39eb4600..e8d6b8c4 100644 --- a/quanta/components/debugger/pathmapperdialog.h +++ b/quanta/components/debugger/pathmapperdialog.h @@ -22,6 +22,7 @@ class PathMapperDialog : public PathMapperDialogS { Q_OBJECT + TQ_OBJECT public: enum Direction diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index fc7486d4..933d003a 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -1,6 +1,6 @@ PathMapperDialogS - + PathMapperDialogS @@ -22,7 +22,7 @@ unnamed - + groupBox6 @@ -33,7 +33,7 @@ unnamed - + lblDebuggerLocalBasedir @@ -49,7 +49,7 @@ Local basedir: - + lblDebuggerServerBasedir @@ -65,7 +65,7 @@ Server basedir: - + lineLocalPath @@ -74,7 +74,7 @@ The quanta will know that files starting with "/home/user/project/" on the local computer, will start with "/var/www/" on the remote computer. - + lineServerPath @@ -85,7 +85,7 @@ The quanta will know that files starting with "/home/user/project/" on the local - + Layout1 @@ -109,14 +109,14 @@ The quanta will know that files starting with "/home/user/project/" on the local Expanding - + 20 20 - + buttonOk @@ -133,7 +133,7 @@ The quanta will know that files starting with "/home/user/project/" on the local true - + buttonCancel @@ -149,7 +149,7 @@ The quanta will know that files starting with "/home/user/project/" on the local - + groupBox7 @@ -160,7 +160,7 @@ The quanta will know that files starting with "/home/user/project/" on the local unnamed - + Local Directory @@ -204,7 +204,7 @@ The quanta will know that files starting with "/home/user/project/" on the local - + groupBox8 @@ -215,7 +215,7 @@ The quanta will know that files starting with "/home/user/project/" on the local unnamed - + lblTranslates @@ -231,7 +231,7 @@ The quanta will know that files starting with "/home/user/project/" on the local Translates to: - + lblOriginal @@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local ledTranslationExists - + 22 22 - + 22 22 @@ -279,7 +279,7 @@ The quanta will know that files starting with "/home/user/project/" on the local This indicator tells you whether the translated path exists on local disk or not. - + lineTranslated @@ -297,7 +297,7 @@ The quanta will know that files starting with "/home/user/project/" on the local This field shows what the "original path" above will look like after translation. - + linePath @@ -335,10 +335,10 @@ The quanta will know that files starting with "/home/user/project/" on the local reject() - + slotHistoryclicked() - - + + kled.h diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index af70da0a..be930d17 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -32,10 +32,10 @@ class DebuggerBreakpoint; -QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *myparent, const char* name) - : DebuggerInterface(myparent, name) +QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *mytqparent, const char* name) + : DebuggerInterface(mytqparent, name) { - m_manager = static_cast(parent()); + m_manager = static_cast(tqparent()); } QuantaDebuggerInterface::~QuantaDebuggerInterface () @@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line) } // Public help functions -bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log) +bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log) { - return m_manager->showStatus(message, log); + return m_manager->showtqStatus(message, log); } bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line) @@ -86,20 +86,20 @@ const TQString QuantaDebuggerInterface::activeFileParts(const TQString & str) // n/d/p = name/dir/path // Filename, filedir and filepath - newstr.replace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); - newstr.replace("%afd", ViewManager::ref()->activeDocument()->url().directory()); - newstr.replace("%afp", ViewManager::ref()->activeDocument()->url().path()); + newstr.tqreplace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); + newstr.tqreplace("%afd", ViewManager::ref()->activeDocument()->url().directory()); + newstr.tqreplace("%afp", ViewManager::ref()->activeDocument()->url().path()); // filedir and filepath relative to project root - newstr.replace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); - newstr.replace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.tqreplace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); + newstr.tqreplace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); // filedir and filepath relative to document root - newstr.replace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); - newstr.replace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.tqreplace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); + newstr.tqreplace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); - newstr.replace("%apd", Project::ref()->projectBaseURL().path()); - newstr.replace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); + newstr.tqreplace("%apd", Project::ref()->projectBaseURL().path()); + newstr.tqreplace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); kdDebug(24002) << k_funcinfo << ", BaseURL " << Project::ref()->projectBaseURL().path() << ", active doc : " << ViewManager::ref()->activeDocument()->url().path() << ", documentFolderForURL" << Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()) << ", newstr" << newstr << endl; diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index d18fd1cd..ba637307 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -28,12 +28,13 @@ class DebuggerManager; class QuantaDebuggerInterface : public DebuggerInterface { Q_OBJECT + TQ_OBJECT private: DebuggerManager *m_manager; public: - QuantaDebuggerInterface(TQObject *myparent, const char* name); + QuantaDebuggerInterface(TQObject *mytqparent, const char* name); ~QuantaDebuggerInterface(); // Breakpoints @@ -42,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface void refreshBreakpoints(); // Public help functions - bool showStatus(const TQString& message, bool log); + bool showtqStatus(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 03ddd7d3..9c7263bb 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -39,7 +39,7 @@ namespace VariablesListViewColumns enum Columns { Name = 0, - Status, + tqStatus, Value, Type, Size @@ -47,12 +47,12 @@ namespace VariablesListViewColumns }; } -VariablesListView::VariablesListView(TQWidget *parent, const char *name) - : KListView(parent, name) +VariablesListView::VariablesListView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { // If you change here, change the VariablesListViewColumns enums above addColumn(i18n("Name")); - addColumn(TQString::null); + addColumn(TQString()); addColumn(i18n("Value")); addColumn(i18n("Type")); addColumn(i18n("Size")); @@ -106,7 +106,7 @@ void VariablesListView::slotRemoveSelected() void VariablesListView::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Delete) + if(e->key() != TQt::Key_Delete) { e->ignore(); return; @@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab { KListViewItem * item; - // Remove children that doesen't exist anymore + // Remove tqchildren that doesen't exist anymore TQPtrList oldlist = oldvar->values(); for(DebuggerVariable* oldchild = oldlist.last(); oldchild; oldchild = oldlist.prev()) { @@ -178,7 +178,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab oldvar->deleteChild(oldchild); } - // Update and add children + // Update and add tqchildren TQPtrList newlist = newvar->values(); for(DebuggerVariable* newchild = newlist.last(); newchild; newchild = newlist.prev()) { @@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab item = oldvar->item(); if(oldvar->value() != newvar->value()) - item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok")); + item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok")); else - item->setPixmap(VariablesListViewColumns::Status, KPixmap()); + item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap()); oldvar->copy(newvar, false); @@ -274,7 +274,7 @@ void VariablesListView::slotVariableDump( ) if(!v) return; - quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(v->name())); + quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").tqarg(v->name())); quantaApp->messageOutput()->showMessage(v->value()); quantaApp->messageOutput()->showMessage("<<<\n"); } @@ -284,7 +284,7 @@ void VariablesListView::slotVariableCopyToClipboard( ) DebuggerVariable *v = selected(true); if(!v) return; - TQApplication::clipboard()->setText(v->value()); + TQApplication::tqclipboard()->setText(v->value()); } #include "variableslistview.moc" diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index 729aa8d8..b4f3d9bc 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -28,6 +28,7 @@ class DebuggerVariable; class VariablesListView : public KListView { Q_OBJECT + TQ_OBJECT enum menuitems { @@ -38,7 +39,7 @@ class VariablesListView : public KListView }; public: - VariablesListView(TQWidget *parent = 0, const char *name = 0); + VariablesListView(TQWidget *tqparent = 0, const char *name = 0); ~VariablesListView(); void addVariable(DebuggerVariable* variable); diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index 6dbe92d1..528da3ea 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -24,11 +24,12 @@ *@author gulmini luciano */ -class areaAttribute : public QObject{ +class areaAttribute : public TQObject{ Q_OBJECT + TQ_OBJECT private: - TQRect m_geometry; + TQRect m_tqgeometry; TQMap m_attributeMap; //tag specific attributes public: @@ -37,13 +38,13 @@ class areaAttribute : public QObject{ void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; } void setAllAttributes(TQMap map){ m_attributeMap = map; } void resetAttributes(); - TQRect geometry() const { return m_geometry; } + TQRect tqgeometry() const { return m_tqgeometry; } TQString src() const{ return m_attributeMap["src"]; } TQString attributeValue(TQString l) const { return attributeMap()[l];} TQMap attributeMap() const { return m_attributeMap; } public slots: - void setGeometry(TQRect g) { m_geometry = g; } + void setGeometry(TQRect g) { m_tqgeometry = g; } }; #endif diff --git a/quanta/components/framewizard/fmfpeditor.h b/quanta/components/framewizard/fmfpeditor.h index 1a89f0c8..2fc52e64 100644 --- a/quanta/components/framewizard/fmfpeditor.h +++ b/quanta/components/framewizard/fmfpeditor.h @@ -26,6 +26,7 @@ class fmFPeditor : public fmFPeditorS { Q_OBJECT + TQ_OBJECT public: fmFPeditor(); diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui index ef8990a9..bcfb43c1 100644 --- a/quanta/components/framewizard/fmfpeditors.ui +++ b/quanta/components/framewizard/fmfpeditors.ui @@ -1,6 +1,6 @@ fmFPeditorS - + fmFPeditorS @@ -19,7 +19,7 @@ unnamed - + Layout8 @@ -43,14 +43,14 @@ Expanding - + 55 0 - + pbOk @@ -58,7 +58,7 @@ &OK - + pbCancel @@ -68,11 +68,11 @@ - + tw - + tab @@ -83,7 +83,7 @@ unnamed - + bgBorder @@ -100,7 +100,7 @@ 6 - + rbBorderYes @@ -111,7 +111,7 @@ true - + rbBorderNo @@ -124,7 +124,7 @@ - + gbMargins @@ -141,7 +141,7 @@ 6 - + Layout8 @@ -155,7 +155,7 @@ 6 - + Layout4 @@ -169,7 +169,7 @@ 6 - + TextLabel2_3 @@ -177,7 +177,7 @@ From left: - + sbLeft @@ -190,7 +190,7 @@ - + Layout3 @@ -204,7 +204,7 @@ 6 - + TextLabel1_3 @@ -212,7 +212,7 @@ From top: - + sbTop @@ -229,7 +229,7 @@ - + bgScrolling @@ -246,7 +246,7 @@ 6 - + rbScrollingYes @@ -254,7 +254,7 @@ Yes - + rbScrollingAuto @@ -265,7 +265,7 @@ true - + rbScrollingNo @@ -275,7 +275,7 @@ - + bgNoresize @@ -295,7 +295,7 @@ 6 - + rbResizeYes @@ -303,7 +303,7 @@ Yes - + rbResizeNo @@ -316,7 +316,7 @@ - + Layout10 @@ -330,7 +330,7 @@ 6 - + Layout9 @@ -344,7 +344,7 @@ 6 - + tlFrameSource @@ -352,7 +352,7 @@ Frame source: - + tlFrameName @@ -362,7 +362,7 @@ - + Layout8 @@ -381,7 +381,7 @@ fc - + leName @@ -392,7 +392,7 @@ - + tab @@ -403,7 +403,7 @@ unnamed - + Layout11 @@ -417,7 +417,7 @@ 6 - + tlId @@ -425,7 +425,7 @@ Id: - + TextLabel2_2 @@ -433,7 +433,7 @@ Class: - + TextLabel3 @@ -441,7 +441,7 @@ Style: - + TextLabel4 @@ -449,7 +449,7 @@ Title: - + TextLabel6 @@ -459,7 +459,7 @@ - + Layout10 @@ -473,27 +473,27 @@ 6 - + leId - + leClass - + leStyle - + leTitle - + leLongdesc @@ -510,7 +510,7 @@ Expanding - + 20 40 @@ -537,5 +537,5 @@ - + diff --git a/quanta/components/framewizard/fmrceditor.h b/quanta/components/framewizard/fmrceditor.h index 254f1cc5..ab33d5b4 100644 --- a/quanta/components/framewizard/fmrceditor.h +++ b/quanta/components/framewizard/fmrceditor.h @@ -26,6 +26,7 @@ class fmRCeditor : public fmRCeditorS { Q_OBJECT + TQ_OBJECT public: fmRCeditor(); ~fmRCeditor(); diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui index 25cd41bd..d85bb0da 100644 --- a/quanta/components/framewizard/fmrceditors.ui +++ b/quanta/components/framewizard/fmrceditors.ui @@ -1,6 +1,6 @@ fmRCeditorS - + fmRCeditorS @@ -20,13 +20,13 @@ 0 - + 300 150 - + 300 150 @@ -45,7 +45,7 @@ 6 - + Layout11 @@ -59,7 +59,7 @@ 6 - + tl @@ -67,7 +67,7 @@ - + sb @@ -80,7 +80,7 @@ - + Layout3 @@ -104,14 +104,14 @@ Expanding - + 31 0 - + pbOk @@ -119,7 +119,7 @@ &OK - + pbCancel @@ -145,5 +145,5 @@ reject() - + diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index e0e7d5d9..0eabb061 100644 --- a/quanta/components/framewizard/framewizard.cpp +++ b/quanta/components/framewizard/framewizard.cpp @@ -28,7 +28,7 @@ static const TQString info1=i18n("You must select an area."), info2=i18n("Before editing a frame you must save the file."); -FrameWizard::FrameWizard(TQWidget *parent, const char *name) : FrameWizardS(parent, name), +FrameWizard::FrameWizard(TQWidget *tqparent, const char *name) : FrameWizardS(tqparent, name), m_hasSelected(false),m_saved(false) { m_hasSelected = false; @@ -44,7 +44,7 @@ m_hasSelected(false),m_saved(false) } FrameWizard::~FrameWizard(){ -#define QT_CHECK_NULL +#define TQT_CHECK_NULL Q_CHECK_PTR( vfe ); } @@ -57,7 +57,7 @@ void FrameWizard::split(){ if(m_hasSelected) { int split = 0; TQString currNodeLabel = m_currSA; - TQString senderName=sender()->name(); + TQString senderName=TQT_TQOBJECT(const_cast(sender()))->name(); if(senderName=="pbHorizontal"){ split = showRCeditorDlg(i18n("Enter the desired number of rows:")); if(split>=2) vfe->split(currNodeLabel,split,HORIZONTAL); diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h index 42386982..177c6c6b 100644 --- a/quanta/components/framewizard/framewizard.h +++ b/quanta/components/framewizard/framewizard.h @@ -26,6 +26,7 @@ class TQStringList; class FrameWizard : public FrameWizardS { Q_OBJECT + TQ_OBJECT private: bool m_hasSelected, m_saved; // if saved = false the the file containing the frameset structure @@ -35,7 +36,7 @@ class FrameWizard : public FrameWizardS TQString m_currSA; public: - FrameWizard( TQWidget* parent=0, const char *name=0); + FrameWizard( TQWidget* tqparent=0, const char *name=0); ~FrameWizard(); private slots: diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui index a06d321b..6f3d030e 100644 --- a/quanta/components/framewizard/framewizards.ui +++ b/quanta/components/framewizard/framewizards.ui @@ -1,6 +1,6 @@ FrameWizardS - + FrameWizardS @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 32767 @@ -45,7 +45,7 @@ 6 - + Layout2 @@ -59,7 +59,7 @@ 6 - + pbHelp @@ -77,14 +77,14 @@ Expanding - + 30 0 - + Layout1 @@ -98,7 +98,7 @@ 6 - + pbOk @@ -106,7 +106,7 @@ &OK - + pbCancel @@ -118,7 +118,7 @@ - + Layout11 @@ -132,7 +132,7 @@ 6 - + Layout9 @@ -146,7 +146,7 @@ 6 - + tl @@ -161,14 +161,14 @@ Expanding - + 0 30 - + ButtonGroup4 @@ -193,7 +193,7 @@ 6 - + pbVertical @@ -201,7 +201,7 @@ Vertical - + pbHorizontal @@ -221,14 +221,14 @@ Expanding - + 0 16 - + ButtonGroup5 @@ -253,7 +253,7 @@ 6 - + pbEditFrame @@ -261,7 +261,7 @@ Edit Frame - + pbDelete @@ -272,7 +272,7 @@ Delete - + pbReset @@ -295,7 +295,7 @@ Expanding - + 0 30 @@ -362,7 +362,7 @@ - + visualframeeditor.h diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp index c168e323..40f76ae2 100644 --- a/quanta/components/framewizard/selectablearea.cpp +++ b/quanta/components/framewizard/selectablearea.cpp @@ -20,7 +20,7 @@ //#include #include "fwglobal.h" -SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : KHTMLPart(parent,name) { +SelectableArea::SelectableArea(TQWidget *tqparent, const char *name ) : KHTMLPart(tqparent,name) { view()->setFrameShape(TQFrame::NoFrame); view()->setMinimumSize(TQSize(1,1)); view()->installEventFilter(this); @@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){ } break; case TQEvent::Resize : { - emit Resized( view()->geometry() ); + emit Resized( view()->tqgeometry() ); view()->hide(); view()->show(); return true; diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 8de351a9..3df3200a 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -29,9 +29,10 @@ class SelectableArea : public KHTMLPart { Q_OBJECT + TQ_OBJECT public : - SelectableArea(TQWidget *parent=0, const char *name=0); + SelectableArea(TQWidget *tqparent=0, const char *name=0); ~SelectableArea(); TQString idLabel() const { return m_idLabel; } void setIdLabel(const TQString &i) { m_idLabel = i; } diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index fd1f187f..0ff7cf74 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -20,7 +20,7 @@ static const int SIZE = 101; treeNode::treeNode(const TQString &l, const TQString &pl) : m_label(l), m_parentLabel(pl), m_splitType(NONE){ - m_childrenList.setAutoDelete(true); + m_tqchildrenList.setAutoDelete(true); m_atts = new areaAttribute; } @@ -29,16 +29,16 @@ treeNode::~treeNode(){ } void treeNode::addChildNode(const TQString &l) { - m_childrenList.append( new treeNode(l,m_label) ); + m_tqchildrenList.append( new treeNode(l,m_label) ); } void treeNode::removeChildNode(const TQString &l,bool autoDelete) { - m_childrenList.setAutoDelete(autoDelete); - m_childrenList.remove(findChild(l)); + m_tqchildrenList.setAutoDelete(autoDelete); + m_tqchildrenList.remove(findChild(l)); } treeNode* treeNode::findChild(const TQString &l){ - TQPtrListIterator it( m_childrenList ); + TQPtrListIterator it( m_tqchildrenList ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; @@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){ n->nextChild(); } - TQPtrList list = n->childrenList(); + TQPtrList list = n->tqchildrenList(); TQPtrListIterator it( list ); treeNode *node= it.current(); - TQRect newGeometry = n->atts()->geometry(); + TQRect newGeometry = n->atts()->tqgeometry(); if(n->splitType()==VERTICAL){ - newGeometry.setHeight(node->atts()->geometry().height()); + newGeometry.setHeight(node->atts()->tqgeometry().height()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->geometry().width(); + dim += node->atts()->tqgeometry().width(); dim += 6; } newGeometry.setWidth(dim); } else if(n->splitType()==HORIZONTAL){ - newGeometry.setWidth(node->atts()->geometry().width()); + newGeometry.setWidth(node->atts()->tqgeometry().width()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->geometry().height(); + dim += node->atts()->tqgeometry().height(); dim += 6; } newGeometry.setHeight(dim); @@ -98,7 +98,7 @@ void tree::refreshGeometries(treeNode *n){ treeNode* tree::findNode(const TQString &l){ if(l==m_root->label()) return m_root; - return m_nodeList.find(l); + return m_nodeList.tqfind(l); } TQString tree::addChildNode(const TQString &l){ @@ -114,13 +114,13 @@ TQString tree::addChildNode(const TQString &l){ } bool tree::insertChildNode(const TQString &l){ - TQString parent = findNode(l)->parentLabel(); - int pos=findNode( parent )->childPosition( findNode(l) ); + TQString tqparent = findNode(l)->tqparentLabel(); + int pos=findNode( tqparent )->childPosition( findNode(l) ); ++nodeId; - treeNode *newNode = new treeNode(TQString::number(nodeId,10),parent); + treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent); newNode->atts()->setAttribute( "src",findNode(l)->atts()->src() ); m_nodeList.insert(TQString::number(nodeId,10),newNode); - return findNode( parent )->insertChild(pos,newNode); + return findNode( tqparent )->insertChild(pos,newNode); } void tree::reset(){ diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index 0d686630..6680e443 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -33,36 +33,36 @@ class treeNode { TQString m_label, m_parentLabel; SplitType m_splitType; - TQPtrList m_childrenList; + TQPtrList m_tqchildrenList; areaAttribute *m_atts; public: - treeNode(const TQString &l=TQString::null, const TQString &pl=TQString::null); + treeNode(const TQString &l=TQString(), const TQString &pl=TQString()); ~treeNode(); void addChildNode(const TQString &L); - void addChildNode(treeNode *n){ m_childrenList.append(n); } + void addChildNode(treeNode *n){ m_tqchildrenList.append(n); } void removeChildNode(const TQString &l, bool autoDelete); void setSplitType(SplitType s) { m_splitType = s; } void setLabel(const TQString &l) { m_label = l; } - void removeChildren() { m_childrenList.clear(); } + void removeChildren() { m_tqchildrenList.clear(); } void setParentLabel(const TQString &s){ m_parentLabel = s;} - int childPosition(treeNode* n){ return m_childrenList.find(n); } - bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); } + int childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); } + bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); } TQString label() const { return m_label; } - TQString parentLabel() const { return m_parentLabel; } + TQString tqparentLabel() const { return m_parentLabel; } SplitType splitType() const { return m_splitType; } - TQPtrList childrenList() { return m_childrenList; } + TQPtrList tqchildrenList() { return m_tqchildrenList; } - treeNode* firstChild() { return m_childrenList.first(); } - treeNode* nextChild() { return m_childrenList.next(); } - treeNode* lastChild() { return m_childrenList.last(); } - treeNode* currentChild() { return m_childrenList.current(); } + treeNode* firstChild() { return m_tqchildrenList.first(); } + treeNode* nextChild() { return m_tqchildrenList.next(); } + treeNode* lastChild() { return m_tqchildrenList.last(); } + treeNode* currentChild() { return m_tqchildrenList.current(); } treeNode* findChild(const TQString &L); areaAttribute* atts() { return m_atts; } - int countChildren() const { return m_childrenList.count(); } - bool hasChildren() const { return !m_childrenList.isEmpty(); } + int countChildren() const { return m_tqchildrenList.count(); } + bool hasChildren() const { return !m_tqchildrenList.isEmpty(); } }; class tree{ @@ -77,7 +77,7 @@ class tree{ treeNode* root() const { return m_root; } TQString addChildNode(const TQString &l); bool insertChildNode(const TQString &L); - void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//parent node,child node + void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//tqparent node,child node treeNode* findNode(const TQString &L); areaAttribute* findAreaAttribute(const TQString &l){ return findNode(l)->atts(); }; void reset(); diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index a11dae84..d75074bd 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -32,7 +32,7 @@ TQMap > SIZES; static int splitterIdNumber = 0; -VisualFrameEditor::VisualFrameEditor(TQWidget * parent, const char * name) : TQHBox(parent,name){ +VisualFrameEditor::VisualFrameEditor(TQWidget * tqparent, const char * name) : TQHBox(tqparent,name){ m_internalTree = new tree; m_internalTree->root()->atts()->setGeometry(TQRect(0,0,510,422)); m_firstInsertedSA = 0L; @@ -46,12 +46,12 @@ VisualFrameEditor::~VisualFrameEditor(){ void VisualFrameEditor::setGeometries(const TQString &l){ int cP = cancelledPixels(m_internalTree->findNode(l)->countChildren()); - TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry()); - TQPtrList list=m_internalTree->findNode(l)->childrenList(); + TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry()); + TQPtrList list=m_internalTree->findNode(l)->tqchildrenList(); TQPtrListIterator it( list ); treeNode *node; if(m_internalTree->findNode(l)->splitType() == VERTICAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setWidth( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -60,7 +60,7 @@ void VisualFrameEditor::setGeometries(const TQString &l){ } else if(m_internalTree->findNode(l)->splitType() == HORIZONTAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().height()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -76,17 +76,17 @@ void VisualFrameEditor::split(const TQString &l, int n, SplitType type) { setGeometries(l); } else { - TQString parentLabel=m_internalTree->findNode(l)->parentLabel(); - SplitType parentSplit=m_internalTree->findNode(parentLabel)->splitType(); - if( parentSplit != type ) { + TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel(); + SplitType tqparentSplit=m_internalTree->findNode(tqparentLabel)->splitType(); + if( tqparentSplit != type ) { m_internalTree->findNode(l)->setSplitType(type); for(int i = 1; i<=n; i++) m_internalTree->addChildNode(l); setGeometries(l); } else { for(int i = 1; i<=n; i++) m_internalTree->insertChildNode(l); - m_internalTree->findNode(parentLabel)->removeChildNode(l,true); - setGeometries(m_internalTree->findNode(parentLabel)->label()); + m_internalTree->findNode(tqparentLabel)->removeChildNode(l,true); + setGeometries(m_internalTree->findNode(tqparentLabel)->label()); } } } @@ -109,9 +109,9 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ // then every asterisk must be assigned a percentage of 10% so the real percentage // notation is cols="40%,50%,10%" for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if(!(*it).contains("%") && !(*it).contains("*")) leftPercentage -= ( (*it).toInt()*100 )/d; - if((*it).contains("%")) leftPercentage -= (*it).section("%",0,0).toInt(); - if((*it).contains("*")) { + if(!(*it).tqcontains("%") && !(*it).tqcontains("*")) leftPercentage -= ( (*it).toInt()*100 )/d; + if((*it).tqcontains("%")) leftPercentage -= (*it).section("%",0,0).toInt(); + if((*it).tqcontains("*")) { int weight= (*it).section("*",0,0).toInt(); if( weight==0 ) weight=1; weightAsteriskCounter += weight; @@ -125,7 +125,7 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ // a quelli effettivamente generati dal metodo build che opera un'altra normalizzazione. // In genere la differenza �dell' 1% for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if((*it).contains("*")){ + if((*it).tqcontains("*")){ int weight= (*it).section("*",0,0).toInt(); if(weight==0) weight=1; int newPercentage = weight*leftPercentageDistributedAmongAsterisks; @@ -136,28 +136,28 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ return list; } -void VisualFrameEditor::buildInternalTree(const TQString &parent){ +void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ TQString line = m_existingStructure.first(); - if(line.contains("findNode(parent)->atts()->geometry(); + TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); - int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); + int dummyDimension=dummy.height()-cancelledPixels(line.tqcontains(",")+1); - TQPtrList list=m_internalTree->findNode(parent)->childrenList(); + TQPtrList list=m_internalTree->findNode(tqparent)->tqchildrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; TQRect newGeometry(dummy); double newDimension; - if(percentages.first().contains("%")) + if(percentages.first().tqcontains("%")) newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0; else newDimension=(double)percentages.first().toInt(); newGeometry.setHeight( proxInt(newDimension) ); @@ -166,24 +166,24 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ } } else - if(line.contains("cols")) { - split(parent,(line.contains(",")+1),VERTICAL); + if(line.tqcontains("cols")) { + split(tqparent,(line.tqcontains(",")+1),VERTICAL); TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); + TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); - int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); + int dummyDimension=dummy.width()-cancelledPixels(line.tqcontains(",")+1); - TQPtrList list=m_internalTree->findNode(parent)->childrenList(); + TQPtrList list=m_internalTree->findNode(tqparent)->tqchildrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; TQRect newGeometry(dummy); double newDimension; - if(percentages.first().contains("%")) + if(percentages.first().tqcontains("%")) newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0; else newDimension=(double)percentages.first().toInt(); newGeometry.setWidth( proxInt(newDimension) ); @@ -193,23 +193,23 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ } m_existingStructure.pop_front(); - m_internalTree->findNode(parent)->firstChild(); - while(m_internalTree->findNode(parent)->currentChild()) { - buildInternalTree(m_internalTree->findNode(parent)->currentChild()->label()); - m_internalTree->findNode(parent)->nextChild(); + m_internalTree->findNode(tqparent)->firstChild(); + while(m_internalTree->findNode(tqparent)->currentChild()) { + buildInternalTree(m_internalTree->findNode(tqparent)->currentChild()->label()); + m_internalTree->findNode(tqparent)->nextChild(); } } else { TQMap attributeMap; - if( line.contains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize"; - else attributeMap["noresize"] = TQString::null; + if( line.tqcontains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize"; + else attributeMap["noresize"] = TQString(); TQRegExp srcPattern("\\s+src\\s*=\\s*\"([%-\\w\\s\\./_\\+\\d]*)\""); //search for files if(srcPattern.search(line) !=-1 ) { KURL pathToConvert, basePath; pathToConvert.setPath(srcPattern.cap(1)); basePath.setPath( Project::ref()->projectBaseURL().path() ); - attributeMap["src"] = QExtFileInfo::toAbsolute( pathToConvert, basePath ).path(); + attributeMap["src"] = TQExtFileInfo::toAbsolute( pathToConvert, basePath ).path(); line.remove(srcPattern);//we don't need to operate on this anymore } @@ -221,7 +221,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ attributeMap[ pattern.cap(1).section( TQRegExp("=\\s*\"") ,0,0) ] = pattern.cap(1).section(TQRegExp("=\\s*\""),1,1).remove("\""); if ( pos >= 0 ) pos += pattern.matchedLength(); } - m_internalTree->findNode(parent)->atts()->setAllAttributes(attributeMap); + m_internalTree->findNode(tqparent)->atts()->setAllAttributes(attributeMap); m_existingStructure.pop_front(); } } @@ -246,23 +246,23 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){ void VisualFrameEditor::removeNode(const TQString &l){ if( l == m_internalTree->root()->label() ) m_internalTree->reset();//trying to remove root node is equivalent to reinitialize else { - TQString parentLabel=m_internalTree->findNode(l)->parentLabel(); - if(m_internalTree->findNode(parentLabel)->countChildren()>=3) - m_internalTree->removeChildNode(parentLabel,l,true); + TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel(); + if(m_internalTree->findNode(tqparentLabel)->countChildren()>=3) + m_internalTree->removeChildNode(tqparentLabel,l,true); else { - m_internalTree->removeChildNode(parentLabel,l,true); - if( !m_internalTree->findNode(parentLabel)->firstChild()->hasChildren() ){ //final nodes - TQMap map = m_internalTree->findNode(parentLabel)->firstChild()->atts()->attributeMap(); - m_internalTree->findNode(parentLabel)->removeChildren(); - m_internalTree->findNode(parentLabel)->atts()->setAllAttributes( map ) ; - m_internalTree->findNode(parentLabel)->setSplitType(NONE); + m_internalTree->removeChildNode(tqparentLabel,l,true); + if( !m_internalTree->findNode(tqparentLabel)->firstChild()->hasChildren() ){ //final nodes + TQMap map = m_internalTree->findNode(tqparentLabel)->firstChild()->atts()->attributeMap(); + m_internalTree->findNode(tqparentLabel)->removeChildren(); + m_internalTree->findNode(tqparentLabel)->atts()->setAllAttributes( map ) ; + m_internalTree->findNode(tqparentLabel)->setSplitType(NONE); } else { - TQPtrList list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList(); - if( parentLabel != m_internalTree->root()->label() ) { - TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel(); - m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); - m_internalTree->removeChildNode( grandParentLabel ,parentLabel, true ); + TQPtrList list = m_internalTree->findNode(tqparentLabel)->firstChild()->tqchildrenList(); + if( tqparentLabel != m_internalTree->root()->label() ) { + TQString grandParentLabel = m_internalTree->findNode(tqparentLabel)->tqparentLabel(); + m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false ); + m_internalTree->removeChildNode( grandParentLabel ,tqparentLabel, true ); treeNode *node; for ( node = list.first(); node; node = list.next() ) { node->setParentLabel(grandParentLabel); @@ -270,12 +270,12 @@ void VisualFrameEditor::removeNode(const TQString &l){ } } else { - m_internalTree->findNode(parentLabel)->setSplitType( m_internalTree->findNode(parentLabel)->firstChild()->splitType() ); - m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); + m_internalTree->findNode(tqparentLabel)->setSplitType( m_internalTree->findNode(tqparentLabel)->firstChild()->splitType() ); + m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false ); treeNode *node; for ( node = list.first(); node; node = list.next() ) { - node->setParentLabel(parentLabel); - m_internalTree->findNode(parentLabel)->addChildNode(node); + node->setParentLabel(tqparentLabel); + m_internalTree->findNode(tqparentLabel)->addChildNode(node); } } } @@ -283,14 +283,14 @@ void VisualFrameEditor::removeNode(const TQString &l){ } } -void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ +void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){ if(n->hasChildren()) { TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10)); - TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii()); - if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] ); + TQSplitter *splitter = new TQSplitter(tqparent,splitterName.ascii()); + if(SIZES.tqcontains(splitterName)) splitter->setSizes( SIZES[splitterName] ); switch( n->splitType() ){ - case VERTICAL : splitter->setOrientation(TQSplitter::Horizontal);break; - case HORIZONTAL : splitter->setOrientation(TQSplitter::Vertical);break; + case VERTICAL : splitter->setOrientation(Qt::Horizontal);break; + case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break; default:break; } n->firstChild(); @@ -300,11 +300,11 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ } } else { - SelectableArea *sa=new SelectableArea(parent,n->label().ascii()); - if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + SelectableArea *sa=new SelectableArea(tqparent,n->label().ascii()); + if(tqparent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast(tqparent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; - sa->view()->setGeometry(n->atts()->geometry()); + sa->view()->setGeometry(n->atts()->tqgeometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); @@ -335,7 +335,7 @@ TQString VisualFrameEditor::createFrameTag(areaAttribute *a){ base.setPath( Project::ref()->projectBaseURL().path() ); KURL u; u.setPath(Src); - tagMiddle+= (" src=\"" + QExtFileInfo::toRelative( u, base).path() + "\""); + tagMiddle+= (" src=\"" + TQExtFileInfo::toRelative( u, base).path() + "\""); } if( !Longdesc.isEmpty() ) @@ -371,11 +371,11 @@ TQString VisualFrameEditor::RCvalue(treeNode *n) { int lostPixels = (6*(child_number-1)); // 6 pixels are lost every time a splitter is drawn switch( n->splitType() ) { - case VERTICAL: percentage/=n->atts()->geometry().width(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width(); + case VERTICAL: percentage/=n->atts()->tqgeometry().width(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width(); break; - case HORIZONTAL: percentage/=n->atts()->geometry().height(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().height(); + case HORIZONTAL: percentage/=n->atts()->tqgeometry().height(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().height(); break; default:break; } @@ -421,9 +421,9 @@ TQString VisualFrameEditor::formatStructure(){ TQString s; int tabNum = 0; for ( TQStringList::Iterator it = nonFormattedStructure.begin(); it != nonFormattedStructure.end(); ++it ) { - if((*it).contains("")) { + if((*it).tqcontains("")) { tabNum--; s.truncate(s.length()-1); } @@ -441,9 +441,9 @@ TQString VisualFrameEditor::framesetStructure() { } void VisualFrameEditor::setMarkupLanguage(const TQString& s){ - if( s.contains("xhtml",false)!=0 ) m_markupLanguage = XHTML; + if( s.tqcontains("xhtml",false)!=0 ) m_markupLanguage = XHTML; else - if( s.contains("html",false)!=0 ) m_markupLanguage = HTML; + if( s.tqcontains("html",false)!=0 ) m_markupLanguage = HTML; } #include "visualframeeditor.moc" diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index 27cef614..c3b28b7b 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -29,6 +29,7 @@ class VisualFrameEditor : public TQHBox { Q_OBJECT + TQ_OBJECT private: enum MarkupLanguage{XHTML,HTML}; tree *m_internalTree; @@ -36,9 +37,9 @@ class VisualFrameEditor : public TQHBox { TQStringList m_existingStructure; MarkupLanguage m_markupLanguage; - void buildInternalTree(const TQString &parent); + void buildInternalTree(const TQString &tqparent); void setGeometries(const TQString &l); - void drawGUI(treeNode *n, TQWidget* parent); + void drawGUI(treeNode *n, TQWidget* tqparent); TQStringList convertAsterisks(const TQString &s, int d); TQString createFrameTag(areaAttribute *a); @@ -47,9 +48,9 @@ class VisualFrameEditor : public TQHBox { void createStructure(treeNode* n); public: - VisualFrameEditor( TQWidget * parent = 0, const char * name = 0); + VisualFrameEditor( TQWidget * tqparent = 0, const char * name = 0); ~VisualFrameEditor(); - void draw() { repaint(); } + void draw() { tqrepaint(); } void loadExistingStructure(const TQStringList &list); TQString framesetStructure(); void removeNode(const TQString &l); diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index bb581859..e9475242 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -48,8 +48,8 @@ int newNum; -TableEditor::TableEditor(TQWidget* parent, const char* name) - : TableEditorS(parent, name) +TableEditor::TableEditor(TQWidget* tqparent, const char* name) + : TableEditorS(tqparent, name) { m_popup = new KPopupMenu(); m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); @@ -152,7 +152,7 @@ void TableEditor::slotContextMenuRequested( int row, int col, const TQPoint & po TQTableSelection selection = m_dataTable->selection(m_dataTable->currentSelection()); TQRect rect(TQPoint(selection.topRow(), selection.leftCol()) , TQPoint(selection.bottomRow(), selection.rightCol())); - if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.contains(m_row, m_col)) { + if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.tqcontains(m_row, m_col)) { m_popup->setItemVisible(m_mergeCellsId, true); m_popup->setItemVisible(m_mergeSeparatorId, true); } @@ -204,7 +204,7 @@ void TableEditor::slotEditRow() void TableEditor::slotEditCol() { - KMessageBox::information(this, i18n("Edit col: %1").arg(m_col + 1)); + KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1)); TagDialog dlg(QuantaCommon::tagFromDTD(m_dtd,"col")); dlg.exec(); } @@ -411,7 +411,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -451,7 +451,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -496,7 +496,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(nCol); for (int i = 0; i < colValue - 1; i++) { - setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol)); + setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").tqarg(nRow).tqarg(lastCol)); m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -713,11 +713,11 @@ TQString TableEditor::indent( int n ) TQString TableEditor::cellValue( int row, int col ) { if (!m_dataTable) - return TQString::null; + return TQString(); TQString str; Node *node = (*m_tableTags)[row][col].node; if (!node) - return TQString::null; + return TQString(); str = node->tag->toString(); str += m_dataTable->text(row, col); str += "tag->name) + ">"; @@ -758,7 +758,7 @@ TQString TableEditor::tableToString() TQString TableEditor::tagContent(Node *node) { if (!node) - return TQString::null; + return TQString(); TQString content; int bl, bc, el, ec; node->tag->endPos(bl, bc); @@ -775,7 +775,7 @@ TQString TableEditor::tagContent(Node *node) n->tag->beginPos(el, ec); ec--; } else { - return TQString::null; + return TQString(); } } content = m_write->text(bl, bc, el, ec); @@ -919,12 +919,12 @@ void TableEditor::slotRemoveRow() if ((*it3).merged) { TableNode *mainTableNode = &((*m_tableTags)[(*it3).mergedRow][(*it3).mergedCol]); - if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode)) + if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode)) { int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt(); rowspan--; if (rowspan > 1) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan)); else mainTableNode->node->tag->deleteAttribute("rowspan"); updatedMainNodes.append(mainTableNode); @@ -970,12 +970,12 @@ void TableEditor::slotRemoveCol() if ((*it2).merged) { TableNode *mainTableNode = &((*m_tableTags)[(*it2).mergedRow][(*it2).mergedCol]); - if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode)) + if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode)) { int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt(); colspan--; if (colspan > 1) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(colspan)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan)); else mainTableNode->node->tag->deleteAttribute("colspan"); updatedMainNodes.append(mainTableNode); @@ -1054,13 +1054,13 @@ void TableEditor::slotMergeCells() rCol = selection.rightCol(); TableNode *mainTableNode = &((*m_tableTags)[tRow][lCol]); if (rCol - lCol > 0) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(rCol - lCol + 1)); if (bRow - tRow > 0) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(bRow - tRow + 1)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1)); for (int i = 0; i < bRow - tRow + 1; i++) for (int j = 0; j < rCol - lCol + 1; j++) { if (i != 0 || j != 0) { - setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1)); + setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").tqarg(tRow + 1).tqarg(lCol + 1)); m_dataTable->item(tRow + i, lCol + j)->setEnabled(false); TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]); Node::deleteNode(tableNode->node); @@ -1163,7 +1163,7 @@ void TableEditor::slotEditChildTable() table = *it; if (table.row == m_row && table.col == m_col) { TQString cellData = m_dataTable->text(table.row, table.col); - int pos = cellData.find(table.nestedData); + int pos = cellData.tqfind(table.nestedData); if (pos == -1) { KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table")); error = true; @@ -1182,9 +1182,9 @@ void TableEditor::slotEditChildTable() baseNode = localParser->parse(w); tempDocCreated = true; //try to find the child table position - int pos2 = tableData.find(cellData); + int pos2 = tableData.tqfind(cellData); if (pos2 != -1) - pos2 = tableData.find(table.nestedData, pos2); + pos2 = tableData.tqfind(table.nestedData, pos2); else { KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table")); error = true; @@ -1192,8 +1192,8 @@ void TableEditor::slotEditChildTable() break; } tableData = tableData.left(pos2); - table.bLine = tableData.contains('\n'); - pos2 = tableData.findRev('\n'); + table.bLine = tableData.tqcontains('\n'); + pos2 = tableData.tqfindRev('\n'); if (pos2 != -1) { table.bCol = tableData.length() - pos2; } else { @@ -1214,7 +1214,7 @@ void TableEditor::slotEditChildTable() if (editor.exec()) { int length = table.nestedData.length(); (*it).nestedData = editor.readModifiedTable(); - cellData.replace(pos, length, (*it).nestedData); + cellData.tqreplace(pos, length, (*it).nestedData); setCellText(m_dataTable, table.row, table.col, cellData); } //cleanup on success @@ -1271,27 +1271,27 @@ void TableEditor::configureCell(int row, int col, Node * node) return; // Header (TH) or standard cell? item->setHeader(node->tag->name.lower() == "th"); - // Horizontal alignment - Qt::AlignmentFlags flags; + //Qt::Horizontal tqalignment + TQt::AlignmentFlags flags; TQString align = node->tag->attributeValue("align", true); if (align == "right") - flags = Qt::AlignRight; + flags = TQt::AlignRight; else if (align == "center") - flags = Qt::AlignHCenter; + flags = TQt::AlignHCenter; else if (align == "justify") - flags = Qt::AlignJustify; + flags = TQt::AlignJustify; else if (align.isEmpty() && item->header()) - flags = Qt::AlignHCenter; // TH is centered by default + flags = TQt::AlignHCenter; // TH is centered by default else - flags = Qt::AlignLeft; - item->setAlignment(flags); - // Vertical alignment + flags = TQt::AlignLeft; + item->tqsetAlignment(flags); + //Qt::Vertical tqalignment TQString valign = node->tag->attributeValue("valign", true); if (valign == "top") - flags = Qt::AlignTop; + flags = TQt::AlignTop; else if (valign == "bottom") - flags = Qt::AlignBottom; - else flags = Qt::AlignVCenter; + flags = TQt::AlignBottom; + else flags = TQt::AlignVCenter; item->setVAlignment(flags); } diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h index 3b913811..f8e7cf40 100644 --- a/quanta/components/tableeditor/tableeditor.h +++ b/quanta/components/tableeditor/tableeditor.h @@ -47,9 +47,10 @@ class Parser; class TableEditor : public TableEditorS { Q_OBJECT + TQ_OBJECT public: - TableEditor( TQWidget* parent = 0, const char* name = 0 ); + TableEditor( TQWidget* tqparent = 0, const char* name = 0 ); ~TableEditor(); virtual bool setTableArea( int bLine, int bCol, int eLine, int eCol, Parser * docParser ); @@ -65,7 +66,7 @@ public: public slots: virtual void slotContextMenuRequested( int row, int col, const TQPoint & pos ); virtual void slotEditCell(); - // Wrapper for setText to use TableItem instead of QTableItem + // Wrapper for setText to use TableItem instead of TQTableItem virtual void slotEditCellText( int r, int ); virtual void slotEditRow(); virtual void slotEditCol(); diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui index 88def66d..04af473c 100644 --- a/quanta/components/tableeditor/tableeditors.ui +++ b/quanta/components/tableeditor/tableeditors.ui @@ -1,6 +1,6 @@ TableEditorS - + TableEditorS @@ -40,7 +40,7 @@ Expanding - + 16 20 @@ -78,11 +78,11 @@ true - + tabWidget - + tab @@ -93,7 +93,7 @@ unnamed - + textLabel5 @@ -104,7 +104,7 @@ tableData - + tableData @@ -142,7 +142,7 @@ Expanding - + 276 20 @@ -159,14 +159,14 @@ Expanding - + 276 20 - + rowSpinBox @@ -177,7 +177,7 @@ 0 - + textLabel2 @@ -188,7 +188,7 @@ colSpinBox - + captionText @@ -209,7 +209,7 @@ &Table Properties - + textLabel3 @@ -228,7 +228,7 @@ captionText - + textLabel1 @@ -239,7 +239,7 @@ rowSpinBox - + colSpinBox @@ -252,7 +252,7 @@ - + tab @@ -263,7 +263,7 @@ unnamed - + frame3 @@ -280,7 +280,7 @@ unnamed - + headerTableData @@ -313,14 +313,14 @@ Expanding - + 340 20 - + headerRowSpinBox @@ -331,7 +331,7 @@ 0 - + textLabel4_2 @@ -342,7 +342,7 @@ headerRowSpinBox - + headerColSpinBox @@ -350,7 +350,7 @@ 999 - + textLabel4 @@ -361,7 +361,7 @@ headerColSpinBox - + textLabel6 @@ -374,7 +374,7 @@ - + headerCheckBox @@ -392,7 +392,7 @@ Expanding - + 40 20 @@ -412,7 +412,7 @@ - + tab @@ -423,7 +423,7 @@ unnamed - + frame3_2 @@ -440,7 +440,7 @@ unnamed - + footerTableData @@ -466,7 +466,7 @@ FollowStyle - + footerRowSpinBox @@ -477,7 +477,7 @@ 0 - + textLabel4_2_2 @@ -488,7 +488,7 @@ footerRowSpinBox - + footerColSpinBox @@ -496,7 +496,7 @@ 999 - + textLabel4_3 @@ -507,7 +507,7 @@ footerColSpinBox - + textLabel6_2 @@ -528,7 +528,7 @@ Expanding - + 340 20 @@ -537,7 +537,7 @@ - + footerCheckBox @@ -555,7 +555,7 @@ Expanding - + 40 20 @@ -638,5 +638,5 @@ footerColSpinBox footerTableData - + diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 60625d95..b877df76 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -21,23 +21,23 @@ TableItem::TableItem(TQTable* table, EditType et) : TQTableItem(table, et) { setReplaceable(false); - m_halign = Qt::AlignLeft; - m_valign = Qt::AlignVCenter; + m_halign = TQt::AlignLeft; + m_valign = TQt::AlignVCenter; } TableItem::TableItem(TQTable* table, EditType et, const TQString& text) : TQTableItem(table, et, text) { setReplaceable(false); - m_halign = Qt::AlignLeft; - m_valign = Qt::AlignVCenter; + m_halign = TQt::AlignLeft; + m_valign = TQt::AlignVCenter; } TableItem::TableItem (TQTable* table, EditType et, const TQString& text, const TQPixmap& p) : TQTableItem(table, et, text, p) { setReplaceable(false); - m_halign = Qt::AlignLeft; - m_valign = Qt::AlignVCenter; + m_halign = TQt::AlignLeft; + m_valign = TQt::AlignVCenter; } TQWidget* TableItem::createEditor() const @@ -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::sizeHint() const +TQSize TableItem::tqsizeHint() const { - TQSize size = TQTableItem::sizeHint(); + TQSize size = TQTableItem::tqsizeHint(); 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 88c94e20..66d3b85b 100644 --- a/quanta/components/tableeditor/tableitem.h +++ b/quanta/components/tableeditor/tableitem.h @@ -20,31 +20,31 @@ #include #include -class TableItem : public QTableItem +class TableItem : public TQTableItem { private: - Qt::AlignmentFlags m_halign; - Qt::AlignmentFlags m_valign; + TQt::AlignmentFlags m_halign; + TQt::AlignmentFlags m_valign; bool m_header; public: - // Standard constructors copied from QTableItem + // Standard constructors copied from TQTableItem TableItem(TQTable* table, EditType et); TableItem(TQTable* table, EditType et, const TQString& text); TableItem (TQTable* table, EditType et, const TQString& text, const TQPixmap& p); - // Use TQTextEdit instead of standard QLineEdit + // Use TQTextEdit instead of standard TQLineEdit virtual TQWidget* createEditor() const; - // Get text from QTextEdit + // Get text from TQTextEdit virtual void setContentFromEditor(TQWidget *w); - // Paint cell - handle alignment (horizontal and vertical) and bold for header + // 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 sizeHint because TQTextEdit has some margin around - virtual TQSize sizeHint() const; + // Return A bit larger tqsizeHint because TQTextEdit has some margin around + virtual TQSize tqsizeHint() const; // Get and set vertical aligment - Qt::AlignmentFlags vAlignment() {return m_valign;} - void setVAlignment(Qt::AlignmentFlags flags) {m_valign = flags;} + TQt::AlignmentFlags vAlignment() {return m_valign;} + void setVAlignment(TQt::AlignmentFlags flags) {m_valign = flags;} // Get and set horizontal aligment - Qt::AlignmentFlags alignment() {return m_halign;} - void setAlignment(Qt::AlignmentFlags flags) {m_halign = flags;} + TQt::AlignmentFlags tqalignment() {return m_halign;} + void tqsetAlignment(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/data/chars b/quanta/data/chars index e5d2a4f4..eef828a5 100644 --- a/quanta/data/chars +++ b/quanta/data/chars @@ -5,8 +5,8 @@ $ ($) Dollar sign % (%) Percent sign & (&) Ampersand ' (') Apostrophe -( (() Left parenthesis -) ()) Right parenthesis +( (() Left tqparenthesis +) ()) Right tqparenthesis * (*) Asterisk + (+) Plus sign , (,) Comma @@ -27,7 +27,7 @@ $ ($) Dollar sign _ (_) Underscore ` (`) Grave accent { ({) Left curly brace -| (|) Vertical bar +| (|)Qt::Vertical bar } (}) Right curly brace ~ (~) Tilde ( ) Nonbreaking space @@ -157,7 +157,7 @@ _ (_) Underscore † (†) Dagger ‡ (‡) Double Dagger • (•) Bullet -… (…) Horizontal Ellipsis +… (…)Qt::Horizontal Ellipsis ‰ (‰) Per Mille sign ‹ (‹) Single Left-Pointing Angle Quotation mark › (›) Single Right-Pointing Angle Quotation mark diff --git a/quanta/data/doc/faq.html b/quanta/data/doc/faq.html index e48a438d..2f5fb651 100644 --- a/quanta/data/doc/faq.html +++ b/quanta/data/doc/faq.html @@ -126,11 +126,11 @@
Top
2.3 Compiling Quanta Plus
-

An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter. Basically, you need the headers from KDE, Qt, and GCC. If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.

+

An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter. Basically, you need the headers from KDE, TQt, and GCC. If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.

Type the following in a shell and see what you get:

  • test `echo $KDEDIR` && echo "yes" || echo "noKDE"
    • -
  • test `echo $QTDIR` && echo "yes" || echo "noQT"
    • +
  • test `echo $TQTDIR` && echo "yes" || echo "noQT"

If you don't get two yes answers, then you need to find the location of the one that failed and export it to your current shell environment.

Then it is as simple as:

@@ -145,7 +145,7 @@
Top
2.4 I get error X when running ./configure
-

Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $QTDIR environment variables. This is the most likely cause. Aside from that, if you are missing something very important, then configure will tell you what it needs.

+

Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $TQTDIR environment variables. This is the most likely cause. Aside from that, if you are missing something very important, then configure will tell you what it needs.

Top
diff --git a/quanta/data/doc/templates.html b/quanta/data/doc/templates.html index 3043187e..0e6f3e82 100644 --- a/quanta/data/doc/templates.html +++ b/quanta/data/doc/templates.html @@ -145,7 +145,7 @@ cool things we took into consideration when using templates in projects.

Our goal with templates is to extend them to include multi file "concept" templates useful for things like placing an order or creating an about section, Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template -design mode to deal with site layout and structure which you could use to design and interactively +design mode to deal with site tqlayout and structure which you could use to design and interactively update your sites. If you would like to be involved contact us.


diff --git a/quanta/data/doc/tips.html b/quanta/data/doc/tips.html index 9efe6822..81b26204 100644 --- a/quanta/data/doc/tips.html +++ b/quanta/data/doc/tips.html @@ -105,7 +105,7 @@
  • You always have control where you place your templates so you can choose to move them. However, Quanta Plus does not track this, so you will need to change links. This is a good task for KFileReplace, which is now a plug-in as a KPart!

    • Templates conclusion

    -

    Our goal with templates is to extend them to include multi-file "concept" templates, useful for certain things, like placing an order or creating an about section. Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template design mode to deal with site layout and structure which you could use to design and interactively update your sites. If you would like to be involved, then contact us.

    +

    Our goal with templates is to extend them to include multi-file "concept" templates, useful for certain things, like placing an order or creating an about section. Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template design mode to deal with site tqlayout and structure which you could use to design and interactively update your sites. If you would like to be involved, then contact us.

    Quanta Plus Toolbars

    Toolbar Description

    diff --git a/quanta/data/dtep/cffunct/bitmaskset.tag b/quanta/data/dtep/cffunct/bitmaskset.tag index 42289ce6..0e57dec9 100644 --- a/quanta/data/dtep/cffunct/bitmaskset.tag +++ b/quanta/data/dtep/cffunct/bitmaskset.tag @@ -2,7 +2,7 @@ - + diff --git a/quanta/data/dtep/cffunct/datetime.tag b/quanta/data/dtep/cffunct/datetime.tag index a2f29126..bd5b4e04 100644 --- a/quanta/data/dtep/cffunct/datetime.tag +++ b/quanta/data/dtep/cffunct/datetime.tag @@ -54,7 +54,7 @@ - + diff --git a/quanta/data/dtep/cfml/cfldap.tag b/quanta/data/dtep/cfml/cfldap.tag index 9d77cd77..497d51aa 100644 --- a/quanta/data/dtep/cfml/cfldap.tag +++ b/quanta/data/dtep/cfml/cfldap.tag @@ -43,7 +43,7 @@ add delete - replace + tqreplace diff --git a/quanta/data/dtep/cfml/cftreeitem.tag b/quanta/data/dtep/cfml/cftreeitem.tag index 2e54a59a..710ddd6f 100644 --- a/quanta/data/dtep/cfml/cftreeitem.tag +++ b/quanta/data/dtep/cfml/cftreeitem.tag @@ -3,7 +3,7 @@ - + cd diff --git a/quanta/data/dtep/css/table-layout.tag b/quanta/data/dtep/css/table-layout.tag index 36306882..4e47f267 100644 --- a/quanta/data/dtep/css/table-layout.tag +++ b/quanta/data/dtep/css/table-layout.tag @@ -1,6 +1,6 @@ - + auto diff --git a/quanta/data/dtep/css/unicode-bidi.tag b/quanta/data/dtep/css/unicode-bidi.tag index cb3b4cf8..b0d9024d 100644 --- a/quanta/data/dtep/css/unicode-bidi.tag +++ b/quanta/data/dtep/css/unicode-bidi.tag @@ -1,6 +1,6 @@ - + normal diff --git a/quanta/data/dtep/docbook-4.2/a.tag b/quanta/data/dtep/docbook-4.2/a.tag index 2e5e1355..367eaca6 100644 --- a/quanta/data/dtep/docbook-4.2/a.tag +++ b/quanta/data/dtep/docbook-4.2/a.tag @@ -253,8 +253,8 @@ - - parentbook + + tqparentbook diff --git a/quanta/data/dtep/docbook-4.2/l.tag b/quanta/data/dtep/docbook-4.2/l.tag index 08737456..b94155dc 100644 --- a/quanta/data/dtep/docbook-4.2/l.tag +++ b/quanta/data/dtep/docbook-4.2/l.tag @@ -41,7 +41,7 @@ - + width diff --git a/quanta/data/dtep/docbook-4.2/s.tag b/quanta/data/dtep/docbook-4.2/s.tag index 1a616cc1..45e0e481 100644 --- a/quanta/data/dtep/docbook-4.2/s.tag +++ b/quanta/data/dtep/docbook-4.2/s.tag @@ -470,7 +470,7 @@ ipaddress library macro - netmask + nettqmask newsgroup osname resource diff --git a/quanta/data/dtep/dtd-description.txt b/quanta/data/dtep/dtd-description.txt index 3c55890d..b66ad8c6 100644 --- a/quanta/data/dtep/dtd-description.txt +++ b/quanta/data/dtep/dtd-description.txt @@ -172,7 +172,7 @@ TypeRx = regular expression to find the type of the element. The pattern is DefinitionRx =\$+([a-zA-Z]+)=new\\s[a-zA-Z]+; TypeRx = new\\s([a-zA-Z]+); This will match strings like "$fooObj=new foo;". Now this string is - searched and it will find "new foo;", where "foo" is the first + searched and it will tqfind "new foo;", where "foo" is the first captured text (the regular expression matching foo is between brackets). So the type of "$fooObj" is "foo". @@ -185,7 +185,7 @@ ClearRx = OBSOLETED by DefinitionRx. Don't use it. [Parsing rules] AreaBorders = comma separated list of the area borders encapsulating this pseudo DTD. In case of PHP it is: , <* *>, <% %> -Tags = tagname(attribute[defaultvalue]). If the parent(real) DTD has a tag with tagname and +Tags = tagname(attribute[defaultvalue]). If the tqparent(real) DTD has a tag with tagname and the attribute value of this tag is equal with the DTD name, the tag area is parsed according to the rules of this DTD. If [defaultvalue] is present, it means that if the attribute is not present in the tag it's taken as present with value = defaultvalue. Example: diff --git a/quanta/data/dtep/html-frameset/font.tag b/quanta/data/dtep/html-frameset/font.tag index 2e38aa2c..1c8aa521 100644 --- a/quanta/data/dtep/html-frameset/font.tag +++ b/quanta/data/dtep/html-frameset/font.tag @@ -31,7 +31,7 @@ -4 - + @@ -71,7 +71,7 @@ - + diff --git a/quanta/data/dtep/html-frameset/frame.tag b/quanta/data/dtep/html-frameset/frame.tag index 0cf37a05..44b8fd0c 100644 --- a/quanta/data/dtep/html-frameset/frame.tag +++ b/quanta/data/dtep/html-frameset/frame.tag @@ -9,10 +9,10 @@ - + - + diff --git a/quanta/data/dtep/html-frameset/frameset.tag b/quanta/data/dtep/html-frameset/frameset.tag index 0c830af5..c32bd8ae 100644 --- a/quanta/data/dtep/html-frameset/frameset.tag +++ b/quanta/data/dtep/html-frameset/frameset.tag @@ -26,10 +26,10 @@ - + - + diff --git a/quanta/data/dtep/html-strict/a.tag b/quanta/data/dtep/html-strict/a.tag index a10e1c04..471badb7 100644 --- a/quanta/data/dtep/html-strict/a.tag +++ b/quanta/data/dtep/html-strict/a.tag @@ -109,9 +109,9 @@ - + - + @@ -143,11 +143,11 @@ - + - + @@ -180,11 +180,11 @@ - + - + @@ -217,11 +217,11 @@ - + - + @@ -254,12 +254,12 @@ - + - + Shape diff --git a/quanta/data/dtep/html-strict/b.tag b/quanta/data/dtep/html-strict/b.tag index 47424fe8..d2bb30da 100644 --- a/quanta/data/dtep/html-strict/b.tag +++ b/quanta/data/dtep/html-strict/b.tag @@ -2,7 +2,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -104,11 +104,11 @@ - + - + @@ -141,7 +141,7 @@ - + @@ -163,7 +163,7 @@ RTL - + @@ -184,7 +184,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -360,6 +360,6 @@ - + diff --git a/quanta/data/dtep/html-strict/c.tag b/quanta/data/dtep/html-strict/c.tag index e22bc9d3..25afb2f1 100644 --- a/quanta/data/dtep/html-strict/c.tag +++ b/quanta/data/dtep/html-strict/c.tag @@ -2,7 +2,7 @@ - + @@ -35,11 +35,11 @@ - + - + @@ -72,11 +72,11 @@ - + - + @@ -109,7 +109,7 @@ - + @@ -164,14 +164,14 @@ Character - alignment character for cells + tqalignment character for cells Character offset - alignment character offset + tqalignment character offset @@ -232,19 +232,19 @@ Character - alignment character for cells + tqalignment character for cells Character offset - alignment character offset + tqalignment character offset - + - + diff --git a/quanta/data/dtep/html-strict/d.tag b/quanta/data/dtep/html-strict/d.tag index bef94ba9..d9ef7134 100644 --- a/quanta/data/dtep/html-strict/d.tag +++ b/quanta/data/dtep/html-strict/d.tag @@ -6,7 +6,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -124,11 +124,11 @@ - + - + @@ -161,7 +161,7 @@ - + @@ -178,7 +178,7 @@ justify - + @@ -230,7 +230,7 @@ - + @@ -239,10 +239,10 @@ - + - + @@ -250,7 +250,7 @@ - + @@ -283,6 +283,6 @@ - + diff --git a/quanta/data/dtep/html-strict/e.tag b/quanta/data/dtep/html-strict/e.tag index 275630e7..ab77988b 100644 --- a/quanta/data/dtep/html-strict/e.tag +++ b/quanta/data/dtep/html-strict/e.tag @@ -2,7 +2,7 @@ - + @@ -35,6 +35,6 @@ - + diff --git a/quanta/data/dtep/html-strict/f.tag b/quanta/data/dtep/html-strict/f.tag index 67ce4dc9..786f2108 100644 --- a/quanta/data/dtep/html-strict/f.tag +++ b/quanta/data/dtep/html-strict/f.tag @@ -2,7 +2,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -130,7 +130,7 @@ - + diff --git a/quanta/data/dtep/html-strict/h.tag b/quanta/data/dtep/html-strict/h.tag index 9d48f029..fd241416 100644 --- a/quanta/data/dtep/html-strict/h.tag +++ b/quanta/data/dtep/html-strict/h.tag @@ -15,7 +15,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -365,10 +365,10 @@ - + - + diff --git a/quanta/data/dtep/html-strict/i.tag b/quanta/data/dtep/html-strict/i.tag index cf4f838e..e38436b8 100644 --- a/quanta/data/dtep/html-strict/i.tag +++ b/quanta/data/dtep/html-strict/i.tag @@ -2,7 +2,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -298,6 +298,6 @@ - + diff --git a/quanta/data/dtep/html-strict/k.tag b/quanta/data/dtep/html-strict/k.tag index fa7f66d9..fa12141e 100644 --- a/quanta/data/dtep/html-strict/k.tag +++ b/quanta/data/dtep/html-strict/k.tag @@ -2,7 +2,7 @@ - + @@ -35,6 +35,6 @@ - + diff --git a/quanta/data/dtep/html-strict/l.tag b/quanta/data/dtep/html-strict/l.tag index 68718b4f..4117b3a0 100644 --- a/quanta/data/dtep/html-strict/l.tag +++ b/quanta/data/dtep/html-strict/l.tag @@ -23,7 +23,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -140,7 +140,7 @@ compact - + @@ -192,7 +192,7 @@ - + diff --git a/quanta/data/dtep/html-strict/m.tag b/quanta/data/dtep/html-strict/m.tag index 3b20e3bd..92908dd3 100644 --- a/quanta/data/dtep/html-strict/m.tag +++ b/quanta/data/dtep/html-strict/m.tag @@ -27,7 +27,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/quanta/data/dtep/html-strict/n.tag b/quanta/data/dtep/html-strict/n.tag index 648cbe2b..5d749973 100644 --- a/quanta/data/dtep/html-strict/n.tag +++ b/quanta/data/dtep/html-strict/n.tag @@ -2,7 +2,7 @@ - + @@ -22,6 +22,6 @@ - + diff --git a/quanta/data/dtep/html-strict/o.tag b/quanta/data/dtep/html-strict/o.tag index 0caa1fee..5b92af52 100644 --- a/quanta/data/dtep/html-strict/o.tag +++ b/quanta/data/dtep/html-strict/o.tag @@ -97,7 +97,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -179,9 +179,9 @@ - + - + @@ -235,8 +235,8 @@ - + - + diff --git a/quanta/data/dtep/html-strict/p.tag b/quanta/data/dtep/html-strict/p.tag index 71487b05..fc7e41e1 100644 --- a/quanta/data/dtep/html-strict/p.tag +++ b/quanta/data/dtep/html-strict/p.tag @@ -25,7 +25,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -128,6 +128,6 @@ - + diff --git a/quanta/data/dtep/html-strict/q.tag b/quanta/data/dtep/html-strict/q.tag index 3225bf5d..b2e2fe60 100644 --- a/quanta/data/dtep/html-strict/q.tag +++ b/quanta/data/dtep/html-strict/q.tag @@ -2,7 +2,7 @@ - + @@ -35,6 +35,6 @@ - + diff --git a/quanta/data/dtep/html-strict/s.tag b/quanta/data/dtep/html-strict/s.tag index 30f59c9c..ae23cb35 100644 --- a/quanta/data/dtep/html-strict/s.tag +++ b/quanta/data/dtep/html-strict/s.tag @@ -33,13 +33,13 @@ - + - + - + @@ -72,7 +72,7 @@ - + @@ -123,14 +123,14 @@ - + - + - + @@ -162,11 +162,11 @@ - + - + @@ -199,11 +199,11 @@ - + - + @@ -236,7 +236,7 @@ - + @@ -273,13 +273,13 @@ - + - + - + @@ -312,11 +312,11 @@ - + - + @@ -349,6 +349,6 @@ - + diff --git a/quanta/data/dtep/html-strict/t.tag b/quanta/data/dtep/html-strict/t.tag index 426dbaaf..691fdee5 100644 --- a/quanta/data/dtep/html-strict/t.tag +++ b/quanta/data/dtep/html-strict/t.tag @@ -70,7 +70,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -118,9 +118,9 @@ - + - + @@ -222,7 +222,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -320,9 +320,9 @@ - + - + @@ -360,9 +360,9 @@ - + - + @@ -464,7 +464,7 @@ - + @@ -516,7 +516,7 @@ - + @@ -555,15 +555,15 @@ - + - + - + - + @@ -606,14 +606,14 @@ - + - + - + @@ -646,6 +646,6 @@ - + diff --git a/quanta/data/dtep/html-strict/u.tag b/quanta/data/dtep/html-strict/u.tag index 305f837c..df243de9 100644 --- a/quanta/data/dtep/html-strict/u.tag +++ b/quanta/data/dtep/html-strict/u.tag @@ -20,14 +20,14 @@ Depricated in HTML 4.0 - + - + - + @@ -67,6 +67,6 @@ - + diff --git a/quanta/data/dtep/html-strict/v.tag b/quanta/data/dtep/html-strict/v.tag index 06fa14bb..22026f9b 100644 --- a/quanta/data/dtep/html-strict/v.tag +++ b/quanta/data/dtep/html-strict/v.tag @@ -2,7 +2,7 @@ - + @@ -35,6 +35,6 @@ - + diff --git a/quanta/data/dtep/html/a.tag b/quanta/data/dtep/html/a.tag index a4658cb1..914f1031 100644 --- a/quanta/data/dtep/html/a.tag +++ b/quanta/data/dtep/html/a.tag @@ -109,9 +109,9 @@ - + - + @@ -151,11 +151,11 @@ - + - + @@ -195,11 +195,11 @@ - + - + @@ -239,11 +239,11 @@ - + - + @@ -284,12 +284,12 @@ - + - + Shape diff --git a/quanta/data/dtep/html/b.tag b/quanta/data/dtep/html/b.tag index 35877ad6..cab51e10 100644 --- a/quanta/data/dtep/html/b.tag +++ b/quanta/data/dtep/html/b.tag @@ -2,7 +2,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -116,11 +116,11 @@ - + - + @@ -160,7 +160,7 @@ - + @@ -182,7 +182,7 @@ RTL - + @@ -246,7 +246,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -472,6 +472,6 @@ - + diff --git a/quanta/data/dtep/html/c.tag b/quanta/data/dtep/html/c.tag index 2875b88e..bea8512b 100644 --- a/quanta/data/dtep/html/c.tag +++ b/quanta/data/dtep/html/c.tag @@ -2,7 +2,7 @@ - + @@ -42,12 +42,12 @@ - + - + @@ -111,11 +111,11 @@ - + - + @@ -155,11 +155,11 @@ - + - + @@ -199,7 +199,7 @@ - + @@ -254,14 +254,14 @@ Character - alignment character for cells + tqalignment character for cells Character offset - alignment character offset + tqalignment character offset @@ -322,14 +322,14 @@ Character - alignment character for cells + tqalignment character for cells Character offset - alignment character offset + tqalignment character offset @@ -341,9 +341,9 @@ - + - + diff --git a/quanta/data/dtep/html/d.tag b/quanta/data/dtep/html/d.tag index e482727f..6de4bdfa 100644 --- a/quanta/data/dtep/html/d.tag +++ b/quanta/data/dtep/html/d.tag @@ -6,7 +6,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -148,11 +148,11 @@ - + - + @@ -192,7 +192,7 @@ - + @@ -209,7 +209,7 @@ justify - + @@ -273,7 +273,7 @@ - + @@ -282,17 +282,17 @@ - + - + - + @@ -332,6 +332,6 @@ - + diff --git a/quanta/data/dtep/html/e.tag b/quanta/data/dtep/html/e.tag index a966799a..e8280e01 100644 --- a/quanta/data/dtep/html/e.tag +++ b/quanta/data/dtep/html/e.tag @@ -2,7 +2,7 @@ - + @@ -42,6 +42,6 @@ - + diff --git a/quanta/data/dtep/html/f.tag b/quanta/data/dtep/html/f.tag index 8136efba..ce9ca712 100644 --- a/quanta/data/dtep/html/f.tag +++ b/quanta/data/dtep/html/f.tag @@ -2,7 +2,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -275,6 +275,6 @@ - + diff --git a/quanta/data/dtep/html/h.tag b/quanta/data/dtep/html/h.tag index febe25ca..2d63792d 100644 --- a/quanta/data/dtep/html/h.tag +++ b/quanta/data/dtep/html/h.tag @@ -15,7 +15,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -414,10 +414,10 @@ - + - + diff --git a/quanta/data/dtep/html/i.tag b/quanta/data/dtep/html/i.tag index 0dca3a63..45eed713 100644 --- a/quanta/data/dtep/html/i.tag +++ b/quanta/data/dtep/html/i.tag @@ -2,7 +2,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -489,6 +489,6 @@ - + diff --git a/quanta/data/dtep/html/k.tag b/quanta/data/dtep/html/k.tag index e0babed5..431505e9 100644 --- a/quanta/data/dtep/html/k.tag +++ b/quanta/data/dtep/html/k.tag @@ -2,7 +2,7 @@ - + @@ -42,6 +42,6 @@ - + diff --git a/quanta/data/dtep/html/l.tag b/quanta/data/dtep/html/l.tag index 6e02de9f..ab677502 100644 --- a/quanta/data/dtep/html/l.tag +++ b/quanta/data/dtep/html/l.tag @@ -23,7 +23,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/quanta/data/dtep/html/m.tag b/quanta/data/dtep/html/m.tag index 413df4f8..130b81b5 100644 --- a/quanta/data/dtep/html/m.tag +++ b/quanta/data/dtep/html/m.tag @@ -27,7 +27,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/quanta/data/dtep/html/n.tag b/quanta/data/dtep/html/n.tag index f745cf46..b759bf5e 100644 --- a/quanta/data/dtep/html/n.tag +++ b/quanta/data/dtep/html/n.tag @@ -2,7 +2,7 @@ - + @@ -66,6 +66,6 @@ - + diff --git a/quanta/data/dtep/html/o.tag b/quanta/data/dtep/html/o.tag index 85767c1a..43529b5d 100644 --- a/quanta/data/dtep/html/o.tag +++ b/quanta/data/dtep/html/o.tag @@ -97,7 +97,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -192,9 +192,9 @@ - + - + @@ -246,8 +246,8 @@ - + - + diff --git a/quanta/data/dtep/html/p.tag b/quanta/data/dtep/html/p.tag index 33017fa0..caf3ab10 100644 --- a/quanta/data/dtep/html/p.tag +++ b/quanta/data/dtep/html/p.tag @@ -25,7 +25,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -139,6 +139,6 @@ - + diff --git a/quanta/data/dtep/html/q.tag b/quanta/data/dtep/html/q.tag index 1d5f512c..c14c1e36 100644 --- a/quanta/data/dtep/html/q.tag +++ b/quanta/data/dtep/html/q.tag @@ -2,7 +2,7 @@ - + @@ -42,6 +42,6 @@ - + diff --git a/quanta/data/dtep/html/s.tag b/quanta/data/dtep/html/s.tag index 6a3cb987..188d1939 100644 --- a/quanta/data/dtep/html/s.tag +++ b/quanta/data/dtep/html/s.tag @@ -51,7 +51,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -142,14 +142,14 @@ - + - + - + @@ -189,11 +189,11 @@ - + - + @@ -233,11 +233,11 @@ - + - + @@ -277,7 +277,7 @@ - + @@ -314,13 +314,13 @@ - + - + - + @@ -360,10 +360,10 @@ - + - + @@ -403,6 +403,6 @@ - + diff --git a/quanta/data/dtep/html/strong.tag b/quanta/data/dtep/html/strong.tag index 2be3da65..0ec79185 100644 --- a/quanta/data/dtep/html/strong.tag +++ b/quanta/data/dtep/html/strong.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/html/t.tag b/quanta/data/dtep/html/t.tag index 3d1d959f..df104014 100644 --- a/quanta/data/dtep/html/t.tag +++ b/quanta/data/dtep/html/t.tag @@ -70,7 +70,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -119,9 +119,9 @@ - + - + @@ -224,7 +224,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -334,9 +334,9 @@ - + - + @@ -374,9 +374,9 @@ - + - + @@ -478,7 +478,7 @@ - + @@ -542,7 +542,7 @@ - + @@ -580,16 +580,16 @@ - + - + - + - + @@ -632,14 +632,14 @@ - + - + - + @@ -679,6 +679,6 @@ - + diff --git a/quanta/data/dtep/html/u.tag b/quanta/data/dtep/html/u.tag index 34778191..5553014b 100644 --- a/quanta/data/dtep/html/u.tag +++ b/quanta/data/dtep/html/u.tag @@ -20,14 +20,14 @@ Depricated in HTML 4.0 - + - + - + @@ -67,6 +67,6 @@ - + diff --git a/quanta/data/dtep/html/v.tag b/quanta/data/dtep/html/v.tag index 11ea92a7..90d6dad5 100644 --- a/quanta/data/dtep/html/v.tag +++ b/quanta/data/dtep/html/v.tag @@ -2,7 +2,7 @@ - + @@ -42,6 +42,6 @@ - + diff --git a/quanta/data/dtep/kde-docbook-4.1.2/l.tag b/quanta/data/dtep/kde-docbook-4.1.2/l.tag index b9238e09..cae36163 100644 --- a/quanta/data/dtep/kde-docbook-4.1.2/l.tag +++ b/quanta/data/dtep/kde-docbook-4.1.2/l.tag @@ -40,7 +40,7 @@ - + width diff --git a/quanta/data/dtep/php/dba.tag b/quanta/data/dtep/php/dba.tag index 04efd953..bdf1a0ab 100644 --- a/quanta/data/dtep/php/dba.tag +++ b/quanta/data/dtep/php/dba.tag @@ -49,7 +49,7 @@ - + diff --git a/quanta/data/dtep/php/dbm.tag b/quanta/data/dtep/php/dbm.tag index 50c9011e..250b6f3c 100644 --- a/quanta/data/dtep/php/dbm.tag +++ b/quanta/data/dtep/php/dbm.tag @@ -33,7 +33,7 @@ - + diff --git a/quanta/data/dtep/php/dbplus.tag b/quanta/data/dtep/php/dbplus.tag index 03f3009f..695fb448 100644 --- a/quanta/data/dtep/php/dbplus.tag +++ b/quanta/data/dtep/php/dbplus.tag @@ -24,7 +24,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/quanta/data/dtep/php/domxml.tag b/quanta/data/dtep/php/domxml.tag index 03c2e310..b95dd866 100644 --- a/quanta/data/dtep/php/domxml.tag +++ b/quanta/data/dtep/php/domxml.tag @@ -139,7 +139,7 @@ - + diff --git a/quanta/data/dtep/php/fam.tag b/quanta/data/dtep/php/fam.tag index e976c9e5..1b6789df 100644 --- a/quanta/data/dtep/php/fam.tag +++ b/quanta/data/dtep/php/fam.tag @@ -11,7 +11,7 @@ - + diff --git a/quanta/data/dtep/php/filesystem.tag b/quanta/data/dtep/php/filesystem.tag index 8b75719f..601a4855 100644 --- a/quanta/data/dtep/php/filesystem.tag +++ b/quanta/data/dtep/php/filesystem.tag @@ -263,7 +263,7 @@ - + diff --git a/quanta/data/dtep/php/http.tag b/quanta/data/dtep/php/http.tag index ab12f29c..544571c0 100644 --- a/quanta/data/dtep/php/http.tag +++ b/quanta/data/dtep/php/http.tag @@ -2,7 +2,7 @@ - + diff --git a/quanta/data/dtep/php/hw.tag b/quanta/data/dtep/php/hw.tag index 806ed4f6..e2e4433b 100644 --- a/quanta/data/dtep/php/hw.tag +++ b/quanta/data/dtep/php/hw.tag @@ -8,11 +8,11 @@ - + - + @@ -135,11 +135,11 @@ - + - + @@ -153,7 +153,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -202,7 +202,7 @@ - + diff --git a/quanta/data/dtep/php/hwapi.tag b/quanta/data/dtep/php/hwapi.tag index 09744277..7b0580ab 100644 --- a/quanta/data/dtep/php/hwapi.tag +++ b/quanta/data/dtep/php/hwapi.tag @@ -19,7 +19,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -134,7 +134,7 @@ - + diff --git a/quanta/data/dtep/php/hyperwave.tag b/quanta/data/dtep/php/hyperwave.tag index af08d010..0e75108e 100644 --- a/quanta/data/dtep/php/hyperwave.tag +++ b/quanta/data/dtep/php/hyperwave.tag @@ -7,11 +7,11 @@ - + - + @@ -133,11 +133,11 @@ - + - + @@ -151,7 +151,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/quanta/data/dtep/php/ircg.tag b/quanta/data/dtep/php/ircg.tag index a80b31c7..d948d409 100644 --- a/quanta/data/dtep/php/ircg.tag +++ b/quanta/data/dtep/php/ircg.tag @@ -129,7 +129,7 @@ - + diff --git a/quanta/data/dtep/php/ldap.tag b/quanta/data/dtep/php/ldap.tag index bb652bb8..df81cf3b 100644 --- a/quanta/data/dtep/php/ldap.tag +++ b/quanta/data/dtep/php/ldap.tag @@ -113,7 +113,7 @@ - + @@ -163,7 +163,7 @@ - + diff --git a/quanta/data/dtep/php/mbstring.tag b/quanta/data/dtep/php/mbstring.tag index 64939fc7..12090db5 100644 --- a/quanta/data/dtep/php/mbstring.tag +++ b/quanta/data/dtep/php/mbstring.tag @@ -53,7 +53,7 @@ - + @@ -88,9 +88,9 @@ - + - + diff --git a/quanta/data/dtep/php/memcache.tag b/quanta/data/dtep/php/memcache.tag index 7e93f96d..2a38e77c 100644 --- a/quanta/data/dtep/php/memcache.tag +++ b/quanta/data/dtep/php/memcache.tag @@ -42,7 +42,7 @@ - + diff --git a/quanta/data/dtep/php/ming.tag b/quanta/data/dtep/php/ming.tag index c69ec01a..b4f42ec6 100644 --- a/quanta/data/dtep/php/ming.tag +++ b/quanta/data/dtep/php/ming.tag @@ -27,24 +27,24 @@ - - + + - + - + - + - + @@ -141,9 +141,9 @@ - + - + @@ -182,54 +182,54 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/quanta/data/dtep/php/mnogosearch.tag b/quanta/data/dtep/php/mnogosearch.tag index 3485cdec..d813ee2f 100644 --- a/quanta/data/dtep/php/mnogosearch.tag +++ b/quanta/data/dtep/php/mnogosearch.tag @@ -48,7 +48,7 @@ - + diff --git a/quanta/data/dtep/php/msession.tag b/quanta/data/dtep/php/msession.tag index 91495875..37114711 100644 --- a/quanta/data/dtep/php/msession.tag +++ b/quanta/data/dtep/php/msession.tag @@ -14,7 +14,7 @@ - + diff --git a/quanta/data/dtep/php/ncurses.tag b/quanta/data/dtep/php/ncurses.tag index 5daae115..76fc6cc7 100644 --- a/quanta/data/dtep/php/ncurses.tag +++ b/quanta/data/dtep/php/ncurses.tag @@ -204,9 +204,9 @@ - - - + + + diff --git a/quanta/data/dtep/php/pcre.tag b/quanta/data/dtep/php/pcre.tag index 15dcf520..d466a8e3 100644 --- a/quanta/data/dtep/php/pcre.tag +++ b/quanta/data/dtep/php/pcre.tag @@ -29,7 +29,7 @@ - + diff --git a/quanta/data/dtep/php/pdf.tag b/quanta/data/dtep/php/pdf.tag index a9b1b61a..d2533f1b 100644 --- a/quanta/data/dtep/php/pdf.tag +++ b/quanta/data/dtep/php/pdf.tag @@ -3,7 +3,7 @@ - + diff --git a/quanta/data/dtep/php/regex.tag b/quanta/data/dtep/php/regex.tag index 5b0752bf..325996ac 100644 --- a/quanta/data/dtep/php/regex.tag +++ b/quanta/data/dtep/php/regex.tag @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/quanta/data/dtep/php/simplexml.tag b/quanta/data/dtep/php/simplexml.tag index e2797756..aca2b4ac 100644 --- a/quanta/data/dtep/php/simplexml.tag +++ b/quanta/data/dtep/php/simplexml.tag @@ -5,7 +5,7 @@ - + diff --git a/quanta/data/dtep/php/strings.tag b/quanta/data/dtep/php/strings.tag index 474c10a4..461034e0 100644 --- a/quanta/data/dtep/php/strings.tag +++ b/quanta/data/dtep/php/strings.tag @@ -183,9 +183,9 @@ - + - + @@ -199,9 +199,9 @@ - + - + @@ -339,7 +339,7 @@ - + diff --git a/quanta/data/dtep/php/swf.tag b/quanta/data/dtep/php/swf.tag index 444f80c0..b453bd7c 100644 --- a/quanta/data/dtep/php/swf.tag +++ b/quanta/data/dtep/php/swf.tag @@ -29,7 +29,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -191,20 +191,20 @@ - + - + - + @@ -212,32 +212,32 @@ - + - + - + - + - + - + - + @@ -249,7 +249,7 @@ - + diff --git a/quanta/data/dtep/php/tidy.tag b/quanta/data/dtep/php/tidy.tag index b87ccada..43a6385b 100644 --- a/quanta/data/dtep/php/tidy.tag +++ b/quanta/data/dtep/php/tidy.tag @@ -70,7 +70,7 @@ - + diff --git a/quanta/data/dtep/php/xslt.tag b/quanta/data/dtep/php/xslt.tag index 15d90be5..619c26ce 100644 --- a/quanta/data/dtep/php/xslt.tag +++ b/quanta/data/dtep/php/xslt.tag @@ -66,6 +66,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/anyName.tag b/quanta/data/dtep/relaxng/anyName.tag index fc6e4c31..3598ddad 100644 --- a/quanta/data/dtep/relaxng/anyName.tag +++ b/quanta/data/dtep/relaxng/anyName.tag @@ -4,8 +4,8 @@ - + - + diff --git a/quanta/data/dtep/relaxng/attribute.tag b/quanta/data/dtep/relaxng/attribute.tag index da288603..33107bf8 100644 --- a/quanta/data/dtep/relaxng/attribute.tag +++ b/quanta/data/dtep/relaxng/attribute.tag @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -27,6 +27,6 @@ - + diff --git a/quanta/data/dtep/relaxng/choice.tag b/quanta/data/dtep/relaxng/choice.tag index a5b07483..9057d664 100644 --- a/quanta/data/dtep/relaxng/choice.tag +++ b/quanta/data/dtep/relaxng/choice.tag @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,6 +28,6 @@ - + diff --git a/quanta/data/dtep/relaxng/data.tag b/quanta/data/dtep/relaxng/data.tag index d7c01c05..45ed28e7 100644 --- a/quanta/data/dtep/relaxng/data.tag +++ b/quanta/data/dtep/relaxng/data.tag @@ -5,9 +5,9 @@ - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/define.tag b/quanta/data/dtep/relaxng/define.tag index 3d43ef67..5bc39dac 100644 --- a/quanta/data/dtep/relaxng/define.tag +++ b/quanta/data/dtep/relaxng/define.tag @@ -6,7 +6,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -26,6 +26,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/div.tag b/quanta/data/dtep/relaxng/div.tag index 1be93bb0..f633852a 100644 --- a/quanta/data/dtep/relaxng/div.tag +++ b/quanta/data/dtep/relaxng/div.tag @@ -4,9 +4,9 @@ - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/element.tag b/quanta/data/dtep/relaxng/element.tag index 7d508021..0a92fc6a 100644 --- a/quanta/data/dtep/relaxng/element.tag +++ b/quanta/data/dtep/relaxng/element.tag @@ -5,7 +5,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -29,6 +29,6 @@ - + diff --git a/quanta/data/dtep/relaxng/except.tag b/quanta/data/dtep/relaxng/except.tag index bd85cab5..f6235b38 100644 --- a/quanta/data/dtep/relaxng/except.tag +++ b/quanta/data/dtep/relaxng/except.tag @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,6 +28,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/grammar.tag b/quanta/data/dtep/relaxng/grammar.tag index 0f3f4a99..a9017426 100644 --- a/quanta/data/dtep/relaxng/grammar.tag +++ b/quanta/data/dtep/relaxng/grammar.tag @@ -5,11 +5,11 @@ - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/group.tag b/quanta/data/dtep/relaxng/group.tag index 42f9858b..3f971508 100644 --- a/quanta/data/dtep/relaxng/group.tag +++ b/quanta/data/dtep/relaxng/group.tag @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/include.tag b/quanta/data/dtep/relaxng/include.tag index ff3310f9..0c1d0885 100644 --- a/quanta/data/dtep/relaxng/include.tag +++ b/quanta/data/dtep/relaxng/include.tag @@ -5,10 +5,10 @@ - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/interleave.tag b/quanta/data/dtep/relaxng/interleave.tag index d30632ab..e0a1603c 100644 --- a/quanta/data/dtep/relaxng/interleave.tag +++ b/quanta/data/dtep/relaxng/interleave.tag @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/list.tag b/quanta/data/dtep/relaxng/list.tag index f5660fb8..49ee5e57 100644 --- a/quanta/data/dtep/relaxng/list.tag +++ b/quanta/data/dtep/relaxng/list.tag @@ -4,7 +4,7 @@ - + @@ -12,13 +12,13 @@ - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/mixed.tag b/quanta/data/dtep/relaxng/mixed.tag index f14335cf..8625b1dd 100644 --- a/quanta/data/dtep/relaxng/mixed.tag +++ b/quanta/data/dtep/relaxng/mixed.tag @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/nsName.tag b/quanta/data/dtep/relaxng/nsName.tag index 39a73cd9..f6bd95bb 100644 --- a/quanta/data/dtep/relaxng/nsName.tag +++ b/quanta/data/dtep/relaxng/nsName.tag @@ -4,8 +4,8 @@ - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/oneOrMore.tag b/quanta/data/dtep/relaxng/oneOrMore.tag index 4658479f..763aff34 100644 --- a/quanta/data/dtep/relaxng/oneOrMore.tag +++ b/quanta/data/dtep/relaxng/oneOrMore.tag @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/optional.tag b/quanta/data/dtep/relaxng/optional.tag index 5d56d5f9..8b51f18b 100644 --- a/quanta/data/dtep/relaxng/optional.tag +++ b/quanta/data/dtep/relaxng/optional.tag @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/parentRef.tag b/quanta/data/dtep/relaxng/parentRef.tag index 39ace697..0fcb9817 100644 --- a/quanta/data/dtep/relaxng/parentRef.tag +++ b/quanta/data/dtep/relaxng/parentRef.tag @@ -1,7 +1,7 @@ - + diff --git a/quanta/data/dtep/relaxng/start.tag b/quanta/data/dtep/relaxng/start.tag index 2e1a4429..952beee8 100644 --- a/quanta/data/dtep/relaxng/start.tag +++ b/quanta/data/dtep/relaxng/start.tag @@ -5,17 +5,17 @@ - + - + - + \ No newline at end of file diff --git a/quanta/data/dtep/relaxng/zeroOrMore.tag b/quanta/data/dtep/relaxng/zeroOrMore.tag index 7b8bea98..eb5f468e 100644 --- a/quanta/data/dtep/relaxng/zeroOrMore.tag +++ b/quanta/data/dtep/relaxng/zeroOrMore.tag @@ -4,7 +4,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/schema/all.tag b/quanta/data/dtep/schema/all.tag index 62e9bb6a..0c435782 100644 --- a/quanta/data/dtep/schema/all.tag +++ b/quanta/data/dtep/schema/all.tag @@ -38,9 +38,9 @@ Maximum number of times the element can occur. The value must be 1. - + - + diff --git a/quanta/data/dtep/schema/annotation.tag b/quanta/data/dtep/schema/annotation.tag index 1846c969..610295a0 100644 --- a/quanta/data/dtep/schema/annotation.tag +++ b/quanta/data/dtep/schema/annotation.tag @@ -11,9 +11,9 @@ A unique ID for the element. - + - + diff --git a/quanta/data/dtep/schema/any.tag b/quanta/data/dtep/schema/any.tag index 182ebdf7..f2fcbf1b 100644 --- a/quanta/data/dtep/schema/any.tag +++ b/quanta/data/dtep/schema/any.tag @@ -56,8 +56,8 @@ How should the XML processor handle validation, in regard to elements specified by this element? - + - + diff --git a/quanta/data/dtep/schema/anyAttribute.tag b/quanta/data/dtep/schema/anyAttribute.tag index 62e43733..07ebf80b 100644 --- a/quanta/data/dtep/schema/anyAttribute.tag +++ b/quanta/data/dtep/schema/anyAttribute.tag @@ -36,8 +36,8 @@ How should the XML processor handle validation, in regard to attributes specified by this element? - + - + diff --git a/quanta/data/dtep/schema/attribute.tag b/quanta/data/dtep/schema/attribute.tag index b4e5c1bc..e6ac7ee4 100644 --- a/quanta/data/dtep/schema/attribute.tag +++ b/quanta/data/dtep/schema/attribute.tag @@ -102,9 +102,9 @@ - + - + diff --git a/quanta/data/dtep/schema/attributeGroup.tag b/quanta/data/dtep/schema/attributeGroup.tag index 5e07e926..168ccf22 100644 --- a/quanta/data/dtep/schema/attributeGroup.tag +++ b/quanta/data/dtep/schema/attributeGroup.tag @@ -42,11 +42,11 @@ - + - + diff --git a/quanta/data/dtep/schema/choice.tag b/quanta/data/dtep/schema/choice.tag index d45f2356..72207791 100644 --- a/quanta/data/dtep/schema/choice.tag +++ b/quanta/data/dtep/schema/choice.tag @@ -31,13 +31,13 @@ Maximum number of times the element can occur. Value can be >=0 or unbounded. Default is 1. - + - + diff --git a/quanta/data/dtep/schema/complexContent.tag b/quanta/data/dtep/schema/complexContent.tag index 4096b604..3cc7b1dd 100644 --- a/quanta/data/dtep/schema/complexContent.tag +++ b/quanta/data/dtep/schema/complexContent.tag @@ -25,10 +25,10 @@ true, if character data is allowed to appear between the child elements. Default is false. - + - + diff --git a/quanta/data/dtep/schema/complexType.tag b/quanta/data/dtep/schema/complexType.tag index 4ea80bfa..2efe28c4 100644 --- a/quanta/data/dtep/schema/complexType.tag +++ b/quanta/data/dtep/schema/complexType.tag @@ -75,7 +75,7 @@ - + @@ -86,6 +86,6 @@ - + diff --git a/quanta/data/dtep/schema/element.tag b/quanta/data/dtep/schema/element.tag index 24adffa3..3048ee50 100644 --- a/quanta/data/dtep/schema/element.tag +++ b/quanta/data/dtep/schema/element.tag @@ -141,8 +141,8 @@ - Name of an element that can be substituted with this one. Only usable if the parent element is schema. - Name of an element that can be substituted with this one. Only usable if the parent element is schema. + Name of an element that can be substituted with this one. Only usable if the tqparent element is schema. + Name of an element that can be substituted with this one. Only usable if the tqparent element is schema. @@ -156,13 +156,13 @@ - + - + diff --git a/quanta/data/dtep/schema/enumeration.tag b/quanta/data/dtep/schema/enumeration.tag index 3995f0ea..f8d27152 100644 --- a/quanta/data/dtep/schema/enumeration.tag +++ b/quanta/data/dtep/schema/enumeration.tag @@ -11,8 +11,8 @@ Acceptable value. - + - + diff --git a/quanta/data/dtep/schema/extension.tag b/quanta/data/dtep/schema/extension.tag index 12f5689f..05cea05e 100644 --- a/quanta/data/dtep/schema/extension.tag +++ b/quanta/data/dtep/schema/extension.tag @@ -21,7 +21,7 @@ Name of a built-in data type, simpleType, or complexType. - + @@ -30,6 +30,6 @@ - + diff --git a/quanta/data/dtep/schema/field.tag b/quanta/data/dtep/schema/field.tag index c5c1fa08..59a4d0d3 100644 --- a/quanta/data/dtep/schema/field.tag +++ b/quanta/data/dtep/schema/field.tag @@ -21,8 +21,8 @@ Single element or attribute whose content or value is used for the constraint. - + - + diff --git a/quanta/data/dtep/schema/fractionDigits.tag b/quanta/data/dtep/schema/fractionDigits.tag index 360679d1..227f9834 100644 --- a/quanta/data/dtep/schema/fractionDigits.tag +++ b/quanta/data/dtep/schema/fractionDigits.tag @@ -11,8 +11,8 @@ Maximum number of decimal places allowed, which must be >=0. - + - + \ No newline at end of file diff --git a/quanta/data/dtep/schema/group.tag b/quanta/data/dtep/schema/group.tag index 8a945c0a..3012de46 100644 --- a/quanta/data/dtep/schema/group.tag +++ b/quanta/data/dtep/schema/group.tag @@ -64,11 +64,11 @@ - + - + diff --git a/quanta/data/dtep/schema/import.tag b/quanta/data/dtep/schema/import.tag index a7a7015e..dcf4d5a9 100644 --- a/quanta/data/dtep/schema/import.tag +++ b/quanta/data/dtep/schema/import.tag @@ -44,8 +44,8 @@ - + - + diff --git a/quanta/data/dtep/schema/include.tag b/quanta/data/dtep/schema/include.tag index 0a19816d..7e4b40dc 100644 --- a/quanta/data/dtep/schema/include.tag +++ b/quanta/data/dtep/schema/include.tag @@ -34,8 +34,8 @@ - + - + diff --git a/quanta/data/dtep/schema/key.tag b/quanta/data/dtep/schema/key.tag index 9798beb5..2995e7d0 100644 --- a/quanta/data/dtep/schema/key.tag +++ b/quanta/data/dtep/schema/key.tag @@ -21,10 +21,10 @@ Name of the key element. - + - + diff --git a/quanta/data/dtep/schema/keyref.tag b/quanta/data/dtep/schema/keyref.tag index 87d2dcb5..a24941e8 100644 --- a/quanta/data/dtep/schema/keyref.tag +++ b/quanta/data/dtep/schema/keyref.tag @@ -31,10 +31,10 @@ Name of a key or unique element defined in this or another schema. - + - + diff --git a/quanta/data/dtep/schema/length.tag b/quanta/data/dtep/schema/length.tag index 5153975c..4bc20262 100644 --- a/quanta/data/dtep/schema/length.tag +++ b/quanta/data/dtep/schema/length.tag @@ -11,8 +11,8 @@ Exact number of characters or list items allowed, which must be >=0. - + - + diff --git a/quanta/data/dtep/schema/list.tag b/quanta/data/dtep/schema/list.tag index 454c3225..8037dafd 100644 --- a/quanta/data/dtep/schema/list.tag +++ b/quanta/data/dtep/schema/list.tag @@ -21,9 +21,9 @@ Name of a built-in data type or simpleType. If the content contains a simpleType element, then itemType is not allowed, else itemType is required. - + - + diff --git a/quanta/data/dtep/schema/maxExclusive.tag b/quanta/data/dtep/schema/maxExclusive.tag index b30d15bf..8b41abed 100644 --- a/quanta/data/dtep/schema/maxExclusive.tag +++ b/quanta/data/dtep/schema/maxExclusive.tag @@ -11,8 +11,8 @@ Upper bounds for numeric values. data less than value. - + - + diff --git a/quanta/data/dtep/schema/maxInclusive.tag b/quanta/data/dtep/schema/maxInclusive.tag index 85e2a28c..75224876 100644 --- a/quanta/data/dtep/schema/maxInclusive.tag +++ b/quanta/data/dtep/schema/maxInclusive.tag @@ -11,8 +11,8 @@ Upper bounds for numeric values. Data less than or equal to value. - + - + diff --git a/quanta/data/dtep/schema/maxLength.tag b/quanta/data/dtep/schema/maxLength.tag index f0f285fa..905c618a 100644 --- a/quanta/data/dtep/schema/maxLength.tag +++ b/quanta/data/dtep/schema/maxLength.tag @@ -11,8 +11,8 @@ Maximum number of characters or list items allowed, which must be >=0. - + - + diff --git a/quanta/data/dtep/schema/minExclusive.tag b/quanta/data/dtep/schema/minExclusive.tag index 0cba57e1..e44bf4e7 100644 --- a/quanta/data/dtep/schema/minExclusive.tag +++ b/quanta/data/dtep/schema/minExclusive.tag @@ -11,8 +11,8 @@ Lower bounds for numeric values. Data > value. - + - + diff --git a/quanta/data/dtep/schema/minInclusive.tag b/quanta/data/dtep/schema/minInclusive.tag index b3eb6dd5..56f3716d 100644 --- a/quanta/data/dtep/schema/minInclusive.tag +++ b/quanta/data/dtep/schema/minInclusive.tag @@ -11,8 +11,8 @@ Lower bounds for numeric values. Data >= value. - + - + diff --git a/quanta/data/dtep/schema/minLength.tag b/quanta/data/dtep/schema/minLength.tag index 761f4302..6386027d 100644 --- a/quanta/data/dtep/schema/minLength.tag +++ b/quanta/data/dtep/schema/minLength.tag @@ -11,8 +11,8 @@ Minimum number of characters or list items allowed, which must be >=0. - + - + diff --git a/quanta/data/dtep/schema/notation.tag b/quanta/data/dtep/schema/notation.tag index 016c30d0..291ea924 100644 --- a/quanta/data/dtep/schema/notation.tag +++ b/quanta/data/dtep/schema/notation.tag @@ -54,8 +54,8 @@ - + - + diff --git a/quanta/data/dtep/schema/pattern.tag b/quanta/data/dtep/schema/pattern.tag index 4a81f785..19f3b171 100644 --- a/quanta/data/dtep/schema/pattern.tag +++ b/quanta/data/dtep/schema/pattern.tag @@ -11,8 +11,8 @@ Exact sequence of characters that are acceptable. - + - + diff --git a/quanta/data/dtep/schema/redefine.tag b/quanta/data/dtep/schema/redefine.tag index 8dcb0456..e421b3bb 100644 --- a/quanta/data/dtep/schema/redefine.tag +++ b/quanta/data/dtep/schema/redefine.tag @@ -30,12 +30,12 @@ - + - + diff --git a/quanta/data/dtep/schema/restriction.tag b/quanta/data/dtep/schema/restriction.tag index c4562b34..d39176e4 100644 --- a/quanta/data/dtep/schema/restriction.tag +++ b/quanta/data/dtep/schema/restriction.tag @@ -21,7 +21,7 @@ Name of a built-in data type, simpleType, or complexType. - + @@ -43,6 +43,6 @@ - + diff --git a/quanta/data/dtep/schema/schema.tag b/quanta/data/dtep/schema/schema.tag index 28d38b3b..7d2cc41a 100644 --- a/quanta/data/dtep/schema/schema.tag +++ b/quanta/data/dtep/schema/schema.tag @@ -85,7 +85,7 @@ - + @@ -97,6 +97,6 @@ - + diff --git a/quanta/data/dtep/schema/selector.tag b/quanta/data/dtep/schema/selector.tag index 33ab2ad3..ce5ec026 100644 --- a/quanta/data/dtep/schema/selector.tag +++ b/quanta/data/dtep/schema/selector.tag @@ -21,8 +21,8 @@ An XPath expression, relative to the element being declared, that identifies the child elements to which the identity constraint applies. - + - + diff --git a/quanta/data/dtep/schema/sequence.tag b/quanta/data/dtep/schema/sequence.tag index 08aa3e04..c3bcc82b 100644 --- a/quanta/data/dtep/schema/sequence.tag +++ b/quanta/data/dtep/schema/sequence.tag @@ -31,13 +31,13 @@ Maximum number of times the element can occur. Value can be >=0 or unbounded. Default is 1. - + - + diff --git a/quanta/data/dtep/schema/simpleContent.tag b/quanta/data/dtep/schema/simpleContent.tag index 7c55c717..9ae47f7e 100644 --- a/quanta/data/dtep/schema/simpleContent.tag +++ b/quanta/data/dtep/schema/simpleContent.tag @@ -11,10 +11,10 @@ A unique ID for the element. - + - + diff --git a/quanta/data/dtep/schema/simpleType.tag b/quanta/data/dtep/schema/simpleType.tag index 7b3f7534..2476e6fc 100644 --- a/quanta/data/dtep/schema/simpleType.tag +++ b/quanta/data/dtep/schema/simpleType.tag @@ -34,11 +34,11 @@ - + - + diff --git a/quanta/data/dtep/schema/totalDigits.tag b/quanta/data/dtep/schema/totalDigits.tag index 73001d4e..b46744ee 100644 --- a/quanta/data/dtep/schema/totalDigits.tag +++ b/quanta/data/dtep/schema/totalDigits.tag @@ -11,8 +11,8 @@ Exact number of digits allowed, which must be >=0. - + - + diff --git a/quanta/data/dtep/schema/union.tag b/quanta/data/dtep/schema/union.tag index bb598cec..37b647e7 100644 --- a/quanta/data/dtep/schema/union.tag +++ b/quanta/data/dtep/schema/union.tag @@ -21,9 +21,9 @@ List of built-in data types or simpleType elements defined in a schema. - + - + diff --git a/quanta/data/dtep/schema/unique.tag b/quanta/data/dtep/schema/unique.tag index e8083013..d6ebb689 100644 --- a/quanta/data/dtep/schema/unique.tag +++ b/quanta/data/dtep/schema/unique.tag @@ -21,10 +21,10 @@ Name for the element. Usage is required. - + - + diff --git a/quanta/data/dtep/schema/whiteSpace.tag b/quanta/data/dtep/schema/whiteSpace.tag index 4210eb25..dfda451b 100644 --- a/quanta/data/dtep/schema/whiteSpace.tag +++ b/quanta/data/dtep/schema/whiteSpace.tag @@ -9,15 +9,15 @@ preserve - replace + tqreplace collapse How white space (line feeds, tabs, spaces, and carriage returns) is handled. How white space (line feeds, tabs, spaces, and carriage returns) is handled. - + - + diff --git a/quanta/data/dtep/tagxml/attr.tag b/quanta/data/dtep/tagxml/attr.tag index 1d56e92d..bf08eb6c 100644 --- a/quanta/data/dtep/tagxml/attr.tag +++ b/quanta/data/dtep/tagxml/attr.tag @@ -30,12 +30,12 @@ - + - + diff --git a/quanta/data/dtep/tagxml/nonparams.tag b/quanta/data/dtep/tagxml/nonparams.tag index b1244f82..f3af056d 100644 --- a/quanta/data/dtep/tagxml/nonparams.tag +++ b/quanta/data/dtep/tagxml/nonparams.tag @@ -1,12 +1,12 @@ - + - + - - + + \ No newline at end of file diff --git a/quanta/data/dtep/tagxml/spacer.tag b/quanta/data/dtep/tagxml/spacer.tag index 71d776ae..463f991a 100644 --- a/quanta/data/dtep/tagxml/spacer.tag +++ b/quanta/data/dtep/tagxml/spacer.tag @@ -3,7 +3,7 @@ diff --git a/quanta/data/dtep/xhtml-basic/a.tag b/quanta/data/dtep/xhtml-basic/a.tag index 7d02f942..82b0b0a1 100644 --- a/quanta/data/dtep/xhtml-basic/a.tag +++ b/quanta/data/dtep/xhtml-basic/a.tag @@ -48,7 +48,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/blockquote.tag b/quanta/data/dtep/xhtml-basic/blockquote.tag index ad642e61..fc4701fd 100644 --- a/quanta/data/dtep/xhtml-basic/blockquote.tag +++ b/quanta/data/dtep/xhtml-basic/blockquote.tag @@ -10,7 +10,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/body.tag b/quanta/data/dtep/xhtml-basic/body.tag index c9bcca72..c7bf368e 100644 --- a/quanta/data/dtep/xhtml-basic/body.tag +++ b/quanta/data/dtep/xhtml-basic/body.tag @@ -2,7 +2,7 @@ - + @@ -19,6 +19,6 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/div.tag b/quanta/data/dtep/xhtml-basic/div.tag index 9dfc2599..5073c953 100644 --- a/quanta/data/dtep/xhtml-basic/div.tag +++ b/quanta/data/dtep/xhtml-basic/div.tag @@ -3,7 +3,7 @@ - + @@ -41,6 +41,6 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/xhtml-basic/form.tag b/quanta/data/dtep/xhtml-basic/form.tag index d4e0b368..36fe22f5 100644 --- a/quanta/data/dtep/xhtml-basic/form.tag +++ b/quanta/data/dtep/xhtml-basic/form.tag @@ -29,7 +29,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/head.tag b/quanta/data/dtep/xhtml-basic/head.tag index bdcc1ef7..16f8b252 100644 --- a/quanta/data/dtep/xhtml-basic/head.tag +++ b/quanta/data/dtep/xhtml-basic/head.tag @@ -9,12 +9,12 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/headings.tag b/quanta/data/dtep/xhtml-basic/headings.tag index af41ba13..408e31e3 100644 --- a/quanta/data/dtep/xhtml-basic/headings.tag +++ b/quanta/data/dtep/xhtml-basic/headings.tag @@ -3,7 +3,7 @@ - + @@ -25,11 +25,11 @@ - + - + @@ -51,12 +51,12 @@ - + - + @@ -78,10 +78,10 @@ - + - + @@ -103,11 +103,11 @@ - + - + @@ -129,11 +129,11 @@ - + - + @@ -155,7 +155,7 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/html.tag b/quanta/data/dtep/xhtml-basic/html.tag index 4d9b566e..922b9086 100644 --- a/quanta/data/dtep/xhtml-basic/html.tag +++ b/quanta/data/dtep/xhtml-basic/html.tag @@ -15,10 +15,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/input.tag b/quanta/data/dtep/xhtml-basic/input.tag index 379ececb..e52a3fa5 100644 --- a/quanta/data/dtep/xhtml-basic/input.tag +++ b/quanta/data/dtep/xhtml-basic/input.tag @@ -67,7 +67,7 @@ Shortcut - + @@ -99,6 +99,6 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/li.tag b/quanta/data/dtep/xhtml-basic/li.tag index 570d70c7..f1fbda6e 100644 --- a/quanta/data/dtep/xhtml-basic/li.tag +++ b/quanta/data/dtep/xhtml-basic/li.tag @@ -5,7 +5,7 @@ - + @@ -43,6 +43,6 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/ol.tag b/quanta/data/dtep/xhtml-basic/ol.tag index 4e9adab9..355b08cf 100644 --- a/quanta/data/dtep/xhtml-basic/ol.tag +++ b/quanta/data/dtep/xhtml-basic/ol.tag @@ -2,8 +2,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/p.tag b/quanta/data/dtep/xhtml-basic/p.tag index eadc4781..cba2d813 100644 --- a/quanta/data/dtep/xhtml-basic/p.tag +++ b/quanta/data/dtep/xhtml-basic/p.tag @@ -13,7 +13,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/select.tag b/quanta/data/dtep/xhtml-basic/select.tag index 241684e6..532cedb5 100644 --- a/quanta/data/dtep/xhtml-basic/select.tag +++ b/quanta/data/dtep/xhtml-basic/select.tag @@ -20,8 +20,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/table.tag b/quanta/data/dtep/xhtml-basic/table.tag index ead404b5..9f20ac09 100644 --- a/quanta/data/dtep/xhtml-basic/table.tag +++ b/quanta/data/dtep/xhtml-basic/table.tag @@ -4,9 +4,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/td.tag b/quanta/data/dtep/xhtml-basic/td.tag index cde92e8f..d09b988e 100644 --- a/quanta/data/dtep/xhtml-basic/td.tag +++ b/quanta/data/dtep/xhtml-basic/td.tag @@ -61,7 +61,7 @@ - + @@ -98,6 +98,6 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/textarea.tag b/quanta/data/dtep/xhtml-basic/textarea.tag index 35161dd7..cb0f0874 100644 --- a/quanta/data/dtep/xhtml-basic/textarea.tag +++ b/quanta/data/dtep/xhtml-basic/textarea.tag @@ -23,7 +23,7 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/th.tag b/quanta/data/dtep/xhtml-basic/th.tag index d6851796..7a58b71f 100644 --- a/quanta/data/dtep/xhtml-basic/th.tag +++ b/quanta/data/dtep/xhtml-basic/th.tag @@ -61,7 +61,7 @@ - + @@ -98,6 +98,6 @@ - + diff --git a/quanta/data/dtep/xhtml-basic/tr.tag b/quanta/data/dtep/xhtml-basic/tr.tag index 5a544503..d7d689d4 100644 --- a/quanta/data/dtep/xhtml-basic/tr.tag +++ b/quanta/data/dtep/xhtml-basic/tr.tag @@ -33,9 +33,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-basic/ul.tag b/quanta/data/dtep/xhtml-basic/ul.tag index a2ce9a38..46385c7a 100644 --- a/quanta/data/dtep/xhtml-basic/ul.tag +++ b/quanta/data/dtep/xhtml-basic/ul.tag @@ -3,9 +3,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/a.tag b/quanta/data/dtep/xhtml-frameset/a.tag index 9140cd66..9fc9aeb4 100644 --- a/quanta/data/dtep/xhtml-frameset/a.tag +++ b/quanta/data/dtep/xhtml-frameset/a.tag @@ -61,7 +61,7 @@ - + Shape @@ -85,7 +85,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/abbr.tag b/quanta/data/dtep/xhtml-frameset/abbr.tag index 93aa69d7..59a267d1 100644 --- a/quanta/data/dtep/xhtml-frameset/abbr.tag +++ b/quanta/data/dtep/xhtml-frameset/abbr.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/acronym.tag b/quanta/data/dtep/xhtml-frameset/acronym.tag index 93d73b08..35634a11 100644 --- a/quanta/data/dtep/xhtml-frameset/acronym.tag +++ b/quanta/data/dtep/xhtml-frameset/acronym.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/address.tag b/quanta/data/dtep/xhtml-frameset/address.tag index 7626fbf5..5cedd95f 100644 --- a/quanta/data/dtep/xhtml-frameset/address.tag +++ b/quanta/data/dtep/xhtml-frameset/address.tag @@ -2,7 +2,7 @@ - + @@ -45,6 +45,6 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/applet.tag b/quanta/data/dtep/xhtml-frameset/applet.tag index 1da9149e..8da60ec1 100644 --- a/quanta/data/dtep/xhtml-frameset/applet.tag +++ b/quanta/data/dtep/xhtml-frameset/applet.tag @@ -73,7 +73,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/area.tag b/quanta/data/dtep/xhtml-frameset/area.tag index 7bbf41b0..24dee60f 100644 --- a/quanta/data/dtep/xhtml-frameset/area.tag +++ b/quanta/data/dtep/xhtml-frameset/area.tag @@ -3,7 +3,7 @@ - + Shape diff --git a/quanta/data/dtep/xhtml-frameset/b.tag b/quanta/data/dtep/xhtml-frameset/b.tag index dac70a04..86cbb519 100644 --- a/quanta/data/dtep/xhtml-frameset/b.tag +++ b/quanta/data/dtep/xhtml-frameset/b.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/bdo.tag b/quanta/data/dtep/xhtml-frameset/bdo.tag index 676eb609..eea7e5ad 100644 --- a/quanta/data/dtep/xhtml-frameset/bdo.tag +++ b/quanta/data/dtep/xhtml-frameset/bdo.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/big.tag b/quanta/data/dtep/xhtml-frameset/big.tag index bbf21a7c..6ebf8aad 100644 --- a/quanta/data/dtep/xhtml-frameset/big.tag +++ b/quanta/data/dtep/xhtml-frameset/big.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/blockquote.tag b/quanta/data/dtep/xhtml-frameset/blockquote.tag index 82709643..07170c99 100644 --- a/quanta/data/dtep/xhtml-frameset/blockquote.tag +++ b/quanta/data/dtep/xhtml-frameset/blockquote.tag @@ -10,7 +10,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/body.tag b/quanta/data/dtep/xhtml-frameset/body.tag index 36982ce4..c956b5d3 100644 --- a/quanta/data/dtep/xhtml-frameset/body.tag +++ b/quanta/data/dtep/xhtml-frameset/body.tag @@ -56,7 +56,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/button.tag b/quanta/data/dtep/xhtml-frameset/button.tag index 011def6a..52a481c6 100644 --- a/quanta/data/dtep/xhtml-frameset/button.tag +++ b/quanta/data/dtep/xhtml-frameset/button.tag @@ -32,7 +32,7 @@ Disable the element - + @@ -88,6 +88,6 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/caption.tag b/quanta/data/dtep/xhtml-frameset/caption.tag index 7917420e..0ef0acf1 100644 --- a/quanta/data/dtep/xhtml-frameset/caption.tag +++ b/quanta/data/dtep/xhtml-frameset/caption.tag @@ -15,7 +15,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/center.tag b/quanta/data/dtep/xhtml-frameset/center.tag index 67943607..039a85ab 100644 --- a/quanta/data/dtep/xhtml-frameset/center.tag +++ b/quanta/data/dtep/xhtml-frameset/center.tag @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/cite.tag b/quanta/data/dtep/xhtml-frameset/cite.tag index 815bac00..4f3c8c6c 100644 --- a/quanta/data/dtep/xhtml-frameset/cite.tag +++ b/quanta/data/dtep/xhtml-frameset/cite.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/code.tag b/quanta/data/dtep/xhtml-frameset/code.tag index 28759903..219089d8 100644 --- a/quanta/data/dtep/xhtml-frameset/code.tag +++ b/quanta/data/dtep/xhtml-frameset/code.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/colgroup.tag b/quanta/data/dtep/xhtml-frameset/colgroup.tag index d4ecc9a8..20c27974 100644 --- a/quanta/data/dtep/xhtml-frameset/colgroup.tag +++ b/quanta/data/dtep/xhtml-frameset/colgroup.tag @@ -54,8 +54,8 @@ You can add multiple values with commas - + - + diff --git a/quanta/data/dtep/xhtml-frameset/dd.tag b/quanta/data/dtep/xhtml-frameset/dd.tag index b6a135ef..c7ff069f 100644 --- a/quanta/data/dtep/xhtml-frameset/dd.tag +++ b/quanta/data/dtep/xhtml-frameset/dd.tag @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/del.tag b/quanta/data/dtep/xhtml-frameset/del.tag index 4d07e4b9..34bef391 100644 --- a/quanta/data/dtep/xhtml-frameset/del.tag +++ b/quanta/data/dtep/xhtml-frameset/del.tag @@ -15,7 +15,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/dfn.tag b/quanta/data/dtep/xhtml-frameset/dfn.tag index 99e3daff..6fe0b46a 100644 --- a/quanta/data/dtep/xhtml-frameset/dfn.tag +++ b/quanta/data/dtep/xhtml-frameset/dfn.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/dir.tag b/quanta/data/dtep/xhtml-frameset/dir.tag index 13612182..a63731e9 100644 --- a/quanta/data/dtep/xhtml-frameset/dir.tag +++ b/quanta/data/dtep/xhtml-frameset/dir.tag @@ -8,9 +8,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/div.tag b/quanta/data/dtep/xhtml-frameset/div.tag index ca4b037a..4b59e711 100644 --- a/quanta/data/dtep/xhtml-frameset/div.tag +++ b/quanta/data/dtep/xhtml-frameset/div.tag @@ -16,7 +16,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/dl.tag b/quanta/data/dtep/xhtml-frameset/dl.tag index 1f38c5a0..32c9f645 100644 --- a/quanta/data/dtep/xhtml-frameset/dl.tag +++ b/quanta/data/dtep/xhtml-frameset/dl.tag @@ -8,9 +8,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/dt.tag b/quanta/data/dtep/xhtml-frameset/dt.tag index 4d9192aa..18d1d506 100644 --- a/quanta/data/dtep/xhtml-frameset/dt.tag +++ b/quanta/data/dtep/xhtml-frameset/dt.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/em.tag b/quanta/data/dtep/xhtml-frameset/em.tag index 3c5005b1..b2765e02 100644 --- a/quanta/data/dtep/xhtml-frameset/em.tag +++ b/quanta/data/dtep/xhtml-frameset/em.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/fieldset.tag b/quanta/data/dtep/xhtml-frameset/fieldset.tag index f2e942bd..b80d46dc 100644 --- a/quanta/data/dtep/xhtml-frameset/fieldset.tag +++ b/quanta/data/dtep/xhtml-frameset/fieldset.tag @@ -3,7 +3,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/font.tag b/quanta/data/dtep/xhtml-frameset/font.tag index 4cc18db6..d7784288 100644 --- a/quanta/data/dtep/xhtml-frameset/font.tag +++ b/quanta/data/dtep/xhtml-frameset/font.tag @@ -39,7 +39,7 @@ - + @@ -81,7 +81,7 @@ - + \ No newline at end of file diff --git a/quanta/data/dtep/xhtml-frameset/form.tag b/quanta/data/dtep/xhtml-frameset/form.tag index b3d554b1..1a87abc0 100644 --- a/quanta/data/dtep/xhtml-frameset/form.tag +++ b/quanta/data/dtep/xhtml-frameset/form.tag @@ -80,7 +80,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/frameset.tag b/quanta/data/dtep/xhtml-frameset/frameset.tag index 7e0b6f09..d1addb63 100644 --- a/quanta/data/dtep/xhtml-frameset/frameset.tag +++ b/quanta/data/dtep/xhtml-frameset/frameset.tag @@ -27,11 +27,11 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/head.tag b/quanta/data/dtep/xhtml-frameset/head.tag index 9305caea..74e94d81 100644 --- a/quanta/data/dtep/xhtml-frameset/head.tag +++ b/quanta/data/dtep/xhtml-frameset/head.tag @@ -15,7 +15,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/headings.tag b/quanta/data/dtep/xhtml-frameset/headings.tag index 5469ac0b..a943a2ec 100644 --- a/quanta/data/dtep/xhtml-frameset/headings.tag +++ b/quanta/data/dtep/xhtml-frameset/headings.tag @@ -16,7 +16,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -363,7 +363,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/html.tag b/quanta/data/dtep/xhtml-frameset/html.tag index d401f801..639ac562 100644 --- a/quanta/data/dtep/xhtml-frameset/html.tag +++ b/quanta/data/dtep/xhtml-frameset/html.tag @@ -18,10 +18,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/i.tag b/quanta/data/dtep/xhtml-frameset/i.tag index eefb38d4..e605fba6 100644 --- a/quanta/data/dtep/xhtml-frameset/i.tag +++ b/quanta/data/dtep/xhtml-frameset/i.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/iframe.tag b/quanta/data/dtep/xhtml-frameset/iframe.tag index fb5ffb99..9d5b5d15 100644 --- a/quanta/data/dtep/xhtml-frameset/iframe.tag +++ b/quanta/data/dtep/xhtml-frameset/iframe.tag @@ -88,7 +88,7 @@ - + @@ -154,7 +154,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/ins.tag b/quanta/data/dtep/xhtml-frameset/ins.tag index de225ae1..eeb636a6 100644 --- a/quanta/data/dtep/xhtml-frameset/ins.tag +++ b/quanta/data/dtep/xhtml-frameset/ins.tag @@ -15,7 +15,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/kbd.tag b/quanta/data/dtep/xhtml-frameset/kbd.tag index 6cfaa511..563ebdd0 100644 --- a/quanta/data/dtep/xhtml-frameset/kbd.tag +++ b/quanta/data/dtep/xhtml-frameset/kbd.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/label.tag b/quanta/data/dtep/xhtml-frameset/label.tag index 3e53f7ba..23878a5e 100644 --- a/quanta/data/dtep/xhtml-frameset/label.tag +++ b/quanta/data/dtep/xhtml-frameset/label.tag @@ -27,7 +27,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/legend.tag b/quanta/data/dtep/xhtml-frameset/legend.tag index 685ae528..417b9c78 100644 --- a/quanta/data/dtep/xhtml-frameset/legend.tag +++ b/quanta/data/dtep/xhtml-frameset/legend.tag @@ -22,7 +22,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/li.tag b/quanta/data/dtep/xhtml-frameset/li.tag index c4acfaa2..efff88aa 100644 --- a/quanta/data/dtep/xhtml-frameset/li.tag +++ b/quanta/data/dtep/xhtml-frameset/li.tag @@ -29,7 +29,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/map.tag b/quanta/data/dtep/xhtml-frameset/map.tag index b64d44f2..9852af99 100644 --- a/quanta/data/dtep/xhtml-frameset/map.tag +++ b/quanta/data/dtep/xhtml-frameset/map.tag @@ -9,7 +9,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/menu.tag b/quanta/data/dtep/xhtml-frameset/menu.tag index 10322fc8..a98f6d53 100644 --- a/quanta/data/dtep/xhtml-frameset/menu.tag +++ b/quanta/data/dtep/xhtml-frameset/menu.tag @@ -8,9 +8,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/noframes.tag b/quanta/data/dtep/xhtml-frameset/noframes.tag index 59ff061b..a3e207cd 100644 --- a/quanta/data/dtep/xhtml-frameset/noframes.tag +++ b/quanta/data/dtep/xhtml-frameset/noframes.tag @@ -3,9 +3,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/noscript.tag b/quanta/data/dtep/xhtml-frameset/noscript.tag index a973201b..6bb56abc 100644 --- a/quanta/data/dtep/xhtml-frameset/noscript.tag +++ b/quanta/data/dtep/xhtml-frameset/noscript.tag @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/object.tag b/quanta/data/dtep/xhtml-frameset/object.tag index baebd55d..10513193 100644 --- a/quanta/data/dtep/xhtml-frameset/object.tag +++ b/quanta/data/dtep/xhtml-frameset/object.tag @@ -136,7 +136,7 @@ - + @@ -203,7 +203,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/ol.tag b/quanta/data/dtep/xhtml-frameset/ol.tag index 4a33b85a..2d2e2fb1 100644 --- a/quanta/data/dtep/xhtml-frameset/ol.tag +++ b/quanta/data/dtep/xhtml-frameset/ol.tag @@ -28,9 +28,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/optgroup.tag b/quanta/data/dtep/xhtml-frameset/optgroup.tag index 08a52ff5..56839297 100644 --- a/quanta/data/dtep/xhtml-frameset/optgroup.tag +++ b/quanta/data/dtep/xhtml-frameset/optgroup.tag @@ -15,9 +15,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/p.tag b/quanta/data/dtep/xhtml-frameset/p.tag index 48008e82..907587d5 100644 --- a/quanta/data/dtep/xhtml-frameset/p.tag +++ b/quanta/data/dtep/xhtml-frameset/p.tag @@ -26,7 +26,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/pre.tag b/quanta/data/dtep/xhtml-frameset/pre.tag index ad3955f7..5a9acb0c 100644 --- a/quanta/data/dtep/xhtml-frameset/pre.tag +++ b/quanta/data/dtep/xhtml-frameset/pre.tag @@ -17,7 +17,7 @@ preserve - + @@ -48,6 +48,6 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/q.tag b/quanta/data/dtep/xhtml-frameset/q.tag index 241bde5b..09d64568 100644 --- a/quanta/data/dtep/xhtml-frameset/q.tag +++ b/quanta/data/dtep/xhtml-frameset/q.tag @@ -9,7 +9,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/s.tag b/quanta/data/dtep/xhtml-frameset/s.tag index 98ad6cf7..9fd600cb 100644 --- a/quanta/data/dtep/xhtml-frameset/s.tag +++ b/quanta/data/dtep/xhtml-frameset/s.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/samp.tag b/quanta/data/dtep/xhtml-frameset/samp.tag index 6cecf4e0..e84d0525 100644 --- a/quanta/data/dtep/xhtml-frameset/samp.tag +++ b/quanta/data/dtep/xhtml-frameset/samp.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/select.tag b/quanta/data/dtep/xhtml-frameset/select.tag index d0c87373..fb17bd73 100644 --- a/quanta/data/dtep/xhtml-frameset/select.tag +++ b/quanta/data/dtep/xhtml-frameset/select.tag @@ -53,10 +53,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/small.tag b/quanta/data/dtep/xhtml-frameset/small.tag index 538b3b7a..7392cde2 100644 --- a/quanta/data/dtep/xhtml-frameset/small.tag +++ b/quanta/data/dtep/xhtml-frameset/small.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/span.tag b/quanta/data/dtep/xhtml-frameset/span.tag index 2ff722d0..aaae5401 100644 --- a/quanta/data/dtep/xhtml-frameset/span.tag +++ b/quanta/data/dtep/xhtml-frameset/span.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/strike.tag b/quanta/data/dtep/xhtml-frameset/strike.tag index 478e692c..c49e498e 100644 --- a/quanta/data/dtep/xhtml-frameset/strike.tag +++ b/quanta/data/dtep/xhtml-frameset/strike.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/strong.tag b/quanta/data/dtep/xhtml-frameset/strong.tag index 0424fa5e..6d3f007d 100644 --- a/quanta/data/dtep/xhtml-frameset/strong.tag +++ b/quanta/data/dtep/xhtml-frameset/strong.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/style.tag b/quanta/data/dtep/xhtml-frameset/style.tag index aa052448..afa3fe55 100644 --- a/quanta/data/dtep/xhtml-frameset/style.tag +++ b/quanta/data/dtep/xhtml-frameset/style.tag @@ -50,8 +50,8 @@ preserve - + - + diff --git a/quanta/data/dtep/xhtml-frameset/sub.tag b/quanta/data/dtep/xhtml-frameset/sub.tag index ec46544b..315c5ab0 100644 --- a/quanta/data/dtep/xhtml-frameset/sub.tag +++ b/quanta/data/dtep/xhtml-frameset/sub.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/sup.tag b/quanta/data/dtep/xhtml-frameset/sup.tag index d441423a..dec7d2c8 100644 --- a/quanta/data/dtep/xhtml-frameset/sup.tag +++ b/quanta/data/dtep/xhtml-frameset/sup.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/table.tag b/quanta/data/dtep/xhtml-frameset/table.tag index b76d5095..d5296fb2 100644 --- a/quanta/data/dtep/xhtml-frameset/table.tag +++ b/quanta/data/dtep/xhtml-frameset/table.tag @@ -83,7 +83,7 @@ Deprecated - + @@ -91,7 +91,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/tbody.tag b/quanta/data/dtep/xhtml-frameset/tbody.tag index db13711d..c04eebf6 100644 --- a/quanta/data/dtep/xhtml-frameset/tbody.tag +++ b/quanta/data/dtep/xhtml-frameset/tbody.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/td.tag b/quanta/data/dtep/xhtml-frameset/td.tag index e46c9414..39e99979 100644 --- a/quanta/data/dtep/xhtml-frameset/td.tag +++ b/quanta/data/dtep/xhtml-frameset/td.tag @@ -115,7 +115,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/textarea.tag b/quanta/data/dtep/xhtml-frameset/textarea.tag index 9c94dc0f..50f9210a 100644 --- a/quanta/data/dtep/xhtml-frameset/textarea.tag +++ b/quanta/data/dtep/xhtml-frameset/textarea.tag @@ -42,8 +42,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/tfoot.tag b/quanta/data/dtep/xhtml-frameset/tfoot.tag index e07605f4..cca684ca 100644 --- a/quanta/data/dtep/xhtml-frameset/tfoot.tag +++ b/quanta/data/dtep/xhtml-frameset/tfoot.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/th.tag b/quanta/data/dtep/xhtml-frameset/th.tag index 27ff8b6a..7e1e3d97 100644 --- a/quanta/data/dtep/xhtml-frameset/th.tag +++ b/quanta/data/dtep/xhtml-frameset/th.tag @@ -115,7 +115,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/thead.tag b/quanta/data/dtep/xhtml-frameset/thead.tag index 059263d1..5bb973ca 100644 --- a/quanta/data/dtep/xhtml-frameset/thead.tag +++ b/quanta/data/dtep/xhtml-frameset/thead.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/title.tag b/quanta/data/dtep/xhtml-frameset/title.tag index f24df571..02ef0059 100644 --- a/quanta/data/dtep/xhtml-frameset/title.tag +++ b/quanta/data/dtep/xhtml-frameset/title.tag @@ -7,8 +7,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/tr.tag b/quanta/data/dtep/xhtml-frameset/tr.tag index 4baf805c..e1611664 100644 --- a/quanta/data/dtep/xhtml-frameset/tr.tag +++ b/quanta/data/dtep/xhtml-frameset/tr.tag @@ -45,9 +45,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/tt.tag b/quanta/data/dtep/xhtml-frameset/tt.tag index 08f25532..768f3791 100644 --- a/quanta/data/dtep/xhtml-frameset/tt.tag +++ b/quanta/data/dtep/xhtml-frameset/tt.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/u.tag b/quanta/data/dtep/xhtml-frameset/u.tag index bc931d0d..be82dd1c 100644 --- a/quanta/data/dtep/xhtml-frameset/u.tag +++ b/quanta/data/dtep/xhtml-frameset/u.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-frameset/ul.tag b/quanta/data/dtep/xhtml-frameset/ul.tag index 21443c5d..bb30c1c6 100644 --- a/quanta/data/dtep/xhtml-frameset/ul.tag +++ b/quanta/data/dtep/xhtml-frameset/ul.tag @@ -20,9 +20,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-frameset/var.tag b/quanta/data/dtep/xhtml-frameset/var.tag index ad5627b0..c2ea19b3 100644 --- a/quanta/data/dtep/xhtml-frameset/var.tag +++ b/quanta/data/dtep/xhtml-frameset/var.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/a.tag b/quanta/data/dtep/xhtml-strict/a.tag index 07c82584..701ee488 100644 --- a/quanta/data/dtep/xhtml-strict/a.tag +++ b/quanta/data/dtep/xhtml-strict/a.tag @@ -61,7 +61,7 @@ - + Shape @@ -79,7 +79,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/abbr.tag b/quanta/data/dtep/xhtml-strict/abbr.tag index b988c322..08fc6d94 100644 --- a/quanta/data/dtep/xhtml-strict/abbr.tag +++ b/quanta/data/dtep/xhtml-strict/abbr.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/acronym.tag b/quanta/data/dtep/xhtml-strict/acronym.tag index 12bf30f1..c2a2eba5 100644 --- a/quanta/data/dtep/xhtml-strict/acronym.tag +++ b/quanta/data/dtep/xhtml-strict/acronym.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/address.tag b/quanta/data/dtep/xhtml-strict/address.tag index 3b1f699e..c74c8141 100644 --- a/quanta/data/dtep/xhtml-strict/address.tag +++ b/quanta/data/dtep/xhtml-strict/address.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/area.tag b/quanta/data/dtep/xhtml-strict/area.tag index 578166c8..77286795 100644 --- a/quanta/data/dtep/xhtml-strict/area.tag +++ b/quanta/data/dtep/xhtml-strict/area.tag @@ -3,7 +3,7 @@ - + Shape diff --git a/quanta/data/dtep/xhtml-strict/b.tag b/quanta/data/dtep/xhtml-strict/b.tag index 54e28332..736049f5 100644 --- a/quanta/data/dtep/xhtml-strict/b.tag +++ b/quanta/data/dtep/xhtml-strict/b.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/bdo.tag b/quanta/data/dtep/xhtml-strict/bdo.tag index 7435ea68..1e6919b4 100644 --- a/quanta/data/dtep/xhtml-strict/bdo.tag +++ b/quanta/data/dtep/xhtml-strict/bdo.tag @@ -3,7 +3,7 @@ - + @@ -38,6 +38,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/big.tag b/quanta/data/dtep/xhtml-strict/big.tag index b951e28b..c9ca87ac 100644 --- a/quanta/data/dtep/xhtml-strict/big.tag +++ b/quanta/data/dtep/xhtml-strict/big.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/blockquote.tag b/quanta/data/dtep/xhtml-strict/blockquote.tag index c85ecfb9..f3acbe4a 100644 --- a/quanta/data/dtep/xhtml-strict/blockquote.tag +++ b/quanta/data/dtep/xhtml-strict/blockquote.tag @@ -10,7 +10,7 @@ - + @@ -33,6 +33,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/body.tag b/quanta/data/dtep/xhtml-strict/body.tag index c2e67cdf..e991819e 100644 --- a/quanta/data/dtep/xhtml-strict/body.tag +++ b/quanta/data/dtep/xhtml-strict/body.tag @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/button.tag b/quanta/data/dtep/xhtml-strict/button.tag index bf88752c..4cea665b 100644 --- a/quanta/data/dtep/xhtml-strict/button.tag +++ b/quanta/data/dtep/xhtml-strict/button.tag @@ -32,7 +32,7 @@ Disable the element - + @@ -78,6 +78,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/caption.tag b/quanta/data/dtep/xhtml-strict/caption.tag index 0d433812..956ed2bd 100644 --- a/quanta/data/dtep/xhtml-strict/caption.tag +++ b/quanta/data/dtep/xhtml-strict/caption.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/cite.tag b/quanta/data/dtep/xhtml-strict/cite.tag index 58cb492f..b3e2e76b 100644 --- a/quanta/data/dtep/xhtml-strict/cite.tag +++ b/quanta/data/dtep/xhtml-strict/cite.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/code.tag b/quanta/data/dtep/xhtml-strict/code.tag index b29a87d4..625050da 100644 --- a/quanta/data/dtep/xhtml-strict/code.tag +++ b/quanta/data/dtep/xhtml-strict/code.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/colgroup.tag b/quanta/data/dtep/xhtml-strict/colgroup.tag index d4ecc9a8..20c27974 100644 --- a/quanta/data/dtep/xhtml-strict/colgroup.tag +++ b/quanta/data/dtep/xhtml-strict/colgroup.tag @@ -54,8 +54,8 @@ You can add multiple values with commas - + - + diff --git a/quanta/data/dtep/xhtml-strict/dd.tag b/quanta/data/dtep/xhtml-strict/dd.tag index 97992bf9..53fda2d1 100644 --- a/quanta/data/dtep/xhtml-strict/dd.tag +++ b/quanta/data/dtep/xhtml-strict/dd.tag @@ -2,7 +2,7 @@ - + @@ -56,6 +56,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/del.tag b/quanta/data/dtep/xhtml-strict/del.tag index eab2ed61..27d93048 100644 --- a/quanta/data/dtep/xhtml-strict/del.tag +++ b/quanta/data/dtep/xhtml-strict/del.tag @@ -14,7 +14,7 @@ - + @@ -68,6 +68,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/dfn.tag b/quanta/data/dtep/xhtml-strict/dfn.tag index fbeb6d72..42d4d6fc 100644 --- a/quanta/data/dtep/xhtml-strict/dfn.tag +++ b/quanta/data/dtep/xhtml-strict/dfn.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/div.tag b/quanta/data/dtep/xhtml-strict/div.tag index aba511ae..1f83d680 100644 --- a/quanta/data/dtep/xhtml-strict/div.tag +++ b/quanta/data/dtep/xhtml-strict/div.tag @@ -3,7 +3,7 @@ - + @@ -57,6 +57,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/dl.tag b/quanta/data/dtep/xhtml-strict/dl.tag index 430067b8..d1edcf28 100644 --- a/quanta/data/dtep/xhtml-strict/dl.tag +++ b/quanta/data/dtep/xhtml-strict/dl.tag @@ -2,9 +2,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/dt.tag b/quanta/data/dtep/xhtml-strict/dt.tag index ef239795..efc31477 100644 --- a/quanta/data/dtep/xhtml-strict/dt.tag +++ b/quanta/data/dtep/xhtml-strict/dt.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/em.tag b/quanta/data/dtep/xhtml-strict/em.tag index 807065df..f858197f 100644 --- a/quanta/data/dtep/xhtml-strict/em.tag +++ b/quanta/data/dtep/xhtml-strict/em.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/fieldset.tag b/quanta/data/dtep/xhtml-strict/fieldset.tag index 588944d5..9384f3d1 100644 --- a/quanta/data/dtep/xhtml-strict/fieldset.tag +++ b/quanta/data/dtep/xhtml-strict/fieldset.tag @@ -3,7 +3,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/form.tag b/quanta/data/dtep/xhtml-strict/form.tag index d8b0e6dc..d4d7d9c3 100644 --- a/quanta/data/dtep/xhtml-strict/form.tag +++ b/quanta/data/dtep/xhtml-strict/form.tag @@ -68,7 +68,7 @@ - + @@ -90,6 +90,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/head.tag b/quanta/data/dtep/xhtml-strict/head.tag index 917a21b3..6aeac10b 100644 --- a/quanta/data/dtep/xhtml-strict/head.tag +++ b/quanta/data/dtep/xhtml-strict/head.tag @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/headings.tag b/quanta/data/dtep/xhtml-strict/headings.tag index b7190ebc..259cf843 100644 --- a/quanta/data/dtep/xhtml-strict/headings.tag +++ b/quanta/data/dtep/xhtml-strict/headings.tag @@ -3,7 +3,7 @@ - + @@ -38,12 +38,12 @@ - + - + @@ -78,12 +78,12 @@ - + - + @@ -118,12 +118,12 @@ - + - + @@ -158,12 +158,12 @@ - + - + @@ -198,12 +198,12 @@ - + - + @@ -238,7 +238,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/html.tag b/quanta/data/dtep/xhtml-strict/html.tag index afc592c3..45a26694 100644 --- a/quanta/data/dtep/xhtml-strict/html.tag +++ b/quanta/data/dtep/xhtml-strict/html.tag @@ -18,10 +18,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/i.tag b/quanta/data/dtep/xhtml-strict/i.tag index 36dbd43a..f7bcd0ef 100644 --- a/quanta/data/dtep/xhtml-strict/i.tag +++ b/quanta/data/dtep/xhtml-strict/i.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/ins.tag b/quanta/data/dtep/xhtml-strict/ins.tag index eed48a2c..5bd2e4a4 100644 --- a/quanta/data/dtep/xhtml-strict/ins.tag +++ b/quanta/data/dtep/xhtml-strict/ins.tag @@ -14,7 +14,7 @@ - + @@ -68,6 +68,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/kbd.tag b/quanta/data/dtep/xhtml-strict/kbd.tag index 2b222085..246f6230 100644 --- a/quanta/data/dtep/xhtml-strict/kbd.tag +++ b/quanta/data/dtep/xhtml-strict/kbd.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/label.tag b/quanta/data/dtep/xhtml-strict/label.tag index 9b898aee..f675a366 100644 --- a/quanta/data/dtep/xhtml-strict/label.tag +++ b/quanta/data/dtep/xhtml-strict/label.tag @@ -26,7 +26,7 @@ - + @@ -61,6 +61,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/legend.tag b/quanta/data/dtep/xhtml-strict/legend.tag index 1a5f486c..034fbaa2 100644 --- a/quanta/data/dtep/xhtml-strict/legend.tag +++ b/quanta/data/dtep/xhtml-strict/legend.tag @@ -9,7 +9,7 @@ Shortcut - + @@ -44,6 +44,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/li.tag b/quanta/data/dtep/xhtml-strict/li.tag index 5ceb4358..66fd4600 100644 --- a/quanta/data/dtep/xhtml-strict/li.tag +++ b/quanta/data/dtep/xhtml-strict/li.tag @@ -6,7 +6,7 @@ - + @@ -60,6 +60,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/map.tag b/quanta/data/dtep/xhtml-strict/map.tag index 8f6a1e9d..5104be41 100644 --- a/quanta/data/dtep/xhtml-strict/map.tag +++ b/quanta/data/dtep/xhtml-strict/map.tag @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/noscript.tag b/quanta/data/dtep/xhtml-strict/noscript.tag index 451adfd4..7dad1ffe 100644 --- a/quanta/data/dtep/xhtml-strict/noscript.tag +++ b/quanta/data/dtep/xhtml-strict/noscript.tag @@ -3,7 +3,7 @@ - + @@ -26,6 +26,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/object.tag b/quanta/data/dtep/xhtml-strict/object.tag index add63d74..fc8a1d5a 100644 --- a/quanta/data/dtep/xhtml-strict/object.tag +++ b/quanta/data/dtep/xhtml-strict/object.tag @@ -102,7 +102,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/ol.tag b/quanta/data/dtep/xhtml-strict/ol.tag index 25c76d7a..98e58f38 100644 --- a/quanta/data/dtep/xhtml-strict/ol.tag +++ b/quanta/data/dtep/xhtml-strict/ol.tag @@ -3,9 +3,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/optgroup.tag b/quanta/data/dtep/xhtml-strict/optgroup.tag index 08a52ff5..56839297 100644 --- a/quanta/data/dtep/xhtml-strict/optgroup.tag +++ b/quanta/data/dtep/xhtml-strict/optgroup.tag @@ -15,9 +15,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/p.tag b/quanta/data/dtep/xhtml-strict/p.tag index 4c5e225f..9146892d 100644 --- a/quanta/data/dtep/xhtml-strict/p.tag +++ b/quanta/data/dtep/xhtml-strict/p.tag @@ -13,7 +13,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/pre.tag b/quanta/data/dtep/xhtml-strict/pre.tag index 9abff9a7..7c5f6909 100644 --- a/quanta/data/dtep/xhtml-strict/pre.tag +++ b/quanta/data/dtep/xhtml-strict/pre.tag @@ -11,7 +11,7 @@ preserve - + @@ -40,6 +40,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/q.tag b/quanta/data/dtep/xhtml-strict/q.tag index ebb1b878..76d13722 100644 --- a/quanta/data/dtep/xhtml-strict/q.tag +++ b/quanta/data/dtep/xhtml-strict/q.tag @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/samp.tag b/quanta/data/dtep/xhtml-strict/samp.tag index 2ec41eb4..e0f7bdf7 100644 --- a/quanta/data/dtep/xhtml-strict/samp.tag +++ b/quanta/data/dtep/xhtml-strict/samp.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/select.tag b/quanta/data/dtep/xhtml-strict/select.tag index d0c87373..fb17bd73 100644 --- a/quanta/data/dtep/xhtml-strict/select.tag +++ b/quanta/data/dtep/xhtml-strict/select.tag @@ -53,10 +53,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/small.tag b/quanta/data/dtep/xhtml-strict/small.tag index 0fdbe561..0d2c4263 100644 --- a/quanta/data/dtep/xhtml-strict/small.tag +++ b/quanta/data/dtep/xhtml-strict/small.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/span.tag b/quanta/data/dtep/xhtml-strict/span.tag index ca85ab65..6218d5d7 100644 --- a/quanta/data/dtep/xhtml-strict/span.tag +++ b/quanta/data/dtep/xhtml-strict/span.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/strong.tag b/quanta/data/dtep/xhtml-strict/strong.tag index 98d57d89..3bc13488 100644 --- a/quanta/data/dtep/xhtml-strict/strong.tag +++ b/quanta/data/dtep/xhtml-strict/strong.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/style.tag b/quanta/data/dtep/xhtml-strict/style.tag index aa052448..afa3fe55 100644 --- a/quanta/data/dtep/xhtml-strict/style.tag +++ b/quanta/data/dtep/xhtml-strict/style.tag @@ -50,8 +50,8 @@ preserve - + - + diff --git a/quanta/data/dtep/xhtml-strict/sub.tag b/quanta/data/dtep/xhtml-strict/sub.tag index 5691c5f0..0a195674 100644 --- a/quanta/data/dtep/xhtml-strict/sub.tag +++ b/quanta/data/dtep/xhtml-strict/sub.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/sup.tag b/quanta/data/dtep/xhtml-strict/sup.tag index 33e052d3..815c4e35 100644 --- a/quanta/data/dtep/xhtml-strict/sup.tag +++ b/quanta/data/dtep/xhtml-strict/sup.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/table.tag b/quanta/data/dtep/xhtml-strict/table.tag index aa22e02c..39d145c9 100644 --- a/quanta/data/dtep/xhtml-strict/table.tag +++ b/quanta/data/dtep/xhtml-strict/table.tag @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/tbody.tag b/quanta/data/dtep/xhtml-strict/tbody.tag index db13711d..c04eebf6 100644 --- a/quanta/data/dtep/xhtml-strict/tbody.tag +++ b/quanta/data/dtep/xhtml-strict/tbody.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/td.tag b/quanta/data/dtep/xhtml-strict/td.tag index 48775d37..26c47877 100644 --- a/quanta/data/dtep/xhtml-strict/td.tag +++ b/quanta/data/dtep/xhtml-strict/td.tag @@ -88,7 +88,7 @@ - + @@ -142,6 +142,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/textarea.tag b/quanta/data/dtep/xhtml-strict/textarea.tag index 9c94dc0f..50f9210a 100644 --- a/quanta/data/dtep/xhtml-strict/textarea.tag +++ b/quanta/data/dtep/xhtml-strict/textarea.tag @@ -42,8 +42,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/tfoot.tag b/quanta/data/dtep/xhtml-strict/tfoot.tag index e07605f4..cca684ca 100644 --- a/quanta/data/dtep/xhtml-strict/tfoot.tag +++ b/quanta/data/dtep/xhtml-strict/tfoot.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/th.tag b/quanta/data/dtep/xhtml-strict/th.tag index d5c619f2..84230d57 100644 --- a/quanta/data/dtep/xhtml-strict/th.tag +++ b/quanta/data/dtep/xhtml-strict/th.tag @@ -88,7 +88,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/thead.tag b/quanta/data/dtep/xhtml-strict/thead.tag index 059263d1..5bb973ca 100644 --- a/quanta/data/dtep/xhtml-strict/thead.tag +++ b/quanta/data/dtep/xhtml-strict/thead.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/title.tag b/quanta/data/dtep/xhtml-strict/title.tag index f24df571..02ef0059 100644 --- a/quanta/data/dtep/xhtml-strict/title.tag +++ b/quanta/data/dtep/xhtml-strict/title.tag @@ -7,8 +7,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/tr.tag b/quanta/data/dtep/xhtml-strict/tr.tag index 4baf805c..e1611664 100644 --- a/quanta/data/dtep/xhtml-strict/tr.tag +++ b/quanta/data/dtep/xhtml-strict/tr.tag @@ -45,9 +45,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/tt.tag b/quanta/data/dtep/xhtml-strict/tt.tag index a7506a8b..91138326 100644 --- a/quanta/data/dtep/xhtml-strict/tt.tag +++ b/quanta/data/dtep/xhtml-strict/tt.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml-strict/ul.tag b/quanta/data/dtep/xhtml-strict/ul.tag index bd4404c4..9f1450f6 100644 --- a/quanta/data/dtep/xhtml-strict/ul.tag +++ b/quanta/data/dtep/xhtml-strict/ul.tag @@ -3,9 +3,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml-strict/var.tag b/quanta/data/dtep/xhtml-strict/var.tag index 1c20c088..4c4e8dc3 100644 --- a/quanta/data/dtep/xhtml-strict/var.tag +++ b/quanta/data/dtep/xhtml-strict/var.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml/a.tag b/quanta/data/dtep/xhtml/a.tag index 9140cd66..9fc9aeb4 100644 --- a/quanta/data/dtep/xhtml/a.tag +++ b/quanta/data/dtep/xhtml/a.tag @@ -61,7 +61,7 @@ - + Shape @@ -85,7 +85,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/quanta/data/dtep/xhtml/abbr.tag b/quanta/data/dtep/xhtml/abbr.tag index 9748630f..76cab4bd 100644 --- a/quanta/data/dtep/xhtml/abbr.tag +++ b/quanta/data/dtep/xhtml/abbr.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/acronym.tag b/quanta/data/dtep/xhtml/acronym.tag index 93d73b08..35634a11 100644 --- a/quanta/data/dtep/xhtml/acronym.tag +++ b/quanta/data/dtep/xhtml/acronym.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/address.tag b/quanta/data/dtep/xhtml/address.tag index 6a309b43..45b2c9fc 100644 --- a/quanta/data/dtep/xhtml/address.tag +++ b/quanta/data/dtep/xhtml/address.tag @@ -2,7 +2,7 @@ - + @@ -45,6 +45,6 @@ - + diff --git a/quanta/data/dtep/xhtml/applet.tag b/quanta/data/dtep/xhtml/applet.tag index 98aed01a..4372bef9 100644 --- a/quanta/data/dtep/xhtml/applet.tag +++ b/quanta/data/dtep/xhtml/applet.tag @@ -73,7 +73,7 @@ - + @@ -139,7 +139,7 @@ - + diff --git a/quanta/data/dtep/xhtml/area.tag b/quanta/data/dtep/xhtml/area.tag index 7bbf41b0..24dee60f 100644 --- a/quanta/data/dtep/xhtml/area.tag +++ b/quanta/data/dtep/xhtml/area.tag @@ -3,7 +3,7 @@ - + Shape diff --git a/quanta/data/dtep/xhtml/b.tag b/quanta/data/dtep/xhtml/b.tag index dac70a04..86cbb519 100644 --- a/quanta/data/dtep/xhtml/b.tag +++ b/quanta/data/dtep/xhtml/b.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/bdo.tag b/quanta/data/dtep/xhtml/bdo.tag index 2a592a37..ed648538 100644 --- a/quanta/data/dtep/xhtml/bdo.tag +++ b/quanta/data/dtep/xhtml/bdo.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/big.tag b/quanta/data/dtep/xhtml/big.tag index bbf21a7c..6ebf8aad 100644 --- a/quanta/data/dtep/xhtml/big.tag +++ b/quanta/data/dtep/xhtml/big.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/blockquote.tag b/quanta/data/dtep/xhtml/blockquote.tag index 82709643..07170c99 100644 --- a/quanta/data/dtep/xhtml/blockquote.tag +++ b/quanta/data/dtep/xhtml/blockquote.tag @@ -10,7 +10,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/quanta/data/dtep/xhtml/body.tag b/quanta/data/dtep/xhtml/body.tag index c7fe5941..d2d20457 100644 --- a/quanta/data/dtep/xhtml/body.tag +++ b/quanta/data/dtep/xhtml/body.tag @@ -56,7 +56,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/quanta/data/dtep/xhtml/button.tag b/quanta/data/dtep/xhtml/button.tag index 011def6a..52a481c6 100644 --- a/quanta/data/dtep/xhtml/button.tag +++ b/quanta/data/dtep/xhtml/button.tag @@ -32,7 +32,7 @@ Disable the element - + @@ -88,6 +88,6 @@ - + diff --git a/quanta/data/dtep/xhtml/caption.tag b/quanta/data/dtep/xhtml/caption.tag index 8936eb10..92a47799 100644 --- a/quanta/data/dtep/xhtml/caption.tag +++ b/quanta/data/dtep/xhtml/caption.tag @@ -15,7 +15,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/quanta/data/dtep/xhtml/center.tag b/quanta/data/dtep/xhtml/center.tag index 860eff90..2351c61a 100644 --- a/quanta/data/dtep/xhtml/center.tag +++ b/quanta/data/dtep/xhtml/center.tag @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml/cite.tag b/quanta/data/dtep/xhtml/cite.tag index 57f00da6..1a92b725 100644 --- a/quanta/data/dtep/xhtml/cite.tag +++ b/quanta/data/dtep/xhtml/cite.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/code.tag b/quanta/data/dtep/xhtml/code.tag index e96dfd0b..29f1147c 100644 --- a/quanta/data/dtep/xhtml/code.tag +++ b/quanta/data/dtep/xhtml/code.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/colgroup.tag b/quanta/data/dtep/xhtml/colgroup.tag index d4ecc9a8..20c27974 100644 --- a/quanta/data/dtep/xhtml/colgroup.tag +++ b/quanta/data/dtep/xhtml/colgroup.tag @@ -54,8 +54,8 @@ You can add multiple values with commas - + - + diff --git a/quanta/data/dtep/xhtml/dd.tag b/quanta/data/dtep/xhtml/dd.tag index 7b6779b9..a56729a4 100644 --- a/quanta/data/dtep/xhtml/dd.tag +++ b/quanta/data/dtep/xhtml/dd.tag @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml/del.tag b/quanta/data/dtep/xhtml/del.tag index f4026744..1ae3dae3 100644 --- a/quanta/data/dtep/xhtml/del.tag +++ b/quanta/data/dtep/xhtml/del.tag @@ -15,7 +15,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/quanta/data/dtep/xhtml/dfn.tag b/quanta/data/dtep/xhtml/dfn.tag index dcd1fbb9..432f3931 100644 --- a/quanta/data/dtep/xhtml/dfn.tag +++ b/quanta/data/dtep/xhtml/dfn.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/dir.tag b/quanta/data/dtep/xhtml/dir.tag index 13612182..a63731e9 100644 --- a/quanta/data/dtep/xhtml/dir.tag +++ b/quanta/data/dtep/xhtml/dir.tag @@ -8,9 +8,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/div.tag b/quanta/data/dtep/xhtml/div.tag index 21a5b47c..6b033710 100644 --- a/quanta/data/dtep/xhtml/div.tag +++ b/quanta/data/dtep/xhtml/div.tag @@ -16,7 +16,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/quanta/data/dtep/xhtml/dl.tag b/quanta/data/dtep/xhtml/dl.tag index 1f38c5a0..32c9f645 100644 --- a/quanta/data/dtep/xhtml/dl.tag +++ b/quanta/data/dtep/xhtml/dl.tag @@ -8,9 +8,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/dt.tag b/quanta/data/dtep/xhtml/dt.tag index 4d9192aa..18d1d506 100644 --- a/quanta/data/dtep/xhtml/dt.tag +++ b/quanta/data/dtep/xhtml/dt.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/em.tag b/quanta/data/dtep/xhtml/em.tag index 3c5005b1..b2765e02 100644 --- a/quanta/data/dtep/xhtml/em.tag +++ b/quanta/data/dtep/xhtml/em.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/fieldset.tag b/quanta/data/dtep/xhtml/fieldset.tag index 550b5e7f..8db70f7d 100644 --- a/quanta/data/dtep/xhtml/fieldset.tag +++ b/quanta/data/dtep/xhtml/fieldset.tag @@ -3,7 +3,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/quanta/data/dtep/xhtml/font.tag b/quanta/data/dtep/xhtml/font.tag index 61c00a64..bb1df39f 100644 --- a/quanta/data/dtep/xhtml/font.tag +++ b/quanta/data/dtep/xhtml/font.tag @@ -39,7 +39,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/quanta/data/dtep/xhtml/form.tag b/quanta/data/dtep/xhtml/form.tag index e913755e..cb7798e4 100644 --- a/quanta/data/dtep/xhtml/form.tag +++ b/quanta/data/dtep/xhtml/form.tag @@ -80,7 +80,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/quanta/data/dtep/xhtml/head.tag b/quanta/data/dtep/xhtml/head.tag index 9305caea..74e94d81 100644 --- a/quanta/data/dtep/xhtml/head.tag +++ b/quanta/data/dtep/xhtml/head.tag @@ -15,7 +15,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/quanta/data/dtep/xhtml/headings.tag b/quanta/data/dtep/xhtml/headings.tag index 37e6eca2..6f2ab4f5 100644 --- a/quanta/data/dtep/xhtml/headings.tag +++ b/quanta/data/dtep/xhtml/headings.tag @@ -16,7 +16,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -363,7 +363,7 @@ - + diff --git a/quanta/data/dtep/xhtml/html.tag b/quanta/data/dtep/xhtml/html.tag index afc592c3..45a26694 100644 --- a/quanta/data/dtep/xhtml/html.tag +++ b/quanta/data/dtep/xhtml/html.tag @@ -18,10 +18,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml/i.tag b/quanta/data/dtep/xhtml/i.tag index 45855df4..0b4e0b1e 100644 --- a/quanta/data/dtep/xhtml/i.tag +++ b/quanta/data/dtep/xhtml/i.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/iframe.tag b/quanta/data/dtep/xhtml/iframe.tag index 7c09ad13..3f4420e6 100644 --- a/quanta/data/dtep/xhtml/iframe.tag +++ b/quanta/data/dtep/xhtml/iframe.tag @@ -88,7 +88,7 @@ - + @@ -153,7 +153,7 @@ - + diff --git a/quanta/data/dtep/xhtml/ins.tag b/quanta/data/dtep/xhtml/ins.tag index e3b082e8..16dadd0c 100644 --- a/quanta/data/dtep/xhtml/ins.tag +++ b/quanta/data/dtep/xhtml/ins.tag @@ -15,7 +15,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/quanta/data/dtep/xhtml/kbd.tag b/quanta/data/dtep/xhtml/kbd.tag index 433d0310..f71fcb58 100644 --- a/quanta/data/dtep/xhtml/kbd.tag +++ b/quanta/data/dtep/xhtml/kbd.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/label.tag b/quanta/data/dtep/xhtml/label.tag index 249d512a..bf1fce54 100644 --- a/quanta/data/dtep/xhtml/label.tag +++ b/quanta/data/dtep/xhtml/label.tag @@ -27,7 +27,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml/legend.tag b/quanta/data/dtep/xhtml/legend.tag index 18de65d3..0b7d7cb3 100644 --- a/quanta/data/dtep/xhtml/legend.tag +++ b/quanta/data/dtep/xhtml/legend.tag @@ -22,7 +22,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/quanta/data/dtep/xhtml/li.tag b/quanta/data/dtep/xhtml/li.tag index f6644cee..5bc5ca06 100644 --- a/quanta/data/dtep/xhtml/li.tag +++ b/quanta/data/dtep/xhtml/li.tag @@ -29,7 +29,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/quanta/data/dtep/xhtml/map.tag b/quanta/data/dtep/xhtml/map.tag index b64d44f2..9852af99 100644 --- a/quanta/data/dtep/xhtml/map.tag +++ b/quanta/data/dtep/xhtml/map.tag @@ -9,7 +9,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/quanta/data/dtep/xhtml/menu.tag b/quanta/data/dtep/xhtml/menu.tag index 10322fc8..a98f6d53 100644 --- a/quanta/data/dtep/xhtml/menu.tag +++ b/quanta/data/dtep/xhtml/menu.tag @@ -8,9 +8,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/noframes.tag b/quanta/data/dtep/xhtml/noframes.tag index 758e6cb2..b932929e 100644 --- a/quanta/data/dtep/xhtml/noframes.tag +++ b/quanta/data/dtep/xhtml/noframes.tag @@ -3,7 +3,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/quanta/data/dtep/xhtml/noscript.tag b/quanta/data/dtep/xhtml/noscript.tag index 0c604a67..ec2f3ac3 100644 --- a/quanta/data/dtep/xhtml/noscript.tag +++ b/quanta/data/dtep/xhtml/noscript.tag @@ -3,7 +3,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/quanta/data/dtep/xhtml/object.tag b/quanta/data/dtep/xhtml/object.tag index baebd55d..10513193 100644 --- a/quanta/data/dtep/xhtml/object.tag +++ b/quanta/data/dtep/xhtml/object.tag @@ -136,7 +136,7 @@ - + @@ -203,7 +203,7 @@ - + diff --git a/quanta/data/dtep/xhtml/ol.tag b/quanta/data/dtep/xhtml/ol.tag index 4a33b85a..2d2e2fb1 100644 --- a/quanta/data/dtep/xhtml/ol.tag +++ b/quanta/data/dtep/xhtml/ol.tag @@ -28,9 +28,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/optgroup.tag b/quanta/data/dtep/xhtml/optgroup.tag index 08a52ff5..56839297 100644 --- a/quanta/data/dtep/xhtml/optgroup.tag +++ b/quanta/data/dtep/xhtml/optgroup.tag @@ -15,9 +15,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/p.tag b/quanta/data/dtep/xhtml/p.tag index aabd50f8..b9bea07e 100644 --- a/quanta/data/dtep/xhtml/p.tag +++ b/quanta/data/dtep/xhtml/p.tag @@ -26,7 +26,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/quanta/data/dtep/xhtml/pre.tag b/quanta/data/dtep/xhtml/pre.tag index 0b861099..b4d70015 100644 --- a/quanta/data/dtep/xhtml/pre.tag +++ b/quanta/data/dtep/xhtml/pre.tag @@ -17,7 +17,7 @@ preserve - + @@ -48,6 +48,6 @@ - + diff --git a/quanta/data/dtep/xhtml/q.tag b/quanta/data/dtep/xhtml/q.tag index abc31b1b..b1577c29 100644 --- a/quanta/data/dtep/xhtml/q.tag +++ b/quanta/data/dtep/xhtml/q.tag @@ -9,7 +9,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/quanta/data/dtep/xhtml/s.tag b/quanta/data/dtep/xhtml/s.tag index 419cb720..5f072e92 100644 --- a/quanta/data/dtep/xhtml/s.tag +++ b/quanta/data/dtep/xhtml/s.tag @@ -3,7 +3,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/quanta/data/dtep/xhtml/samp.tag b/quanta/data/dtep/xhtml/samp.tag index 6cecf4e0..e84d0525 100644 --- a/quanta/data/dtep/xhtml/samp.tag +++ b/quanta/data/dtep/xhtml/samp.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/select.tag b/quanta/data/dtep/xhtml/select.tag index d0c87373..fb17bd73 100644 --- a/quanta/data/dtep/xhtml/select.tag +++ b/quanta/data/dtep/xhtml/select.tag @@ -53,10 +53,10 @@ - + - + diff --git a/quanta/data/dtep/xhtml/small.tag b/quanta/data/dtep/xhtml/small.tag index 4d045201..9799ee96 100644 --- a/quanta/data/dtep/xhtml/small.tag +++ b/quanta/data/dtep/xhtml/small.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/span.tag b/quanta/data/dtep/xhtml/span.tag index d674850e..82241f9c 100644 --- a/quanta/data/dtep/xhtml/span.tag +++ b/quanta/data/dtep/xhtml/span.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/strike.tag b/quanta/data/dtep/xhtml/strike.tag index 4907d5be..03d9e85c 100644 --- a/quanta/data/dtep/xhtml/strike.tag +++ b/quanta/data/dtep/xhtml/strike.tag @@ -3,7 +3,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/quanta/data/dtep/xhtml/strong.tag b/quanta/data/dtep/xhtml/strong.tag index 2be3da65..0ec79185 100644 --- a/quanta/data/dtep/xhtml/strong.tag +++ b/quanta/data/dtep/xhtml/strong.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/style.tag b/quanta/data/dtep/xhtml/style.tag index 781181b4..5cad56d6 100644 --- a/quanta/data/dtep/xhtml/style.tag +++ b/quanta/data/dtep/xhtml/style.tag @@ -50,8 +50,8 @@ preserve - + - + diff --git a/quanta/data/dtep/xhtml/sub.tag b/quanta/data/dtep/xhtml/sub.tag index ec46544b..315c5ab0 100644 --- a/quanta/data/dtep/xhtml/sub.tag +++ b/quanta/data/dtep/xhtml/sub.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/sup.tag b/quanta/data/dtep/xhtml/sup.tag index 176cf71a..07eac389 100644 --- a/quanta/data/dtep/xhtml/sup.tag +++ b/quanta/data/dtep/xhtml/sup.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/table.tag b/quanta/data/dtep/xhtml/table.tag index b76d5095..d5296fb2 100644 --- a/quanta/data/dtep/xhtml/table.tag +++ b/quanta/data/dtep/xhtml/table.tag @@ -83,7 +83,7 @@ Deprecated - + @@ -91,7 +91,7 @@ - + diff --git a/quanta/data/dtep/xhtml/tbody.tag b/quanta/data/dtep/xhtml/tbody.tag index db13711d..c04eebf6 100644 --- a/quanta/data/dtep/xhtml/tbody.tag +++ b/quanta/data/dtep/xhtml/tbody.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/td.tag b/quanta/data/dtep/xhtml/td.tag index e46c9414..39e99979 100644 --- a/quanta/data/dtep/xhtml/td.tag +++ b/quanta/data/dtep/xhtml/td.tag @@ -115,7 +115,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/quanta/data/dtep/xhtml/textarea.tag b/quanta/data/dtep/xhtml/textarea.tag index ea019898..6612247b 100644 --- a/quanta/data/dtep/xhtml/textarea.tag +++ b/quanta/data/dtep/xhtml/textarea.tag @@ -42,8 +42,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml/tfoot.tag b/quanta/data/dtep/xhtml/tfoot.tag index e07605f4..cca684ca 100644 --- a/quanta/data/dtep/xhtml/tfoot.tag +++ b/quanta/data/dtep/xhtml/tfoot.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/th.tag b/quanta/data/dtep/xhtml/th.tag index 78b82c25..6720e4e0 100644 --- a/quanta/data/dtep/xhtml/th.tag +++ b/quanta/data/dtep/xhtml/th.tag @@ -115,7 +115,7 @@ - + @@ -181,7 +181,7 @@ - + diff --git a/quanta/data/dtep/xhtml/thead.tag b/quanta/data/dtep/xhtml/thead.tag index 059263d1..5bb973ca 100644 --- a/quanta/data/dtep/xhtml/thead.tag +++ b/quanta/data/dtep/xhtml/thead.tag @@ -40,9 +40,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/title.tag b/quanta/data/dtep/xhtml/title.tag index f24df571..02ef0059 100644 --- a/quanta/data/dtep/xhtml/title.tag +++ b/quanta/data/dtep/xhtml/title.tag @@ -7,8 +7,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml/tr.tag b/quanta/data/dtep/xhtml/tr.tag index 4baf805c..e1611664 100644 --- a/quanta/data/dtep/xhtml/tr.tag +++ b/quanta/data/dtep/xhtml/tr.tag @@ -45,9 +45,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/tt.tag b/quanta/data/dtep/xhtml/tt.tag index 08f25532..768f3791 100644 --- a/quanta/data/dtep/xhtml/tt.tag +++ b/quanta/data/dtep/xhtml/tt.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/u.tag b/quanta/data/dtep/xhtml/u.tag index 38e47050..56a4e61e 100644 --- a/quanta/data/dtep/xhtml/u.tag +++ b/quanta/data/dtep/xhtml/u.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml/ul.tag b/quanta/data/dtep/xhtml/ul.tag index 21443c5d..bb30c1c6 100644 --- a/quanta/data/dtep/xhtml/ul.tag +++ b/quanta/data/dtep/xhtml/ul.tag @@ -20,9 +20,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml/var.tag b/quanta/data/dtep/xhtml/var.tag index 74e336d4..2b0bddb5 100644 --- a/quanta/data/dtep/xhtml/var.tag +++ b/quanta/data/dtep/xhtml/var.tag @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/a.tag b/quanta/data/dtep/xhtml11/a.tag index eda33421..34ccd660 100644 --- a/quanta/data/dtep/xhtml11/a.tag +++ b/quanta/data/dtep/xhtml11/a.tag @@ -59,7 +59,7 @@ - + rect circle @@ -69,7 +69,7 @@ - + @@ -103,6 +103,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/abbr.tag b/quanta/data/dtep/xhtml11/abbr.tag index b988c322..08fc6d94 100644 --- a/quanta/data/dtep/xhtml11/abbr.tag +++ b/quanta/data/dtep/xhtml11/abbr.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/acronym.tag b/quanta/data/dtep/xhtml11/acronym.tag index 12bf30f1..c2a2eba5 100644 --- a/quanta/data/dtep/xhtml11/acronym.tag +++ b/quanta/data/dtep/xhtml11/acronym.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/address.tag b/quanta/data/dtep/xhtml11/address.tag index 3b1f699e..c74c8141 100644 --- a/quanta/data/dtep/xhtml11/address.tag +++ b/quanta/data/dtep/xhtml11/address.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/applet.tag b/quanta/data/dtep/xhtml11/applet.tag index 1a9d5acd..e4bec12d 100644 --- a/quanta/data/dtep/xhtml11/applet.tag +++ b/quanta/data/dtep/xhtml11/applet.tag @@ -63,7 +63,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/area.tag b/quanta/data/dtep/xhtml11/area.tag index 1c992e3b..67c45a1d 100644 --- a/quanta/data/dtep/xhtml11/area.tag +++ b/quanta/data/dtep/xhtml11/area.tag @@ -3,8 +3,8 @@ - - shape + + tqshape diff --git a/quanta/data/dtep/xhtml11/b.tag b/quanta/data/dtep/xhtml11/b.tag index 54e28332..736049f5 100644 --- a/quanta/data/dtep/xhtml11/b.tag +++ b/quanta/data/dtep/xhtml11/b.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/bdo.tag b/quanta/data/dtep/xhtml11/bdo.tag index 47fc984f..6981975c 100644 --- a/quanta/data/dtep/xhtml11/bdo.tag +++ b/quanta/data/dtep/xhtml11/bdo.tag @@ -13,7 +13,7 @@ rtl - + @@ -48,6 +48,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/big.tag b/quanta/data/dtep/xhtml11/big.tag index b951e28b..c9ca87ac 100644 --- a/quanta/data/dtep/xhtml11/big.tag +++ b/quanta/data/dtep/xhtml11/big.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/blockquote.tag b/quanta/data/dtep/xhtml11/blockquote.tag index b74910eb..1ac79dbf 100644 --- a/quanta/data/dtep/xhtml11/blockquote.tag +++ b/quanta/data/dtep/xhtml11/blockquote.tag @@ -8,7 +8,7 @@ - + @@ -31,6 +31,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/body.tag b/quanta/data/dtep/xhtml11/body.tag index 6b46aba5..50117437 100644 --- a/quanta/data/dtep/xhtml11/body.tag +++ b/quanta/data/dtep/xhtml11/body.tag @@ -14,7 +14,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/button.tag b/quanta/data/dtep/xhtml11/button.tag index c659c0e3..0c204c06 100644 --- a/quanta/data/dtep/xhtml11/button.tag +++ b/quanta/data/dtep/xhtml11/button.tag @@ -15,7 +15,7 @@ - + @@ -61,6 +61,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/caption.tag b/quanta/data/dtep/xhtml11/caption.tag index 0d433812..956ed2bd 100644 --- a/quanta/data/dtep/xhtml11/caption.tag +++ b/quanta/data/dtep/xhtml11/caption.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/cite.tag b/quanta/data/dtep/xhtml11/cite.tag index 58cb492f..b3e2e76b 100644 --- a/quanta/data/dtep/xhtml11/cite.tag +++ b/quanta/data/dtep/xhtml11/cite.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/code.tag b/quanta/data/dtep/xhtml11/code.tag index b29a87d4..625050da 100644 --- a/quanta/data/dtep/xhtml11/code.tag +++ b/quanta/data/dtep/xhtml11/code.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/col.tag b/quanta/data/dtep/xhtml11/col.tag index 9bad383d..e900365a 100644 --- a/quanta/data/dtep/xhtml11/col.tag +++ b/quanta/data/dtep/xhtml11/col.tag @@ -45,14 +45,14 @@ You can add multiple values with commas char - alignment character for cells + tqalignment character for cells charoff - alignment character offset + tqalignment character offset diff --git a/quanta/data/dtep/xhtml11/colgroup.tag b/quanta/data/dtep/xhtml11/colgroup.tag index a0dfb5d2..548a7cb8 100644 --- a/quanta/data/dtep/xhtml11/colgroup.tag +++ b/quanta/data/dtep/xhtml11/colgroup.tag @@ -45,19 +45,19 @@ You can add multiple values with commas char - alignment character for cells + tqalignment character for cells charoff - alignment character offset + tqalignment character offset - + - + diff --git a/quanta/data/dtep/xhtml11/dd.tag b/quanta/data/dtep/xhtml11/dd.tag index 97992bf9..53fda2d1 100644 --- a/quanta/data/dtep/xhtml11/dd.tag +++ b/quanta/data/dtep/xhtml11/dd.tag @@ -2,7 +2,7 @@ - + @@ -56,6 +56,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/del.tag b/quanta/data/dtep/xhtml11/del.tag index 1a7c17db..dc48ab2b 100644 --- a/quanta/data/dtep/xhtml11/del.tag +++ b/quanta/data/dtep/xhtml11/del.tag @@ -14,7 +14,7 @@ - + @@ -68,6 +68,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/dfn.tag b/quanta/data/dtep/xhtml11/dfn.tag index fbeb6d72..42d4d6fc 100644 --- a/quanta/data/dtep/xhtml11/dfn.tag +++ b/quanta/data/dtep/xhtml11/dfn.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/div.tag b/quanta/data/dtep/xhtml11/div.tag index 1f8500f0..dde0e712 100644 --- a/quanta/data/dtep/xhtml11/div.tag +++ b/quanta/data/dtep/xhtml11/div.tag @@ -2,7 +2,7 @@ - + @@ -56,6 +56,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/dl.tag b/quanta/data/dtep/xhtml11/dl.tag index 430067b8..d1edcf28 100644 --- a/quanta/data/dtep/xhtml11/dl.tag +++ b/quanta/data/dtep/xhtml11/dl.tag @@ -2,9 +2,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/dt.tag b/quanta/data/dtep/xhtml11/dt.tag index ef239795..efc31477 100644 --- a/quanta/data/dtep/xhtml11/dt.tag +++ b/quanta/data/dtep/xhtml11/dt.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/em.tag b/quanta/data/dtep/xhtml11/em.tag index 807065df..f858197f 100644 --- a/quanta/data/dtep/xhtml11/em.tag +++ b/quanta/data/dtep/xhtml11/em.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/fieldset.tag b/quanta/data/dtep/xhtml11/fieldset.tag index c2bc156f..7ab940b3 100644 --- a/quanta/data/dtep/xhtml11/fieldset.tag +++ b/quanta/data/dtep/xhtml11/fieldset.tag @@ -3,7 +3,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/form.tag b/quanta/data/dtep/xhtml11/form.tag index c332c515..5f851d9d 100644 --- a/quanta/data/dtep/xhtml11/form.tag +++ b/quanta/data/dtep/xhtml11/form.tag @@ -57,7 +57,7 @@ - + @@ -79,6 +79,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/head.tag b/quanta/data/dtep/xhtml11/head.tag index b53932b3..30b8fad8 100644 --- a/quanta/data/dtep/xhtml11/head.tag +++ b/quanta/data/dtep/xhtml11/head.tag @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/headings.tag b/quanta/data/dtep/xhtml11/headings.tag index eb0b4fa0..dc23edec 100644 --- a/quanta/data/dtep/xhtml11/headings.tag +++ b/quanta/data/dtep/xhtml11/headings.tag @@ -3,7 +3,7 @@ - + @@ -38,11 +38,11 @@ - + - + @@ -77,11 +77,11 @@ - + - + @@ -116,11 +116,11 @@ - + - + @@ -155,11 +155,11 @@ - + - + @@ -194,11 +194,11 @@ - + - + @@ -233,7 +233,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/html.tag b/quanta/data/dtep/xhtml11/html.tag index 22894f8d..7794c33a 100644 --- a/quanta/data/dtep/xhtml11/html.tag +++ b/quanta/data/dtep/xhtml11/html.tag @@ -16,10 +16,10 @@ http://www.w3.org/1999/xhtml - + - + diff --git a/quanta/data/dtep/xhtml11/i.tag b/quanta/data/dtep/xhtml11/i.tag index 36dbd43a..f7bcd0ef 100644 --- a/quanta/data/dtep/xhtml11/i.tag +++ b/quanta/data/dtep/xhtml11/i.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/ins.tag b/quanta/data/dtep/xhtml11/ins.tag index c088199f..37c7be63 100644 --- a/quanta/data/dtep/xhtml11/ins.tag +++ b/quanta/data/dtep/xhtml11/ins.tag @@ -14,7 +14,7 @@ - + @@ -68,6 +68,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/kbd.tag b/quanta/data/dtep/xhtml11/kbd.tag index 2b222085..246f6230 100644 --- a/quanta/data/dtep/xhtml11/kbd.tag +++ b/quanta/data/dtep/xhtml11/kbd.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/label.tag b/quanta/data/dtep/xhtml11/label.tag index 75fb81c6..efb6174a 100644 --- a/quanta/data/dtep/xhtml11/label.tag +++ b/quanta/data/dtep/xhtml11/label.tag @@ -26,7 +26,7 @@ - + @@ -61,6 +61,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/legend.tag b/quanta/data/dtep/xhtml11/legend.tag index 048dff82..a55a5880 100644 --- a/quanta/data/dtep/xhtml11/legend.tag +++ b/quanta/data/dtep/xhtml11/legend.tag @@ -9,7 +9,7 @@ Shortcut - + @@ -44,6 +44,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/li.tag b/quanta/data/dtep/xhtml11/li.tag index 5ceb4358..66fd4600 100644 --- a/quanta/data/dtep/xhtml11/li.tag +++ b/quanta/data/dtep/xhtml11/li.tag @@ -6,7 +6,7 @@ - + @@ -60,6 +60,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/map.tag b/quanta/data/dtep/xhtml11/map.tag index 156f895f..4edddf1e 100644 --- a/quanta/data/dtep/xhtml11/map.tag +++ b/quanta/data/dtep/xhtml11/map.tag @@ -3,7 +3,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/noscript.tag b/quanta/data/dtep/xhtml11/noscript.tag index 86b73ab5..8a9cb611 100644 --- a/quanta/data/dtep/xhtml11/noscript.tag +++ b/quanta/data/dtep/xhtml11/noscript.tag @@ -3,7 +3,7 @@ - + @@ -26,6 +26,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/object.tag b/quanta/data/dtep/xhtml11/object.tag index 3953c45b..a76d9589 100644 --- a/quanta/data/dtep/xhtml11/object.tag +++ b/quanta/data/dtep/xhtml11/object.tag @@ -121,7 +121,7 @@ - + @@ -175,7 +175,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/ol.tag b/quanta/data/dtep/xhtml11/ol.tag index 25c76d7a..98e58f38 100644 --- a/quanta/data/dtep/xhtml11/ol.tag +++ b/quanta/data/dtep/xhtml11/ol.tag @@ -3,9 +3,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/optgroup.tag b/quanta/data/dtep/xhtml11/optgroup.tag index 82452057..57c7c978 100644 --- a/quanta/data/dtep/xhtml11/optgroup.tag +++ b/quanta/data/dtep/xhtml11/optgroup.tag @@ -15,9 +15,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/p.tag b/quanta/data/dtep/xhtml11/p.tag index bffe7b97..52233810 100644 --- a/quanta/data/dtep/xhtml11/p.tag +++ b/quanta/data/dtep/xhtml11/p.tag @@ -13,7 +13,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/pre.tag b/quanta/data/dtep/xhtml11/pre.tag index 623064c4..03f41221 100644 --- a/quanta/data/dtep/xhtml11/pre.tag +++ b/quanta/data/dtep/xhtml11/pre.tag @@ -11,7 +11,7 @@ preserve - + @@ -40,6 +40,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/q.tag b/quanta/data/dtep/xhtml11/q.tag index 1eaefcd1..ad91bfe2 100644 --- a/quanta/data/dtep/xhtml11/q.tag +++ b/quanta/data/dtep/xhtml11/q.tag @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/rbc.tag b/quanta/data/dtep/xhtml11/rbc.tag index fbd5b7ec..5f73674a 100644 --- a/quanta/data/dtep/xhtml11/rbc.tag +++ b/quanta/data/dtep/xhtml11/rbc.tag @@ -2,8 +2,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/rtc.tag b/quanta/data/dtep/xhtml11/rtc.tag index 97c21176..67abdda7 100644 --- a/quanta/data/dtep/xhtml11/rtc.tag +++ b/quanta/data/dtep/xhtml11/rtc.tag @@ -2,8 +2,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/ruby.tag b/quanta/data/dtep/xhtml11/ruby.tag index d133114f..5a55cdff 100644 --- a/quanta/data/dtep/xhtml11/ruby.tag +++ b/quanta/data/dtep/xhtml11/ruby.tag @@ -2,12 +2,12 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/samp.tag b/quanta/data/dtep/xhtml11/samp.tag index 2ec41eb4..e0f7bdf7 100644 --- a/quanta/data/dtep/xhtml11/samp.tag +++ b/quanta/data/dtep/xhtml11/samp.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/select.tag b/quanta/data/dtep/xhtml11/select.tag index 74eb9e58..31ada1cc 100644 --- a/quanta/data/dtep/xhtml11/select.tag +++ b/quanta/data/dtep/xhtml11/select.tag @@ -47,9 +47,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/small.tag b/quanta/data/dtep/xhtml11/small.tag index 0fdbe561..0d2c4263 100644 --- a/quanta/data/dtep/xhtml11/small.tag +++ b/quanta/data/dtep/xhtml11/small.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/span.tag b/quanta/data/dtep/xhtml11/span.tag index ca85ab65..6218d5d7 100644 --- a/quanta/data/dtep/xhtml11/span.tag +++ b/quanta/data/dtep/xhtml11/span.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/strong.tag b/quanta/data/dtep/xhtml11/strong.tag index 98d57d89..3bc13488 100644 --- a/quanta/data/dtep/xhtml11/strong.tag +++ b/quanta/data/dtep/xhtml11/strong.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/style.tag b/quanta/data/dtep/xhtml11/style.tag index d3c16a0e..648217c5 100644 --- a/quanta/data/dtep/xhtml11/style.tag +++ b/quanta/data/dtep/xhtml11/style.tag @@ -53,8 +53,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/sub.tag b/quanta/data/dtep/xhtml11/sub.tag index 5691c5f0..0a195674 100644 --- a/quanta/data/dtep/xhtml11/sub.tag +++ b/quanta/data/dtep/xhtml11/sub.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/sup.tag b/quanta/data/dtep/xhtml11/sup.tag index 33e052d3..815c4e35 100644 --- a/quanta/data/dtep/xhtml11/sup.tag +++ b/quanta/data/dtep/xhtml11/sup.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/table.tag b/quanta/data/dtep/xhtml11/table.tag index 2680b2d3..334a0d91 100644 --- a/quanta/data/dtep/xhtml11/table.tag +++ b/quanta/data/dtep/xhtml11/table.tag @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/tbody.tag b/quanta/data/dtep/xhtml11/tbody.tag index 62814633..62e80ac3 100644 --- a/quanta/data/dtep/xhtml11/tbody.tag +++ b/quanta/data/dtep/xhtml11/tbody.tag @@ -31,9 +31,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/td.tag b/quanta/data/dtep/xhtml11/td.tag index 4ace9ce3..30ec67d6 100644 --- a/quanta/data/dtep/xhtml11/td.tag +++ b/quanta/data/dtep/xhtml11/td.tag @@ -72,7 +72,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/textarea.tag b/quanta/data/dtep/xhtml11/textarea.tag index e19a6061..a0233b03 100644 --- a/quanta/data/dtep/xhtml11/textarea.tag +++ b/quanta/data/dtep/xhtml11/textarea.tag @@ -36,8 +36,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/tfoot.tag b/quanta/data/dtep/xhtml11/tfoot.tag index ec0b79a2..dadde62b 100644 --- a/quanta/data/dtep/xhtml11/tfoot.tag +++ b/quanta/data/dtep/xhtml11/tfoot.tag @@ -31,8 +31,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/th.tag b/quanta/data/dtep/xhtml11/th.tag index bd944333..3d8e539c 100644 --- a/quanta/data/dtep/xhtml11/th.tag +++ b/quanta/data/dtep/xhtml11/th.tag @@ -72,7 +72,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/quanta/data/dtep/xhtml11/thead.tag b/quanta/data/dtep/xhtml11/thead.tag index 326a1b87..f5df6cc5 100644 --- a/quanta/data/dtep/xhtml11/thead.tag +++ b/quanta/data/dtep/xhtml11/thead.tag @@ -31,8 +31,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/title.tag b/quanta/data/dtep/xhtml11/title.tag index 4c9f61b7..76f9045c 100644 --- a/quanta/data/dtep/xhtml11/title.tag +++ b/quanta/data/dtep/xhtml11/title.tag @@ -7,8 +7,8 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/tr.tag b/quanta/data/dtep/xhtml11/tr.tag index 27c68366..1ca8aa0e 100644 --- a/quanta/data/dtep/xhtml11/tr.tag +++ b/quanta/data/dtep/xhtml11/tr.tag @@ -36,9 +36,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/tt.tag b/quanta/data/dtep/xhtml11/tt.tag index a7506a8b..91138326 100644 --- a/quanta/data/dtep/xhtml11/tt.tag +++ b/quanta/data/dtep/xhtml11/tt.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/dtep/xhtml11/ul.tag b/quanta/data/dtep/xhtml11/ul.tag index bd4404c4..9f1450f6 100644 --- a/quanta/data/dtep/xhtml11/ul.tag +++ b/quanta/data/dtep/xhtml11/ul.tag @@ -3,9 +3,9 @@ - + - + diff --git a/quanta/data/dtep/xhtml11/var.tag b/quanta/data/dtep/xhtml11/var.tag index 1c20c088..4c4e8dc3 100644 --- a/quanta/data/dtep/xhtml11/var.tag +++ b/quanta/data/dtep/xhtml11/var.tag @@ -2,7 +2,7 @@ - + @@ -37,6 +37,6 @@ - + diff --git a/quanta/data/templates/pages/docbook/kde-doc-template.docbook b/quanta/data/templates/pages/docbook/kde-doc-template.docbook index 65a5773c..e9b610fb 100644 --- a/quanta/data/templates/pages/docbook/kde-doc-template.docbook +++ b/quanta/data/templates/pages/docbook/kde-doc-template.docbook @@ -271,7 +271,7 @@ Programming &kmyapplication; plugins is a joy to behold. Just read through the n should consult the docbook reference for further details. The example below was taken from that reference and shortened a bit for readability. --> - + XtUnmanageChildren Xt - Geometry Management @@ -279,10 +279,10 @@ taken from that reference and shortened a bit for readability. --> XtUnmanageChildren -remove a list of children from a parent widget's managed +remove a list of tqchildren from a tqparent widget's managed list. -widgetsremoving -XtUnmanageChildren +widgetsremoving +XtUnmanageChildren @@ -291,16 +291,16 @@ list. 4 March 1996 -void XtUnmanageChildren(children, num_children) - WidgetList children; - Cardinal num_children; +void XtUnmanageChildren(tqchildren, num_tqchildren) + WidgetList tqchildren; + Cardinal num_tqchildren; - + Inputs -children +tqchildren Specifies an array of child widgets. Each child must be of @@ -309,40 +309,40 @@ class RectObj or any subclass thereof. -num_children +num_tqchildren -Specifies the number of elements in children. +Specifies the number of elements in tqchildren. - + Description XtUnmanageChildren() unmaps the specified widgets -and removes them from their parent's geometry management. +and removes them from their tqparent's tqgeometry management. The widgets will disappear from the screen, and (depending -on its parent) may no longer have screen space allocated for +on its tqparent) may no longer have screen space allocated for them. -Each of the widgets in the children array must have -the same parent. +Each of the widgets in the tqchildren array must have +the same tqparent. See the “Algorithm” section below for full details of the widget unmanagement procedure. - + Usage Unmanaging widgets is the usual method for temporarily making them invisible. They can be re-managed with XtManageChildren(). -You can unmap a widget, but leave it under geometry +You can unmap a widget, but leave it under tqgeometry management by calling XtUnmapWidget(). You can destroy a widget's window without destroying the widget by calling XtUnrealizeWidget(). You can destroy a @@ -354,12 +354,12 @@ often more convenient to call XtUnmanageChild() several times than it is to declare and initialize an array of widgets to pass to XtUnmanageChildren(). Calling XtUnmanageChildren() is more efficient, however, -because it only calls the parent's change_managed() +because it only calls the tqparent's change_managed() method once. - + Algorithm XtUnmanageChildren() performs the following: @@ -388,11 +388,11 @@ by unmapping it. - + Structures The WidgetList type is simply an array of widgets: -typedef Widget *WidgetList; +typedef Widget *WidgetList; diff --git a/quanta/data/templates/scripts/javascript/overlib.js b/quanta/data/templates/scripts/javascript/overlib.js index 4ec178bd..ed75a9ea 100644 --- a/quanta/data/templates/scripts/javascript/overlib.js +++ b/quanta/data/templates/scripts/javascript/overlib.js @@ -182,7 +182,7 @@ if (typeof ol_background == 'undefined') { var ol_background = ""; } // Normal is "Close". if (typeof ol_close == 'undefined') { var ol_close = "Close"; } -// Default vertical alignment for popups. +// Default vertical tqalignment for popups. // It's best to leave RIGHT here. Other options are LEFT and CENTER. if (typeof ol_hpos == 'undefined') { var ol_hpos = RIGHT; } @@ -196,11 +196,11 @@ if (typeof ol_autostatus == 'undefined') { var ol_autostatus = 0; } // Default height for popup. Often best left alone. if (typeof ol_height == 'undefined') { var ol_height = -1; } -// Horizontal grid spacing that popups will snap to. +//Qt::Horizontal grid spacing that popups will snap to. // 0 makes no grid, anything else will cause a snap to that grid spacing. if (typeof ol_snapx == 'undefined') { var ol_snapx = 0; } -// Vertical grid spacing that popups will snap to. +//Qt::Vertical grid spacing that popups will snap to. // 0 makes no grid, andthing else will cause a snap to that grid spacing. if (typeof ol_snapy == 'undefined') { var ol_snapy = 0; } diff --git a/quanta/data/tips b/quanta/data/tips index 609ed245..1a23291c 100644 --- a/quanta/data/tips +++ b/quanta/data/tips @@ -201,7 +201,7 @@ Just go to Settings > Configure Shortcuts. -

    ...that you can set the Upload Status of files and folders in the project tree? Right click on a project file or folder and select Upload Status and set the appropriate actions. This enables you to set a project root below the document root and prevent support files from uploading while requiring confirmation on sensitive data files. +

    ...that you can set the Upload tqStatus of files and folders in the project tree? Right click on a project file or folder and select Upload tqStatus and set the appropriate actions. This enables you to set a project root below the document root and prevent support files from uploading while requiring confirmation on sensitive data files.

    @@ -278,7 +278,7 @@ Just go to Settings > Configure Shortcuts. -

    ...that you can visually check the status of your links from within Quanta? Select KLinkStatus from the Plugins menu and Quanta will load a visual link checker. +

    ...that you can visually check the status of your links from within Quanta? Select KLinktqStatus from the Plugins menu and Quanta will load a visual link checker.

    diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index de63fc3e..d823fc1f 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -50,10 +50,10 @@ #include "tagaction.h" #include "toolbartabwidget.h" -ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) - :ActionConfigDialogS( parent, name, modal, fl ) +ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, KMainWindow* tqparent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) + :ActionConfigDialogS( tqparent, name, modal, fl ) { - m_mainWindow = parent; + m_mainWindow = tqparent; m_toolbarList = toolbarList; buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); @@ -89,7 +89,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); - toolbarName.replace(r, ""); + toolbarName.tqreplace(r, ""); item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8())); actionTreeView->insertItem(item); @@ -106,13 +106,13 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name()); + oldActionItem = new KListViewItem(item, oldActionItem, action->text().tqreplace(r,""), action->shortcut().toString(), action->name()); oldActionItem->setPixmap(0, SmallIcon(action->icon()) ); } } node = node.nextSibling(); } - if (tb->label(tb->currentPageIndex()).replace(r, "") == toolbarName) + if (tb->label(tb->currentPageIndex()).tqreplace(r, "") == toolbarName) { item->setOpen(true); if (item->firstChild()) @@ -142,7 +142,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict &toolbarList, for (uint i = 0; i < acCount; i++) { action = ac->action(i); - item = new KListViewItem(allActionsItem, action->text().replace(r, ""), action->shortcut().toString(), action->name()); + item = new KListViewItem(allActionsItem, action->text().tqreplace(r, ""), action->shortcut().toString(), action->name()); item->setPixmap(0, SmallIcon(action->icon()) ); } allActionsItem->sortChildItems(0, true); @@ -168,11 +168,11 @@ void ActionConfigDialog::slotAddToolbar() for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); - if (!actionTreeView->findItem(toolbarName, 0)) + if (!actionTreeView->tqfindItem(toolbarName, 0)) { item = actionTreeView->lastItem(); - if (item->parent()) - item = item->parent(); + if (item->tqparent()) + item = item->tqparent(); new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8())); break; } @@ -183,14 +183,14 @@ void ActionConfigDialog::slotRemoveToolbar() { TQListViewItem *item = actionTreeView->currentItem(); TQString s = item->text(0); - if (item->parent()) + if (item->tqparent()) { - item = item->parent(); + item = item->tqparent(); s = item->text(0); } if (s != i18n("All")) { - if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); @@ -213,8 +213,8 @@ void ActionConfigDialog::slotEditToolbar() TQString toolbarId; TQListViewItem *oldItem; TQListViewItem *item = actionTreeView->currentItem(); - if (item->parent()) - item = item->parent(); + if (item->tqparent()) + item = item->tqparent(); toolbarName = item->text(0); if ( toolbarName != i18n("All")) { @@ -231,7 +231,7 @@ void ActionConfigDialog::slotEditToolbar() ToolbarEntry *p_toolbar = m_toolbarList[toolbarId]; if (p_toolbar) { - oldItem = actionTreeView->findItem(toolbarName, 0); + oldItem = actionTreeView->tqfindItem(toolbarName, 0); item = new KListViewItem(actionTreeView, oldItem, toolbarName); item->setOpen(oldItem->isOpen()); delete oldItem; @@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar() action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); + oldItem = new KListViewItem(item, oldItem, action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); oldItem->setPixmap(0, SmallIcon(action->icon())); } } @@ -266,7 +266,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) if (currentAction && currentAction->inherits("TagAction")) { if ( buttonApply->isEnabled() && - KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) + KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) { saveCurrentAction(); } @@ -309,7 +309,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) actionIcon->setIcon(s); } TQString actionText = el.attribute("text"); - actionText.replace(TQRegExp("\\&(?!\\&)"),""); + actionText.tqreplace(TQRegExp("\\&(?!\\&)"),""); lineText->setText(actionText); lineToolTip->setText( el.attribute("tooltip") ); selectedShortcut = action->shortcut(); @@ -344,7 +344,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) node.toElement().attribute("name") == el.attribute("name")) { toolbarListBox->insertItem(toolbarName); - if (item->parent()->text(0) == toolbarName) + if (item->tqparent()->text(0) == toolbarName) current = count; count++; } @@ -406,7 +406,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) { outputBox->setCurrentItem(2); } else - if (s == "replace") + if (s == "tqreplace") { outputBox->setCurrentItem(3); } else @@ -431,7 +431,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) { errorBox->setCurrentItem(2); } else - if (s == "replace") + if (s == "tqreplace") { errorBox->setCurrentItem(3); } else @@ -472,7 +472,7 @@ void ActionConfigDialog::saveCurrentAction() currentAction->setIcon(s); TQString oldText = el.attribute("text"); s = lineText->text(); - s.replace('&', "&&"); + s.tqreplace('&', "&&"); el.setAttribute("text", s); currentAction->setText(s); s = lineToolTip->text(); @@ -549,7 +549,7 @@ void ActionConfigDialog::saveCurrentAction() case 2:{ item.setAttribute("output", "selection"); break; } - case 3:{ item.setAttribute("output", "replace"); + case 3:{ item.setAttribute("output", "tqreplace"); break; } case 4:{ item.setAttribute("output", "new"); @@ -570,7 +570,7 @@ void ActionConfigDialog::saveCurrentAction() case 2:{ item.setAttribute("error", "selection"); break; } - case 3:{ item.setAttribute("error", "replace"); + case 3:{ item.setAttribute("error", "tqreplace"); break; } case 4:{ item.setAttribute("error", "new"); @@ -618,7 +618,7 @@ void ActionConfigDialog::saveCurrentAction() if (p_toolbar) { TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild(); - bool placeOnToolbar = toolbarListBox->findItem(toolbarName, Qt::ExactMatch); + bool placeOnToolbar = toolbarListBox->tqfindItem(toolbarName, TQt::ExactMatch); while (!node.isNull()) { if (node.nodeName() == "Action" && @@ -630,12 +630,12 @@ void ActionConfigDialog::saveCurrentAction() { currentAction->unplug(tb->page(i)); currentAction->unplug(p_toolbar->menu); - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); TQListViewItemIterator iter(actionTreeView); while (iter.current()) { listItem = iter.current(); - if (listItem->depth() > 0 && listItem->parent()->text(0) == toolbarName + if (listItem->depth() > 0 && listItem->tqparent()->text(0) == toolbarName && listItem->text(2) == el.attribute("name")) { delete listItem; @@ -658,7 +658,7 @@ void ActionConfigDialog::saveCurrentAction() item.setAttribute("name",el.attribute("name")); p_toolbar->guiClient->domDocument().firstChild().firstChild().appendChild(item); //put it also in the treeview - listItem = actionTreeView->findItem(toolbarName, 0); + listItem = actionTreeView->tqfindItem(toolbarName, 0); if (listItem) { TQListViewItem *after = listItem->firstChild(); @@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction() p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance()); } TQWidget *toolBar = tb->page(i); - if (toolBar->minimumSizeHint().height() > 20) + if (toolBar->tqminimumSizeHint().height() > 20) { toolBar->adjustSize(); toolBar->setGeometry(0,0, tb->width(), toolBar->height()); @@ -698,29 +698,29 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) { TQString shortcutText = shortcut.toString(); TQString shortcutText2; - int pos = shortcutText.find(';'); + int pos = shortcutText.tqfind(';'); if (pos != -1) { shortcutText2 = shortcutText.mid(pos + 1); shortcutText = shortcutText.left(pos); } TQString s = shortcutText; - s.replace('+', "\\+"); + s.tqreplace('+', "\\+"); TQRegExp shortcutRx("\\(" + s + "\\)|" + s + "$|" + s + ";"); s = shortcutText2; - s.replace('+', "\\+"); + s.tqreplace('+', "\\+"); TQRegExp shortcutRx2("\\(" + s + "\\)|" + s + "$|" + s + ";"); TQString global; //check for conflicting global shortcuts TQMap::Iterator it; for ( it = globalShortcuts.begin(); it != globalShortcuts.end(); ++it ) { - if (it.data().contains(shortcutRx)) + if (it.data().tqcontains(shortcutRx)) { global = it.key(); break; } - if (!shortcutText2.isEmpty() && it.data().contains(shortcutRx2)) + if (!shortcutText2.isEmpty() && it.data().tqcontains(shortcutRx2)) { shortcutText = shortcutText2; global = it.key(); @@ -737,12 +737,12 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) for (uint i = 0; i < ac->count(); i++) { KAction *action = ac->action(i); - if (action != currentAction && action->shortcut().toString().contains(shortcutRx)) + if (action != currentAction && action->shortcut().toString().tqcontains(shortcutRx)) { global = action->text(); break; } - if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().contains(shortcutRx)) + if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().tqcontains(shortcutRx)) { shortcutText = shortcutText2; global = action->text(); @@ -761,11 +761,11 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) selectedShortcut = shortcut; } else { - global.replace('&',""); + global.tqreplace('&',""); TQString s = i18n("The '%1' key combination has already been allocated " "to the \"%2\" action.\n" "Please choose a unique key combination."). - arg(shortcutText).arg(global); + tqarg(shortcutText).tqarg(global); KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts")); } } @@ -779,7 +779,7 @@ void ActionConfigDialog::accept() void ActionConfigDialog::reject() { - if (buttonApply->isEnabled() && KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) + if (buttonApply->isEnabled() && KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) saveCurrentAction(); ActionConfigDialogS::reject(); } @@ -805,29 +805,29 @@ void ActionConfigDialog::slotNewAction() static_cast(currentAction)->setModified(true); TQListViewItem *currentItem = actionTreeView->currentItem(); TQListViewItem *item = new KListViewItem(allActionsItem); - TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count()); + TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count()); currentAction->setText(actionText); item->setText(2, currentAction->name()); item->setText(0, actionText); item->setPixmap(0, SmallIcon("ball")); allActionsItem->sortChildItems(0, true); - if (currentItem->parent() && currentItem->parent() == allActionsItem) + if (currentItem->tqparent() && currentItem->tqparent() == allActionsItem) { actionTreeView->setCurrentItem(item); } else { - TQListViewItem *parentItem = currentItem->parent(); - if (!parentItem) - parentItem = currentItem; + TQListViewItem *tqparentItem = currentItem->tqparent(); + if (!tqparentItem) + tqparentItem = currentItem; - item = new KListViewItem(parentItem, currentItem); + item = new KListViewItem(tqparentItem, currentItem); item->setText(0, actionText); item->setText(2, currentAction->name()); item->setPixmap(0, SmallIcon("ball")); actionTreeView->setCurrentItem(item); - if (parentItem != allActionsItem) + if (tqparentItem != allActionsItem) { - toolbarListBox->insertItem(parentItem->text(0)); + toolbarListBox->insertItem(tqparentItem->text(0)); toolbarListBox->setCurrentItem(0); toolbarListBox->setSelected(0, true); } @@ -838,7 +838,7 @@ void ActionConfigDialog::slotNewAction() void ActionConfigDialog::slotDeleteAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("Removing the action removes all the references to it.\nAre you sure you want to remove the %1 action?").arg(currentAction->text()),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Removing the action removes all the references to it.\nAre you sure you want to remove the %1 action?").tqarg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { TQString actionName = currentAction->name(); emit deleteUserAction(currentAction); @@ -876,7 +876,7 @@ void ActionConfigDialog::slotAddContainerToolbar() TQStringList lst; for (i = 0; i < tb->count(); i++) { - if (!toolbarListBox->findItem(tb->label(i), Qt::ExactMatch)) + if (!toolbarListBox->tqfindItem(tb->label(i), TQt::ExactMatch)) lst << tb->label(i); } diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index d0bee34e..cbe44d1d 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -42,10 +42,11 @@ struct ToolbarEntry { class ActionConfigDialog: public ActionConfigDialogS { Q_OBJECT + TQ_OBJECT public: - ActionConfigDialog(const TQDict &toolbarList, KMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString::null); + ActionConfigDialog(const TQDict &toolbarList, KMainWindow* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); ~ActionConfigDialog(); void createScriptAction(const TQString& a_name, const TQString& a_script); diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index baeb41bd..c5002777 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -11,7 +11,7 @@ ***************************************************************************/ Andras Mantia <amantia@kde.org> - + ActionConfigDialogS @@ -30,16 +30,16 @@ unnamed - + splitter2 Horizontal - + - layout17 + tqlayout17 @@ -56,7 +56,7 @@ &Delete Action - + addAction @@ -77,7 +77,7 @@ Expanding - + 16 20 @@ -94,14 +94,14 @@ Fixed - + 16 20 - + textLabel1 @@ -158,9 +158,9 @@ - + - layout9 + tqlayout9 @@ -177,7 +177,7 @@ &Apply - + buttonCancel @@ -198,7 +198,7 @@ Fixed - + 16 20 @@ -209,7 +209,7 @@ buttonOk - + 90 0 @@ -225,7 +225,7 @@ true - + actionProperties @@ -239,7 +239,7 @@ unnamed - + addToolbar @@ -247,7 +247,7 @@ &Add... - + removeToolbar @@ -265,14 +265,14 @@ Fixed - + 16 20 - + TextLabel2 @@ -283,12 +283,12 @@ lineToolTip - + lineToolTip - + TextLabel1_2 @@ -311,13 +311,13 @@ 0 - + 32 32 - + 32 32 @@ -330,12 +330,12 @@ 22 - + lineText - + buttonGroup4_2 @@ -346,7 +346,7 @@ unnamed - + customShortcut @@ -365,7 +365,7 @@ None - + noShortcut @@ -383,7 +383,7 @@ toolbarListBox - + textLabel2 @@ -391,7 +391,7 @@ Container toolbars: - + Tag @@ -419,7 +419,7 @@ - + textLabel3 @@ -430,7 +430,7 @@ typeCombo - + buttonGroup13 @@ -441,11 +441,11 @@ unnamed - + widgetStack1 - + page @@ -456,7 +456,7 @@ unnamed - + TextLabel5_2_2_2 @@ -464,17 +464,17 @@ <tag> : - + lineTag - + lineClosingTag - + useClosingTag @@ -485,7 +485,7 @@ true - + useActionDialog @@ -498,7 +498,7 @@ - + page @@ -521,14 +521,14 @@ 0 - + 64 20 - + textLabel1_2 @@ -547,7 +547,7 @@ inputBox - + None @@ -575,7 +575,7 @@ - + textLabel2_2 @@ -594,7 +594,7 @@ outputBox - + None @@ -640,7 +640,7 @@ 5 - + None @@ -686,7 +686,7 @@ 5 - + textLabel3_2 @@ -707,7 +707,7 @@ - + page @@ -718,7 +718,7 @@ unnamed - + textEdit @@ -740,7 +740,7 @@ Expanding - + 55 20 @@ -976,7 +976,7 @@ kkeybutton.h kpushbutton.h - + buttonOk_clicked() slotNewAction() slotDeleteAction() @@ -989,8 +989,8 @@ shortcutKeyButton_toggled(bool) slotToggled(bool) slotTextChanged() - - + + klistview.h kicondialog.h diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui index f7f064f9..916332dd 100644 --- a/quanta/dialogs/casewidget.ui +++ b/quanta/dialogs/casewidget.ui @@ -1,6 +1,6 @@ CaseWidget - + CaseWidget @@ -12,7 +12,7 @@ 158 - + 500 100 @@ -22,7 +22,7 @@ unnamed - + buttonGroup2 @@ -33,7 +33,7 @@ unnamed - + upperTag @@ -41,7 +41,7 @@ Upper case - + lowerTag @@ -49,7 +49,7 @@ Lower case - + unchangedTag @@ -62,7 +62,7 @@ - + buttonGroup3 @@ -73,7 +73,7 @@ unnamed - + upperAttr @@ -81,7 +81,7 @@ Upper case - + lowerAttr @@ -89,7 +89,7 @@ Lower case - + unchangedAttr @@ -104,5 +104,5 @@ - + diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index 9f66cb11..7a4c596d 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -46,9 +46,9 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) targetDirURL.adjustPath(1); bool doCopy = true; - if (!QExtFileInfo::exists(targetDirURL, false, 0L)) + if (!TQExtFileInfo::exists(targetDirURL, false, 0L)) { - doCopy = QExtFileInfo::createDir(targetDirURL, 0L); + doCopy = TQExtFileInfo::createDir(targetDirURL, 0L); } KURL destURL; @@ -93,9 +93,9 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) targetDirURL = destination; } bool doCopy = true; - if (!QExtFileInfo::exists(targetDirURL, false, 0L)) + if (!TQExtFileInfo::exists(targetDirURL, false, 0L)) { - doCopy = QExtFileInfo::createDir(targetDirURL, 0L); + doCopy = TQExtFileInfo::createDir(targetDirURL, 0L); } KIO::UDSEntry entry; diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 452919aa..b46947db 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -28,8 +28,9 @@ class KURL; -class CopyTo : public QObject{ +class CopyTo : public TQObject{ Q_OBJECT + TQ_OBJECT public: CopyTo(const KURL& dirURL); ~CopyTo(); diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui index 8e1910f4..d44b604e 100644 --- a/quanta/dialogs/debuggeroptionss.ui +++ b/quanta/dialogs/debuggeroptionss.ui @@ -1,6 +1,6 @@ DebuggerOptionsS - + DebuggerOptionsS @@ -20,7 +20,7 @@ 0 - + 350 220 @@ -36,7 +36,7 @@ 6 - + checkDebugger @@ -47,7 +47,7 @@ true - + ButtonGroup1 @@ -72,7 +72,7 @@ 6 - + radioPhp3 @@ -80,7 +80,7 @@ PHP3 listener - + radioPhp4 @@ -101,7 +101,7 @@ Expanding - + 20 20 @@ -120,7 +120,7 @@ Expanding - + 20 20 @@ -137,5 +137,5 @@ setEnabled(bool) - + diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui index 3d46130e..d339ebdc 100644 --- a/quanta/dialogs/dirtydialog.ui +++ b/quanta/dialogs/dirtydialog.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2002 Andras Mantia <amantia@kde.org> - + DirtyDialog @@ -29,7 +29,7 @@ 0 - + 400 220 @@ -42,7 +42,7 @@ unnamed - + textLabel @@ -58,7 +58,7 @@ The file was changed outside of the Quanta editor. - + ButtonGroup2 @@ -75,7 +75,7 @@ 6 - + buttonIgnore @@ -83,7 +83,7 @@ &Do not load the modified version from disk - + buttonLoad @@ -91,7 +91,7 @@ &Use the version from disk (will lose the current content) - + warningLabel @@ -106,7 +106,7 @@ (If you later save the document, you will lose what was on the disk.) - + WordBreak|AlignVCenter @@ -120,14 +120,14 @@ Fixed - + 20 20 - + buttonCompare @@ -150,5 +150,5 @@ buttonIgnore buttonLoad - + diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 70d06c86..18301045 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -34,14 +34,14 @@ #include "resource.h" #include "qextfileinfo.h" -DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n("File Changed"), KDialogBase::Ok) +DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *tqparent, const char *name ) : KDialogBase(tqparent, name, true, i18n("File Changed"), KDialogBase::Ok) { m_src.setPath(srcName); m_dest.setPath(destName); m_busy = false; m_createBackup = createBackup; m_mainWidget = new DirtyDialog(this); - m_mainWidget->textLabel->setText(i18n("The file %1 was changed outside of the Quanta editor.").arg(srcName)); + m_mainWidget->textLabel->setText(i18n("The file %1 was changed outside of the Quanta editor.").tqarg(srcName)); setMainWidget(m_mainWidget); } @@ -78,7 +78,7 @@ void DirtyDlg::slotCompareDone(KProcess* proc) { KURL backupURL = m_src; backupURL.setPath(backupURL.path()+".backup"); - QExtFileInfo::copy(m_src, backupURL, -1, true, false, this); + TQExtFileInfo::copy(m_src, backupURL, -1, true, false, this); } KIO::UDSEntry entry; diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index ec457d25..c850ab25 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -28,9 +28,10 @@ class TQCloseEvent; class DirtyDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *parent=0, const char *name=0); + DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *tqparent=0, const char *name=0); ~DirtyDlg(); protected slots: // Protected slots diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index e5aab152..0921fa98 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2002, 2003 Andras Mantia <amantia@kde.org>, (C) 2002, 2003, 2004 Eric Laffoon <sequitur@kde.org> - + DonationDialog @@ -86,7 +86,7 @@ is the future of software, but it is no guarantee of success. How many open sour Expanding - + 365 20 @@ -108,13 +108,13 @@ is the future of software, but it is no guarantee of success. How many open sour 0 - + 0 30 - + 32767 40 @@ -143,10 +143,10 @@ is the future of software, but it is no guarantee of success. How many open sour KTextBrowser2 closeButton - + init() - - + + kpushbutton.h ktextbrowser.h diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index 525a0429..60c47e20 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2002, 2003 Andras Mantia <amantia@kde.org> - + DTDSelectDialog @@ -21,7 +21,7 @@ 161 - + 440 160 @@ -34,7 +34,7 @@ unnamed - + messageLabel @@ -45,16 +45,16 @@ Dialog message2: true - + WordBreak|AlignVCenter - + dtdCombo - + textLabel @@ -62,7 +62,7 @@ Dialog message2: Current DTD: - + comboLabel @@ -70,7 +70,7 @@ Dialog message2: Select DTD: - + currentDTD @@ -78,7 +78,7 @@ Dialog message2: true - + convertDTD @@ -86,7 +86,7 @@ Dialog message2: Conver&t the document to the selected DTD - + useClosestMatching @@ -105,8 +105,8 @@ Dialog message2: dtdselectdialog.ui.h - + init() - - + + diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index c2595716..72759a00 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -40,8 +40,8 @@ #include "resource.h" #include "quantacommon.h" -DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent, const char *name) - : DTEPEditDlgS(parent, name) +DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent, const char *name) + : DTEPEditDlgS(tqparent, name) { nameEdit->setFocus(); m_descriptionFile = descriptionFile; @@ -94,7 +94,7 @@ void DTEPEditDlg::readGeneral() TQString inherits = m_config->readEntry("Inherits"); TQStringList lst(DTDs::ref()->nameList()); inheritsCombo->insertStringList(lst); - int idx = lst.findIndex(inherits); + int idx = lst.tqfindIndex(inherits); if (idx == -1) inheritsCombo->insertItem(inherits, 0); else @@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral() void DTEPEditDlg::readPages() { int i = 1; - while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6) + while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6) { - m_config->setGroup(TQString("Page%1").arg(i)); + m_config->setGroup(TQString("Page%1").tqarg(i)); TQString title = m_config->readEntry("Title"); TQString groups = m_config->readEntry("Groups"); if (i == 1) @@ -203,7 +203,7 @@ void DTEPEditDlg::saveResult() { if (f.exists()) { - if (KMessageBox::questionYesNo(this, i18n("The file %1 is not writable.
    Do you want to save the configuration to a different file?    ").arg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("The file %1 is not writable.
    Do you want to save the configuration to a different file?    ").tqarg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) { targetFile = KFileDialog::getSaveFileName(locateLocal("data", resourceDir + "dtep/description.rc"), i18n("*.rc|DTEP Description"), this, i18n("Save Description As")); } else @@ -255,35 +255,35 @@ void DTEPEditDlg::writePages(KConfig *config) if (enablePage1->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit1->text()); writeEntry(config, "Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit2->text()); writeEntry(config, "Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit3->text()); writeEntry(config, "Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit4->text()); writeEntry(config, "Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit5->text()); writeEntry(config, "Groups", groupsEdit5->text()); } @@ -343,10 +343,10 @@ void DTEPEditDlg::readStructures() int objectGroupId = m_config->readNumEntry("ObjectGroupIndex", -1); int i = 1; - while (m_config->hasGroup(TQString("StructGroup_%1").arg(i))) + while (m_config->hasGroup(TQString("StructGroup_%1").tqarg(i))) { StructGroup group; - m_config->setGroup(TQString("StructGroup_%1").arg(i)); + m_config->setGroup(TQString("StructGroup_%1").tqarg(i)); group.name = m_config->readEntry("Name"); group.noName = m_config->readEntry("No_Name"); group.icon = m_config->readEntry("Icon"); @@ -354,7 +354,7 @@ void DTEPEditDlg::readStructures() group.hasFileName = m_config->readBoolEntry("HasFileName", false); group.fileNameRx = m_config->readEntry("FileNameRx"); group.appendToTags = m_config->readBoolEntry("AppendToTags", false); - group.parentGroup = m_config->readEntry("ParentGroup"); + group.tqparentGroup = m_config->readEntry("ParentGroup"); group.definitionRx = m_config->readEntry("DefinitionRx"); group.definitionRxMinimal = m_config->readBoolEntry("DefinitionRx_Minimal", false); group.usageRx = m_config->readEntry("UsageRx"); @@ -387,7 +387,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) for (TQValueList::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(TQString("StructGroup_%1").arg(i)); + config->setGroup(TQString("StructGroup_%1").tqarg(i)); writeEntry(config, "Name", group.name); writeEntry(config, "No_Name", group.noName); writeEntry(config, "Icon", group.icon); @@ -397,7 +397,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) config->writeEntry("AppendToTags", group.appendToTags); if (m_family == 1) { - writeEntry(config, "ParentGroup", group.parentGroup); + writeEntry(config, "ParentGroup", group.tqparentGroup); writeEntry(config, "DefinitionRx", group.definitionRx); config->writeEntry("DefinitionRx_Minimal", group.definitionRxMinimal); writeEntry(config, "UsageRx", group.usageRx); @@ -453,7 +453,7 @@ void DTEPEditDlg::slotEditStructGroup() structDlg.hasFilename->setChecked(group.hasFileName); structDlg.fileNameRxEdit->setText(group.fileNameRx); structDlg.appendToTags->setChecked(group.appendToTags); - structDlg.parentGroupEdit->setText(group.parentGroup); + structDlg.tqparentGroupEdit->setText(group.tqparentGroup); for (int i = 0; i < structDlg.tagTypeCombo->count(); i++) { if (structDlg.tagTypeCombo->text(i) == group.tagType) @@ -513,7 +513,7 @@ StructGroup DTEPEditDlg::readFromStructDlg(DTEPStructureEditDlgS *structDlg) group.hasFileName = structDlg->hasFilename->isChecked(); group.fileNameRx = structDlg->fileNameRxEdit->text(); group.appendToTags = structDlg->appendToTags->isChecked(); - group.parentGroup = structDlg->parentGroupEdit->text(); + group.tqparentGroup = structDlg->tqparentGroupEdit->text(); group.tagType = structDlg->tagTypeCombo->currentText(); group.definitionRx = structDlg->definitionRxEdit->text(); group.definitionRxMinimal = structDlg->definitionRxMinimal->isChecked(); @@ -536,7 +536,7 @@ void DTEPEditDlg::slotDeleteStructGroup() int currentItem = structuresList->currentItem(); if (currentItem != -1) { - if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the %1 group?").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the %1 group?").tqarg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) { m_structGroups.remove(m_structGroups.at(currentItem)); structuresList->removeItem(currentItem); diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index ed921a5a..6906e40d 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -37,7 +37,7 @@ struct StructGroup { bool hasFileName; TQString fileNameRx; bool appendToTags; - TQString parentGroup; + TQString tqparentGroup; TQString definitionRx; bool definitionRxMinimal; TQString usageRx; @@ -56,8 +56,9 @@ struct StructGroup { class DTEPEditDlg : public DTEPEditDlgS { Q_OBJECT + TQ_OBJECT public: - DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0); + DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent = 0, const char *name = 0); ~DTEPEditDlg(); void saveResult(); void slotFamilyChanged(int family); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 739ffcc5..3b36feeb 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2005 Andras Mantia <amantia@kde.org> - + DTEPEditDlgS @@ -28,11 +28,11 @@ unnamed - + tabWidget - + tab @@ -43,7 +43,7 @@ unnamed - + textLabel1 @@ -68,7 +68,7 @@ The real name of the DTEP. In case of XML DTEPs this should be the DTD definition string, like -<i>//W3C//DTD&nbsp;HTML&nbsp;4.01&nbsp;Transitional//EN</i>. - + textLabel2 @@ -103,7 +103,7 @@ Expanding - + 40 20 @@ -158,14 +158,14 @@ Expanding - + 20 50 - + groupBox1 @@ -176,11 +176,11 @@ unnamed - + generalWidgetStack - + WStackPage @@ -191,7 +191,7 @@ unnamed - + textLabel3 @@ -208,7 +208,7 @@ URL pointing to the DTD definiton file, like <i>http://www.w3.org/TR/html4/loose.dtd</i>. - + textLabel4 @@ -251,14 +251,14 @@ - + WStackPage 1 - + topLevel @@ -284,7 +284,7 @@ - + textLabel9 @@ -312,7 +312,7 @@ The name of the folder where the toolbars are stored. This is a relative name to <br><i>$KDEDIR(&nbsp;or&nbsp;$KDEHOME)/share/apps/quanta/toolbars</i> . - + textLabel10 @@ -340,7 +340,7 @@ Comma separated list of toolbars from the toolbar folder that will be loaded when a document with this DTEP is loaded. - + caseSensitive @@ -365,7 +365,7 @@ Indicates whether the DTEP has case sensitive tags. In case of XML this should be checked, but for example HTML variants are not case sensitive. - + textLabel7 @@ -388,7 +388,7 @@ <p><b>Pseudo type</b>:DTEP describing some other language, where the notion of a tag is not the same as in XML. Examples are <i>PHP, JavaScript, CSS</i>.</p> - + textLabel8 @@ -432,7 +432,7 @@ <p><b>Pseudo type</b>:DTEP describing some other language, where the notion of a tag is not the same as in XML. Examples are <i>PHP, JavaScript, CSS</i>.</p> - + textLabel1_2 @@ -484,7 +484,7 @@ The default extension of files belonging to this DTEP - + textLabel2_2 @@ -505,7 +505,7 @@ Expanding - + 40 20 @@ -514,7 +514,7 @@ - + tab @@ -535,14 +535,14 @@ Expanding - + 20 50 - + enablePage1 @@ -556,7 +556,7 @@ Every tab edit dialog will have one more extra page aside of the main page. You can configure what will be on this page in the below fields. - + textLabel11 @@ -573,7 +573,7 @@ The title of the page, like <b>Core && i18n</b>. As you see, the ampersand must be doubled. - + textLabel12 @@ -595,7 +595,7 @@ </b></p> - + enablePage2 @@ -609,7 +609,7 @@ See the tooltip and "What's This?" information for the first checkbox - + enablePage3 @@ -623,7 +623,7 @@ See the tooltip and "What's This?" information for the first checkbox - + enablePage4 @@ -637,7 +637,7 @@ See the tooltip and "What's This?" information for the first checkbox - + enablePage5 @@ -695,7 +695,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel12_3 @@ -720,7 +720,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel11_3_2 @@ -734,7 +734,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel11_2 @@ -748,7 +748,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel12_2 @@ -762,7 +762,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel11_3 @@ -776,7 +776,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel12_3_2 @@ -801,7 +801,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel11_5 @@ -826,7 +826,7 @@ See the tooltip and "What's This?" information for the first page fields - + textLabel12_5 @@ -886,7 +886,7 @@ - + TabPage @@ -897,7 +897,7 @@ unnamed - + enableMinusInWords @@ -911,7 +911,7 @@ If enabled <b>this-is-a-word</b> is treated like a word. Otherwise it is treated like 4 words. - + textLabel13 @@ -929,7 +929,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> - + groupBox7 @@ -948,11 +948,11 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> unnamed - + rulesWidgetStack - + WStackPage @@ -963,7 +963,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> unnamed - + xmlStyleTags @@ -980,7 +980,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> Check to use XML style single tags (<b>&lt;single_tag /&gt;</b>), otherwise HTML style single tags (<b>&lt;single_tag&gt;</b>) are used. - + useCommonRules @@ -1002,7 +1002,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> </b></p> - + extendedBooleans @@ -1059,7 +1059,7 @@ See the <b>True</b> and <b>False</b> boxes to define the The value of "true" in case of extended booleans - + textLabel39 @@ -1069,11 +1069,11 @@ See the <b>True</b> and <b>False</b> boxes to define the False: - + AlignVCenter|AlignRight - + textLabel38 @@ -1083,7 +1083,7 @@ See the <b>True</b> and <b>False</b> boxes to define the True: - + AlignVCenter|AlignRight @@ -1097,7 +1097,7 @@ See the <b>True</b> and <b>False</b> boxes to define the Expanding - + 40 20 @@ -1117,7 +1117,7 @@ See the <b>True</b> and <b>False</b> boxes to define the A special area can be a pseudo DTD, a comment or something like that, for example <i>&lt;!--&nbsp;--&gt;</i>. - + textLabel27 @@ -1144,7 +1144,7 @@ See the <b>True</b> and <b>False</b> boxes to define the Comma-separated list of the names for the above-defined special areas - + textLabel28 @@ -1158,7 +1158,7 @@ See the <b>True</b> and <b>False</b> boxes to define the Comma-separated list of the names for the above-defined special areas - + textLabel40 @@ -1187,7 +1187,7 @@ Example:<b>script(language)</b> means that any <b>&lt;scri - + WStackPage @@ -1198,7 +1198,7 @@ Example:<b>script(language)</b> means that any <b>&lt;scri unnamed - + textLabel21 @@ -1212,14 +1212,14 @@ Example:<b>script(language)</b> means that any <b>&lt;scri Tags and attributes defining this DTEP - Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the parent (a real) DTEP has a tag with <i>tagname</i> and + Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the tqparent (a real) DTEP has a tag with <i>tagname</i> and the <i>attribute value</i> of this tag is equal with the name of this DTEP, the tag area is parsed according to the rules of this DTEP.<br> If <i>[defaultvalue]</i> is present, it means that if the attribute is not present in the tag it is taken as present with <i>value = defaultvalue</i>.<br> Example: <b>Tags=style(type[text/css])</b> means that both <b>&lt;style&gt;</b> and <b>&lt;style&nbsp;type="text/css"&gt;</b> are treated the same way and the DTEP defined by this tag is named <b>text/css</b>. - + textLabel20 @@ -1237,7 +1237,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <b>&lt;?&nbsp;?&gt;,&nbsp;&lt;*&nbsp;*&gt;,&nbsp;&lt;%&nbsp;%&gt;</b> - + textLabel22 @@ -1254,7 +1254,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> Comma separated list of structure keywords. The keywords used here are used to create new node (nodes for structures) in the structure tree, like for a function, class or if block. - + textLabel26 @@ -1271,7 +1271,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> Regular expression that finds the beginning or end of a structure. This is usually the combination of <b>Structure beginning</b> and <b>Structure end</b>, like <b>\{&nbsp;|&nbsp;\}</b> - + textLabel24 @@ -1288,7 +1288,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> A string specifying the beginning of a structure, like <b>{</b> in many cases. - + textLabel23 @@ -1302,7 +1302,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> Comma separated list of the local scope defining keywords - Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>. + Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>. @@ -1313,7 +1313,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> Comma separated list of the local scope defining keywords - Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>. + Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>. @@ -1335,7 +1335,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> Tags and attributes defining this DTEP - Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the parent (a real) DTEP has a tag with <i>tagname</i> and + Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the tqparent (a real) DTEP has a tag with <i>tagname</i> and the <i>attribute value</i> of this tag is equal with the name of this DTEP, the tag area is parsed according to the rules of this DTEP.<br> If <i>[defaultvalue]</i> is present, it means that if the attribute is not present in the tag it is taken as present with <i>value = defaultvalue</i>.<br> @@ -1365,7 +1365,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> A string specifying the end of a structure, like <b>}</b> in many cases. - + textLabel25 @@ -1393,7 +1393,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> A string specifying the beginning of a structure, like <b>{</b> in many cases. - + textLabel19 @@ -1424,7 +1424,7 @@ Example:<br> The regular expression must be terminated with <b>$</b> (match end of line). - + textLabel18 @@ -1487,7 +1487,7 @@ Example:<br> - + textLabel15 @@ -1516,7 +1516,7 @@ Example:<br> Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> - + textLabel17 @@ -1533,7 +1533,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> Comma-separated list of DTEPs that can be present inside this DTEP. The list consist usually of pseudo DTEPs. - + textLabel16 @@ -1577,7 +1577,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> The character specifying the end of a tag. See the information for the attribute separator for details. - + textLabel14 @@ -1615,7 +1615,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> - + TabPage @@ -1626,7 +1626,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> unnamed - + textLabel29 @@ -1647,7 +1647,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> Expanding - + 20 270 @@ -1678,7 +1678,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> &Delete - + structuresList @@ -1957,11 +1957,11 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b> editStructButton deleteStructButton - + slotEditStructGroup() slotAddStructGroup() slotDeleteStructGroup() slotFamilyChanged(int) - - + + diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index 12abe665..2e2e4153 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2005 Andras Mantia <amantia@kde.org> - + DTEPStructureEditDlgS @@ -28,7 +28,7 @@ unnamed - + textLabel30 @@ -50,14 +50,14 @@ The user visible name of the group. It will be shown in the structure tree as a top node when there are elements belonging to this group in the document. - + textLabel32 &Icon: - + AlignVCenter|AlignRight @@ -76,13 +76,13 @@ 0 - + 50 50 - + 50 50 @@ -92,7 +92,7 @@ - + textLabel34 @@ -112,7 +112,7 @@ Regular expression to get the filename. The expression is used to <b>remove</b> the unnecessary strings from the element's text. - + hasFilename @@ -137,7 +137,7 @@ Regular expression to get the filename. The expression is used to <b>remove</b> the unnecessary strings from the element's text. - + textLabel33 @@ -154,7 +154,7 @@ Defines which tags belong to this group. The format is <i>tagname(attribute1, attribute2, ...)</i>. Tags with name <i>tagname</i> will appear under this group. The item text of the corresponding node in the tree will be <i>attribute1_value | attribute2_value | ...</i>Currently only one tag may be listed here. - + textLabel31 @@ -206,14 +206,14 @@ Fixed - + 20 16 - + appendToTags @@ -227,7 +227,7 @@ Treat elements as new tags, so they will show up during tag autocompletion. - + pseudoGroupBox @@ -250,11 +250,11 @@ Example (simplified):<br> <b>DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;<br> TypeRx=new\\s([a-zA-Z]+);</b><br><br> -This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will find <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> +This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will tqfind <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> So the type of <b>$fooObj</b> is <b>foo</b>. - + textLabel36 @@ -280,7 +280,7 @@ Example 3:<br> - variables are used as <b>$i</b>. In this case <i>UsageRx </i>is the same as <i>DefinitionRx</i>. - + textLabel37 @@ -298,11 +298,11 @@ Example 3:<br> Example (simplified):<br> <b>DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;<br> TypeRx=new\\s([a-zA-Z]+);</b><br><br> -This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will find <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> +This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will tqfind <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> So the type of <b>$fooObj</b> is <b>foo</b>. - + textLabel35 @@ -342,7 +342,7 @@ Example 3:<br> - variables are used as <b>$i</b>. In this case <i>UsageRx </i>is the same as <i>DefinitionRx</i>. - + textLabel41 @@ -350,24 +350,24 @@ Example 3:<br> Parent group: - The name of the group that may be the parent of this + The name of the group that may be the tqparent of this - The name of the group that may be the parent of this. For example <b>classes</b> might be a parent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. + The name of the group that may be the tqparent of this. For example <b>classes</b> might be a tqparent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. - parentGroupEdit + tqparentGroupEdit - The name of the group that may be the parent of this + The name of the group that may be the tqparent of this - The name of the group that may be the parent of this. For example <b>classes</b> might be a parent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. + The name of the group that may be the tqparent of this. For example <b>classes</b> might be a tqparent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion. - + textLabel42 @@ -378,7 +378,7 @@ Example 3:<br> Only tags of this type can be part of the group - + textLabel44 @@ -389,7 +389,7 @@ Example 3:<br> Regular expression used to remove unwanted strings from the completion text - + textLabel43 @@ -482,14 +482,14 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& Expanding - + 340 20 - + parseFile @@ -503,7 +503,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& Check if the filename that is in the elements text should be parsed. This makes sense only if the element may contain a filename and the <i>FileNameRx</i> is specified. - + buttonGroup1 @@ -514,7 +514,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& unnamed - + simpleGroup @@ -525,7 +525,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& This is a simple group, nothing special - + variableGroup @@ -536,7 +536,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& The group's elements are variables - + functionGroup @@ -547,7 +547,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& The group's elements are functions - + classGroup @@ -558,7 +558,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& The group's elements are classes - + objectGroup @@ -585,7 +585,7 @@ Example for a <i>class</i> group:<br> The first captured area (between "<b>(</b>" and "<b>)</b>") holds the class name. - + definitionRxMinimal @@ -624,7 +624,7 @@ The first captured area (between "<b>(</b>" and "<b>)</b> hasFilename fileNameRxEdit appendToTags - parentGroupEdit + tqparentGroupEdit tagTypeCombo definitionRxEdit definitionRxMinimal @@ -639,7 +639,7 @@ The first captured area (between "<b>(</b>" and "<b>)</b> variableGroup classGroup - + kicondialog.h diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 63fd1e58..818df7ac 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -29,13 +29,13 @@ #include "filecombo.h" #include "qextfileinfo.h" -FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) - :TQWidget(parent,name) +FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *tqparent, const char *name ) + :TQWidget(tqparent,name) { baseURL = a_baseURL; m_absolutePath = false; - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); combo->setEditable(true); @@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - layout ->addWidget( combo ); - layout ->addWidget( button ); + tqlayout ->addWidget( combo ); + tqlayout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -53,12 +53,12 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) setFocusProxy(combo); } -FileCombo::FileCombo( TQWidget *parent, const char *name ) - :TQWidget( parent, name ) +FileCombo::FileCombo( TQWidget *tqparent, const char *name ) + :TQWidget( tqparent, name ) { baseURL.setPath("."); - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); button = new TQPushButton(this); @@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - layout ->addWidget( combo ); - layout ->addWidget( button ); + tqlayout ->addWidget( combo ); + tqlayout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -97,7 +97,7 @@ void FileCombo::slotFileSelect() delete dlg; if ( !url.isEmpty() ) { - if (!m_absolutePath) url = QExtFileInfo::toRelative(url, baseURL); + if (!m_absolutePath) url = TQExtFileInfo::toRelative(url, baseURL); combo->setEditText( url.path() ); } } diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h index 6991243b..e8610816 100644 --- a/quanta/dialogs/filecombo.h +++ b/quanta/dialogs/filecombo.h @@ -31,9 +31,10 @@ class KURL; class FileCombo : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0); - FileCombo(TQWidget *parent=0, const char *name=0); + FileCombo(const KURL& a_baseURL, TQWidget *tqparent=0, const char *name=0); + FileCombo(TQWidget *tqparent=0, const char *name=0); ~FileCombo(); TQString text() const; diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index fba27fc4..22ef785f 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2003 Andras Mantia <amantia@kde.org> - + FourButtonMessageBox @@ -21,7 +21,7 @@ 150 - + 0 150 @@ -31,18 +31,18 @@ unnamed - + pixmapLabel - + 32 32 - + textLabel @@ -50,9 +50,9 @@ - + - layout2 + tqlayout2 @@ -110,7 +110,7 @@ Fixed - + 20 16 @@ -151,14 +151,14 @@ int m_status; - + cancelButton_clicked() user1Button_clicked() user2Button_clicked() user3Button_clicked() - + status() - + diff --git a/quanta/dialogs/fourbuttonmessagebox.ui.h b/quanta/dialogs/fourbuttonmessagebox.ui.h index 00f31046..85f8c148 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui.h +++ b/quanta/dialogs/fourbuttonmessagebox.ui.h @@ -3,7 +3,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui index dffdaa17..b2684e01 100644 --- a/quanta/dialogs/loadentitydlgs.ui +++ b/quanta/dialogs/loadentitydlgs.ui @@ -1,6 +1,6 @@ LoadEntityDlgS - + LoadEntityDlgS @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -27,7 +27,7 @@ Source DTD: - + textLabel2 @@ -59,7 +59,7 @@ Expanding - + 20 40 @@ -68,5 +68,5 @@ - + diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 79dc4bc1..1f1728ae 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -41,8 +41,8 @@ #include "dtds.h" -AbbreviationDlg::AbbreviationDlg(TQWidget *parent, const char *name): - AbbreviationDlgS(parent, name) +AbbreviationDlg::AbbreviationDlg(TQWidget *tqparent, const char *name): + AbbreviationDlgS(tqparent, name) { m_oldItem = 0L; m_currentAbbrev = 0L; @@ -76,8 +76,8 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName) for ( it = m_currentAbbrev->abbreviations.constBegin(); it != m_currentAbbrev->abbreviations.constEnd(); ++it ) { templateStr = it.key(); - templateName = templateStr.mid(templateStr.find(' ') + 1); - templateStr = templateStr.left(templateStr.find(' ')); + templateName = templateStr.mid(templateStr.tqfind(' ') + 1); + templateStr = templateStr.left(templateStr.tqfind(' ')); new KListViewItem(templatesList, templateStr, templateName); } for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit ) @@ -95,9 +95,9 @@ void AbbreviationDlg::slotNewGroup() TQString groupName = KInputDialog::getText(i18n("New Abbreviation Group"), i18n("Group name:"), "", &ok, this); if (ok && !groupName.isEmpty()) { - if (qConfig.abbreviations.contains(groupName)) + if (qConfig.abbreviations.tqcontains(groupName)) { - KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").arg(groupName), i18n("Group already exists")); + KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").tqarg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); } else { @@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate() { TQListViewItem *item = templatesList->currentItem(); if (item && - KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").arg(item->text(1)),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1)); delete item; @@ -248,7 +248,7 @@ void AbbreviationDlg::saveTemplates() el.setAttribute("code", it.data()); s = it.key(); s2 = ""; - pos = s.find(' '); + pos = s.tqfind(' '); if (pos != -1) { s2 = s.mid(pos+1); @@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates() f.close(); } else { - KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").arg(s)); + KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").tqarg(s)); } } diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index d2ba7ea6..949ad663 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -27,8 +27,9 @@ struct DTDStruct; class AbbreviationDlg : public AbbreviationDlgS { Q_OBJECT + TQ_OBJECT public: - AbbreviationDlg(TQWidget *parent, const char *name = 0); + AbbreviationDlg(TQWidget *tqparent, const char *name = 0); ~AbbreviationDlg(); void saveTemplates(); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index 9274fdc6..8e115d0f 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2003 Andras Mantia <amantia@kde.org> - + AbbreviationDlgS @@ -52,7 +52,7 @@ &New... - + textLabel1_2 @@ -71,7 +71,7 @@ groupCombo - + textLabel1 @@ -103,7 +103,7 @@ - + codeEdit @@ -152,7 +152,7 @@ true - + addButton @@ -170,14 +170,14 @@ Preferred - + 20 30 - + removeButton @@ -185,7 +185,7 @@ &Remove - + editButton @@ -193,7 +193,7 @@ &Edit... - + textLabel2 @@ -210,7 +210,7 @@ codeEdit - + textLabel3 @@ -255,7 +255,7 @@ Expanding - + 20 40 @@ -269,9 +269,9 @@ templatesList - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) AbbreviationDlgS - slotTemplateSelectionChanged(QListViewItem*) + slotTemplateSelectionChanged(TQListViewItem*) addButton @@ -317,7 +317,7 @@ templatesList - doubleClicked(QListViewItem*) + doubleClicked(TQListViewItem*) AbbreviationDlgS slotEditTemplate() @@ -334,19 +334,19 @@ editButton codeEdit - - slotTemplateSelectionChanged(QListViewItem*) + + slotTemplateSelectionChanged(TQListViewItem*) dtdCombo_activated(const QString&) slotGroupChanged(const QString&) slotAddTemplate() slotRemoveTemplate() - templatesList_currentChanged(QListViewItem*) + templatesList_currentChanged(TQListViewItem*) slotEditTemplate() slotAddDTEP() slotRemoveDTEP() slotNewGroup() - - + + klistview.h klistbox.h diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 5aa9254f..733b66eb 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2003 by Andras Mantia <amantia@kde.org> - + CodeTemplateDlgS @@ -21,7 +21,7 @@ 72 - + 400 70 @@ -34,7 +34,7 @@ unnamed - + textLabel1 @@ -45,7 +45,7 @@ templateEdit - + textLabel2 @@ -56,12 +56,12 @@ descriptionEdit - + templateEdit - + descriptionEdit @@ -72,10 +72,10 @@ templateEdit descriptionEdit - + accept() reject() pushButton4_clicked() - - + + diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5f96a2eb 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filesmask.cpp - description + filestqmask.cpp - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky @@ -23,15 +23,15 @@ //kde includes #include -FileMasks::FileMasks(TQWidget *parent, const char *name) - :FileMasksS(parent,name) +FileMasks::FileMasks(TQWidget *tqparent, const char *name) + :FileMasksS(tqparent,name) { connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); } FileMasks::~FileMasks(){ } -/** set masks to default */ +/** set tqmasks to default */ void FileMasks::setToDefault() { KMimeType::List list = KMimeType::allMimeTypes(); @@ -43,12 +43,12 @@ void FileMasks::setToDefault() for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (name.contains("text")) + if (name.tqcontains("text")) { - if (!markup.contains(name) && !script.contains(name)) + if (!markup.tqcontains(name) && !script.tqcontains(name)) text += name+"; "; } - if (name.contains("image")) + if (name.tqcontains("image")) { image += name +"; "; } diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index 965eb190..cc596259 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -1,5 +1,5 @@ /*************************************************************************** - filesmask.h - description + filestqmask.h - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky @@ -24,8 +24,9 @@ class FileMasks : public FileMasksS { Q_OBJECT + TQ_OBJECT public: - FileMasks(TQWidget *parent=0, const char *name=0); + FileMasks(TQWidget *tqparent=0, const char *name=0); ~FileMasks(); public slots: diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index f8cdb4f6..fb7d322a 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ - + FileMasksS @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -39,12 +39,12 @@ unnamed - + encodingCombo - + defaultDTDCombo @@ -52,7 +52,7 @@ New files will have the extension and highlighting according to this setting - + GroupBox1 @@ -69,23 +69,23 @@ unnamed - + lineMarkup - + AlignLeft - + lineImage - + AlignLeft - + buttonDefault @@ -93,7 +93,7 @@ &Reset to Default - + TextLabel4_2 @@ -104,7 +104,7 @@ lineText - + TextLabel1_3 @@ -115,7 +115,7 @@ lineMarkup - + TextLabel3_2 @@ -126,15 +126,15 @@ lineImage - + lineText - + AlignLeft - + TextLabel2_2 @@ -146,7 +146,7 @@ 0 - + 0 0 @@ -172,38 +172,38 @@ Expanding - + 153 20 - + lineScript - + AlignLeft - + TextLabel1_2 Default character &encoding: - + AlignVCenter|AlignLeft encodingCombo - + TextLabel1_2_3 @@ -224,14 +224,14 @@ Expanding - + 20 50 - + buttonGroup7 @@ -242,7 +242,7 @@ unnamed - + reloadFiles @@ -250,7 +250,7 @@ L&oad last-opened files - + showSplash @@ -258,7 +258,7 @@ S&how splashscreen - + reloadProject @@ -268,15 +268,15 @@ - + - layout2 + tqlayout2 unnamed - + tlAutoSave @@ -284,7 +284,7 @@ Create backups every - + sbAutoSave @@ -298,7 +298,7 @@ 15 - + textLabel1 @@ -308,7 +308,7 @@ - + showDTDSelectDialog @@ -332,5 +332,5 @@ reloadProject reloadFiles - + diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp index 24e3c6a6..c38e2875 100644 --- a/quanta/dialogs/settings/parseroptions.cpp +++ b/quanta/dialogs/settings/parseroptions.cpp @@ -22,11 +22,11 @@ #include /* - * Constructs a ParserOptions which is a child of 'parent', with the + * Constructs a ParserOptions which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* name ) - : ParserOptionsUI( parent, name ) +ParserOptions::ParserOptions( KConfig *a_config, TQWidget* tqparent, const char* name ) + : ParserOptionsUI( tqparent, name ) { config = a_config; config->setGroup("Parser options"); @@ -70,7 +70,7 @@ ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* */ ParserOptions::~ParserOptions() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index a4c5f6f3..55710161 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -23,9 +23,10 @@ class KConfig; class ParserOptions : public ParserOptionsUI { Q_OBJECT + TQ_OBJECT public: - ParserOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + ParserOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0); ~ParserOptions(); void updateConfig(); diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui index 34a54cd6..2a5fed0b 100644 --- a/quanta/dialogs/settings/parseroptionsui.ui +++ b/quanta/dialogs/settings/parseroptionsui.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2002 Andras Mantia <amantia@kde.org> - + ParserOptionsUI @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -39,7 +39,7 @@ unnamed - + buttonGroup1 @@ -50,7 +50,7 @@ unnamed - + refreshFrequency @@ -74,14 +74,14 @@ Expanding - + 122 20 - + instantUpdate @@ -102,14 +102,14 @@ Expanding - + 122 20 - + showClosingTags @@ -117,7 +117,7 @@ Show closing tags - + showEmptyNodes @@ -125,7 +125,7 @@ Show empt&y nodes and groups - + spinExpand @@ -136,7 +136,7 @@ Set to 0 in order to expand the whole tree - + TextLabel1_5 @@ -144,7 +144,7 @@ Refresh frequency (in seconds): - + TextLabel2_2 @@ -154,7 +154,7 @@ - + GroupBox1 @@ -168,7 +168,7 @@ unnamed - + Select Tag Area @@ -183,7 +183,7 @@ comboDoubleClick - + Find Tag @@ -198,7 +198,7 @@ comboLBM - + TextLabel1 @@ -206,7 +206,7 @@ Left button: - + Popup Menu @@ -216,7 +216,7 @@ comboRBM - + TextLabel1_4 @@ -224,7 +224,7 @@ Double click: - + TextLabel1_2 @@ -232,7 +232,7 @@ Middle button: - + TextLabel1_3 @@ -240,7 +240,7 @@ Right button: - + Find Tag & Open Tree @@ -282,7 +282,7 @@ Expanding - + 20 40 @@ -310,5 +310,5 @@ refreshFrequency spinExpand - + diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index 2df03ea9..3c0e3c1b 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -23,17 +23,17 @@ #include #include -PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) - : PreviewOptionsS(parent,name) +PreviewOptions::PreviewOptions(TQWidget *tqparent, const char *name) + : PreviewOptionsS(tqparent,name) { } PreviewOptions::~PreviewOptions(){ } -void PreviewOptions::setWindowLayout(const TQString& layout ) +void PreviewOptions::setWindowLayout(const TQString& tqlayout ) { - if ( layout == "Default") resetLayout->setChecked(true); + if ( tqlayout == "Default") resetLayout->setChecked(true); else resetLayout->setChecked(false); } @@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition() return position; } -TQString PreviewOptions::layout() +TQString PreviewOptions::tqlayout() { - TQString layout = "Custom"; + TQString tqlayout = "Custom"; if ( resetLayout->isChecked() ) - layout = "Default"; - return layout; + tqlayout = "Default"; + return tqlayout; } TQString PreviewOptions::closeButtons() diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index 3cc5b820..ebddcc32 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -24,12 +24,13 @@ class KConfig; class PreviewOptions : public PreviewOptionsS { Q_OBJECT + TQ_OBJECT public: - PreviewOptions(TQWidget *parent=0, const char *name=0); + PreviewOptions(TQWidget *tqparent=0, const char *name=0); ~PreviewOptions(); TQString position(); - TQString layout(); + TQString tqlayout(); TQString closeButtons(); TQString docPosition(); uint toolviewTabs(); diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui index a27a164b..e3743258 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ - + PreviewOptionsS @@ -21,7 +21,7 @@ 512 - + 350 220 @@ -31,15 +31,15 @@ unnamed - + resetLayout - Reset window layout to the default on the next startup + Reset window tqlayout to the default on the next startup - + showHidden @@ -47,7 +47,7 @@ Show hidden files in files tree - + saveLocalTrees @@ -55,7 +55,7 @@ Save tree status for local trees - + buttonGroup3 @@ -66,7 +66,7 @@ unnamed - + radioShowCloseButtons @@ -77,7 +77,7 @@ true - + radioNoCloseButtons @@ -85,7 +85,7 @@ &Do not show - + radioDelayedCloseButtons @@ -95,7 +95,7 @@ - + buttonGroup3_2 @@ -106,7 +106,7 @@ unnamed - + radioNewDocTab @@ -117,7 +117,7 @@ true - + radioSeparateDocView @@ -127,7 +127,7 @@ - + buttonGroup4 @@ -138,7 +138,7 @@ unnamed - + radioIconText @@ -149,7 +149,7 @@ true - + radioText @@ -157,7 +157,7 @@ Text - + radioIcon @@ -167,7 +167,7 @@ - + ButtonGroup1 @@ -184,7 +184,7 @@ 6 - + radioToolview @@ -192,7 +192,7 @@ Separate toolview - + radioEditor @@ -215,14 +215,14 @@ Expanding - + 20 30 - + buttonGroup1 @@ -233,7 +233,7 @@ unnamed - + warnBinaryOpening @@ -241,7 +241,7 @@ Warn about opening binar&y/unknown files - + warnEventActions @@ -249,7 +249,7 @@ Warn when executing &actions associated with events - + warnAll @@ -276,5 +276,5 @@ radioNoCloseButtons radioDelayedCloseButtons - + diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index 13ed198d..242e7e7c 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ - + StyleOptionsS @@ -29,7 +29,7 @@ 0 - + 410 250 @@ -39,7 +39,7 @@ unnamed - + TextLabel3 @@ -47,7 +47,7 @@ Attribute quotation: - + Double Quotes @@ -62,7 +62,7 @@ attributeQuotation - + TextLabel1 @@ -70,7 +70,7 @@ Tag case: - + TextLabel2 @@ -78,7 +78,7 @@ Attribute case: - + Default Case @@ -98,7 +98,7 @@ attributeCase - + optionalTagAutoClose @@ -106,7 +106,7 @@ Auto-close o&ptional tags - + Default Case @@ -126,7 +126,7 @@ tagCase - + tagAutoClose @@ -144,14 +144,14 @@ Expanding - + 20 30 - + tagUpdateClosing @@ -159,7 +159,7 @@ &Update opening/closing tag automatically - + useAutoCompletion @@ -175,7 +175,7 @@ Use &auto-completion - + replaceAccented @@ -183,8 +183,8 @@ Automatic &replacement of the accented characters - If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their unicode style notation, for the above case with <b>&#038;#225;</b>.<br> -We suggest to leave this option off and use an unicode or locale encoding for your documents. + If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their tqunicode style notation, for the above case with <b>&#038;#225;</b>.<br> +We suggest to leave this option off and use an tqunicode or locale encoding for your documents. @@ -197,5 +197,5 @@ We suggest to leave this option off and use an unicode or locale encoding for yo tagAutoClose useAutoCompletion - + diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index 200b5afe..2caa497e 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -28,8 +28,8 @@ #include "specialchardialog.h" #include "resource.h" -SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) - :SpecialCharDialogS( parent, name, modal, fl ) +SpecialCharDialog::SpecialCharDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl) + :SpecialCharDialogS( tqparent, name, modal, fl ) { connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(filterChars(const TQString&)) ); @@ -52,7 +52,7 @@ void SpecialCharDialog::filterChars(const TQString& filter) CharsListBox->insertStringList(charList); else { for (TQStringList::ConstIterator it = charList.begin(); it != charList.end(); ++it) - if ( (*it).contains(filter, false) ) + if ( (*it).tqcontains(filter, false) ) CharsListBox->insertItem(*it); } if (CharsListBox->currentItem() == -1 && CharsListBox->count()) @@ -67,8 +67,8 @@ TQString SpecialCharDialog::selection() void SpecialCharDialog::insertCode() { TQString selected = CharsListBox->text(CharsListBox->currentItem()); - int begin = selected.find("(&")+1; - int length = selected.find(";)") - begin + 1; + int begin = selected.tqfind("(&")+1; + int length = selected.tqfind(";)") - begin + 1; m_selection = selected.mid(begin, length); done(TQDialog::Accepted); } diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h index 4155e081..dec3320e 100644 --- a/quanta/dialogs/specialchardialog.h +++ b/quanta/dialogs/specialchardialog.h @@ -24,10 +24,11 @@ class SpecialCharDialog : public SpecialCharDialogS { Q_OBJECT + TQ_OBJECT public: - SpecialCharDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); + SpecialCharDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); ~SpecialCharDialog(); TQString selection(); diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index acc52e53..c0ed272f 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -1,6 +1,6 @@ SpecialCharDialogS - + SpecialCharDialogS @@ -22,19 +22,19 @@ unnamed - + - layout4 + tqlayout4 unnamed - + buttonOk - + 100 0 @@ -50,11 +50,11 @@ true - + buttonChar - + 100 0 @@ -74,18 +74,18 @@ Expanding - + 112 20 - + buttonCancel - + 100 0 @@ -103,15 +103,15 @@ - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -145,7 +145,7 @@ buttonChar buttonCancel - + klineedit.h klistbox.h diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 878216e3..10ea4273 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -21,10 +21,10 @@ // // 1999-09-27 Espen Sand // KColorDialog is now subclassed from KDialogBase. I have also extended -// KColorDialog::getColor() so that in contains a parent argument. This +// KColorDialog::getColor() so that in contains a tqparent argument. This // improves centering capability. // -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // // @@ -66,8 +66,8 @@ #define STANDARD_PAL_SIZE 17 -ColorCombo::ColorCombo( TQWidget *parent, const char *name ) - : TQComboBox( parent, name ) +ColorCombo::ColorCombo( TQWidget *tqparent, const char *name ) + : TQComboBox( tqparent, name ) { customColor.setRgb( 255, 255, 255 ); internalcolor.setRgb( 255, 255, 255 ); @@ -165,7 +165,7 @@ void ColorCombo::slotActivated( int index ) TQPainter painter; TQPen pen; - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -219,7 +219,7 @@ void ColorCombo::addColors() insertItem( i18n("None") ); - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -270,23 +270,23 @@ void ColorCombo::createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; standardPaletteNames = new TQString [STANDARD_PAL_SIZE]; diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index b6f851e0..a1f92a31 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // @@ -37,11 +37,12 @@ /** * Combobox for colours. */ -class ColorCombo : public QComboBox +class ColorCombo : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); + ColorCombo( TQWidget *tqparent = 0L, const char *name = 0L ); ~ColorCombo(); void setColor( const TQColor &col ); diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp index 8e52ae01..f45eea8f 100644 --- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp +++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp @@ -21,8 +21,8 @@ #include #include -CoreWidgetDlg::CoreWidgetDlg(TQWidget *parent, const char *name) - :CoreWidgetDlgS(parent,name), TagWidget(parent,name) +CoreWidgetDlg::CoreWidgetDlg(TQWidget *tqparent, const char *name) + :CoreWidgetDlgS(tqparent,name), TagWidget(tqparent,name) { } @@ -48,13 +48,13 @@ void CoreWidgetDlg::writeAttributes( TQDict *d ) dict = d; TQString *t; // value of attr. - if (( t=d->find("id") )) setValue(*t, lineId); - if (( t=d->find("class") )) setValue(*t, lineClass); - if (( t=d->find("style") )) setValue(*t, lineStyle); - if (( t=d->find("title") )) setValue(*t, lineTitle); + if (( t=d->tqfind("id") )) setValue(*t, lineId); + if (( t=d->tqfind("class") )) setValue(*t, lineClass); + if (( t=d->tqfind("style") )) setValue(*t, lineStyle); + if (( t=d->tqfind("title") )) setValue(*t, lineTitle); - if (( t=d->find("lang") )) setValue(*t, lineLang); - if (( t=d->find("dir") )) setValue(*t, lineDir); + if (( t=d->tqfind("lang") )) setValue(*t, lineLang); + if (( t=d->tqfind("dir") )) setValue(*t, lineDir); } diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index 713ccf2c..a7954793 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -24,8 +24,8 @@ #include #include -ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) - :KDialogBase(parent,name), listbox(new KListBox(this)) +ListDlg::ListDlg(TQStringList &entryList,TQWidget* tqparent, const char *name ) + :KDialogBase(tqparent,name), listbox(new KListBox(this)) { Q_CHECK_PTR(listbox); setMainWidget(listbox); @@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) } listbox->setMinimumSize(350,150); adjustSize(); - resize(sizeHint()); + resize(tqsizeHint()); connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); } diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index ea455d70..4615e495 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -32,8 +32,9 @@ selected item with the getEntry() method. class ListDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0); + ListDlg(TQStringList &entryList,TQWidget* tqparent=0, const char *name =0); ~ListDlg(); TQString getEntry(); int getEntryNum(); diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 65102ba8..7579c47a 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -20,7 +20,7 @@ #include "tqpainter.h" #include -PictureView::PictureView(TQWidget *parent, char *file, const char *name ) : TQFrame(parent,name) +PictureView::PictureView(TQWidget *tqparent, char *file, const char *name ) : TQFrame(tqparent,name) { if ( file ) { pix = new TQImage(file); @@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file) picheight = pix->height(); scale(); - repaint(); + tqrepaint(); } /** try scale image */ diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index 59a71609..e8fadc31 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -29,8 +29,9 @@ used by TagImgDlg class PictureView : public TQFrame { Q_OBJECT + TQ_OBJECT public: - PictureView(TQWidget *parent=0, char *file=0, const char *name=0); + PictureView(TQWidget *tqparent=0, char *file=0, const char *name=0); /** try scale image */ void scale(); public slots: // Public slots diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index 251c4b8b..1ab0bdde 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -39,7 +39,7 @@ TQString Attr::attrName() const } -Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) +Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { combo = (TQComboBox *)w; @@ -50,7 +50,7 @@ Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) TQString method = el.attribute("method"); TQString interface = el.attribute("interface", "QuantaIf"); TQString arguments = el.attribute("arguments"); - arguments.replace("%tagname%", m_dtdTag->name()); + arguments.tqreplace("%tagname%", m_dtdTag->name()); DCOPReply reply = QuantaCommon::callDCOPMethod(interface, method, arguments); if (reply.isValid()) { @@ -87,9 +87,9 @@ void Attr_list::setValue(const TQString &value) } -TQDomNode findChild( TQDomNode &parent, const TQString &name ) +TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ) { - for ( TQDomNode n = parent.firstChild(); !n.isNull(); n = n.nextSibling() ) + for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() ) if ( n.nodeName() == name ) return n; return TQDomNode(); diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h index bbd562c6..c9567eda 100644 --- a/quanta/dialogs/tagdialogs/tagattr.h +++ b/quanta/dialogs/tagdialogs/tagattr.h @@ -34,16 +34,16 @@ class TQDomElement; class TQWidget; -class QTag; +class TQTag; -TQDomNode findChild( TQDomNode &parent, const TQString &name ); +TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ); class Attr { public: - Attr( TQDomElement const& el, TQWidget *, QTag *dtdTag ) + Attr( TQDomElement const& el, TQWidget *, TQTag *dtdTag ) : domEl(el), name(domEl.attribute("name","")), m_dtdTag(dtdTag) {} //{ domEl = el; name = domEl->attribute("name",""); m_dtdTag = dtdTag;} virtual ~Attr(){} @@ -57,7 +57,7 @@ class Attr protected: TQDomElement domEl; TQString name; - QTag *m_dtdTag; + TQTag *m_dtdTag; }; @@ -67,7 +67,7 @@ class Attr_line : public Attr TQLineEdit *line; public: - Attr_line( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_line( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { line = (TQLineEdit *)w; } virtual ~Attr_line(){}; @@ -82,7 +82,7 @@ class Attr_color : public Attr ColorCombo *color; public: - Attr_color( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_color( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { color = (ColorCombo *)w; } virtual ~Attr_color(){}; @@ -96,7 +96,7 @@ class Attr_file : public Attr FileCombo *file; public: - Attr_file( TQDomElement const& el, TQWidget *w , QTag * dtdTag ) : Attr(el, w, dtdTag) + Attr_file( TQDomElement const& el, TQWidget *w , TQTag * dtdTag ) : Attr(el, w, dtdTag) { file = (FileCombo *)w; } virtual ~Attr_file(){}; @@ -110,7 +110,7 @@ class Attr_list : public Attr TQComboBox *combo; public: - Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ); + Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ); virtual ~Attr_list(){}; virtual TQString value() { return combo->currentText(); } @@ -124,7 +124,7 @@ class Attr_check : public Attr TQCheckBox *check; public: - Attr_check( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_check( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { check = (TQCheckBox *)w; } virtual ~Attr_check(){}; diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index bc5800ae..12ecec0d 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -42,7 +42,7 @@ #include "qtag.h" #include "kafkacommon.h" -TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true) { init(dtdTag, a_baseURL); @@ -60,7 +60,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL) } -TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true), m_selection(selection) { init(dtdTag, a_baseURL); @@ -77,7 +77,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_b parseTag(); } -TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, TQString attrs, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true) { init(dtdTag, a_baseURL); @@ -90,7 +90,7 @@ TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL) parseTag(); } -TagDialog::TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true), m_selection(selection) { init(dtdTag, a_baseURL); @@ -113,7 +113,7 @@ TagDialog::~TagDialog() } -void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL) +void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) { setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); @@ -123,7 +123,7 @@ void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL) if (!a_dtdTag) //the tag is invalid, let's create a default one { - dtdTag = new QTag(); + dtdTag = new TQTag(); dtdTag->setName(i18n("Unknown tag")); deleteTag = true; } else @@ -148,7 +148,7 @@ void TagDialog::parseTag() TQDomDocument doc; if (dtdTag->name().lower() == "img") //NOTE: HTML specific code! { - mainDlg = new TagImgDlg(dtdTag->parentDTD, this); + mainDlg = new TagImgDlg(dtdTag->tqparentDTD, this); ((TagImgDlg *)mainDlg)->writeAttributes( dict ); } //read the tag file it is available @@ -164,7 +164,7 @@ void TagDialog::parseTag() { TQDomNode n = nodeList.item(i); TQString nodeTagName = n.toElement().attribute("name"); - if (!dtdTag->parentDTD->caseSensitive) + if (!dtdTag->tqparentDTD->caseSensitive) nodeTagName = nodeTagName.upper(); if (nodeTagName == tagName && n.toElement().elementsByTagName("attr").count() > 0) //read a tag { @@ -179,7 +179,7 @@ void TagDialog::parseTag() else { TQString docString = "\n\n"; - docString += TQString("\n").arg(dtdTag->name()); + docString += TQString("\n").tqarg(dtdTag->name()); docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes()); docString += "\n\n"; doc.setContent(docString); @@ -192,7 +192,7 @@ void TagDialog::parseTag() addTab( mainDlg, i18n("Main") ); } - KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName); + KConfig *dtdConfig = new KConfig(dtdTag->tqparentDTD->fileName); dtdConfig->setGroup("General"); int numOfPages = dtdConfig->readNumEntry("NumOfPages"); extraPageList = new TQPtrList(); @@ -200,14 +200,14 @@ void TagDialog::parseTag() for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(TQString("Page%1").arg(i)); + dtdConfig->setGroup(TQString("Page%1").tqarg(i)); TQString title = dtdConfig->readEntry("Title"); TQStringList groupList; groupList = dtdConfig->readListEntry("Groups"); TQDomDocument extraDoc; //build an internal tag XML for the groups bool addPage = false; TQString docString = "\n\n"; - docString += TQString("\n").arg(i); + docString += TQString("\n").tqarg(i); for (uint j = 0; j < groupList.count(); j++) { groupList[j] = groupList[j].stripWhiteSpace(); @@ -226,7 +226,7 @@ void TagDialog::parseTag() { TQDomNode node = nodeList.item(j); TQString nodeTagName = node.toElement().attribute("name"); - if (groupList.contains(nodeTagName) && dtdTag->commonGroups.contains(nodeTagName)) //add the attributes of this common tag to a new tab + if (groupList.tqcontains(nodeTagName) && dtdTag->commonGroups.tqcontains(nodeTagName)) //add the attributes of this common tag to a new tab { TQString s; TQTextStream str(&s, IO_ReadWrite); @@ -325,15 +325,15 @@ TQString TagDialog::getAttributeString() TQString TagDialog::getAttribute(const TQString& attr) { TQString attrStr = getAttributeString()+" "; - int pos = attrStr.upper().find(attr.upper()); + int pos = attrStr.upper().tqfind(attr.upper()); if (pos != -1) { - pos = attrStr.find("=",pos+1) + 1; - return attrStr.mid(pos, attrStr.find(" ",pos) - pos); + pos = attrStr.tqfind("=",pos+1) + 1; + return attrStr.mid(pos, attrStr.tqfind(" ",pos) - pos); } else { - return TQString::null; + return TQString(); } } @@ -429,7 +429,7 @@ void TagDialog::insertTag(Document *w, bool insertInLine) TQString newTag = getAttributeString(); newTag = TQString("<")+QuantaCommon::tagCase(dtdTag->name())+newTag; - if ( dtdTag->parentDTD->singleTagStyle == "xml" && + if ( dtdTag->tqparentDTD->singleTagStyle == "xml" && (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional())) ) { diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h index c715085f..c3e6c2d4 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.h +++ b/quanta/dialogs/tagdialogs/tagdialog.h @@ -32,13 +32,14 @@ class Document; class TagWidget; class Tagxml; -class QTag; +class TQTag; class Tag; class KURL; class TQShowEvent; class TagDialog : public TQTabDialog { Q_OBJECT + TQ_OBJECT public: /** @@ -50,10 +51,10 @@ public:     */ - TagDialog(QTag* dtdTag, Tag* tag, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, TQString attrs=TQString::null, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs=TQString::null, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, Tag* tag, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, TQString attrs=TQString(), KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs=TQString(), KURL a_baseURL = KURL()); ~TagDialog(); /** Insert an attribute to dict*/ void insertAttribute(TQString *attr, TQString *value); @@ -90,12 +91,12 @@ protected slots: private: bool deleteTag; Tag *m_tag; - QTag* dtdTag; + TQTag* dtdTag; TQString m_selection; TQPtrList *extraPageList; - void init(QTag* dtdTag, KURL a_baseURL); + void init(TQTag* dtdTag, KURL a_baseURL); void parseAttributes(const TQString &attrs); }; diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 9448f48d..b8f08324 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -35,8 +35,8 @@ #include "tagimgdlg.moc" -TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(parent,name) +TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name) { m_dtd = dtd; img = 0L; @@ -108,7 +108,7 @@ void TagImgDlg::slotFileSelect() if ( !url.isEmpty() ) { slotImageSet( url ); - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); lineImgSource->setText( url.path() ); } } @@ -145,26 +145,26 @@ void TagImgDlg::writeAttributes( TQDict *d ) dict = d; TQString *t; // value of attr. - if (( t=d->find("src") )) + if (( t=d->tqfind("src") )) { lineImgSource->setText(*t); KURL url = baseURL; QuantaCommon::setUrl(url, *t); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); slotImageSet( url ); } - if ( (t=d->find("alt")) ) + if ( (t=d->tqfind("alt")) ) setValue(*t, lineAltText); - if ( (t=d->find("width")) && lineWidth ) + if ( (t=d->tqfind("width")) && lineWidth ) setValue(*t, lineWidth); - if ( (t=d->find("height")) && lineHeight ) + if ( (t=d->tqfind("height")) && lineHeight ) setValue(*t, lineHeight); - if ( (t=d->find("hspace")) && lineHSpace) + if ( (t=d->tqfind("hspace")) && lineHSpace) setValue(*t, lineHSpace); - if ( (t=d->find("vspace")) && lineVSpace ) + if ( (t=d->tqfind("vspace")) && lineVSpace ) setValue(*t, lineVSpace); - if ( (t=d->find("align")) && comboAlign ) + if ( (t=d->tqfind("align")) && comboAlign ) setValue(*t, comboAlign); - if ( (t=d->find("border")) && spinBorder ) + if ( (t=d->tqfind("border")) && spinBorder ) setValue(*t, spinBorder); } diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 9f67d0f9..488d2377 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -40,8 +40,9 @@ class TQImage; class TagImgDlg : public TQWidget, TagWidget { Q_OBJECT + TQ_OBJECT public: - TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); + TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent=0, const char *name=0); ~TagImgDlg(); public: @@ -51,19 +52,19 @@ public: KLineEdit *lineImgSource; TQPushButton *buttonImgSource; TQPushButton *buttonRecalcImgSize; - TQLabel *QLabel_4; + TQLabel *TQLabel_4; KLineEdit *lineWidth; - TQLabel *QLabel_5; + TQLabel *TQLabel_5; KLineEdit *lineHeight; - TQLabel *QLabel_6; + TQLabel *TQLabel_6; KLineEdit *lineHSpace; - TQLabel *QLabel_7; + TQLabel *TQLabel_7; KLineEdit *lineVSpace; - TQLabel *QLabel_8; + TQLabel *TQLabel_8; KLineEdit *lineAltText; - TQLabel *QLabel_9; + TQLabel *TQLabel_9; TQSpinBox *spinBorder; - TQLabel *QLabel_10; + TQLabel *TQLabel_10; TQComboBox *comboAlign; PictureView *widgetImg; TQPushButton *buttonOk; diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index 69d6a72e..07a44394 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -34,7 +34,7 @@ void TagImgDlg::initDialog(){ buttonImgSource->setText(i18n("...")); grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4); - QTag *imgTag = m_dtd->tagsList->find("img"); + TQTag *imgTag = m_dtd->tagsList->tqfind("img"); if (!imgTag) return; @@ -42,9 +42,9 @@ void TagImgDlg::initDialog(){ lineWidth = 0L; if (imgTag->attribute("width")) { - QLabel_4= new TQLabel(this,"NoName"); - QLabel_4->setText(i18n("Width:")); - grid->addMultiCellWidget(QLabel_4, 1, 1, 0, 0); + TQLabel_4= new TQLabel(this,"NoName"); + TQLabel_4->setText(i18n("Width:")); + grid->addMultiCellWidget(TQLabel_4, 1, 1, 0, 0); lineWidth= new KLineEdit(this,"NoName"); lineWidth->setValidator( new KFloatValidator( lineWidth ) ); @@ -54,9 +54,9 @@ void TagImgDlg::initDialog(){ lineHeight = 0L; if (imgTag->attribute("height")) { - QLabel_5= new TQLabel(this,"NoName"); - QLabel_5->setText(i18n("Height:")); - grid->addMultiCellWidget(QLabel_5, 1, 1, 2, 2); + TQLabel_5= new TQLabel(this,"NoName"); + TQLabel_5->setText(i18n("Height:")); + grid->addMultiCellWidget(TQLabel_5, 1, 1, 2, 2); lineHeight= new KLineEdit(this,"NoName"); lineHeight->setValidator( new KFloatValidator( lineHeight ) ); @@ -70,9 +70,9 @@ void TagImgDlg::initDialog(){ lineHSpace = 0L; if (imgTag->attribute("hspace")) { - QLabel_6= new TQLabel(this,"NoName"); - QLabel_6->setText(i18n("HSpace:")); - grid->addMultiCellWidget(QLabel_6, 2, 2, 0, 0); + TQLabel_6= new TQLabel(this,"NoName"); + TQLabel_6->setText(i18n("HSpace:")); + grid->addMultiCellWidget(TQLabel_6, 2, 2, 0, 0); lineHSpace= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineHSpace, 2, 2, 1, 1); @@ -81,17 +81,17 @@ void TagImgDlg::initDialog(){ lineVSpace = 0L; if (imgTag->attribute("vspace")) { - QLabel_7= new TQLabel(this,"NoName"); - QLabel_7->setText(i18n("VSpace:")); - grid->addMultiCellWidget(QLabel_7, 2, 2, 2, 2); + TQLabel_7= new TQLabel(this,"NoName"); + TQLabel_7->setText(i18n("VSpace:")); + grid->addMultiCellWidget(TQLabel_7, 2, 2, 2, 2); lineVSpace= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineVSpace, 2, 2, 3, 3); } - QLabel_8= new TQLabel(this,"NoName"); - QLabel_8->setText(i18n("Alternate text:")); - grid->addMultiCellWidget(QLabel_8, 3, 3, 0, 0); + TQLabel_8= new TQLabel(this,"NoName"); + TQLabel_8->setText(i18n("Alternate text:")); + grid->addMultiCellWidget(TQLabel_8, 3, 3, 0, 0); lineAltText= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineAltText, 3, 3, 1, 4); @@ -99,9 +99,9 @@ void TagImgDlg::initDialog(){ spinBorder = 0L; if (imgTag->attribute("border")) { - QLabel_9= new TQLabel(this,"NoName"); - QLabel_9->setText(i18n("Border:")); - grid->addMultiCellWidget(QLabel_9, 4, 4, 0, 0); + TQLabel_9= new TQLabel(this,"NoName"); + TQLabel_9->setText(i18n("Border:")); + grid->addMultiCellWidget(TQLabel_9, 4, 4, 0, 0); spinBorder= new TQSpinBox(this,"NoName"); spinBorder->setRange(0,20); @@ -111,9 +111,9 @@ void TagImgDlg::initDialog(){ comboAlign = 0L; if (imgTag->attribute("align")) { - QLabel_10= new TQLabel(this,"NoName"); - QLabel_10->setText(i18n("Align:")); - grid->addMultiCellWidget(QLabel_10, 4, 4, 2, 2); + TQLabel_10= new TQLabel(this,"NoName"); + TQLabel_10->setText(i18n("Align:")); + grid->addMultiCellWidget(TQLabel_10, 4, 4, 2, 2); comboAlign= new TQComboBox(this,"NoName"); grid->addMultiCellWidget(comboAlign, 4, 4, 3, 4); diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index 1ec00314..d3e03fd5 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -1,6 +1,6 @@ TagMail - + TagMail @@ -19,7 +19,7 @@ unnamed - + AddressLabel @@ -27,7 +27,7 @@ Email address: - + buttonAddressSelect @@ -39,7 +39,7 @@ 0 - + 32 32767 @@ -49,17 +49,17 @@ ... - + lineEmail - + lineSubject - + SubjectLabel @@ -67,7 +67,7 @@ Subject: - + TitleLabel @@ -83,7 +83,7 @@ Title: - + titleEdit @@ -117,7 +117,7 @@ Expanding - + 40 20 @@ -126,5 +126,5 @@ - + diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index 3ed62c57..0aa689d2 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -34,8 +34,8 @@ #include -TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) - :TagMail(parent, name) +TagMailDlg::TagMailDlg(TQWidget *tqparent, const char *name) + :TagMail(tqparent, name) { setCaption(name); setModal(true); @@ -68,18 +68,18 @@ void TagMailDlg::slotSelectAddress() n = n.simplifyWhiteSpace(); for( unsigned int i = 0; i < emails.count(); ++i ) { if (!emails[i].isEmpty()) { - if (n.isEmpty() || (emails[i].find( "<" ) != -1)) + if (n.isEmpty() || (emails[i].tqfind( "<" ) != -1)) addr = ""; else { /* do we really need quotes around this name ? */ - if (n.find(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) + if (n.tqfind(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) addr = qConfig.attrValueQuotation + n + qConfig.attrValueQuotation + " "; else addr = n + " "; } email = emails[i]; - if (!addr.isEmpty() && (email.find( "<" ) == -1) - && (email.find( ">" ) == -1) - && (email.find( "," ) == -1)) + if (!addr.isEmpty() && (email.tqfind( "<" ) == -1) + && (email.tqfind( ">" ) == -1) + && (email.tqfind( "," ) == -1)) addr += "<" + email + ">"; else addr += email; diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 32dffaa5..1b739954 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -24,8 +24,9 @@ class TagMailDlg : public TagMail { Q_OBJECT + TQ_OBJECT public: - TagMailDlg(TQWidget *parent=0, const char *name=0); + TagMailDlg(TQWidget *tqparent=0, const char *name=0); ~TagMailDlg(); private slots: // Private slots /** Select a mail address, using the KABC */ diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui index 39f044c9..4d39033d 100644 --- a/quanta/dialogs/tagdialogs/tagmisc.ui +++ b/quanta/dialogs/tagdialogs/tagmisc.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2001, 2003 Andras Mantia <amantia@kde.org> - + TagMisc @@ -21,7 +21,7 @@ 61 - + 350 60 @@ -34,12 +34,12 @@ unnamed - + elementName - + TextLabel1 @@ -47,7 +47,7 @@ Element name: - + addClosingTag @@ -64,5 +64,5 @@ elementName addClosingTag - + diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index 9313bb08..70c5600c 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -19,8 +19,8 @@ #include #include -TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, const TQString &element ) - :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) +TagMiscDlg::TagMiscDlg( TQWidget* tqparent, const char* name, bool addClosingTag, const TQString &element ) + :KDialogBase( tqparent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index e8d68c3d..4ac7c2a8 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -24,9 +24,10 @@ class TagMisc; class TagMiscDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagMiscDlg( TQWidget* parent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString::null ); + TagMiscDlg( TQWidget* tqparent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString() ); ~TagMiscDlg(); TQString elementTagName() const; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..2b116855 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -23,8 +23,8 @@ #include #include -TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) - : TQDialog(parent,name,true) +TagQuickListDlg::TagQuickListDlg(TQWidget *tqparent, const char *name) + : TQDialog(tqparent,name,true) { setCaption(name); diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index 15f0f21d..e9c13189 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef TAGQUICKLISTDLG_H -#define TAGQUICKLISTDLG_H +#ifndef TAGTQUICKLISTDLG_H +#define TAGTQUICKLISTDLG_H #include @@ -33,16 +33,17 @@ class TQButtonGroup; class TagQuickListDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - TagQuickListDlg(TQWidget *parent=0, const char *name=0); + TagQuickListDlg(TQWidget *tqparent=0, const char *name=0); ~TagQuickListDlg(); public: void initDialog(); - TQLabel *QLabel_1; + TQLabel *TQLabel_1; TQSpinBox *spinBoxRows; TQPushButton *buttonOk; - TQLabel *QLabel_2; + TQLabel *TQLabel_2; TQRadioButton *radioOrdered; TQRadioButton *radioUnordered; TQPushButton *buttonCancel; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp index f7e7b713..7f499c14 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp @@ -21,10 +21,10 @@ void TagQuickListDlg::initDialog() { resize(230,150); - QLabel_1= new TQLabel(this,"NoName"); - QLabel_1->setGeometry(10,10,100,30); - QLabel_1->setMinimumSize(0,0); - QLabel_1->setText(i18n("Rows:")); + TQLabel_1= new TQLabel(this,"NoName"); + TQLabel_1->setGeometry(10,10,100,30); + TQLabel_1->setMinimumSize(0,0); + TQLabel_1->setText(i18n("Rows:")); spinBoxRows= new TQSpinBox(this,"NoName"); spinBoxRows->setGeometry(120,10,100,25); @@ -35,10 +35,10 @@ void TagQuickListDlg::initDialog() buttonOk->setGeometry(10,110,100,30); buttonOk->setMinimumSize(0,0); - QLabel_2= new TQLabel(this,"NoName"); - QLabel_2->setGeometry(10,40,100,30); - QLabel_2->setMinimumSize(0,0); - QLabel_2->setText(i18n("Style:")); + TQLabel_2= new TQLabel(this,"NoName"); + TQLabel_2->setGeometry(10,40,100,30); + TQLabel_2->setMinimumSize(0,0); + TQLabel_2->setText(i18n("Style:")); buttonCancel= new TQPushButton(this,"NoName"); buttonCancel->setGeometry(120,110,100,30); diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp index 014549bc..4eb79f24 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.cpp +++ b/quanta/dialogs/tagdialogs/tagwidget.cpp @@ -30,9 +30,9 @@ #include "tagdialog.h" #include "resource.h" -TagWidget::TagWidget(TQObject *parent, const char *) +TagWidget::TagWidget(TQObject *tqparent, const char *) { - baseURL = ((TagDialog *)parent)->baseURL(); + baseURL = ((TagDialog *)tqparent)->baseURL(); } TagWidget::~TagWidget(){ @@ -47,7 +47,7 @@ void TagWidget::updateDict(const TQString &attr, TQComboBox *combo ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::setValue(const TQString &val, TQComboBox *combo) @@ -92,7 +92,7 @@ void TagWidget::updateDict(const TQString &attr, TQLineEdit *line ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) @@ -104,7 +104,7 @@ void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) @@ -113,7 +113,7 @@ void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) dict->remove(attr); else { - if (!dict->find(attr)) + if (!dict->tqfind(attr)) dict->insert(attr, new TQString("")); } } diff --git a/quanta/dialogs/tagdialogs/tagwidget.h b/quanta/dialogs/tagdialogs/tagwidget.h index b73c6782..38f67877 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.h +++ b/quanta/dialogs/tagdialogs/tagwidget.h @@ -33,7 +33,7 @@ class KURL; class TagWidget { public: - TagWidget(TQObject *parent=0, const char *name=0); + TagWidget(TQObject *tqparent=0, const char *name=0); virtual ~TagWidget(); virtual void readAttributes(TQDict *) {}; diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 5c07b341..41388efc 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -29,14 +29,14 @@ #include "styleeditor.h" -Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, TQWidget *parent, const char *name) - :TQWidget(parent,name), TagWidget(parent,name), doc(d) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *tqparent, const char *name) + :TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d) { initialize(d, dtdTag); } -Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d), m_selection(selection) { initialize(d, dtdTag); } @@ -45,9 +45,9 @@ Tagxml::~Tagxml() { } -void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) +void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) { - m_dtd = dtdTag->parentDTD; + m_dtd = dtdTag->tqparentDTD; m_dtdTag = dtdTag; TQGridLayout *grid = new TQGridLayout( this ); grid->setSpacing( 13 ); @@ -56,7 +56,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) //parse the tag XML file, in order to build up the dialog for ( TQDomNode n = d.firstChild(); !n.isNull(); n = n.nextSibling() ) { - TQDomNode location = findChild(n,"location"); + TQDomNode location = tqfindChild(n,"location"); if ( location.isNull() ) continue; @@ -69,7 +69,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) int colspan = el.attribute("colspan","1").toInt()-1; int rowspan = el.attribute("rowspan","1").toInt()-1; - location = findChild(n,"textlocation"); + location = tqfindChild(n,"textlocation"); el = location.toElement(); int textrow = el.attribute("row","0").toInt(); int textcol = el.attribute("col","0").toInt(); @@ -79,7 +79,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) // qDebug("%s col:%d row:%d cs:%d, rs:%d", n.nodeName().data(), col,row,colspan,rowspan ); TQString tip; - TQDomNode tooltip = findChild( n ,"tooltip" ); + TQDomNode tooltip = tqfindChild( n ,"tooltip" ); if ( !tooltip.isNull() ) { if ( tooltip.firstChild().isText() ) { TQDomText text = tooltip.firstChild().toText(); @@ -87,7 +87,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) } } TQString whatsThis; - TQDomNode what = findChild( n ,"whatsthis" ); + TQDomNode what = tqfindChild( n ,"whatsthis" ); if ( !what.isNull() ) { if ( what.firstChild().isText() ) { TQDomText text = what.firstChild().toText(); @@ -98,7 +98,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) if ( n.nodeName() == "label" ) //a static label { TQLabel *label = new TQLabel(this); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() ) label->setText( ltext.text().isEmpty() ? TQString("") : (ltext.text()+":") ); @@ -116,7 +116,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) TQDomElement el(n.toElement()); TQString type = el.attribute("type","input"); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() && (type != "check") ) //if there is a text label for the attribute { TQLabel *label = new TQLabel(this); @@ -152,7 +152,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) TQCheckBox *w = new TQCheckBox(this); grid->addMultiCellWidget( w, row, row+rowspan, col, col+colspan ); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() ) w->setText( ltext.text() ); if ( !tip.isNull() ) @@ -270,10 +270,10 @@ void Tagxml::readAttributes( TQDict *d ) { if (m_dtd->booleanAttributes == "simple") { - d->replace(name, new TQString("") ); + d->tqreplace(name, new TQString("") ); } else { - d->replace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like , so if a checkbox is false, don't put in the tag at all + d->tqreplace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like , so if a checkbox is false, don't put in the tag at all } } else @@ -283,16 +283,16 @@ void Tagxml::readAttributes( TQDict *d ) /* } else { value = (value == "checked")?m_dtd->booleanTrue:m_dtd->booleanFalse; - d->replace(name, new TQString(value)); + d->tqreplace(name, new TQString(value)); } */ } else if (dynamic_cast(attr)) { // value = KURL::encode_string(value); - d->replace(name, new TQString(value)); + d->tqreplace(name, new TQString(value)); } else { - value.replace(TQRegExp("&(?!amp;)"), "&"); - d->replace(name, new TQString(value) ); + value.tqreplace(TQRegExp("&(?!amp;)"), "&"); + d->tqreplace(name, new TQString(value) ); } } @@ -313,9 +313,9 @@ void Tagxml::writeAttributes( TQDict *d ) name = attr->attrName(); - TQString *v = d->find(name); + TQString *v = d->tqfind(name); if ( v ) { - v->replace("&","&"); + v->tqreplace("&","&"); if ( dynamic_cast(attr) ) // checkbox value = "checked"; else diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index 780b6b91..c08853a0 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -28,10 +28,11 @@ class Tagxml : public TQWidget, TagWidget { Q_OBJECT + TQ_OBJECT public: /** construtor */ - Tagxml(TQDomNode &d, QTag *dtdTag, TQWidget* parent=0, const char *name=0); - Tagxml(TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget* parent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, TQWidget* tqparent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget* tqparent=0, const char *name=0); /** destructor */ ~Tagxml(); @@ -42,12 +43,12 @@ class Tagxml : public TQWidget, TagWidget { void focusToFirstItem(); private: - void initialize(TQDomNode &d, QTag *dtdTag); + void initialize(TQDomNode &d, TQTag *dtdTag); TQDomNode doc; const DTDStruct *m_dtd; TQWidget *m_firstItem; - QTag *m_dtdTag; + TQTag *m_dtdTag; TQString m_selection; }; diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 48ebb7fd..b666f7b6 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -35,8 +35,8 @@ #include "quantacommon.h" #include "viewmanager.h" -AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) - : KTabWidget(parent, name) +AnnotationOutput::AnnotationOutput(TQWidget *tqparent, const char *name) + : KTabWidget(tqparent, name) { m_currentFileAnnotations = new MessageOutput(this); addTab(m_currentFileAnnotations, i18n("Current File")); @@ -81,11 +81,11 @@ void AnnotationOutput::tabChanged(TQWidget *w) readAnnotations(); } -void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const QPair& annotation) +void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair& annotation) { line++; - TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first); - s.replace('\n', ' '); + TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first); + s.tqreplace('\n', ' '); m_currentFileAnnotations->showMessage(line, 1, fileName, s); } @@ -147,15 +147,15 @@ void AnnotationOutput::readAnnotations() TQString fileName = el.attribute("url"); KURL u = baseURL; QuantaCommon::setUrl(u, fileName); - u = QExtFileInfo::toAbsolute(u, baseURL); - if (Project::ref()->contains(u)) + u = TQExtFileInfo::toAbsolute(u, baseURL); + if (Project::ref()->tqcontains(u)) { bool ok; int line = el.attribute("line").toInt(&ok, 10); TQString text = el.attribute("text"); TQString receiver = el.attribute("receiver"); - text.replace('\n',' '); - TQString lineText = TQString("%1").arg(line); + text.tqreplace('\n',' '); + TQString lineText = TQString("%1").tqarg(line); if (lineText.length() < 20) { TQString s; @@ -170,12 +170,12 @@ void AnnotationOutput::readAnnotations() m_fileNames[fileIt] = u.url(); } KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); - if (openedItems.contains(fileName)) + if (openedItems.tqcontains(fileName)) fileIt->setOpen(true); m_fileNames[it] = u.url(); m_lines[it] = line; - if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver))) + if (!yourself.isEmpty() && (receiver == yourself || roles.tqcontains(receiver))) { m_yourAnnotationsNum++; KListViewItem *fileIt = m_yourFileItems[fileName]; @@ -186,7 +186,7 @@ void AnnotationOutput::readAnnotations() m_yourFileNames[fileIt] = u.url(); } KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); - if (yourOpenedItems.contains(fileName)) + if (yourOpenedItems.tqcontains(fileName)) fileIt->setOpen(true); m_yourFileNames[it] = u.url(); m_yourLines[it] = line; @@ -198,14 +198,14 @@ void AnnotationOutput::readAnnotations() } if (m_yourAnnotationsNum > 0) { - setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum)); + setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum)); } else { setTabLabel(m_yourAnnotations, i18n("For You")); } } -void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap > &a_annotations) +void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap > &a_annotations) { m_annotatedFileItems.clear(); m_fileNames.clear(); @@ -215,7 +215,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap > annotations = a_annotations; + TQMap > annotations = a_annotations; TQDomDocument *dom = Project::ref()->dom(); TQDomElement annotationElement = dom->firstChild().firstChild().namedItem("annotations").toElement(); if (annotationElement.isNull()) @@ -234,16 +234,16 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it) + for (TQMap >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it) { TQDomElement el = dom->createElement("annotation"); el.setAttribute("url", fileName); @@ -261,7 +261,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap (item->parent()) != m_allAnnotations) + if (dynamic_cast (item->tqparent()) != m_allAnnotations) { emit clicked(m_fileNames[item], m_lines[item], 0); } else @@ -270,7 +270,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item) void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item) { - if (dynamic_cast (item->parent()) != m_yourAnnotations) + if (dynamic_cast (item->tqparent()) != m_yourAnnotations) { emit clicked(m_yourFileNames[item], m_yourLines[item], 0); } else @@ -299,7 +299,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) TQFile f(url.path()); if (f.open(IO_ReadOnly)) { - TQMap > annotations; + TQMap > annotations; uint i = 0; TQTextStream stream(&f); stream.setEncoding(TQTextStream::UnicodeUTF8); @@ -307,7 +307,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) while (!stream.atEnd()) { line = stream.readLine(); - int pos = line.find("@annotation"); + int pos = line.tqfind("@annotation"); if (pos != -1) { TQString receiver; @@ -315,7 +315,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) if (line[pos] == '(') { int p = pos; - pos = line.find(')'); + pos = line.tqfind(')'); if (pos != -1) { receiver = line.mid(p + 1, pos - p - 1); @@ -323,15 +323,15 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) } } else pos++; - int pos2 = line.find(rx); - annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); + int pos2 = line.tqfind(rx); + annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); } ++i; } f.close(); if (!annotations.isEmpty()) { - KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); + KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); writeAnnotations(QuantaCommon::qUrl(u), annotations); } } diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index 51c08ead..ac87d705 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -37,13 +37,14 @@ enum AnnotationScope class AnnotationOutput : public KTabWidget { Q_OBJECT + TQ_OBJECT public: - AnnotationOutput(TQWidget *parent = 0, const char *name = 0); + AnnotationOutput(TQWidget *tqparent = 0, const char *name = 0); ~AnnotationOutput(); MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;} KListView *allAnnotations() const {return m_allAnnotations;} - void writeAnnotations(const TQString &fileName, const TQMap > &annotations); + void writeAnnotations(const TQString &fileName, const TQMap > &annotations); public slots: /** @@ -52,7 +53,7 @@ public slots: void updateAnnotations(); void readAnnotations(); void clearAnnotations(); - void insertAnnotation(uint line, const TQString& fileName, const QPair& annotation); + void insertAnnotation(uint line, const TQString& fileName, const TQPair& annotation); private slots: void tabChanged(TQWidget *w); diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp index dc1c7ad8..ab8c1ef1 100644 --- a/quanta/messages/messageitem.cpp +++ b/quanta/messages/messageitem.cpp @@ -31,7 +31,7 @@ int MessageItem::line() } else { // try to find first number in text TQString s = text(); - int pos = s.find( TQRegExp("[0-9]")); + int pos = s.tqfind( TQRegExp("[0-9]")); if ( pos == -1 ) return lineNumber; int pos2 = pos; @@ -70,10 +70,10 @@ TQString MessageItem::fileName() { TQString fname; TQString s = text(); - int pos = s.find(i18n("File: ")); + int pos = s.tqfind(i18n("File: ")); if (pos != -1) { - int pos2 = s.find(i18n(", "), pos); + int pos2 = s.tqfind(i18n(", "), pos); if (pos2 != -1) fname = s.mid(pos, pos2-pos); else diff --git a/quanta/messages/messageitem.h b/quanta/messages/messageitem.h index 64894e25..82653fab 100644 --- a/quanta/messages/messageitem.h +++ b/quanta/messages/messageitem.h @@ -28,7 +28,7 @@ class MessageItem : public TQListBoxText { public: - MessageItem( TQListBox *listbox, const TQString &text = TQString::null, int line = -1, int column = -1, const TQString &fname = TQString::null); + MessageItem( TQListBox *listbox, const TQString &text = TQString(), int line = -1, int column = -1, const TQString &fname = TQString()); /** return line number for file , associated with this message */ int line(); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index de4627ca..666d98d3 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -24,7 +24,7 @@ #include #include -// Qt includes +// TQt includes #include #include #include @@ -32,8 +32,8 @@ #include "messageoutput.h" #include "messageitem.h" -MessageOutput::MessageOutput(TQWidget *parent, const char *name ) - : TQListBox(parent,name) +MessageOutput::MessageOutput(TQWidget *tqparent, const char *name ) + : TQListBox(tqparent,name) { m_maxItems = 2000; @@ -41,7 +41,7 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text)); pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Normal, TQColorGroup::Mid)); setPalette(pal); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); m_popupMenu = new KPopupMenu(this); connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), @@ -85,7 +85,7 @@ void MessageOutput::showMessage(int line, int col, const TQString &fileName, con int endPos; if ( !count() || (!append && !text(count()-1).stripWhiteSpace().isEmpty()) ) it = insertItem(""); - while ( ( endPos = message.find('\n') ) != -1 ) { + while ( ( endPos = message.tqfind('\n') ) != -1 ) { if (it) { it->setLine(line); @@ -146,7 +146,7 @@ TQString MessageOutput::content() void MessageOutput::copyContent() { - kapp->clipboard()->setText(content(), QClipboard::Clipboard); + kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard); } void MessageOutput::saveContent() @@ -159,13 +159,13 @@ void MessageOutput::saveContent() TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("File
    %1
    already exists. Overwrite it?    ") - .arg(url.path()), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel) + .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) return; TQFile file(url.path()); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot save log file
    %1    ") - .arg(url.url())); + .tqarg(url.url())); return; } diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index 125b85e2..b90198f7 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -32,8 +32,9 @@ weblint output class MessageOutput : public TQListBox { Q_OBJECT + TQ_OBJECT public: - MessageOutput(TQWidget *parent=0, const char *name=0); + MessageOutput(TQWidget *tqparent=0, const char *name=0); ~MessageOutput(); // Return whole content as a single string with EOLs TQString content(); diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 964c35fb..c0942441 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -30,8 +30,8 @@ #include #include "dtd.h" -#include "../quantacommon.h" -#include "../qextfileinfo.h" +#include "../tquantacommon.h" +#include "../tqextfileinfo.h" DTD::DTD(const KURL &dtdURL, const TQString &dtepDir) @@ -51,7 +51,7 @@ TQStringList DTD::getTags() AttributeList* DTD::getTagAttributes(TQString tag) { - return tagAttributes.find(tag); + return tagAttributes.tqfind(tag); } @@ -84,7 +84,7 @@ void DTD::writeTagFiles() TQString dirName = m_dtepDir; KURL u; u.setPath(dirName); - if (!QExtFileInfo::createDir(dirName)) { + if (!TQExtFileInfo::createDir(dirName)) { QuantaCommon::dirCreationError(0, u); return; } @@ -121,10 +121,10 @@ void DTD::writeTagFiles() bool DTD::parseDTD(const KURL &url) { - TQString fileName = TQString::null; + TQString fileName = TQString(); if (!KIO::NetAccess::download(url, fileName)) { - KMessageBox::error(0, i18n("Cannot download the DTD from %1.").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("Cannot download the DTD from %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } TQFile file(fileName); @@ -183,7 +183,7 @@ bool DTD::parseDTD(const KURL &url) parseDTD(entityURL); } else { - kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl; + kdDebug(24000) << TQString("Unknown tag: [%1]").tqarg(line) << endl; } if (it != lines.end()) ++it; @@ -195,14 +195,14 @@ void DTD::parseDTDEntity(TQString line) { TQString name; TQString *value; - line.replace("\\end", " "); + line.tqreplace("\\end", " "); name = line.mid(11); - int firstSpace = name.find(' '); + int firstSpace = name.tqfind(' '); name = name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(11+firstSpace)); - value->remove(0, value->find("\"")+1); - value->remove(value->findRev("\""), value->length()); + value->remove(0, value->tqfind("\"")+1); + value->remove(value->tqfindRev("\""), value->length()); parseDTDReplace(value); stripSpaces(value); @@ -217,14 +217,14 @@ void DTD::parseDTDElement(const TQString &l) { TQString *value; TQString line = l; - line.replace("\\end", " "); + line.tqreplace("\\end", " "); name = line.mid(10); - int firstSpace = name.find(' '); + int firstSpace = name.tqfind(' '); name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(10+firstSpace)); - //value->remove(0, value->find("\"")+1); - value->remove(value->find(">"), 10000); + //value->remove(0, value->tqfind("\"")+1); + value->remove(value->tqfind(">"), 10000); parseDTDReplace(&name); parseDTDReplace(value); @@ -254,14 +254,14 @@ void DTD::parseDTDAttlist(const TQString &l) { TQString *value; TQString line = l; - line.replace("\\end", " "); + line.tqreplace("\\end", " "); name = line.mid(10); - int firstSpace = name.find(' '); + int firstSpace = name.tqfind(' '); name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(10+firstSpace)); - //value->remove(0, value->find("\"")+1); - value->remove(value->find(">"), 10000); + //value->remove(0, value->tqfind("\"")+1); + value->remove(value->tqfind(">"), 10000); parseDTDReplace(&name); parseDTDReplace(value); @@ -362,51 +362,51 @@ void DTD::parseTagAttributeValues(const TQString &name, TQString *value) { void DTD::parseDTDReplace(TQString *value) { int begin, end; - begin = value->find("%"); - end = value->find(";"); + begin = value->tqfind("%"); + end = value->tqfind(";"); while (begin != -1 && end != -1) { TQString replaceText = value->mid(begin+1, end-begin-1); - TQString *replaceValue = entities.find(replaceText); + TQString *replaceValue = entities.tqfind(replaceText); if (replaceValue != 0L) { - value->replace(begin, end-begin+1, *replaceValue); + value->tqreplace(begin, end-begin+1, *replaceValue); } else { kdDebug(24000) << "Can not find entity: " << replaceText << endl; return; } - begin = value->find("%"); - end = value->find(";"); + begin = value->tqfind("%"); + end = value->tqfind(";"); } } void DTD::stripSpaces(TQString *value) { int index=-1; - while ( (index=value->find(' ',++index)) != -1 ) { - if ( value->findRev('(',index) != -1 && value->find(')',index) != -1) + while ( (index=value->tqfind(' ',++index)) != -1 ) { + if ( value->tqfindRev('(',index) != -1 && value->tqfind(')',index) != -1) value->remove(index,1); } } void DTD::removeComments(TQString &value) { int begin, end; - begin = value.find("",begin+2); + begin = value.tqfind("",begin+2); while (begin != -1 && end != -1) { value.remove(begin, end-begin+3); - begin = value.find("",begin+2); + begin = value.tqfind("",begin+2); } - begin = value.find("--"); - end = value.find("--",begin+2); + begin = value.tqfind("--"); + end = value.tqfind("--",begin+2); while (begin != -1 && end != -1) { value.remove(begin, end-begin+2); - begin = value.find("--"); - end = value.find("--",begin+2); + begin = value.tqfind("--"); + end = value.tqfind("--",begin+2); } - value.replace(TQRegExp(""), ""); + value.tqreplace(TQRegExp(""), ""); } bool DTD::parseDTD() diff --git a/quanta/parsers/dtd/dtd.h b/quanta/parsers/dtd/dtd.h index cc0cf238..723ee4b6 100644 --- a/quanta/parsers/dtd/dtd.h +++ b/quanta/parsers/dtd/dtd.h @@ -22,7 +22,7 @@ #include //app includes -#include "qtag.h" +#include "tqtag.h" class KURL; diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 0d623978..577d2734 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -72,10 +72,10 @@ DTDParser::~DTDParser() bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) { bool fineTune = false; - TQString fileName = TQString::null; + TQString fileName = TQString(); if (!KIO::NetAccess::download(m_dtdURL, fileName, 0)) { - KMessageBox::error(0, i18n("Cannot download the DTD from %1.").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("Cannot download the DTD from %1.").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); return false; } DTD::dtd_ptr = xmlParseDTD(NULL, xmlCharStrndup(fileName.utf8(), fileName.utf8().length())); @@ -86,23 +86,23 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) xmlErrorPtr errorPtr = xmlGetLastError(); if (errorPtr != NULL) { - TQString s = TQString::fromLatin1(errorPtr->message); + TQString s = TQString::tqfromLatin1(errorPtr->message); if (!s.isEmpty()) errorStr = s; - s = TQString::fromLatin1(errorPtr->str1); + s = TQString::tqfromLatin1(errorPtr->str1); if (!s.isEmpty()) errorStr += "
    " + s; - s = TQString::fromLatin1(errorPtr->str2); + s = TQString::tqfromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "
    " + s; - s = TQString::fromLatin1(errorPtr->str2); + s = TQString::tqfromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "
    " + s; - errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); + errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2); xmlResetError(errorPtr); } #endif - KMessageBox::error(0, i18n("Error while parsing the DTD.
    The error message is:
    %1    ").arg(errorStr)); + KMessageBox::error(0, i18n("Error while parsing the DTD.
    The error message is:
    %1    ").tqarg(errorStr)); return false; } if (targetDir.isEmpty()) @@ -123,8 +123,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) m_name = w.dtdName->text(); m_nickName = w.nickName->text(); m_doctype = w.doctype->text(); - m_doctype.replace(TQRegExp("")); + m_doctype.tqreplace(TQRegExp("")); m_dtdURLLine = w.dtdURL->text(); m_defaultExtension = w.defaultExtension->text(); m_caseSensitive = w.caseSensitive->isChecked(); @@ -134,7 +134,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) DTD::dirName = targetDir; KURL u; u.setPath(DTD::dirName); - if (!QExtFileInfo::createDir(u, 0L)) { + if (!TQExtFileInfo::createDir(u, 0L)) { QuantaCommon::dirCreationError(0L, u); return false; } @@ -144,7 +144,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQFile file( DTD::dirName + "entities.tag" ); if ( file.open( IO_WriteOnly ) ) { - DTD::entityStream.setDevice(&file); + DTD::entityStream.setDevice(TQT_TQIODEVICE(&file)); DTD::entityStream.setEncoding(TQTextStream::UnicodeUTF8); DTD::entityStream << "" << endl; DTD::entityStream << "" << endl @@ -154,8 +154,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) file.close(); } else { - KMessageBox::error(0L, i18n("Cannot create the
    %1 file.
    Check that you have write permission in the parent folder.    ") - .arg(file.name())); + KMessageBox::error(0L, i18n("Cannot create the
    %1 file.
    Check that you have write permission in the tqparent folder.    ") + .tqarg(file.name())); return false; } } @@ -235,7 +235,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) attr->name = TQString((const char*)at_ptr->name); switch (at_ptr->def) { case 1: {attr->status = "optional"; break;} //NONE - case 2: {attr->status = "required"; break;} //REQUIRED + case 2: {attr->status = "required"; break;} //RETQUIRED case 3: {attr->status = "implied"; break;} //IMPLIED case 4: {attr->status = "fixed"; break;} //FIXED } @@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) if (childNum > 0) { - stream << "" << endl; + stream << "" << endl; for( int i = 0; i < childNum; i++ ) { stream << " " << endl; } - stream << "" << endl; + stream << "" << endl; stream << endl; } /* xmlElementContentPtr content_ptr = el_ptr->content; if (content_ptr) { - stream << "" << endl; + stream << "" << endl; while (content_ptr) { if (!TQString((const char*)content_ptr->name).isEmpty()) @@ -325,17 +325,17 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) { if (content_ptr == el_ptr->content) break; - if (content_ptr->parent) + if (content_ptr->tqparent) { - if (content_ptr == content_ptr->parent->c1) + if (content_ptr == content_ptr->tqparent->c1) content_ptr->c1 = 0L; else content_ptr->c2 = 0L; } - content_ptr = content_ptr->parent; + content_ptr = content_ptr->tqparent; } } - stream << "" << endl; + stream << "" << endl; } */ } stream << "" << endl diff --git a/quanta/parsers/dtd/dtdparser.h b/quanta/parsers/dtd/dtdparser.h index 800fa445..b9948ea6 100644 --- a/quanta/parsers/dtd/dtdparser.h +++ b/quanta/parsers/dtd/dtdparser.h @@ -35,7 +35,7 @@ public: * @param entitiesOnly if true, only the entities are extracted from the DTD into the entities.tag file * @return true on success, false if some error happened */ - bool parse(const TQString &targetDir = TQString::null, bool entitiesOnly = false); + bool parse(const TQString &targetDir = TQString(), bool entitiesOnly = false); protected: void writeDescriptionRC(); diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui index 3247c7ae..adaeabc4 100644 --- a/quanta/parsers/dtd/dtepcreationdlg.ui +++ b/quanta/parsers/dtd/dtepcreationdlg.ui @@ -9,7 +9,7 @@ ***************************************************************************/ (C) 2003 Andras Mantia <amantia@kde.org> - + DTEPCreationDlg @@ -21,7 +21,7 @@ 285 - + 500 200 @@ -37,17 +37,17 @@ unnamed - + nickName - + dtdURL - + textLabel1 @@ -55,7 +55,7 @@ Name: - + textLabel2 @@ -63,7 +63,7 @@ Nickname: - + textLabel3 @@ -71,22 +71,22 @@ !DOCTYPE definition line: - + directory - + doctype - + dtdName - + textLabel5 @@ -94,7 +94,7 @@ DTD URL: - + textLabel4 @@ -102,7 +102,7 @@ Target directory name: - + textLabel1_2 @@ -110,12 +110,12 @@ Default extension: - + defaultExtension - + caseSensitive @@ -126,7 +126,7 @@ true - + fineTune @@ -148,5 +148,5 @@ defaultExtension caseSensitive - +     diff --git a/quanta/parsers/node.cpp b/quanta/parsers/node.cpp index 219716e9..ef7599b8 100644 --- a/quanta/parsers/node.cpp +++ b/quanta/parsers/node.cpp @@ -33,9 +33,9 @@ int NN = 0; //for debugging purposes: count the Node objects GroupElementMapList globalGroupMap; -Node::Node(Node *parent) +Node::Node(Node *tqparent) { - this->parent = parent; + this->tqparent = tqparent; prev = next = child = 0L; tag = 0L; mainListItem = 0L; @@ -48,7 +48,7 @@ Node::Node(Node *parent) m_leafNode = 0L; m_groupElements.clear(); NN++; -// if (nodes.contains(this) == 0) +// if (nodes.tqcontains(this) == 0) nodes[this] = 1; // else // { @@ -60,7 +60,7 @@ bool Node::deleteNode(Node *node) { if (!node) return true; - if (!nodes.contains(node)) + if (!nodes.tqcontains(node)) { kdDebug(24000) << "Trying to delete a node with address " << node << " that was not allocated!" << endl; return false; @@ -71,7 +71,7 @@ bool Node::deleteNode(Node *node) Node::~Node() { -// if (!nodes.contains(this)) +// if (!nodes.tqcontains(this)) // { // kdError(24000) << "No node with this address " << this << " was allocated!" << endl; // return; @@ -89,8 +89,8 @@ Node::~Node() nodes.erase(this); if (prev && prev->next == this) prev->next = 0L; - if (parent && parent->child == this) - parent->child = 0L; + if (tqparent && tqparent->child == this) + tqparent->child = 0L; if (removeAll) { deleteNode(child); @@ -101,8 +101,8 @@ Node::~Node() { if (next && next->prev == this) next->prev = 0L; - if (child && child->parent == this) - child->parent = 0L; + if (child && child->tqparent == this) + child->tqparent = 0L; } delete tag; @@ -148,7 +148,7 @@ void Node::save(TQDomElement& element) const element.setAttribute("removeAll", removeAll); // bool element.setAttribute("insideSpecial", insideSpecial); // bool element.setAttribute("specialInsideXml", specialInsideXml); // bool - element.setAttribute("fileName", fileName); // QString + element.setAttribute("fileName", fileName); // TQString /* TQString s_element; TQTextStream stream(&s_element, IO_WriteOnly); @@ -174,13 +174,13 @@ bool Node::load(TQDomElement const& element) { next = new Node(0); next->prev = this; - next->parent = this->parent; + next->tqparent = this->tqparent; next->load(e); } else if(e.tagName() == "nodeChild") { child = new Node(0); - child->parent = this; + child->tqparent = this; child->load(e); } else if(e.tagName() == "nodeClosing") @@ -201,7 +201,7 @@ bool Node::load(TQDomElement const& element) removeAll = TQString(element.attribute("removeAll")).toInt(); // bool insideSpecial = TQString(element.attribute("insideSpecial")).toInt(); // bool specialInsideXml = TQString(element.attribute("specialInsideXml")).toInt(); // bool - fileName = element.attribute("fileName"); // QString + fileName = element.attribute("fileName"); // TQString //kafkaCommon::coutTree(this, 3); @@ -225,14 +225,14 @@ Node *Node::nextSibling() Node *n = this; while (n) { - if (n->parent && n->parent->next) + if (n->tqparent && n->tqparent->next) { - result = n->parent->next; + result = n->tqparent->next; break; } else { - n = n->parent; + n = n->tqparent; } } } @@ -257,7 +257,7 @@ Node *Node::previousSibling() } else { - result = parent; + result = tqparent; } return result; @@ -272,14 +272,14 @@ Node *Node::nextNotChild() Node *n = this; while (n) { - if (n->parent && n->parent->next) + if (n->tqparent && n->tqparent->next) { - n = n->parent->next; + n = n->tqparent->next; break; } else { - n = n->parent; + n = n->tqparent; } } @@ -291,14 +291,14 @@ TQString Node::nodeName() { if(tag) return tag->name; - return TQString::null; + return TQString(); } TQString Node::nodeValue() { if(tag) return tag->tagStr(); - return TQString::null; + return TQString(); } void Node::setNodeValue(const TQString &value) @@ -358,15 +358,15 @@ Node *Node::SPrev() Node *node = prev; int bCol, bLine, eCol, eLine, col, line; - if(parent) + if(tqparent) { - parent->tag->beginPos(bLine, bCol); - parent->tag->endPos(eLine, eCol); + tqparent->tag->beginPos(bLine, bCol); + tqparent->tag->endPos(eLine, eCol); } while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text) { - if (parent && node->tag->type == Tag::ScriptTag) + if (tqparent && node->tag->type == Tag::ScriptTag) { //Check if it is an embedded ScriptTag. If it is, continue. node->tag->beginPos(line, col); @@ -384,7 +384,7 @@ Node *Node::SNext() Node *node = next; int bCol, bLine, eCol, eLine, col, line; - if(parent) + if(tqparent) { tag->beginPos(bLine, bCol); tag->endPos(eLine, eCol); @@ -392,7 +392,7 @@ Node *Node::SNext() while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text) { - if (parent && node->tag->type == Tag::ScriptTag) + if (tqparent && node->tag->type == Tag::ScriptTag) { //Check if it is an embedded ScriptTag. If it is, continue. node->tag->beginPos(line, col); @@ -509,7 +509,7 @@ void Node::operator =(Node* node) (*this) = (*node); prev = 0L; next = 0L; - parent = 0L; + tqparent = 0L; child = 0L; mainListItem = 0L; m_groupElements.clear(); @@ -520,7 +520,7 @@ void Node::operator =(Node* node) void Node::detachNode() { - if (nodes.contains(this) == 0) + if (nodes.tqcontains(this) == 0) { kdError(24000) << "No node with this address " << this << " was allocated!" << endl; return; diff --git a/quanta/parsers/node.h b/quanta/parsers/node.h index 4e3451af..ab8e6267 100644 --- a/quanta/parsers/node.h +++ b/quanta/parsers/node.h @@ -36,8 +36,8 @@ struct GroupElement{ Node *node; /* The tag which point to the actual place in the node */ Tag *tag; - /*The parent node indicating the beginning of a structure */ - Node *parentNode; + /*The tqparent node indicating the beginning of a structure */ + Node *tqparentNode; bool global; bool deleted; TQString type; @@ -48,7 +48,7 @@ typedef TQValueList GroupElementList; typedef TQMap GroupElementMapList; /** - * A Node is a basic unit of a Tree. It keeps track of his parent, his left neighbour, his right neighbour + * A Node is a basic unit of a Tree. It keeps track of his tqparent, his left neighbour, his right neighbour * and his first child. * It contains some functions to navigate through the tree, but some more are located at kafkacommon.h * (and should be moved here...) @@ -61,7 +61,7 @@ typedef TQMap GroupElementMapList; class Node { public: - Node( Node *parent ); + Node( Node *tqparent ); ~Node(); /** @@ -73,7 +73,7 @@ public: static bool deleteNode(Node *node); /** - * Copy everything from node except prev, next, child, parent, listItem, group, groupTag, which are set to Null + * Copy everything from node except prev, next, child, tqparent, listItem, group, groupTag, which are set to Null * The groupElementsList is cleared. */ void operator =(Node* node); @@ -84,22 +84,22 @@ public: Node *next; Node *prev; - Node *parent; + Node *tqparent; Node *child; - /** Returns the child if available, else the next node, else the next node of the first parent which has one, else 0L. + /** Returns the child if available, else the next node, else the next node of the first tqparent which has one, else 0L. WARNING: it doesn't behave like DOM::Node::nextSibling() which give the next Node, or 0L if there is no next Node */ Node *nextSibling(); Node *previousSibling(); - /** Returns the next node, or the parent's next, if next doesn't exists, - or the granparent's next, if parent's next doesn't exists, etc. */ + /** Returns the next node, or the tqparent's next, if next doesn't exists, + or the grantqparent's next, if tqparent's next doesn't exists, etc. */ Node *nextNotChild(); /** DOM like functions cf dom/dom_node.h */ TQString nodeName(); TQString nodeValue(); void setNodeValue(const TQString &value); - Node* parentNode() {return parent;} + Node* tqparentNode() {return tqparent;} Node* firstChild() {return child;} Node* lastChild(); Node* DOMpreviousSibling() {return prev;} @@ -113,7 +113,7 @@ public: /** Others functions. */ // check if Node has node in its child subtree (and grand-child,...) bool hasForChild(Node *node); - void setParent(Node *nodeParent) {parent = nodeParent;} + void setParent(Node *nodeParent) {tqparent = nodeParent;} //If Node is of type XmlTag or ScriptTag, return the corresponding XmlTagEnd if available Node *getClosingNode(); //If Node is of type XmlTagEnd, return the corresponding XmlTag or ScriptTag if available @@ -130,7 +130,7 @@ public: Node *lastChildNE(); /** - * The main problem manipulating the default links prev/next/parent/child is that we often want + * The main problem manipulating the default links prev/next/tqparent/child is that we often want * to manipulate only the "significant" Nodes e.g. XmlTag, Text, ScriptNode, like in a DOM::Node tree. * These functions, prefixed with "S" which stands for "simplified" or "significant", will only return * and manipulate XmlTag, Text and ScriptNode. diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index 707d97b0..0a9441db 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -115,13 +115,13 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No bool nodeFound = false; bool goUp; Node *rootNode = 0L; - Node *parentNode = a_node; + Node *tqparentNode = a_node; Node *currentNode = a_node; if (currentNode && (currentNode->tag->type != Tag::XmlTag || currentNode->tag->single)) - parentNode = currentNode->parent; + tqparentNode = currentNode->tqparent; Tag *tag = 0L; - QTag *qTag = 0L; + TQTag *qTag = 0L; textLine.append(write->text(startLine, startCol, startLine, write->editIf->lineLength(startLine))); if (line == endLine) { @@ -137,21 +137,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No nodeFound = false; goUp = false; //find the first "<" and the first special area start definition in this line - tagStartPos = textLine.find('<', col); - specialStartPos = specialAreaCount ? textLine.find(m_dtd->specialAreaStartRx, col): -1; + tagStartPos = textLine.tqfind('<', col); + specialStartPos = specialAreaCount ? textLine.tqfind(m_dtd->specialAreaStartRx, col): -1; //if the special area start definition is before the first "<" it means //that we have found a special area if ( specialStartPos != -1 && (specialStartPos <= tagStartPos || tagStartPos == -1) ) { - currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, parentNode); + currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, tqparentNode); if (!rootNode) rootNode = currentNode; TQString foundText = m_dtd->specialAreaStartRx.cap(); //create a toplevel node for the special area AreaStruct area(line, specialStartPos, line, specialStartPos + foundText.length() - 1); - Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, parentNode, currentNode); - if (node->parent && node->prev == node->parent) //some strange cases, but it's possible, eg.: + Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, tqparentNode, currentNode); + if (node->tqparent && node->prev == node->tqparent) //some strange cases, but it's possible, eg.: { node->prev->next = 0L; node->prev = 0L; @@ -263,37 +263,37 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No tag->name.truncate(tag->name.length() - 1); } //the tag we found indicates the beginning of a special area, like