From e02e31c8b9d854cd62cbe9799228f6e08e882773 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:04:08 -0600 Subject: [PATCH] Sync with latest script --- ChangeLog.immodule | 26 +++---- LICENSE.GPL2 | 6 +- LICENSE.GPL3 | 34 +++++----- LICENSE.QPL | 2 +- README.immodule | 2 +- changes.immodule | 8 +-- config.tests/unix/ipv6/ipv6test.cpp | 2 +- config.tests/x11/opengl.test | 2 +- config.tests/x11/xcursor.test | 2 +- config.tests/x11/xrandr.test | 2 +- configure | 2 +- doc/3rdparty.doc | 2 +- doc/accel.doc | 2 +- doc/annotated.doc | 2 +- doc/application-walkthrough.doc | 4 +- doc/canvas.doc | 4 +- doc/changes.doc | 4 +- doc/charinput-qws.doc | 2 +- doc/classchart.doc | 2 +- doc/classes.doc | 2 +- doc/collect.doc | 2 +- doc/commercialeditions.doc | 2 +- doc/coordsys.doc | 2 +- doc/credits.doc | 2 +- doc/customstyles.doc | 2 +- doc/datastreamformat.doc | 2 +- doc/debug.doc | 2 +- doc/distributingqt.doc | 6 +- doc/dnd.doc | 2 +- doc/editions.doc | 2 +- doc/embclasses.doc | 4 +- doc/embporting.doc | 2 +- doc/envvars.doc | 2 +- doc/faq.doc | 4 +- doc/features.doc | 2 +- doc/focus.doc | 2 +- doc/framebuffer-howto.doc | 2 +- doc/functions.doc | 2 +- doc/headers.doc | 2 +- doc/hierarchy.doc | 2 +- doc/how-to-learn-qt.doc | 2 +- doc/html/activeqt-dotnet.html | 4 +- doc/html/activeqt-tools-idc.html | 2 +- doc/html/activeqt-tools-testcon.html | 2 +- doc/html/assistant-6.html | 2 +- doc/html/canvas.html | 2 +- doc/html/commonproblems.html | 2 +- doc/html/customlayout.html | 2 +- doc/html/designer-manual-1.html | 6 +- doc/html/designer-manual-13.html | 8 +-- doc/html/designer-manual-14.html | 2 +- doc/html/designer-manual-16.html | 4 +- doc/html/designer-manual-3.html | 12 ++-- doc/html/designer-manual-4.html | 2 +- doc/html/designer-manual-5.html | 6 +- doc/html/designer-manual-6.html | 8 +-- doc/html/designer-manual-7.html | 18 ++--- doc/html/designer-manual-8.html | 26 +++---- doc/html/designer-manual-9.html | 6 +- doc/html/distributingqt.html | 4 +- doc/html/emb-classes.html | 2 +- doc/html/emb-performance.html | 2 +- doc/html/emb-porting.html | 4 +- doc/html/emb-running.html | 2 +- doc/html/faq.html | 4 +- doc/html/gpl.html | 6 +- doc/html/helpsystem-example.html | 2 +- doc/html/i18n.html | 10 +-- doc/html/keyfeatures30.html | 2 +- doc/html/layout.html | 10 +-- doc/html/license.html | 2 +- doc/html/licenses.html | 4 +- doc/html/linguist-manual-1.html | 4 +- doc/html/linguist-manual-2.html | 6 +- doc/html/linguist-manual-3.html | 4 +- doc/html/linguist-manual-4.html | 8 +-- doc/html/mac-differences.html | 4 +- doc/html/moc.html | 6 +- doc/html/motif-walkthrough-10.html | 2 +- doc/html/motif-walkthrough-3.html | 4 +- doc/html/motif-walkthrough.html | 6 +- doc/html/network.html | 2 +- doc/html/object.html | 4 +- doc/html/opengl-x11-overlays.html | 2 +- doc/html/opengl.html | 4 +- doc/html/picture-example.html | 2 +- doc/html/plugins-howto.html | 14 ++-- doc/html/porting.html | 4 +- doc/html/porting2.html | 6 +- doc/html/propertydocs | 32 ++++----- doc/html/qaccel-h.html | 2 +- doc/html/qaccessible-h.html | 2 +- doc/html/qaction-h.html | 2 +- doc/html/qapplication-h.html | 2 +- doc/html/qapplication.html | 8 +-- doc/html/qasciicache-h.html | 2 +- doc/html/qasciidict-h.html | 2 +- doc/html/qassistantclient-h.html | 2 +- doc/html/qassistantclient.html | 2 +- doc/html/qasyncimageio-h.html | 2 +- doc/html/qasyncio-h.html | 2 +- doc/html/qaxbase.html | 2 +- doc/html/qaxbindable.html | 2 +- doc/html/qaxcontainer.html | 2 +- doc/html/qaxserver-example-hierarchy.html | 4 +- doc/html/qaxserver-example-menus.html | 2 +- doc/html/qaxserver-example-multiple.html | 2 +- doc/html/qaxserver-example-opengl.html | 2 +- doc/html/qaxserver-example-simple.html | 2 +- doc/html/qaxserver-example-tetrax.html | 4 +- doc/html/qaxserver-example-wrapper.html | 2 +- doc/html/qaxserver.html | 34 +++++----- doc/html/qaxwidget.html | 2 +- doc/html/qbig5codec-h.html | 2 +- doc/html/qbitarray-h.html | 2 +- doc/html/qbitarray.html | 2 +- doc/html/qbitmap-h.html | 2 +- doc/html/qbitval.html | 2 +- doc/html/qbrush-h.html | 2 +- doc/html/qbuffer-h.html | 2 +- doc/html/qbutton-h.html | 2 +- doc/html/qbuttongroup-h.html | 2 +- doc/html/qcache-h.html | 2 +- doc/html/qcanvas-h.html | 2 +- doc/html/qcanvas.html | 8 +-- doc/html/qcanvaspolygonalitem.html | 2 +- doc/html/qcanvasspline.html | 4 +- doc/html/qcdestyle-h.html | 2 +- doc/html/qcheckbox-h.html | 2 +- doc/html/qclipboard-h.html | 2 +- doc/html/qcolor-h.html | 2 +- doc/html/qcolor.html | 4 +- doc/html/qcolordialog-h.html | 2 +- doc/html/qcombobox-h.html | 2 +- doc/html/qcommonstyle-h.html | 2 +- doc/html/qcopchannel.html | 4 +- doc/html/qcopchannel_qws-h.html | 2 +- doc/html/qcstring-h.html | 2 +- doc/html/qcursor-h.html | 2 +- doc/html/qdatabrowser-h.html | 2 +- doc/html/qdatastream-h.html | 2 +- doc/html/qdatastream.html | 4 +- doc/html/qdatatable-h.html | 2 +- doc/html/qdataview-h.html | 2 +- doc/html/qdatetime-h.html | 2 +- doc/html/qdatetimeedit-h.html | 2 +- doc/html/qdeepcopy-h.html | 2 +- doc/html/qdesktopwidget-h.html | 2 +- doc/html/qdial-h.html | 2 +- doc/html/qdialog-h.html | 2 +- doc/html/qdialog.html | 2 +- doc/html/qdict-h.html | 2 +- doc/html/qdir-h.html | 2 +- doc/html/qdirectpainter_qws-h.html | 2 +- doc/html/qdns-h.html | 2 +- doc/html/qdockarea-h.html | 2 +- doc/html/qdockwindow-h.html | 2 +- doc/html/qdockwindow.html | 2 +- doc/html/qdom-h.html | 2 +- doc/html/qdomdocument.html | 2 +- doc/html/qdomnodelist.html | 2 +- doc/html/qdragobject-h.html | 2 +- doc/html/qdrawutil-h.html | 2 +- doc/html/qdropsite-h.html | 2 +- doc/html/qeditorfactory-h.html | 2 +- doc/html/qerrormessage-h.html | 2 +- doc/html/qeucjpcodec-h.html | 2 +- doc/html/qeuckrcodec-h.html | 2 +- doc/html/qevent-h.html | 2 +- doc/html/qeventloop-h.html | 2 +- doc/html/qfile-h.html | 2 +- doc/html/qfiledialog-h.html | 2 +- doc/html/qfiledialog.html | 2 +- doc/html/qfileinfo-h.html | 2 +- doc/html/qfocusdata-h.html | 2 +- doc/html/qfont-h.html | 2 +- doc/html/qfont.html | 2 +- doc/html/qfontdatabase-h.html | 2 +- doc/html/qfontdialog-h.html | 2 +- doc/html/qfontinfo-h.html | 2 +- doc/html/qfontmanager_qws-h.html | 2 +- doc/html/qfontmetrics-h.html | 2 +- doc/html/qframe-h.html | 2 +- doc/html/qftp-h.html | 2 +- doc/html/qgb18030codec-h.html | 2 +- doc/html/qgfx_qws-h.html | 2 +- doc/html/qgfxdriverfactory_qws-h.html | 2 +- doc/html/qgfxdriverplugin_qws-h.html | 2 +- doc/html/qgl-h.html | 2 +- doc/html/qglcolormap-h.html | 2 +- doc/html/qglcontext.html | 4 +- doc/html/qglformat.html | 2 +- doc/html/qglobal-h.html | 6 +- doc/html/qglwidget.html | 4 +- doc/html/qgrid-h.html | 2 +- doc/html/qgridview-h.html | 2 +- doc/html/qgroupbox-h.html | 2 +- doc/html/qguardedptr-h.html | 2 +- doc/html/qguardedptr.html | 4 +- doc/html/qhbox-h.html | 2 +- doc/html/qhbuttongroup-h.html | 2 +- doc/html/qheader-h.html | 2 +- doc/html/qhgroupbox-h.html | 2 +- doc/html/qhostaddress-h.html | 2 +- doc/html/qhttp-h.html | 2 +- doc/html/qhttp.html | 2 +- doc/html/qiconset-h.html | 2 +- doc/html/qiconset.html | 4 +- doc/html/qiconview-h.html | 2 +- doc/html/qimage-h.html | 2 +- doc/html/qimage.html | 2 +- doc/html/qimagedecoder.html | 4 +- doc/html/qimageformatplugin-h.html | 2 +- doc/html/qimageio.html | 4 +- doc/html/qinputdialog-h.html | 2 +- doc/html/qintcache-h.html | 2 +- doc/html/qintdict-h.html | 2 +- doc/html/qiodevice-h.html | 2 +- doc/html/qjiscodec-h.html | 2 +- doc/html/qkbddriverfactory_qws-h.html | 2 +- doc/html/qkbddriverplugin_qws-h.html | 2 +- doc/html/qkeyboard_qws-h.html | 2 +- doc/html/qkeysequence-h.html | 2 +- doc/html/qlabel-h.html | 2 +- doc/html/qlayout-h.html | 2 +- doc/html/qlcdnumber-h.html | 2 +- doc/html/qlibrary-h.html | 2 +- doc/html/qlibrary.html | 2 +- doc/html/qlineedit-h.html | 2 +- doc/html/qlineedit.html | 22 +++--- doc/html/qlistbox-h.html | 2 +- doc/html/qlistbox.html | 6 +- doc/html/qlistview-h.html | 2 +- doc/html/qlistview.html | 4 +- doc/html/qlistviewitem.html | 2 +- doc/html/qlocale-h.html | 2 +- doc/html/qlocalfs-h.html | 2 +- doc/html/qmacstyle_mac-h.html | 2 +- doc/html/qmainwindow-h.html | 2 +- doc/html/qmainwindow.html | 2 +- doc/html/qmake-manual-1.html | 4 +- doc/html/qmake-manual-3.html | 2 +- doc/html/qmake-manual-4.html | 2 +- doc/html/qmake-manual-5.html | 2 +- doc/html/qmake-manual-6.html | 6 +- doc/html/qmake-manual-8.html | 18 ++--- doc/html/qmap-h.html | 2 +- doc/html/qmap.html | 2 +- doc/html/qmemarray-h.html | 2 +- doc/html/qmemarray.html | 4 +- doc/html/qmenubar-h.html | 2 +- doc/html/qmenudata-h.html | 2 +- doc/html/qmessagebox-h.html | 4 +- doc/html/qmessagebox.html | 4 +- doc/html/qmetaobject-h.html | 2 +- doc/html/qmetaobject.html | 2 +- doc/html/qmime-h.html | 2 +- doc/html/qmotifdialog.html | 2 +- doc/html/qmotifplusstyle-h.html | 2 +- doc/html/qmotifstyle-h.html | 2 +- doc/html/qmouse_qws-h.html | 2 +- doc/html/qmousedriverfactory_qws-h.html | 2 +- doc/html/qmousedriverplugin_qws-h.html | 2 +- doc/html/qmovie-h.html | 2 +- doc/html/qmovie.html | 4 +- doc/html/qmultilineedit-h.html | 2 +- doc/html/qmultilineedit.html | 2 +- doc/html/qmutex-h.html | 2 +- doc/html/qnamespace-h.html | 4 +- doc/html/qnetworkprotocol-h.html | 2 +- doc/html/qnp-h.html | 2 +- doc/html/qnpinstance.html | 10 +-- doc/html/qnplugin.html | 4 +- doc/html/qnpwidget.html | 2 +- doc/html/qobject-h.html | 2 +- doc/html/qobject.html | 2 +- doc/html/qobjectcleanuphandler-h.html | 2 +- doc/html/qobjectlist-h.html | 2 +- doc/html/qpaintdevice-h.html | 2 +- doc/html/qpaintdevice.html | 2 +- doc/html/qpaintdevicemetrics-h.html | 2 +- doc/html/qpainter-h.html | 2 +- doc/html/qpainter.html | 6 +- doc/html/qpair-h.html | 2 +- doc/html/qpalette-h.html | 2 +- doc/html/qpen-h.html | 2 +- doc/html/qpicture-h.html | 2 +- doc/html/qpicture.html | 4 +- doc/html/qpixmap-h.html | 2 +- doc/html/qpixmapcache-h.html | 2 +- doc/html/qplatinumstyle-h.html | 2 +- doc/html/qpngimagepacker.html | 2 +- doc/html/qpngio-h.html | 2 +- doc/html/qpoint-h.html | 2 +- doc/html/qpointarray-h.html | 2 +- doc/html/qpopupmenu-h.html | 2 +- doc/html/qprinter-h.html | 2 +- doc/html/qprinter.html | 2 +- doc/html/qprocess-h.html | 2 +- doc/html/qprocess.html | 8 +-- doc/html/qprogressbar-h.html | 2 +- doc/html/qprogressdialog-h.html | 2 +- doc/html/qprogressdialog.html | 2 +- doc/html/qptrcollection-h.html | 2 +- doc/html/qptrcollection.html | 2 +- doc/html/qptrdict-h.html | 2 +- doc/html/qptrlist-h.html | 2 +- doc/html/qptrlist.html | 2 +- doc/html/qptrqueue-h.html | 2 +- doc/html/qptrstack-h.html | 2 +- doc/html/qptrvector-h.html | 2 +- doc/html/qptrvector.html | 2 +- doc/html/qpushbutton-h.html | 2 +- doc/html/qradiobutton-h.html | 2 +- doc/html/qrangecontrol-h.html | 2 +- doc/html/qrect-h.html | 2 +- doc/html/qregexp-h.html | 2 +- doc/html/qregexp.html | 4 +- doc/html/qregion-h.html | 4 +- doc/html/qrtlcodec-h.html | 2 +- doc/html/qscrollbar-h.html | 2 +- doc/html/qscrollview-h.html | 2 +- doc/html/qsemaphore-h.html | 2 +- doc/html/qserversocket-h.html | 2 +- doc/html/qsessionmanager-h.html | 2 +- doc/html/qsettings-h.html | 2 +- doc/html/qsettings.html | 2 +- doc/html/qsgistyle-h.html | 2 +- doc/html/qsignal-h.html | 2 +- doc/html/qsignalmapper-h.html | 2 +- doc/html/qsimplerichtext-h.html | 2 +- doc/html/qsize-h.html | 2 +- doc/html/qsizegrip-h.html | 2 +- doc/html/qsizepolicy-h.html | 2 +- doc/html/qsjiscodec-h.html | 2 +- doc/html/qslider-h.html | 2 +- doc/html/qsocket-h.html | 2 +- doc/html/qsocket.html | 2 +- doc/html/qsocketdevice-h.html | 2 +- doc/html/qsocketnotifier-h.html | 2 +- doc/html/qsortedlist-h.html | 2 +- doc/html/qsound-h.html | 2 +- doc/html/qsound.html | 2 +- doc/html/qspinbox-h.html | 2 +- doc/html/qsplashscreen-h.html | 2 +- doc/html/qsplitter-h.html | 2 +- doc/html/qsql-h.html | 2 +- doc/html/qsqlcursor-h.html | 2 +- doc/html/qsqlcursor.html | 2 +- doc/html/qsqldatabase-h.html | 2 +- doc/html/qsqldatabase.html | 6 +- doc/html/qsqldriver-h.html | 2 +- doc/html/qsqldriverplugin-h.html | 2 +- doc/html/qsqldriverplugin.html | 2 +- doc/html/qsqleditorfactory-h.html | 2 +- doc/html/qsqlerror-h.html | 2 +- doc/html/qsqlfield-h.html | 4 +- doc/html/qsqlfieldinfo.html | 14 ++-- doc/html/qsqlform-h.html | 2 +- doc/html/qsqlindex-h.html | 2 +- doc/html/qsqlpropertymap-h.html | 2 +- doc/html/qsqlquery-h.html | 2 +- doc/html/qsqlquery.html | 4 +- doc/html/qsqlrecord-h.html | 2 +- doc/html/qsqlresult-h.html | 2 +- doc/html/qsqlselectcursor-h.html | 2 +- doc/html/qstatusbar-h.html | 2 +- doc/html/qstring-h.html | 2 +- doc/html/qstring.html | 4 +- doc/html/qstringlist-h.html | 2 +- doc/html/qstringlist.html | 2 +- doc/html/qstrlist-h.html | 2 +- doc/html/qstyle-h.html | 2 +- doc/html/qstyle.html | 18 ++--- doc/html/qstylefactory-h.html | 2 +- doc/html/qstyleoption.html | 2 +- doc/html/qstyleplugin-h.html | 2 +- doc/html/qstyleplugin.html | 2 +- doc/html/qstylesheet-h.html | 2 +- doc/html/qsyntaxhighlighter-h.html | 2 +- doc/html/qsyntaxhighlighter.html | 2 +- doc/html/qt-template-lib.html | 4 +- doc/html/qtabbar-h.html | 2 +- doc/html/qtabdialog-h.html | 2 +- doc/html/qtable-h.html | 2 +- doc/html/qtable.html | 8 +-- doc/html/qtabwidget-h.html | 2 +- doc/html/qtextbrowser-h.html | 2 +- doc/html/qtextcodec-h.html | 2 +- doc/html/qtextcodec.html | 6 +- doc/html/qtextcodecplugin-h.html | 2 +- doc/html/qtextdecoder.html | 2 +- doc/html/qtextedit-h.html | 2 +- doc/html/qtextedit.html | 2 +- doc/html/qtextencoder.html | 2 +- doc/html/qtextstream-h.html | 2 +- doc/html/qtextview-h.html | 2 +- doc/html/qthread-h.html | 2 +- doc/html/qthreadstorage-h.html | 2 +- doc/html/qtimer-h.html | 2 +- doc/html/qtoolbar-h.html | 2 +- doc/html/qtoolbox-h.html | 2 +- doc/html/qtoolbutton-h.html | 2 +- doc/html/qtooltip-h.html | 2 +- doc/html/qtooltip.html | 2 +- doc/html/qtranslator-h.html | 2 +- doc/html/qtranslator.html | 2 +- doc/html/qtsciicodec-h.html | 2 +- doc/html/qurl-h.html | 2 +- doc/html/qurl.html | 2 +- doc/html/qurlinfo-h.html | 2 +- doc/html/qurloperator-h.html | 2 +- doc/html/quuid-h.html | 2 +- doc/html/qvalidator-h.html | 2 +- doc/html/qvalidator.html | 2 +- doc/html/qvaluelist-h.html | 2 +- doc/html/qvaluelist.html | 2 +- doc/html/qvaluestack-h.html | 2 +- doc/html/qvaluevector-h.html | 2 +- doc/html/qvaluevector.html | 2 +- doc/html/qvariant-h.html | 2 +- doc/html/qvbox-h.html | 2 +- doc/html/qvbuttongroup-h.html | 2 +- doc/html/qvgroupbox-h.html | 2 +- doc/html/qwaitcondition-h.html | 2 +- doc/html/qwhatsthis-h.html | 2 +- doc/html/qwidget-h.html | 2 +- doc/html/qwidget.html | 2 +- doc/html/qwidgetfactory-h.html | 2 +- doc/html/qwidgetplugin-h.html | 2 +- doc/html/qwidgetplugin.html | 2 +- doc/html/qwidgetstack-h.html | 2 +- doc/html/qwindowdefs-h.html | 2 +- doc/html/qwindowsstyle-h.html | 2 +- doc/html/qwindowsystem_qws-h.html | 2 +- doc/html/qwizard-h.html | 2 +- doc/html/qwmatrix-h.html | 2 +- doc/html/qworkspace-h.html | 2 +- doc/html/qwsdecoration_qws-h.html | 2 +- doc/html/qxml-h.html | 2 +- doc/html/qxmldtdhandler.html | 2 +- doc/html/qxtwidget.html | 2 +- doc/html/signalsandslots.html | 4 +- doc/html/simple-application.html | 2 +- doc/html/sql-driver.html | 14 ++-- doc/html/sql.html | 18 ++--- doc/html/templates.html | 10 +-- doc/html/timers.html | 2 +- doc/html/toplevel-example.html | 2 +- doc/html/tutorial1-08.html | 2 +- doc/html/tutorial2-02.html | 2 +- doc/html/tutorial2-03.html | 2 +- doc/html/tutorial2-05.html | 2 +- doc/html/tutorial2-06.html | 2 +- doc/html/tutorial2-08.html | 2 +- doc/html/winsystem.html | 2 +- doc/html/wizard-example.html | 2 +- doc/html/wizard-wizard-cpp.html | 2 +- doc/html/xml.html | 6 +- doc/html/y2k.html | 2 +- doc/i18n.doc | 12 ++-- doc/indices.doc | 2 +- doc/installation.doc | 2 +- doc/integration.doc | 2 +- doc/layout.doc | 14 ++-- doc/mac.doc | 6 +- doc/makeqpf.doc | 2 +- doc/man/man1/lrelease.1 | 2 +- doc/man/man1/lupdate.1 | 4 +- doc/man/man1/moc.1 | 4 +- doc/man/man3/qapplication.3qt | 8 +-- doc/man/man3/qassistantclient.3qt | 2 +- doc/man/man3/qaxbase.3qt | 2 +- doc/man/man3/qaxbindable.3qt | 2 +- doc/man/man3/qaxwidget.3qt | 2 +- doc/man/man3/qbitarray.3qt | 2 +- doc/man/man3/qbitval.3qt | 2 +- doc/man/man3/qcanvas.3qt | 4 +- doc/man/man3/qcanvaspolygonalitem.3qt | 2 +- doc/man/man3/qcanvasspline.3qt | 4 +- doc/man/man3/qcolor.3qt | 4 +- doc/man/man3/qcopchannel.3qt | 4 +- doc/man/man3/qdatastream.3qt | 4 +- doc/man/man3/qdialog.3qt | 2 +- doc/man/man3/qdockwindow.3qt | 2 +- doc/man/man3/qdomdocument.3qt | 2 +- doc/man/man3/qdomnodelist.3qt | 2 +- doc/man/man3/qfiledialog.3qt | 2 +- doc/man/man3/qfont.3qt | 2 +- doc/man/man3/qglcontext.3qt | 4 +- doc/man/man3/qglformat.3qt | 2 +- doc/man/man3/qglwidget.3qt | 4 +- doc/man/man3/qguardedptr.3qt | 4 +- doc/man/man3/qhttp.3qt | 2 +- doc/man/man3/qiconset.3qt | 4 +- doc/man/man3/qimage.3qt | 2 +- doc/man/man3/qimagedecoder.3qt | 4 +- doc/man/man3/qimageio.3qt | 4 +- doc/man/man3/qlibrary.3qt | 2 +- doc/man/man3/qlineedit.3qt | 2 +- doc/man/man3/qlistbox.3qt | 4 +- doc/man/man3/qlistview.3qt | 4 +- doc/man/man3/qlistviewitem.3qt | 2 +- doc/man/man3/qmainwindow.3qt | 2 +- doc/man/man3/qmap.3qt | 2 +- doc/man/man3/qmemarray.3qt | 4 +- doc/man/man3/qmessagebox.3qt | 4 +- doc/man/man3/qmetaobject.3qt | 2 +- doc/man/man3/qmotifdialog.3qt | 2 +- doc/man/man3/qmovie.3qt | 4 +- doc/man/man3/qnpinstance.3qt | 8 +-- doc/man/man3/qnplugin.3qt | 4 +- doc/man/man3/qnpwidget.3qt | 2 +- doc/man/man3/qobject.3qt | 2 +- doc/man/man3/qpaintdevice.3qt | 2 +- doc/man/man3/qpainter.3qt | 6 +- doc/man/man3/qpicture.3qt | 4 +- doc/man/man3/qpngimagepacker.3qt | 2 +- doc/man/man3/qprinter.3qt | 2 +- doc/man/man3/qprocess.3qt | 8 +-- doc/man/man3/qprogressdialog.3qt | 2 +- doc/man/man3/qptrcollection.3qt | 2 +- doc/man/man3/qptrlist.3qt | 2 +- doc/man/man3/qptrvector.3qt | 2 +- doc/man/man3/qregexp.3qt | 4 +- doc/man/man3/qsettings.3qt | 2 +- doc/man/man3/qsocket.3qt | 2 +- doc/man/man3/qsound.3qt | 2 +- doc/man/man3/qsqlcursor.3qt | 2 +- doc/man/man3/qsqldatabase.3qt | 6 +- doc/man/man3/qsqldriverplugin.3qt | 2 +- doc/man/man3/qsqlfieldinfo.3qt | 8 +-- doc/man/man3/qsqlquery.3qt | 2 +- doc/man/man3/qstring.3qt | 4 +- doc/man/man3/qstringlist.3qt | 2 +- doc/man/man3/qstyle.3qt | 16 ++--- doc/man/man3/qstyleoption.3qt | 2 +- doc/man/man3/qstyleplugin.3qt | 2 +- doc/man/man3/qsyntaxhighlighter.3qt | 2 +- doc/man/man3/qtable.3qt | 8 +-- doc/man/man3/qtextcodec.3qt | 6 +- doc/man/man3/qtextdecoder.3qt | 2 +- doc/man/man3/qtextedit.3qt | 2 +- doc/man/man3/qtextencoder.3qt | 2 +- doc/man/man3/qtooltip.3qt | 2 +- doc/man/man3/qtranslator.3qt | 2 +- doc/man/man3/qurl.3qt | 2 +- doc/man/man3/qvalidator.3qt | 2 +- doc/man/man3/qvaluelist.3qt | 2 +- doc/man/man3/qvaluevector.3qt | 2 +- doc/man/man3/qwidget.3qt | 2 +- doc/man/man3/qwidgetplugin.3qt | 2 +- doc/man/man3/qxmldtdhandler.3qt | 2 +- doc/metaobjects.doc | 2 +- doc/misc.doc | 12 ++-- doc/moc.doc | 8 +-- doc/modules.doc | 2 +- doc/network.doc | 4 +- doc/networking.doc | 8 +-- doc/object.doc | 18 ++--- doc/opengl-x11-overlays.doc | 4 +- doc/overviews-list.doc | 2 +- doc/pictures.doc | 2 +- doc/plugins-howto.doc | 16 ++--- doc/porting2.doc | 8 +-- doc/porting3.doc | 6 +- doc/primes.doc | 2 +- doc/qasciicache.doc | 2 +- doc/qasciidict.doc | 2 +- doc/qcache.doc | 2 +- doc/qcollection-compat.doc | 2 +- doc/qdict.doc | 2 +- doc/qguardedptr.doc | 2 +- doc/qintcache.doc | 2 +- doc/qintdict.doc | 2 +- doc/qmap.doc | 4 +- doc/qmemarray.doc | 6 +- doc/qpair.doc | 2 +- doc/qptrdict.doc | 2 +- doc/qptrlist.doc | 4 +- doc/qptrqueue.doc | 2 +- doc/qptrstack.doc | 2 +- doc/qptrvector.doc | 4 +- doc/qsortedlist.doc | 2 +- doc/qtl.doc | 6 +- doc/qtmac-as-native.doc | 2 +- doc/qvaluelist.doc | 4 +- doc/qvaluestack.doc | 2 +- doc/qvaluevector.doc | 4 +- doc/qvfb.doc | 2 +- doc/qws.doc | 10 +-- doc/session.doc | 2 +- doc/shclass.doc | 2 +- doc/signalsandslots.doc | 6 +- doc/sql-driver.doc | 16 ++--- doc/sql.doc | 20 +++--- doc/table.doc | 2 +- doc/threads.doc | 2 +- doc/tutorial.doc | 4 +- doc/tutorial2.doc | 10 +-- doc/unicode.doc | 2 +- doc/winsystem.doc | 4 +- doc/xml-sax-features-walkthrough.doc | 2 +- doc/xml-sax-walkthrough.doc | 2 +- doc/xml.doc | 8 +-- doc/y2k.doc | 4 +- examples/demo/dnd/styledbutton.cpp | 2 +- examples/demo/dnd/styledbutton.h | 2 +- examples/demo/opengl/fbm.c | 2 +- examples/demo/opengl/gllandscape.cpp | 2 +- examples/demo/qthumbwheel.cpp | 2 +- examples/demo/qthumbwheel.h | 2 +- examples/helpsystem/helpsystem.doc | 2 +- examples/opengl/overlay/glteapots.cpp | 2 +- .../opengl/overlay_x11/README.X11-OVERLAYS | 2 +- examples/picture/picture.cpp | 2 +- examples/sql/sqltable/README | 2 +- examples/toplevel/options.ui | 8 +-- examples/toplevel/toplevel.doc | 2 +- examples/wizard/wizard.cpp | 2 +- extensions/nsplugin/src/npwin.cpp | 2 +- extensions/nsplugin/src/qnp.cpp | 18 ++--- extensions/nsplugin/src/qnp.h | 2 +- mkspecs/irix-cc-64/qmake.conf | 2 +- mkspecs/irix-cc/qmake.conf | 2 +- plugins/src/inputmethods/simple/xcompose2q.rb | 2 +- plugins/src/sqldrivers/ibase/main.cpp | 2 +- plugins/src/sqldrivers/mysql/main.cpp | 2 +- plugins/src/sqldrivers/odbc/main.cpp | 2 +- plugins/src/sqldrivers/psql/main.cpp | 2 +- plugins/src/sqldrivers/sqlite/smain.cpp | 2 +- qmake/CHANGES | 2 +- qmake/book/qmake-advanced.leaf | 6 +- qmake/book/qmake-commandreference.leaf | 20 +++--- qmake/book/qmake-concepts.leaf | 2 +- qmake/book/qmake-preface.leaf | 4 +- qmake/book/qmake-quick.leaf | 2 +- qmake/book/qmake-tutorial.leaf | 2 +- qmake/generators/mac/metrowerks_xml.cpp | 4 +- qmake/generators/mac/metrowerks_xml.h | 2 +- qmake/generators/mac/pbuilder_pbx.cpp | 4 +- qmake/generators/mac/pbuilder_pbx.h | 2 +- qmake/generators/makefile.cpp | 2 +- qmake/generators/makefile.h | 2 +- qmake/generators/projectgenerator.cpp | 2 +- qmake/generators/projectgenerator.h | 2 +- qmake/generators/unix/unixmake.cpp | 2 +- qmake/generators/unix/unixmake.h | 2 +- qmake/generators/unix/unixmake2.cpp | 4 +- qmake/generators/win32/borland_bmake.cpp | 4 +- qmake/generators/win32/borland_bmake.h | 2 +- qmake/generators/win32/mingw_make.cpp | 4 +- qmake/generators/win32/mingw_make.h | 2 +- qmake/generators/win32/msvc_dsp.cpp | 4 +- qmake/generators/win32/msvc_dsp.h | 2 +- qmake/generators/win32/msvc_nmake.cpp | 6 +- qmake/generators/win32/msvc_nmake.h | 2 +- qmake/generators/win32/msvc_objectmodel.cpp | 2 +- qmake/generators/win32/msvc_objectmodel.h | 2 +- qmake/generators/win32/msvc_vcproj.cpp | 6 +- qmake/generators/win32/msvc_vcproj.h | 2 +- qmake/generators/win32/winmakefile.cpp | 2 +- qmake/generators/win32/winmakefile.h | 2 +- qmake/main.cpp | 2 +- qmake/meta.cpp | 2 +- qmake/meta.h | 2 +- qmake/option.cpp | 2 +- qmake/option.h | 2 +- qmake/project.cpp | 38 +++++------ qmake/project.h | 2 +- qmake/property.cpp | 2 +- qmake/property.h | 2 +- src/3rdparty/libjpeg/README | 6 +- src/3rdparty/libjpeg/change.log | 2 +- src/3rdparty/libjpeg/coderules.doc | 4 +- src/3rdparty/libjpeg/jcapistd.c | 2 +- src/3rdparty/libjpeg/jccolor.c | 2 +- src/3rdparty/libjpeg/jchuff.c | 4 +- src/3rdparty/libjpeg/jcmarker.c | 2 +- src/3rdparty/libjpeg/jcmaster.c | 4 +- src/3rdparty/libjpeg/jconfig.doc | 2 +- src/3rdparty/libjpeg/jconfig.manx | 2 +- src/3rdparty/libjpeg/jconfig.st | 2 +- src/3rdparty/libjpeg/jcphuff.c | 4 +- src/3rdparty/libjpeg/jcprepct.c | 2 +- src/3rdparty/libjpeg/jcsample.c | 4 +- src/3rdparty/libjpeg/jdapimin.c | 10 +-- src/3rdparty/libjpeg/jdapistd.c | 4 +- src/3rdparty/libjpeg/jdcolor.c | 2 +- src/3rdparty/libjpeg/jdct.h | 2 +- src/3rdparty/libjpeg/jddctmgr.c | 2 +- src/3rdparty/libjpeg/jdhuff.c | 2 +- src/3rdparty/libjpeg/jdmainct.c | 10 +-- src/3rdparty/libjpeg/jdmarker.c | 10 +-- src/3rdparty/libjpeg/jdpostct.c | 2 +- src/3rdparty/libjpeg/jfdctint.c | 2 +- src/3rdparty/libjpeg/jidctint.c | 2 +- src/3rdparty/libjpeg/jinclude.h | 2 +- src/3rdparty/libjpeg/jmemmgr.c | 10 +-- src/3rdparty/libjpeg/jmemnobs.c | 4 +- src/3rdparty/libjpeg/jmemsys.h | 4 +- src/3rdparty/libjpeg/jmorecfg.h | 2 +- src/3rdparty/libjpeg/jpegint.h | 2 +- src/3rdparty/libjpeg/jpeglib.h | 6 +- src/3rdparty/libjpeg/jquant1.c | 4 +- src/3rdparty/libjpeg/jquant2.c | 8 +-- src/3rdparty/libjpeg/libjpeg.doc | 68 +++++++++---------- src/3rdparty/libjpeg/structure.doc | 46 ++++++------- src/3rdparty/libjpeg/usage.doc | 4 +- src/3rdparty/libjpeg/wizard.doc | 2 +- src/3rdparty/libmng/LICENSE | 4 +- src/3rdparty/libmng/Makefile.in | 2 +- src/3rdparty/libmng/README.autoconf | 2 +- src/3rdparty/libmng/README.config | 4 +- src/3rdparty/libmng/README.dll | 4 +- src/3rdparty/libmng/aclocal.m4 | 22 +++--- src/3rdparty/libmng/configure | 18 ++--- src/3rdparty/libmng/configure.in | 4 +- src/3rdparty/libmng/doc/libmng.txt | 42 ++++++------ src/3rdparty/libmng/doc/man/libmng.3 | 42 ++++++------ src/3rdparty/libmng/libmng.h | 36 +++++----- src/3rdparty/libmng/libmng_chunk_io.c | 18 ++--- src/3rdparty/libmng/libmng_cms.c | 4 +- src/3rdparty/libmng/libmng_conf.h | 16 ++--- src/3rdparty/libmng/libmng_data.h | 2 +- src/3rdparty/libmng/libmng_display.c | 6 +- src/3rdparty/libmng/libmng_error.c | 2 +- src/3rdparty/libmng/libmng_jpeg.c | 4 +- src/3rdparty/libmng/libmng_object_prc.c | 6 +- src/3rdparty/libmng/libmng_pixels.c | 6 +- src/3rdparty/libmng/libmng_read.c | 6 +- src/3rdparty/libmng/libmng_types.h | 2 +- src/3rdparty/libmng/ltmain.sh | 24 +++---- src/3rdparty/libmng/makefiles/configure.in | 4 +- src/3rdparty/libmng/missing | 2 +- src/3rdparty/libpng/CHANGES | 2 +- src/3rdparty/libpng/INSTALL | 2 +- src/3rdparty/libpng/LICENSE | 2 +- src/3rdparty/libpng/README | 2 +- src/3rdparty/libpng/example.c | 4 +- src/3rdparty/libpng/libpng.3 | 18 ++--- src/3rdparty/libpng/libpng.txt | 16 ++--- src/3rdparty/libpng/png.h | 10 +-- src/3rdparty/libpng/pngconf.h | 8 +-- src/3rdparty/libpng/pnggccrd.c | 4 +- src/3rdparty/libpng/pngrutil.c | 6 +- src/3rdparty/libpng/pngwrite.c | 2 +- src/3rdparty/libpng/pngwutil.c | 6 +- .../libpng/projects/borland/libpng.readme.txt | 2 +- src/3rdparty/libpng/scripts/makefile.bd32 | 2 +- src/3rdparty/libpng/scripts/makefile.knr | 2 +- src/3rdparty/opentype/FTL.TXT | 4 +- src/3rdparty/opentype/ftxopen.h | 2 +- src/3rdparty/sqlite/attach.c | 2 +- src/3rdparty/sqlite/btree.c | 4 +- src/3rdparty/sqlite/btree_rb.c | 4 +- src/3rdparty/sqlite/date.c | 2 +- src/3rdparty/sqlite/delete.c | 4 +- src/3rdparty/sqlite/func.c | 2 +- src/3rdparty/sqlite/os.c | 2 +- src/3rdparty/sqlite/pager.c | 4 +- src/3rdparty/sqlite/parse.c | 4 +- src/3rdparty/sqlite/select.c | 8 +-- src/3rdparty/sqlite/sqliteInt.h | 2 +- src/3rdparty/sqlite/tokenize.c | 2 +- src/3rdparty/sqlite/vdbe.c | 2 +- src/3rdparty/sqlite/vdbeaux.c | 2 +- src/3rdparty/sqlite/where.c | 2 +- src/3rdparty/zlib/ChangeLog | 4 +- src/3rdparty/zlib/FAQ | 2 +- src/3rdparty/zlib/Makefile.in | 2 +- src/3rdparty/zlib/README | 2 +- src/3rdparty/zlib/configure | 2 +- src/3rdparty/zlib/deflate.c | 4 +- src/3rdparty/zlib/gzio.c | 4 +- src/3rdparty/zlib/infback.c | 2 +- src/3rdparty/zlib/inffast.c | 2 +- src/3rdparty/zlib/projects/README.projects | 2 +- src/3rdparty/zlib/trees.c | 6 +- src/3rdparty/zlib/win32/DLL_FAQ.txt | 10 +-- src/3rdparty/zlib/zconf.h | 6 +- src/3rdparty/zlib/zconf.in.h | 6 +- src/3rdparty/zlib/zlib.3 | 2 +- src/3rdparty/zlib/zlib.h | 12 ++-- src/attic/qttableview.cpp | 4 +- src/canvas/qcanvas.cpp | 18 ++--- src/canvas/qcanvas.h | 2 +- src/codecs/qbig5codec.cpp | 2 +- src/codecs/qbig5codec.h | 2 +- src/codecs/qeucjpcodec.cpp | 2 +- src/codecs/qeucjpcodec.h | 2 +- src/codecs/qeuckrcodec.cpp | 2 +- src/codecs/qeuckrcodec.h | 2 +- src/codecs/qfontcncodec.cpp | 2 +- src/codecs/qfontcodecs_p.h | 2 +- src/codecs/qfonthkcodec.cpp | 2 +- src/codecs/qfontjpcodec.cpp | 2 +- src/codecs/qfontkrcodec.cpp | 2 +- src/codecs/qfontlaocodec.cpp | 2 +- src/codecs/qfonttwcodec.cpp | 2 +- src/codecs/qgb18030codec.cpp | 2 +- src/codecs/qgb18030codec.h | 2 +- src/codecs/qgbkcodec.h | 2 +- src/codecs/qjiscodec.cpp | 2 +- src/codecs/qjiscodec.h | 2 +- src/codecs/qjpunicode.cpp | 2 +- src/codecs/qjpunicode.h | 2 +- src/codecs/qrtlcodec.cpp | 2 +- src/codecs/qrtlcodec.h | 2 +- src/codecs/qsjiscodec.cpp | 2 +- src/codecs/qsjiscodec.h | 2 +- src/codecs/qtextcodec.cpp | 12 ++-- src/codecs/qtextcodec.h | 2 +- src/codecs/qtextcodecfactory.cpp | 2 +- src/codecs/qtextcodecfactory.h | 2 +- src/codecs/qtextcodecinterface_p.h | 2 +- src/codecs/qtextcodecplugin.cpp | 2 +- src/codecs/qtextcodecplugin.h | 2 +- src/codecs/qtsciicodec.cpp | 2 +- src/codecs/qtsciicodec.h | 2 +- src/codecs/qutfcodec.cpp | 2 +- src/codecs/qutfcodec.h | 2 +- src/dialogs/qcolordialog.cpp | 4 +- src/dialogs/qcolordialog.h | 2 +- src/dialogs/qdialog.cpp | 4 +- src/dialogs/qdialog.h | 2 +- src/dialogs/qerrormessage.cpp | 2 +- src/dialogs/qerrormessage.h | 2 +- src/dialogs/qfiledialog.cpp | 4 +- src/dialogs/qfiledialog.h | 2 +- src/dialogs/qfontdialog.cpp | 8 +-- src/dialogs/qfontdialog.h | 2 +- src/dialogs/qinputdialog.cpp | 2 +- src/dialogs/qinputdialog.h | 2 +- src/dialogs/qmessagebox.cpp | 6 +- src/dialogs/qmessagebox.h | 4 +- src/dialogs/qprintdialog.cpp | 2 +- src/dialogs/qprintdialog.h | 2 +- src/dialogs/qprogressdialog.cpp | 4 +- src/dialogs/qprogressdialog.h | 2 +- src/dialogs/qsemimodal.h | 2 +- src/dialogs/qtabdialog.cpp | 2 +- src/dialogs/qtabdialog.h | 2 +- src/dialogs/qwizard.cpp | 2 +- src/dialogs/qwizard.h | 2 +- src/embedded/qgfxdriverinterface_p.h | 2 +- src/embedded/qkbddriverinterface_p.h | 2 +- src/embedded/qmousedriverinterface_p.h | 2 +- src/iconview/qiconview.cpp | 2 +- src/iconview/qiconview.h | 2 +- src/inputmethod/qinputcontextplugin.cpp | 2 +- src/kernel/q1xcompatibility.h | 2 +- src/kernel/qabstractlayout.cpp | 2 +- src/kernel/qabstractlayout.h | 2 +- src/kernel/qaccel.cpp | 2 +- src/kernel/qaccel.h | 2 +- src/kernel/qaccessible.cpp | 2 +- src/kernel/qaccessible.h | 2 +- src/kernel/qapplication.cpp | 8 +-- src/kernel/qapplication.h | 2 +- src/kernel/qapplication_p.h | 2 +- src/kernel/qapplication_x11.cpp | 18 ++--- src/kernel/qasyncimageio.cpp | 10 +-- src/kernel/qasyncimageio.h | 2 +- src/kernel/qasyncio.cpp | 2 +- src/kernel/qasyncio.h | 2 +- src/kernel/qbitmap.cpp | 2 +- src/kernel/qbitmap.h | 2 +- src/kernel/qbrush.h | 2 +- src/kernel/qclipboard.cpp | 2 +- src/kernel/qclipboard.h | 2 +- src/kernel/qclipboard_x11.cpp | 4 +- src/kernel/qcolor.cpp | 2 +- src/kernel/qcolor.h | 2 +- src/kernel/qcolor_p.cpp | 2 +- src/kernel/qcolor_p.h | 2 +- src/kernel/qcolor_x11.cpp | 6 +- src/kernel/qconnection.cpp | 2 +- src/kernel/qconnection.h | 2 +- src/kernel/qcursor.cpp | 2 +- src/kernel/qcursor.h | 2 +- src/kernel/qcursor_x11.cpp | 2 +- src/kernel/qdesktopwidget.h | 2 +- src/kernel/qdesktopwidget_x11.cpp | 2 +- src/kernel/qdnd_x11.cpp | 2 +- src/kernel/qdragobject.cpp | 2 +- src/kernel/qdragobject.h | 2 +- src/kernel/qdrawutil.cpp | 2 +- src/kernel/qdrawutil.h | 2 +- src/kernel/qdropsite.cpp | 2 +- src/kernel/qdropsite.h | 2 +- src/kernel/qevent.cpp | 2 +- src/kernel/qevent.h | 2 +- src/kernel/qeventloop.cpp | 2 +- src/kernel/qeventloop.h | 2 +- src/kernel/qeventloop_p.h | 2 +- src/kernel/qeventloop_unix.cpp | 2 +- src/kernel/qeventloop_x11.cpp | 2 +- src/kernel/qfocusdata.cpp | 2 +- src/kernel/qfocusdata.h | 2 +- src/kernel/qfont.cpp | 2 +- src/kernel/qfont.h | 2 +- src/kernel/qfont_x11.cpp | 2 +- src/kernel/qfontdata_p.h | 2 +- src/kernel/qfontdatabase.cpp | 10 +-- src/kernel/qfontdatabase.h | 2 +- src/kernel/qfontdatabase_x11.cpp | 4 +- src/kernel/qfontengine_p.h | 2 +- src/kernel/qfontengine_x11.cpp | 8 +-- src/kernel/qfontinfo.h | 2 +- src/kernel/qfontmetrics.h | 2 +- src/kernel/qgif.h | 4 +- src/kernel/qgplugin.cpp | 2 +- src/kernel/qgplugin.h | 2 +- src/kernel/qguardedptr.cpp | 6 +- src/kernel/qguardedptr.h | 2 +- src/kernel/qiconset.cpp | 6 +- src/kernel/qiconset.h | 2 +- src/kernel/qimage.cpp | 10 +-- src/kernel/qimage.h | 2 +- src/kernel/qimageformatinterface_p.h | 2 +- src/kernel/qimageformatplugin.cpp | 2 +- src/kernel/qimageformatplugin.h | 2 +- src/kernel/qinputcontext.cpp | 20 +++--- src/kernel/qinputcontext_p.h | 2 +- src/kernel/qinputcontext_x11.cpp | 2 +- src/kernel/qinternal.cpp | 2 +- src/kernel/qinternal_p.h | 2 +- src/kernel/qjpegio.cpp | 4 +- src/kernel/qjpegio.h | 2 +- src/kernel/qkeycode.h | 2 +- src/kernel/qkeysequence.cpp | 2 +- src/kernel/qkeysequence.h | 2 +- src/kernel/qlayout.cpp | 2 +- src/kernel/qlayout.h | 2 +- src/kernel/qlayoutengine.cpp | 2 +- src/kernel/qlayoutengine_p.h | 2 +- src/kernel/qlocalfs.cpp | 2 +- src/kernel/qlocalfs.h | 2 +- src/kernel/qlock.cpp | 2 +- src/kernel/qlock_p.h | 2 +- src/kernel/qmetaobject.cpp | 4 +- src/kernel/qmetaobject.h | 2 +- src/kernel/qmime.cpp | 2 +- src/kernel/qmime.h | 2 +- src/kernel/qmngio.cpp | 4 +- src/kernel/qmngio.h | 2 +- src/kernel/qmotifdnd_x11.cpp | 4 +- src/kernel/qmovie.cpp | 6 +- src/kernel/qmovie.h | 2 +- src/kernel/qnamespace.h | 4 +- src/kernel/qnetworkprotocol.cpp | 2 +- src/kernel/qnetworkprotocol.h | 2 +- src/kernel/qobject.cpp | 4 +- src/kernel/qobject.h | 2 +- src/kernel/qobjectcleanuphandler.cpp | 2 +- src/kernel/qobjectcleanuphandler.h | 2 +- src/kernel/qobjectdefs.h | 2 +- src/kernel/qobjectdict.h | 2 +- src/kernel/qobjectlist.h | 2 +- src/kernel/qpaintdevice.h | 2 +- src/kernel/qpaintdevice_x11.cpp | 4 +- src/kernel/qpaintdevicedefs.h | 2 +- src/kernel/qpaintdevicemetrics.cpp | 2 +- src/kernel/qpaintdevicemetrics.h | 2 +- src/kernel/qpainter.cpp | 8 +-- src/kernel/qpainter.h | 2 +- src/kernel/qpainter_p.h | 2 +- src/kernel/qpainter_x11.cpp | 4 +- src/kernel/qpalette.cpp | 2 +- src/kernel/qpalette.h | 2 +- src/kernel/qpen.h | 2 +- src/kernel/qpicture.cpp | 6 +- src/kernel/qpicture.h | 2 +- src/kernel/qpixmap.cpp | 2 +- src/kernel/qpixmap.h | 2 +- src/kernel/qpixmap_x11.cpp | 2 +- src/kernel/qpixmapcache.cpp | 2 +- src/kernel/qpixmapcache.h | 2 +- src/kernel/qpngio.cpp | 6 +- src/kernel/qpngio.h | 2 +- src/kernel/qpoint.cpp | 2 +- src/kernel/qpoint.h | 2 +- src/kernel/qpointarray.cpp | 2 +- src/kernel/qpointarray.h | 2 +- src/kernel/qpolygonscanner.cpp | 2 +- src/kernel/qpolygonscanner.h | 2 +- src/kernel/qprinter.cpp | 4 +- src/kernel/qprinter.h | 2 +- src/kernel/qprinter_p.h | 2 +- src/kernel/qprinter_unix.cpp | 2 +- src/kernel/qprocess.cpp | 10 +-- src/kernel/qprocess.h | 2 +- src/kernel/qprocess_unix.cpp | 2 +- src/kernel/qpsprinter.cpp | 4 +- src/kernel/qpsprinter_p.h | 2 +- src/kernel/qrect.cpp | 2 +- src/kernel/qrect.h | 2 +- src/kernel/qregion.cpp | 2 +- src/kernel/qregion.h | 4 +- src/kernel/qregion_x11.cpp | 2 +- src/kernel/qrichtext.cpp | 8 +-- src/kernel/qrichtext_p.cpp | 2 +- src/kernel/qrichtext_p.h | 2 +- src/kernel/qscriptengine.cpp | 2 +- src/kernel/qscriptengine_p.h | 2 +- src/kernel/qscriptengine_x11.cpp | 4 +- src/kernel/qsession.h | 2 +- src/kernel/qsessionmanager.h | 2 +- src/kernel/qsharedmemory_p.cpp | 2 +- src/kernel/qsharedmemory_p.h | 2 +- src/kernel/qsignal.cpp | 2 +- src/kernel/qsignal.h | 2 +- src/kernel/qsignalmapper.cpp | 2 +- src/kernel/qsignalmapper.h | 2 +- src/kernel/qsignalslotimp.h | 2 +- src/kernel/qsimplerichtext.cpp | 2 +- src/kernel/qsimplerichtext.h | 2 +- src/kernel/qsize.cpp | 2 +- src/kernel/qsize.h | 2 +- src/kernel/qsizegrip.cpp | 2 +- src/kernel/qsizegrip.h | 2 +- src/kernel/qsizepolicy.h | 2 +- src/kernel/qsocketnotifier.cpp | 2 +- src/kernel/qsocketnotifier.h | 2 +- src/kernel/qsound.cpp | 4 +- src/kernel/qsound.h | 2 +- src/kernel/qsound_x11.cpp | 2 +- src/kernel/qstyle.cpp | 22 +++--- src/kernel/qstyle.h | 2 +- src/kernel/qstylesheet.cpp | 2 +- src/kernel/qstylesheet.h | 2 +- src/kernel/qt_gfx.pri | 4 +- src/kernel/qt_x11_p.h | 2 +- src/kernel/qtextengine.cpp | 2 +- src/kernel/qtextengine_p.h | 2 +- src/kernel/qtextengine_unix.cpp | 2 +- src/kernel/qtextlayout.cpp | 2 +- src/kernel/qtextlayout_p.h | 2 +- src/kernel/qthread.cpp | 2 +- src/kernel/qthread.h | 2 +- src/kernel/qthread_unix.cpp | 2 +- src/kernel/qtimer.cpp | 2 +- src/kernel/qtimer.h | 2 +- src/kernel/qtranslator.cpp | 4 +- src/kernel/qtranslator.h | 2 +- src/kernel/qucomextra.cpp | 2 +- src/kernel/qucomextra_p.h | 2 +- src/kernel/qurl.cpp | 4 +- src/kernel/qurl.h | 2 +- src/kernel/qurlinfo.cpp | 2 +- src/kernel/qurlinfo.h | 2 +- src/kernel/qurloperator.cpp | 2 +- src/kernel/qurloperator.h | 2 +- src/kernel/qvariant.cpp | 2 +- src/kernel/qvariant.h | 2 +- src/kernel/qvfbhdr.h | 2 +- src/kernel/qwidget.cpp | 4 +- src/kernel/qwidget.h | 2 +- src/kernel/qwidget_p.h | 2 +- src/kernel/qwidget_x11.cpp | 2 +- src/kernel/qwidgetcreate_x11.cpp | 2 +- src/kernel/qwidgetintdict.h | 2 +- src/kernel/qwidgetlist.h | 2 +- src/kernel/qwindow.cpp | 2 +- src/kernel/qwindow.h | 2 +- src/kernel/qwindowdefs.h | 2 +- src/kernel/qwmatrix.cpp | 2 +- src/kernel/qwmatrix.h | 2 +- src/moc/moc.l | 2 +- src/moc/moc.y | 2 +- src/moc/moc_lex.cpp | 2 +- src/network/qdns.cpp | 2 +- src/network/qdns.h | 2 +- src/network/qftp.cpp | 2 +- src/network/qftp.h | 2 +- src/network/qhostaddress.cpp | 2 +- src/network/qhostaddress.h | 2 +- src/network/qhttp.cpp | 4 +- src/network/qhttp.h | 2 +- src/network/qnetwork.cpp | 2 +- src/network/qnetwork.h | 2 +- src/network/qserversocket.cpp | 2 +- src/network/qserversocket.h | 2 +- src/network/qsocket.cpp | 4 +- src/network/qsocket.h | 2 +- src/network/qsocketdevice.cpp | 2 +- src/network/qsocketdevice.h | 2 +- src/network/qsocketdevice_unix.cpp | 2 +- src/opengl/qgl.cpp | 12 ++-- src/opengl/qgl.h | 2 +- src/opengl/qgl_x11.cpp | 4 +- src/opengl/qgl_x11_p.h | 2 +- src/opengl/qglcolormap.cpp | 2 +- src/opengl/qglcolormap.h | 2 +- src/sql/README.module | 2 +- src/sql/drivers/cache/qsqlcachedresult.cpp | 2 +- src/sql/drivers/cache/qsqlcachedresult.h | 2 +- src/sql/drivers/ibase/qsql_ibase.h | 2 +- src/sql/drivers/mysql/qsql_mysql.cpp | 2 +- src/sql/drivers/mysql/qsql_mysql.h | 2 +- src/sql/drivers/odbc/qsql_odbc.cpp | 28 ++++---- src/sql/drivers/odbc/qsql_odbc.h | 2 +- src/sql/drivers/psql/qsql_psql.cpp | 2 +- src/sql/drivers/psql/qsql_psql.h | 2 +- src/sql/qdatabrowser.cpp | 2 +- src/sql/qdatabrowser.h | 2 +- src/sql/qdatatable.cpp | 2 +- src/sql/qdatatable.h | 2 +- src/sql/qdataview.cpp | 2 +- src/sql/qdataview.h | 2 +- src/sql/qeditorfactory.cpp | 2 +- src/sql/qeditorfactory.h | 2 +- src/sql/qsql.cpp | 2 +- src/sql/qsql.h | 2 +- src/sql/qsqlcursor.cpp | 4 +- src/sql/qsqlcursor.h | 2 +- src/sql/qsqldatabase.cpp | 8 +-- src/sql/qsqldatabase.h | 2 +- src/sql/qsqldriver.cpp | 2 +- src/sql/qsqldriver.h | 2 +- src/sql/qsqldriverinterface_p.h | 2 +- src/sql/qsqldriverplugin.cpp | 4 +- src/sql/qsqldriverplugin.h | 2 +- src/sql/qsqleditorfactory.cpp | 2 +- src/sql/qsqleditorfactory.h | 2 +- src/sql/qsqlerror.cpp | 2 +- src/sql/qsqlerror.h | 2 +- src/sql/qsqlextension_p.cpp | 2 +- src/sql/qsqlextension_p.h | 2 +- src/sql/qsqlfield.cpp | 24 +++---- src/sql/qsqlfield.h | 4 +- src/sql/qsqlform.cpp | 2 +- src/sql/qsqlform.h | 2 +- src/sql/qsqlindex.cpp | 2 +- src/sql/qsqlindex.h | 2 +- src/sql/qsqlmanager_p.cpp | 2 +- src/sql/qsqlmanager_p.h | 2 +- src/sql/qsqlpropertymap.cpp | 2 +- src/sql/qsqlpropertymap.h | 2 +- src/sql/qsqlquery.cpp | 6 +- src/sql/qsqlquery.h | 2 +- src/sql/qsqlrecord.cpp | 2 +- src/sql/qsqlrecord.h | 2 +- src/sql/qsqlresult.cpp | 2 +- src/sql/qsqlresult.h | 2 +- src/sql/qsqlselectcursor.cpp | 2 +- src/sql/qsqlselectcursor.h | 2 +- src/styles/qcdestyle.cpp | 2 +- src/styles/qcdestyle.h | 2 +- src/styles/qcommonstyle.cpp | 2 +- src/styles/qcommonstyle.h | 2 +- src/styles/qcompactstyle.cpp | 2 +- src/styles/qcompactstyle.h | 2 +- src/styles/qinterlacestyle.cpp | 2 +- src/styles/qinterlacestyle.h | 2 +- src/styles/qmotifplusstyle.cpp | 2 +- src/styles/qmotifplusstyle.h | 2 +- src/styles/qmotifstyle.cpp | 2 +- src/styles/qmotifstyle.h | 2 +- src/styles/qplatinumstyle.cpp | 2 +- src/styles/qplatinumstyle.h | 2 +- src/styles/qsgistyle.cpp | 2 +- src/styles/qsgistyle.h | 2 +- src/styles/qstylefactory.cpp | 2 +- src/styles/qstylefactory.h | 2 +- src/styles/qstyleinterface_p.h | 2 +- src/styles/qstyleplugin.cpp | 4 +- src/styles/qstyleplugin.h | 2 +- src/styles/qt_styles.pri | 20 +++--- src/styles/qwindowsstyle.cpp | 2 +- src/styles/qwindowsstyle.h | 2 +- src/table/qtable.cpp | 10 +-- src/table/qtable.h | 2 +- src/tools/qasciicache.h | 2 +- src/tools/qasciidict.h | 2 +- src/tools/qbitarray.cpp | 6 +- src/tools/qbitarray.h | 2 +- src/tools/qbuffer.cpp | 2 +- src/tools/qbuffer.h | 2 +- src/tools/qcache.h | 2 +- src/tools/qcleanuphandler.h | 2 +- src/tools/qcom_p.h | 2 +- src/tools/qcomlibrary.cpp | 2 +- src/tools/qcomlibrary_p.h | 2 +- src/tools/qcomponentfactory.cpp | 2 +- src/tools/qcomponentfactory_p.h | 2 +- src/tools/qconfig-small.h | 2 +- src/tools/qcriticalsection_p.cpp | 2 +- src/tools/qcriticalsection_p.h | 2 +- src/tools/qcstring.cpp | 2 +- src/tools/qcstring.h | 2 +- src/tools/qdatastream.cpp | 6 +- src/tools/qdatastream.h | 2 +- src/tools/qdatetime.cpp | 2 +- src/tools/qdatetime.h | 2 +- src/tools/qdeepcopy.cpp | 2 +- src/tools/qdeepcopy.h | 2 +- src/tools/qdict.h | 2 +- src/tools/qdir.cpp | 2 +- src/tools/qdir.h | 2 +- src/tools/qdir_p.h | 2 +- src/tools/qdir_unix.cpp | 2 +- src/tools/qfile.cpp | 2 +- src/tools/qfile.h | 2 +- src/tools/qfile_unix.cpp | 2 +- src/tools/qfiledefs_p.h | 2 +- src/tools/qfileinfo.cpp | 2 +- src/tools/qfileinfo.h | 2 +- src/tools/qfileinfo_unix.cpp | 2 +- src/tools/qgarray.cpp | 2 +- src/tools/qgarray.h | 2 +- src/tools/qgcache.cpp | 2 +- src/tools/qgcache.h | 2 +- src/tools/qgdict.cpp | 2 +- src/tools/qgdict.h | 2 +- src/tools/qgeneric.h | 2 +- src/tools/qglist.cpp | 4 +- src/tools/qglist.h | 2 +- src/tools/qglobal.cpp | 2 +- src/tools/qglobal.h | 6 +- src/tools/qgpluginmanager.cpp | 8 +-- src/tools/qgpluginmanager_p.h | 2 +- src/tools/qgvector.cpp | 4 +- src/tools/qgvector.h | 2 +- src/tools/qintcache.h | 2 +- src/tools/qintdict.h | 2 +- src/tools/qiodevice.cpp | 2 +- src/tools/qiodevice.h | 2 +- src/tools/qlibrary.cpp | 4 +- src/tools/qlibrary.h | 2 +- src/tools/qlibrary_p.h | 2 +- src/tools/qlibrary_unix.cpp | 2 +- src/tools/qlocale.cpp | 4 +- src/tools/qlocale.h | 2 +- src/tools/qlocale_p.h | 2 +- src/tools/qmap.cpp | 2 +- src/tools/qmap.h | 2 +- src/tools/qmemarray.h | 2 +- src/tools/qmutex.h | 2 +- src/tools/qmutex_p.h | 2 +- src/tools/qmutex_unix.cpp | 2 +- src/tools/qmutexpool.cpp | 2 +- src/tools/qmutexpool_p.h | 2 +- src/tools/qpair.h | 2 +- src/tools/qpluginmanager_p.h | 2 +- src/tools/qptrcollection.cpp | 4 +- src/tools/qptrcollection.h | 2 +- src/tools/qptrdict.h | 2 +- src/tools/qptrlist.h | 2 +- src/tools/qptrqueue.h | 2 +- src/tools/qptrstack.h | 2 +- src/tools/qptrvector.h | 2 +- src/tools/qregexp.cpp | 6 +- src/tools/qregexp.h | 2 +- src/tools/qsemaphore.cpp | 2 +- src/tools/qsemaphore.h | 2 +- src/tools/qsettings.cpp | 4 +- src/tools/qsettings.h | 2 +- src/tools/qsettings_p.h | 2 +- src/tools/qshared.h | 2 +- src/tools/qsortedlist.h | 2 +- src/tools/qstring.cpp | 6 +- src/tools/qstring.h | 2 +- src/tools/qstringlist.cpp | 4 +- src/tools/qstringlist.h | 2 +- src/tools/qstrlist.h | 2 +- src/tools/qstrvec.h | 2 +- src/tools/qtextstream.cpp | 6 +- src/tools/qtextstream.h | 2 +- src/tools/qthreadinstance_p.h | 2 +- src/tools/qthreadstorage.h | 2 +- src/tools/qthreadstorage_unix.cpp | 2 +- src/tools/qtl.h | 2 +- src/tools/qucom.cpp | 2 +- src/tools/qucom_p.h | 2 +- src/tools/qunicodetables.cpp | 2 +- src/tools/qunicodetables_p.h | 2 +- src/tools/quuid.cpp | 2 +- src/tools/quuid.h | 2 +- src/tools/qvaluelist.h | 2 +- src/tools/qvaluestack.h | 2 +- src/tools/qvaluevector.h | 2 +- src/tools/qwaitcondition.h | 2 +- src/tools/qwaitcondition_unix.cpp | 2 +- src/tools/qwinexport.h | 2 +- src/widgets/qaction.cpp | 4 +- src/widgets/qaction.h | 2 +- src/widgets/qbutton.cpp | 2 +- src/widgets/qbutton.h | 2 +- src/widgets/qbuttongroup.cpp | 2 +- src/widgets/qbuttongroup.h | 2 +- src/widgets/qcheckbox.cpp | 2 +- src/widgets/qcheckbox.h | 2 +- src/widgets/qcombobox.cpp | 2 +- src/widgets/qcombobox.h | 2 +- src/widgets/qdatetimeedit.cpp | 2 +- src/widgets/qdatetimeedit.h | 2 +- src/widgets/qdial.cpp | 2 +- src/widgets/qdial.h | 2 +- src/widgets/qdialogbuttons.cpp | 2 +- src/widgets/qdialogbuttons_p.h | 2 +- src/widgets/qdockarea.cpp | 4 +- src/widgets/qdockarea.h | 2 +- src/widgets/qdockwindow.cpp | 8 +-- src/widgets/qdockwindow.h | 2 +- src/widgets/qeffects.cpp | 2 +- src/widgets/qeffects_p.h | 2 +- src/widgets/qframe.cpp | 2 +- src/widgets/qframe.h | 2 +- src/widgets/qgrid.cpp | 2 +- src/widgets/qgrid.h | 2 +- src/widgets/qgridview.cpp | 2 +- src/widgets/qgridview.h | 2 +- src/widgets/qgroupbox.cpp | 2 +- src/widgets/qgroupbox.h | 2 +- src/widgets/qhbox.cpp | 2 +- src/widgets/qhbox.h | 2 +- src/widgets/qhbuttongroup.cpp | 2 +- src/widgets/qhbuttongroup.h | 2 +- src/widgets/qheader.cpp | 2 +- src/widgets/qheader.h | 2 +- src/widgets/qhgroupbox.cpp | 2 +- src/widgets/qhgroupbox.h | 2 +- src/widgets/qlabel.cpp | 2 +- src/widgets/qlabel.h | 2 +- src/widgets/qlcdnumber.cpp | 2 +- src/widgets/qlcdnumber.h | 2 +- src/widgets/qlineedit.cpp | 30 ++++---- src/widgets/qlineedit.h | 2 +- src/widgets/qlistbox.cpp | 10 +-- src/widgets/qlistbox.h | 2 +- src/widgets/qlistview.cpp | 8 +-- src/widgets/qlistview.h | 2 +- src/widgets/qmainwindow.cpp | 4 +- src/widgets/qmainwindow.h | 2 +- src/widgets/qmenubar.cpp | 4 +- src/widgets/qmenubar.h | 2 +- src/widgets/qmenudata.cpp | 2 +- src/widgets/qmenudata.h | 2 +- src/widgets/qmultilineedit.cpp | 4 +- src/widgets/qmultilineedit.h | 2 +- src/widgets/qpopupmenu.cpp | 4 +- src/widgets/qpopupmenu.h | 2 +- src/widgets/qprogressbar.cpp | 2 +- src/widgets/qprogressbar.h | 2 +- src/widgets/qpushbutton.cpp | 2 +- src/widgets/qpushbutton.h | 2 +- src/widgets/qradiobutton.cpp | 2 +- src/widgets/qradiobutton.h | 2 +- src/widgets/qrangecontrol.cpp | 2 +- src/widgets/qrangecontrol.h | 2 +- src/widgets/qscrollbar.cpp | 2 +- src/widgets/qscrollbar.h | 2 +- src/widgets/qscrollview.cpp | 2 +- src/widgets/qscrollview.h | 2 +- src/widgets/qslider.cpp | 2 +- src/widgets/qslider.h | 2 +- src/widgets/qspinbox.cpp | 2 +- src/widgets/qspinbox.h | 2 +- src/widgets/qspinwidget.cpp | 2 +- src/widgets/qsplashscreen.cpp | 2 +- src/widgets/qsplashscreen.h | 2 +- src/widgets/qsplitter.cpp | 2 +- src/widgets/qsplitter.h | 2 +- src/widgets/qstatusbar.cpp | 2 +- src/widgets/qstatusbar.h | 2 +- src/widgets/qsyntaxhighlighter.cpp | 4 +- src/widgets/qsyntaxhighlighter.h | 2 +- src/widgets/qsyntaxhighlighter_p.h | 2 +- src/widgets/qtabbar.cpp | 2 +- src/widgets/qtabbar.h | 2 +- src/widgets/qtabwidget.cpp | 2 +- src/widgets/qtabwidget.h | 2 +- src/widgets/qtextbrowser.cpp | 2 +- src/widgets/qtextbrowser.h | 2 +- src/widgets/qtextedit.cpp | 6 +- src/widgets/qtextedit.h | 2 +- src/widgets/qtextview.cpp | 2 +- src/widgets/qtextview.h | 2 +- src/widgets/qtitlebar.cpp | 2 +- src/widgets/qtitlebar_p.h | 2 +- src/widgets/qtoolbar.cpp | 2 +- src/widgets/qtoolbar.h | 2 +- src/widgets/qtoolbox.cpp | 2 +- src/widgets/qtoolbox.h | 2 +- src/widgets/qtoolbutton.cpp | 2 +- src/widgets/qtoolbutton.h | 2 +- src/widgets/qtooltip.cpp | 4 +- src/widgets/qtooltip.h | 2 +- src/widgets/qvalidator.cpp | 4 +- src/widgets/qvalidator.h | 2 +- src/widgets/qvbox.cpp | 2 +- src/widgets/qvbox.h | 2 +- src/widgets/qvbuttongroup.cpp | 2 +- src/widgets/qvbuttongroup.h | 2 +- src/widgets/qvgroupbox.cpp | 2 +- src/widgets/qvgroupbox.h | 2 +- src/widgets/qwhatsthis.cpp | 2 +- src/widgets/qwhatsthis.h | 2 +- src/widgets/qwidgetinterface_p.h | 2 +- src/widgets/qwidgetplugin.cpp | 4 +- src/widgets/qwidgetplugin.h | 2 +- src/widgets/qwidgetresizehandler.cpp | 2 +- src/widgets/qwidgetresizehandler_p.h | 2 +- src/widgets/qwidgetstack.cpp | 2 +- src/widgets/qwidgetstack.h | 2 +- src/workspace/qworkspace.cpp | 2 +- src/workspace/qworkspace.h | 2 +- src/xml/qdom.cpp | 6 +- src/xml/qdom.h | 2 +- src/xml/qsvgdevice.cpp | 4 +- src/xml/qsvgdevice_p.h | 2 +- src/xml/qxml.cpp | 8 +-- src/xml/qxml.h | 2 +- tools/assistant/LICENSE.GPL | 6 +- tools/assistant/book/assistant.leaf | 2 +- tools/assistant/config.cpp | 2 +- tools/assistant/config.h | 2 +- tools/assistant/docuparser.cpp | 2 +- tools/assistant/docuparser.h | 2 +- tools/assistant/finddialog.ui | 2 +- tools/assistant/finddialog.ui.h | 2 +- tools/assistant/helpdialog.ui | 2 +- tools/assistant/helpdialogimpl.cpp | 2 +- tools/assistant/helpdialogimpl.h | 2 +- tools/assistant/helpwindow.cpp | 2 +- tools/assistant/helpwindow.h | 2 +- tools/assistant/index.cpp | 2 +- tools/assistant/index.h | 2 +- tools/assistant/lib/qassistantclient.cpp | 4 +- tools/assistant/lib/qassistantclient.h | 2 +- tools/assistant/main.cpp | 2 +- tools/assistant/mainwindow.ui | 2 +- tools/assistant/mainwindow.ui.h | 2 +- tools/assistant/profile.cpp | 2 +- tools/assistant/profile.h | 2 +- tools/assistant/settingsdialog.ui | 2 +- tools/assistant/settingsdialogimpl.cpp | 2 +- tools/assistant/settingsdialogimpl.h | 2 +- tools/assistant/tabbedbrowser.ui | 2 +- tools/assistant/topicchooser.ui | 2 +- tools/assistant/topicchooserimpl.cpp | 2 +- tools/assistant/topicchooserimpl.h | 2 +- tools/designer/LICENSE.GPL | 6 +- tools/designer/app/main.cpp | 2 +- tools/designer/designer/about.ui | 2 +- tools/designer/designer/actiondnd.cpp | 2 +- tools/designer/designer/actiondnd.h | 2 +- tools/designer/designer/actioneditor.ui | 2 +- tools/designer/designer/actioneditorimpl.cpp | 2 +- tools/designer/designer/actioneditorimpl.h | 2 +- tools/designer/designer/actionlistview.cpp | 2 +- tools/designer/designer/actionlistview.h | 2 +- tools/designer/designer/asciivalidator.cpp | 2 +- tools/designer/designer/asciivalidator.h | 2 +- tools/designer/designer/command.cpp | 2 +- tools/designer/designer/command.h | 2 +- .../designer/designer/configtoolboxdialog.ui | 2 +- .../designer/configtoolboxdialog.ui.h | 2 +- tools/designer/designer/connectiondialog.ui | 2 +- tools/designer/designer/connectionitems.cpp | 2 +- tools/designer/designer/connectionitems.h | 2 +- tools/designer/designer/connectiontable.cpp | 2 +- tools/designer/designer/connectiontable.h | 2 +- tools/designer/designer/createtemplate.ui | 2 +- tools/designer/designer/customwidgeteditor.ui | 2 +- .../designer/customwidgeteditorimpl.cpp | 2 +- .../designer/customwidgeteditorimpl.h | 2 +- tools/designer/designer/database.cpp | 2 +- tools/designer/designer/database.h | 2 +- tools/designer/designer/database2.h | 2 +- tools/designer/designer/dbconnection.ui | 2 +- tools/designer/designer/dbconnectioneditor.ui | 2 +- tools/designer/designer/dbconnectionimpl.cpp | 2 +- tools/designer/designer/dbconnectionimpl.h | 2 +- tools/designer/designer/dbconnections.ui | 2 +- tools/designer/designer/dbconnectionsimpl.cpp | 2 +- tools/designer/designer/dbconnectionsimpl.h | 2 +- tools/designer/designer/defs.cpp | 2 +- tools/designer/designer/defs.h | 2 +- tools/designer/designer/designer_de.ts | 2 +- tools/designer/designer/designer_fr.ts | 2 +- tools/designer/designer/designerapp.cpp | 2 +- tools/designer/designer/designerapp.h | 2 +- tools/designer/designer/designerappiface.cpp | 2 +- tools/designer/designer/designerappiface.h | 2 +- tools/designer/designer/editfunctions.ui | 2 +- tools/designer/designer/editfunctionsimpl.cpp | 2 +- tools/designer/designer/editfunctionsimpl.h | 2 +- tools/designer/designer/finddialog.ui | 2 +- tools/designer/designer/finddialog.ui.h | 2 +- tools/designer/designer/formfile.cpp | 2 +- tools/designer/designer/formfile.h | 2 +- tools/designer/designer/formsettings.ui | 4 +- tools/designer/designer/formsettingsimpl.cpp | 2 +- tools/designer/designer/formsettingsimpl.h | 2 +- tools/designer/designer/formwindow.cpp | 4 +- tools/designer/designer/formwindow.h | 2 +- tools/designer/designer/gotolinedialog.ui | 2 +- tools/designer/designer/gotolinedialog.ui.h | 2 +- tools/designer/designer/hierarchyview.cpp | 2 +- tools/designer/designer/hierarchyview.h | 2 +- tools/designer/designer/iconvieweditor.ui | 2 +- .../designer/designer/iconvieweditorimpl.cpp | 2 +- tools/designer/designer/iconvieweditorimpl.h | 2 +- tools/designer/designer/layout.cpp | 2 +- tools/designer/designer/layout.h | 2 +- tools/designer/designer/listboxdnd.cpp | 2 +- tools/designer/designer/listboxdnd.h | 2 +- tools/designer/designer/listboxeditor.ui | 2 +- tools/designer/designer/listboxeditorimpl.cpp | 2 +- tools/designer/designer/listboxeditorimpl.h | 2 +- tools/designer/designer/listboxrename.cpp | 2 +- tools/designer/designer/listboxrename.h | 2 +- tools/designer/designer/listdnd.cpp | 2 +- tools/designer/designer/listdnd.h | 2 +- tools/designer/designer/listeditor.ui | 2 +- tools/designer/designer/listviewdnd.cpp | 2 +- tools/designer/designer/listviewdnd.h | 2 +- tools/designer/designer/listvieweditor.ui | 2 +- .../designer/designer/listvieweditorimpl.cpp | 2 +- tools/designer/designer/listvieweditorimpl.h | 2 +- tools/designer/designer/mainwindow.cpp | 2 +- tools/designer/designer/mainwindow.h | 2 +- tools/designer/designer/mainwindowactions.cpp | 2 +- tools/designer/designer/menubareditor.cpp | 2 +- tools/designer/designer/menubareditor.h | 2 +- tools/designer/designer/metadatabase.cpp | 2 +- tools/designer/designer/metadatabase.h | 2 +- tools/designer/designer/multilineeditor.ui | 2 +- .../designer/designer/multilineeditorimpl.cpp | 2 +- tools/designer/designer/multilineeditorimpl.h | 2 +- tools/designer/designer/newform.ui | 2 +- tools/designer/designer/newformimpl.cpp | 2 +- tools/designer/designer/newformimpl.h | 2 +- tools/designer/designer/orderindicator.cpp | 2 +- tools/designer/designer/orderindicator.h | 2 +- tools/designer/designer/outputwindow.cpp | 2 +- tools/designer/designer/outputwindow.h | 2 +- tools/designer/designer/paletteeditor.ui | 2 +- .../designer/paletteeditoradvanced.ui | 2 +- .../designer/paletteeditoradvancedimpl.cpp | 2 +- .../designer/paletteeditoradvancedimpl.h | 2 +- tools/designer/designer/paletteeditorimpl.cpp | 2 +- tools/designer/designer/paletteeditorimpl.h | 2 +- tools/designer/designer/pixmapchooser.cpp | 2 +- tools/designer/designer/pixmapchooser.h | 2 +- tools/designer/designer/pixmapcollection.cpp | 2 +- tools/designer/designer/pixmapcollection.h | 2 +- .../designer/pixmapcollectioneditor.ui | 2 +- .../designer/pixmapcollectioneditor.ui.h | 2 +- tools/designer/designer/pixmapfunction.ui | 2 +- tools/designer/designer/popupmenueditor.cpp | 2 +- tools/designer/designer/popupmenueditor.h | 2 +- tools/designer/designer/preferences.ui | 2 +- tools/designer/designer/previewframe.cpp | 2 +- tools/designer/designer/previewframe.h | 2 +- tools/designer/designer/previewwidget.ui | 2 +- tools/designer/designer/previewwidgetimpl.cpp | 2 +- tools/designer/designer/previewwidgetimpl.h | 2 +- tools/designer/designer/project.cpp | 2 +- tools/designer/designer/project.h | 2 +- tools/designer/designer/projectsettings.ui | 2 +- .../designer/designer/projectsettingsimpl.cpp | 2 +- tools/designer/designer/projectsettingsimpl.h | 2 +- tools/designer/designer/propertyeditor.cpp | 2 +- tools/designer/designer/propertyeditor.h | 2 +- tools/designer/designer/propertyobject.cpp | 2 +- tools/designer/designer/qcompletionedit.cpp | 2 +- tools/designer/designer/qcompletionedit.h | 2 +- tools/designer/designer/replacedialog.ui | 2 +- tools/designer/designer/replacedialog.ui.h | 2 +- tools/designer/designer/resource.cpp | 2 +- tools/designer/designer/resource.h | 2 +- tools/designer/designer/richtextfontdialog.ui | 2 +- tools/designer/designer/sizehandle.cpp | 2 +- tools/designer/designer/sizehandle.h | 2 +- tools/designer/designer/sourceeditor.cpp | 2 +- tools/designer/designer/sourceeditor.h | 2 +- tools/designer/designer/sourcefile.cpp | 2 +- tools/designer/designer/sourcefile.h | 2 +- tools/designer/designer/startdialog.ui | 2 +- tools/designer/designer/startdialogimpl.h | 2 +- tools/designer/designer/styledbutton.cpp | 2 +- tools/designer/designer/styledbutton.h | 2 +- .../designer/syntaxhighlighter_html.cpp | 2 +- .../designer/syntaxhighlighter_html.h | 2 +- tools/designer/designer/tableeditor.ui | 2 +- tools/designer/designer/tableeditorimpl.cpp | 2 +- tools/designer/designer/tableeditorimpl.h | 2 +- tools/designer/designer/timestamp.cpp | 2 +- tools/designer/designer/timestamp.h | 2 +- tools/designer/designer/variabledialog.ui | 2 +- .../designer/designer/variabledialogimpl.cpp | 2 +- tools/designer/designer/variabledialogimpl.h | 2 +- tools/designer/designer/widgetaction.cpp | 2 +- tools/designer/designer/widgetaction.h | 2 +- tools/designer/designer/widgetfactory.cpp | 2 +- tools/designer/designer/widgetfactory.h | 2 +- tools/designer/designer/wizardeditor.ui | 2 +- tools/designer/designer/wizardeditorimpl.cpp | 2 +- tools/designer/designer/wizardeditorimpl.h | 2 +- tools/designer/designer/workspace.cpp | 2 +- tools/designer/designer/workspace.h | 2 +- tools/designer/editor/arghintwidget.cpp | 2 +- tools/designer/editor/arghintwidget.h | 2 +- tools/designer/editor/browser.cpp | 2 +- tools/designer/editor/browser.h | 2 +- tools/designer/editor/cindent.cpp | 2 +- tools/designer/editor/cindent.h | 2 +- tools/designer/editor/completion.cpp | 2 +- tools/designer/editor/completion.h | 2 +- tools/designer/editor/conf.cpp | 2 +- tools/designer/editor/conf.h | 2 +- tools/designer/editor/editor.cpp | 2 +- tools/designer/editor/editor.h | 2 +- tools/designer/editor/markerwidget.cpp | 2 +- tools/designer/editor/markerwidget.h | 2 +- tools/designer/editor/paragdata.h | 2 +- tools/designer/editor/parenmatcher.cpp | 2 +- tools/designer/editor/parenmatcher.h | 2 +- tools/designer/editor/preferences.ui | 2 +- tools/designer/editor/preferences.ui.h | 2 +- tools/designer/editor/viewmanager.cpp | 2 +- tools/designer/editor/viewmanager.h | 2 +- tools/designer/editor/yyindent.cpp | 2 +- tools/designer/examples/opengl/glwidget.cpp | 2 +- tools/designer/examples/opengl/glwidget.h | 2 +- tools/designer/examples/opengl/main.cpp | 2 +- tools/designer/interfaces/actioninterface.h | 2 +- .../interfaces/classbrowserinterface.h | 2 +- tools/designer/interfaces/designerinterface.h | 2 +- tools/designer/interfaces/editorinterface.h | 2 +- tools/designer/interfaces/filterinterface.h | 2 +- .../interfaces/interpreterinterface.h | 2 +- tools/designer/interfaces/languageinterface.h | 2 +- .../designer/interfaces/preferenceinterface.h | 2 +- .../interfaces/projectsettingsiface.h | 2 +- .../designer/interfaces/sourcetemplateiface.h | 2 +- .../designer/interfaces/templatewizardiface.h | 2 +- tools/designer/interfaces/widgetinterface.h | 2 +- tools/designer/plugins/cppeditor/common.cpp | 2 +- .../designer/plugins/cppeditor/cppbrowser.cpp | 2 +- tools/designer/plugins/cppeditor/cppbrowser.h | 2 +- .../plugins/cppeditor/cppcompletion.cpp | 2 +- .../plugins/cppeditor/cppcompletion.h | 2 +- .../designer/plugins/cppeditor/cppeditor.cpp | 2 +- tools/designer/plugins/cppeditor/cppeditor.h | 2 +- .../plugins/cppeditor/editorinterfaceimpl.cpp | 2 +- .../plugins/cppeditor/editorinterfaceimpl.h | 2 +- .../cppeditor/languageinterfaceimpl.cpp | 2 +- .../plugins/cppeditor/languageinterfaceimpl.h | 2 +- .../plugins/cppeditor/mainfilesettings.ui | 2 +- .../cppeditor/preferenceinterfaceimpl.cpp | 2 +- .../cppeditor/preferenceinterfaceimpl.h | 2 +- .../plugins/cppeditor/projectsettings.ui | 2 +- .../projectsettingsinterfaceimpl.cpp | 2 +- .../cppeditor/projectsettingsinterfaceimpl.h | 2 +- .../cppeditor/sourcetemplateinterfaceimpl.cpp | 2 +- .../cppeditor/sourcetemplateinterfaceimpl.h | 2 +- .../plugins/cppeditor/syntaxhighliter_cpp.cpp | 2 +- .../plugins/cppeditor/syntaxhighliter_cpp.h | 2 +- tools/designer/plugins/cppeditor/yyreg.cpp | 4 +- tools/designer/plugins/cppeditor/yyreg.h | 2 +- tools/designer/plugins/dlg/dlg2ui.cpp | 2 +- tools/designer/plugins/dlg/dlg2ui.h | 2 +- tools/designer/plugins/dlg/main.cpp | 2 +- tools/designer/plugins/glade/glade2ui.cpp | 2 +- tools/designer/plugins/glade/glade2ui.h | 2 +- tools/designer/plugins/glade/main.cpp | 2 +- tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp | 2 +- tools/designer/plugins/kdevdlg/kdevdlg2ui.h | 2 +- tools/designer/plugins/kdevdlg/main.cpp | 2 +- tools/designer/plugins/rc/main.cpp | 2 +- tools/designer/plugins/rc/rc2ui.cpp | 2 +- tools/designer/plugins/rc/rc2ui.h | 2 +- tools/designer/plugins/wizards/main.cpp | 2 +- .../plugins/wizards/mainwindowwizard.ui | 2 +- .../plugins/wizards/mainwindowwizard.ui.h | 2 +- .../designer/plugins/wizards/sqlformwizard.ui | 2 +- .../plugins/wizards/sqlformwizardimpl.cpp | 2 +- .../plugins/wizards/sqlformwizardimpl.h | 2 +- tools/designer/shared/domtool.cpp | 2 +- tools/designer/shared/domtool.h | 2 +- tools/designer/shared/globaldefs.h | 2 +- tools/designer/shared/parser.cpp | 2 +- tools/designer/shared/parser.h | 2 +- tools/designer/shared/ui2uib.cpp | 2 +- tools/designer/shared/ui2uib.h | 2 +- tools/designer/shared/uib.cpp | 2 +- tools/designer/shared/uib.h | 2 +- tools/designer/shared/widgetdatabase.cpp | 2 +- tools/designer/shared/widgetdatabase.h | 2 +- tools/designer/tools/conv2ui/main.cpp | 2 +- tools/designer/tools/createcw/main.cpp | 2 +- tools/designer/uic/embed.cpp | 2 +- tools/designer/uic/form.cpp | 20 +++--- tools/designer/uic/main.cpp | 2 +- tools/designer/uic/object.cpp | 4 +- tools/designer/uic/subclassing.cpp | 2 +- tools/designer/uic/uic.cpp | 2 +- tools/designer/uic/uic.h | 2 +- tools/designer/uilib/qwidgetfactory.cpp | 2 +- tools/designer/uilib/qwidgetfactory.h | 2 +- tools/designer/uilib/test/main.cpp | 2 +- tools/linguist/LICENSE.GPL | 6 +- tools/linguist/book/linguist-manager.leaf | 6 +- tools/linguist/book/linguist-manual.book | 6 +- tools/linguist/book/linguist-programmer.leaf | 14 ++-- tools/linguist/book/linguist-translator.leaf | 4 +- tools/linguist/linguist/about.ui | 2 +- tools/linguist/linguist/finddialog.cpp | 2 +- tools/linguist/linguist/finddialog.h | 2 +- tools/linguist/linguist/listviews.cpp | 2 +- tools/linguist/linguist/listviews.h | 2 +- tools/linguist/linguist/main.cpp | 2 +- tools/linguist/linguist/msgedit.cpp | 2 +- tools/linguist/linguist/msgedit.h | 2 +- tools/linguist/linguist/phrase.cpp | 2 +- tools/linguist/linguist/phrase.h | 2 +- tools/linguist/linguist/phrasebookbox.cpp | 2 +- tools/linguist/linguist/phrasebookbox.h | 2 +- tools/linguist/linguist/phraselv.cpp | 2 +- tools/linguist/linguist/phraselv.h | 2 +- tools/linguist/linguist/printout.cpp | 2 +- tools/linguist/linguist/printout.h | 2 +- tools/linguist/linguist/simtexth.cpp | 6 +- tools/linguist/linguist/simtexth.h | 2 +- tools/linguist/linguist/statistics.ui | 2 +- tools/linguist/linguist/statistics.ui.h | 2 +- tools/linguist/linguist/trwindow.cpp | 2 +- tools/linguist/linguist/trwindow.h | 2 +- tools/linguist/lrelease/main.cpp | 2 +- tools/linguist/lupdate/fetchtr.cpp | 2 +- tools/linguist/lupdate/main.cpp | 2 +- tools/linguist/lupdate/merge.cpp | 2 +- tools/linguist/lupdate/numberh.cpp | 2 +- tools/linguist/lupdate/sametexth.cpp | 2 +- tools/linguist/qm2ts/main.cpp | 2 +- tools/linguist/qm2ts/qm2ts.1 | 2 +- tools/linguist/shared/metatranslator.cpp | 2 +- tools/linguist/shared/metatranslator.h | 2 +- tools/linguist/shared/proparser.cpp | 2 +- tools/linguist/shared/proparser.h | 2 +- tools/makeqpf/main.cpp | 2 +- tools/mergetr/mergetr.cpp | 2 +- tools/msg2qm/msg2qm.cpp | 2 +- tools/qconfig/LICENSE.GPL | 6 +- tools/qconfig/main.cpp | 2 +- tools/qconfig/main.h | 2 +- tools/qtconfig/LICENSE.GPL | 6 +- tools/qtconfig/colorbutton.cpp | 2 +- tools/qtconfig/colorbutton.h | 2 +- tools/qtconfig/main.cpp | 2 +- tools/qtconfig/mainwindow.cpp | 4 +- tools/qtconfig/mainwindow.h | 2 +- tools/qtconfig/mainwindowbase.ui | 2 +- tools/qtconfig/paletteeditoradvanced.cpp | 2 +- tools/qtconfig/paletteeditoradvanced.h | 2 +- tools/qtconfig/paletteeditoradvancedbase.ui | 2 +- tools/qtconfig/previewframe.cpp | 2 +- tools/qtconfig/previewframe.h | 2 +- tools/qtconfig/previewwidget.cpp | 2 +- tools/qtconfig/previewwidget.h | 2 +- tools/qtconfig/previewwidgetbase.ui | 2 +- tools/qvfb/LICENSE.GPL | 6 +- tools/qvfb/config.ui | 2 +- tools/qvfb/gammaview.h | 2 +- tools/qvfb/main.cpp | 2 +- tools/qvfb/qanimationwriter.cpp | 2 +- tools/qvfb/qanimationwriter.h | 2 +- tools/qvfb/qvfb.cpp | 2 +- tools/qvfb/qvfb.h | 2 +- tools/qvfb/qvfbratedlg.cpp | 2 +- tools/qvfb/qvfbratedlg.h | 2 +- tools/qvfb/qvfbview.cpp | 2 +- tools/qvfb/qvfbview.h | 2 +- tools/qvfb/skin.cpp | 2 +- tools/qvfb/skin.h | 2 +- translations/qt_ar.ts | 2 +- translations/qt_ca.ts | 2 +- translations/qt_cs.ts | 2 +- translations/qt_de.ts | 2 +- translations/qt_es.ts | 2 +- translations/qt_fr.ts | 2 +- translations/qt_he.ts | 2 +- translations/qt_it.ts | 2 +- translations/qt_ja.ts | 2 +- translations/qt_nb.ts | 2 +- translations/qt_pt-br.ts | 2 +- translations/qt_ru.ts | 2 +- translations/qt_sk.ts | 2 +- translations/qt_untranslated.ts | 2 +- translations/qt_zh-cn.ts | 2 +- translations/qt_zh-tw.ts | 2 +- 1796 files changed, 2768 insertions(+), 2768 deletions(-) diff --git a/ChangeLog.immodule b/ChangeLog.immodule index 379d5186..114bf662 100644 --- a/ChangeLog.immodule +++ b/ChangeLog.immodule @@ -121,7 +121,7 @@ - (removePostedEvents): New overriding function. This function only removes events that has specified event type. The implementation is copied from original version of the function and modified to - accept event_type. This function is retquired by postIMEvent() + accept event_type. This function is required by postIMEvent() - (setActiveWindow): Enclose immodule specific code by #if defined(Q_WS_X11) @@ -138,12 +138,12 @@ - Remove #include "qinputcontext.h" to reduce compilation dependency - Add 'class QWidget' declaration - Remove inappropriate #ifndef QT_NO_STRINGLIST. QStringList is now - retquired feature for immodule. See also changes of qfeatures.h + required feature for immodule. See also changes of qfeatures.h * src/input/qinputcontextfactory.cpp - Add #include "qinputcontext.h" - Remove unnecessary #include "qpopupmenu.h" - Remove inappropriate #ifndef QT_NO_STRINGLIST. QStringList is now - retquired feature for immodule. See also changes of qfeatures.h + required feature for immodule. See also changes of qfeatures.h * src/tools/qfeatures.h - Define QT_NO_IM if QT_NO_STRINGLIST is defined @@ -492,7 +492,7 @@ - Follow Trolltech's coding style for Qt3 - Remove unnecessary headers - (UNITIZE): Moved from qsimpleinputcontext.cpp. QT_ prefix is not - retquired since a macro does not pollute symbol space + required since a macro does not pollute symbol space - (struct _ComposeTableElement): Rename to QComposeTableElement - (struct QComposeTableElement): Renamed from _ComposeTableElement - (struct _ComposeTable): Rename to QComposeTable @@ -553,7 +553,7 @@ 2004-08-10 YamaKen * This commit changes the XIM input method into plugin. A little - modification is still retquired to work. See next commit information + modification is still required to work. See next commit information * src/input/qinputcontextfactory.cpp - Remove XIM dependency @@ -581,7 +581,7 @@ - New file * plugins/src/inputmethods/xim/qximinputcontext.h - Moved from src/input/qximinputcontext_p.h. No code changes have - been applied. A little modification is retquired to work. See next + been applied. A little modification is required to work. See next commit information * plugins/src/inputmethods/xim/qximinputcontext_x11.cpp - Moved from src/input/qximinputcontext_x11.cpp. No code changes have @@ -606,7 +606,7 @@ - (setHolderWidget): New override function * src/input/qximinputcontext_x11.cpp - (QXIMInputContext): Split most part of the initialization code - into setHolderWidget() to allow null widget. This is retquired to + into setHolderWidget() to allow null widget. This is required to make imsw-none working properly - (setHolderWidget): New function @@ -1034,7 +1034,7 @@ - (class QInputContext): Modify the class description comment - (filterEvent): Mark the argument as /* const */ to make it const in future - - (reset): Add a retquirement to the function description comment for + - (reset): Add a requirement to the function description comment for reimplementation * src/kernel/qapplication_x11.cpp @@ -1581,7 +1581,7 @@ * src/kernel/qwidget_x11.cpp - (setMicroFocusHint): Replace relative coordinate with - global one for qic->setMicroFocus(). This is retquired to + global one for qic->setMicroFocus(). This is required to share particular IM plugin code with Qt/Embedded * src/widgets/qlineedit.cpp @@ -1679,7 +1679,7 @@ * src/kernel/qinputcontext.h - Remove several pointers to QWidget to share concrete IM implementation code with Qt/Embedded. The IM model of - Qt/Embedded retquires that widgets and input contexts are + Qt/Embedded requires that widgets and input contexts are existing in another process - (QInputContext): Remove the QWidget * arg - (focusWidget, ownerWidget): @@ -1723,7 +1723,7 @@ - (filterEvent): Follow API change of removal of keywidget - (sendIMEvent): Add #ifdef to isolate Qt/X11 dependent code - (sendIMError): New function to hide ownerWidget() from - derived QInputContext. This is retquired to share particular + derived QInputContext. This is required to share particular IM plugin code with Qt/Embedded - (setFocus, unsetFocus): Follow API change @@ -1739,7 +1739,7 @@ focusInputContext() - (getInputContext): Return input context only if isInputMethodEnabled() widget, otherwise returns 0. This - is retquired for proper focus transition handling + is required for proper focus transition handling - (unfocusInputContext): Follow API change of QInputContext::unsetFocus() @@ -1942,7 +1942,7 @@ invocation to follow API change - (translateKeyEventInternal): * Add new arg statefulTranslation to enable duplicate call - within single event loop. This is retquired to support both + within single event loop. This is required to support both QInputContext::filterEvent() and RTL extensions * Restore accidencially omitted qt_mode_switch_remove_mask handling diff --git a/LICENSE.GPL2 b/LICENSE.GPL2 index 1f77c4fc..869c7bd5 100644 --- a/LICENSE.GPL2 +++ b/LICENSE.GPL2 @@ -117,9 +117,9 @@ above, provided that you also meet all of these conditions: these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on - the Program is not retquired to print an announcement.) + the Program is not required to print an announcement.) -These retquirements apply to the modified work as a whole. If +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those @@ -185,7 +185,7 @@ However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - 5. You are not retquired to accept this License, since you have not + 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by diff --git a/LICENSE.GPL3 b/LICENSE.GPL3 index 13687ce5..82922eb7 100644 --- a/LICENSE.GPL3 +++ b/LICENSE.GPL3 @@ -51,7 +51,7 @@ giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and -authors' sake, the GPL retquires that modified versions be marked as +authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. @@ -148,7 +148,7 @@ programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to retquire, +linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. @@ -224,7 +224,7 @@ terms of section 4, provided that you also meet all of these conditions: b) The work must carry prominent notices stating that it is released under this License and any conditions added under section - 7. This retquirement modifies the retquirement in section 4 to + 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this @@ -283,7 +283,7 @@ in one of these ways: d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no - further charge. You need not retquire recipients to copy the + further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) @@ -291,7 +291,7 @@ in one of these ways: clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these retquirements. + available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding @@ -316,7 +316,7 @@ commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information retquired to install +procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object @@ -329,13 +329,13 @@ part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this retquirement does not apply +by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - The retquirement to provide Installation Information does not include a -retquirement to continue to provide support service, warranty, or updates + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and @@ -345,7 +345,7 @@ protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in -source code form), and must retquire no special password or key for +source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. @@ -361,7 +361,7 @@ this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to retquire their own +it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. @@ -410,7 +410,7 @@ where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; -the above retquirements apply either way. +the above requirements apply either way. 8. Termination. @@ -442,10 +442,10 @@ material under section 10. 9. Acceptance Not Required for Having Copies. - You are not retquired to accept this License in order to receive or + You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not retquire acceptance. However, +to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a @@ -489,7 +489,7 @@ by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the retquirements of +patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free @@ -511,7 +511,7 @@ publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner -consistent with the retquirements of this License, to extend the patent +consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work @@ -564,7 +564,7 @@ permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special retquirements of the GNU Affero General Public License, +but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. diff --git a/LICENSE.QPL b/LICENSE.QPL index 48a09cd8..ecdad6ef 100644 --- a/LICENSE.QPL +++ b/LICENSE.QPL @@ -65,7 +65,7 @@ and development of free software which uses the Software. 6. You may develop application programs, reusable components and other software items that link with the original or modified versions of the Software. These items, when distributed, are subject to the following - retquirements: + requirements: a. You must ensure that all recipients of machine-executable forms of these items are also able to receive and use the complete diff --git a/README.immodule b/README.immodule index 62dd8851..d0762189 100644 --- a/README.immodule +++ b/README.immodule @@ -99,7 +99,7 @@ immodule for Qt - set "iiimqcf" that has its own input method switching framework as default, and disable input method selection menu in the context - menu. Such configuration is retquired by some system integrators to + menu. Such configuration is required by some system integrators to provide unified user interface for global input method switching over the desktop diff --git a/changes.immodule b/changes.immodule index 6fcbccd8..15dba6ed 100644 --- a/changes.immodule +++ b/changes.immodule @@ -52,7 +52,7 @@ Build & Install + configure options have been changed for internal reasons. See 'How to install' section of README.immodule -- This version of immodule retquires corresponding version of each +- This version of immodule requires corresponding version of each input method plugins (i.e. update your additional input method plugins) @@ -93,7 +93,7 @@ New features - QInputContext proxying Some methods of QInputContext have been changed to enable - QInputContext proxying. This feature is retquired to implement + QInputContext proxying. This feature is required to implement pluggable input method switcher. @@ -102,7 +102,7 @@ General + QInputContext has been source compatible with Qt4 version. Basic input method plugin can be source compatible without #ifdef. Only - pluggable popup menu retquires #ifdef'ed different code. In addition, + pluggable popup menu requires #ifdef'ed different code. In addition, be careful about use of classes that is deprecated in Qt4. - Our two development tree for Qt3 'Binary Compatible' and 'ALL' have @@ -146,7 +146,7 @@ API Changes in qt-x11-immodule-unified-qt3.3.3-20040910 * QInputContext() Added 'parent' arg to be compatible with Qt4. Since the arg - defaults to 0, no modification of plugins are retquired. + defaults to 0, no modification of plugins are required. * language() * identifierName() diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp index 008f7efe..4700ae62 100644 --- a/config.tests/unix/ipv6/ipv6test.cpp +++ b/config.tests/unix/ipv6/ipv6test.cpp @@ -1,5 +1,5 @@ /* Sample program for configure to test IPv6 support on target -platforms. We check for the retquired IPv6 data structures. */ +platforms. We check for the required IPv6 data structures. */ #if defined(__hpux) #define _HPUX_SOURCE diff --git a/config.tests/x11/opengl.test b/config.tests/x11/opengl.test index 35a3918e..328a7a8b 100755 --- a/config.tests/x11/opengl.test +++ b/config.tests/x11/opengl.test @@ -60,7 +60,7 @@ for L in $LIBS; do if [ "x$F_REASON" = "xthreads" ]; then echo echo "WARNING: $FOUND_LIB is threaded!" - echo "The Qt OpenGL module retquires Qt to be configured with -thread." + echo "The Qt OpenGL module requires Qt to be configured with -thread." echo else [ "$VERBOSE" = "yes" ] && echo " Could not find $L lib anywhere in $LIBDIRS" diff --git a/config.tests/x11/xcursor.test b/config.tests/x11/xcursor.test index f3bd4f00..514e33ca 100755 --- a/config.tests/x11/xcursor.test +++ b/config.tests/x11/xcursor.test @@ -75,7 +75,7 @@ if [ "$XCURSOR" = "yes" ]; then elif [ "$XCURSOR_MAJOR" != "1" ]; then XCURSOR=no [ "$VERBOSE" = "yes" ] && \ - echo " Found Xcursor version $XCURSOR_MAJOR.$XCURSOR_MINOR, version 1.0 or higher retquired." + echo " Found Xcursor version $XCURSOR_MAJOR.$XCURSOR_MINOR, version 1.0 or higher required." else [ "$VERBOSE" = "yes" ] && \ echo " Found Xcursor version $XCURSOR_MAJOR.$XCURSOR_MINOR" diff --git a/config.tests/x11/xrandr.test b/config.tests/x11/xrandr.test index 409fa9ab..66a05c53 100755 --- a/config.tests/x11/xrandr.test +++ b/config.tests/x11/xrandr.test @@ -78,7 +78,7 @@ if [ "$XRANDR" = "yes" ]; then elif [ "$XRANDR_MAJOR" != "1" -o "$XRANDR_MINOR" -lt "1" ]; then XRANDR=no [ "$VERBOSE" = "yes" ] && \ - echo " Found XRandR version $XRANDR_MAJOR.$XRANDR_MINOR, version 1.1 or higher retquired." + echo " Found XRandR version $XRANDR_MAJOR.$XRANDR_MINOR, version 1.1 or higher required." else [ "$VERBOSE" = "yes" ] && \ echo " Found XRandR version $XRANDR_MAJOR.$XRANDR_MINOR" diff --git a/configure b/configure index 681871c7..13ba608a 100755 --- a/configure +++ b/configure @@ -2330,7 +2330,7 @@ Qt/Embedded only: -depths list ....... Comma-separated list of supported bit-per-pixel depths, from: 4, 8, 16, 24, and 32. - (8bpp is retquired by the VGA16 driver) + (8bpp is required by the VGA16 driver) -qt-gfx- ... Enable a graphics in the Qt Library. -plugin-gfx- Enable graphics as a plugin to be diff --git a/doc/3rdparty.doc b/doc/3rdparty.doc index 194a08a6..69991a30 100644 --- a/doc/3rdparty.doc +++ b/doc/3rdparty.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/accel.doc b/doc/accel.doc index 3597eec1..66412418 100644 --- a/doc/accel.doc +++ b/doc/accel.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/annotated.doc b/doc/annotated.doc index 52a16854..4c2131b8 100644 --- a/doc/annotated.doc +++ b/doc/annotated.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/application-walkthrough.doc b/doc/application-walkthrough.doc index 39247a6f..c39abe6f 100644 --- a/doc/application-walkthrough.doc +++ b/doc/application-walkthrough.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -244,7 +244,7 @@ will implement later. Now that we have done the File menu we shift our focus back to the menu bar and insert a separator. From now on further menu bar entries -will be aligned to the right if the windows system style retquires it. +will be aligned to the right if the windows system style requires it. \printline help \printuntil whatsThis diff --git a/doc/canvas.doc b/doc/canvas.doc index f3cf4c48..629aed57 100644 --- a/doc/canvas.doc +++ b/doc/canvas.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -52,7 +52,7 @@ QCanvasItem QCanvasItems \endlink. Canvas items can have an arbitrary shape, size and content, can be freely moved around in the canvas, and can be checked for collisions. Canvas items can be set to move across the canvas automatically and animated canvas items are -supported with QCanvasSprite. (If you retquire 3D graphics see Qt's +supported with QCanvasSprite. (If you require 3D graphics see Qt's \link opengl.html OpenGL module \endlink.) The canvas module uses a document/view model. The \l QCanvasView class diff --git a/doc/changes.doc b/doc/changes.doc index 0f79e217..34ecb37f 100644 --- a/doc/changes.doc +++ b/doc/changes.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -207,7 +207,7 @@ existing code which uses these classes will continue to work. \section2 Regular Expressions Qt has always provided regular expression support, but that support -was pretty much limited to what was retquired in common GUI control +was pretty much limited to what was required in common GUI control elements such as file dialogs. Qt 3.0 introduces a new regular expression engine, QRegExp, that supports most of Perl's regex features and is Unicode based. The most useful additions are support diff --git a/doc/charinput-qws.doc b/doc/charinput-qws.doc index 96be08ec..329026af 100644 --- a/doc/charinput-qws.doc +++ b/doc/charinput-qws.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/classchart.doc b/doc/classchart.doc index 43456bd6..59862ce2 100644 --- a/doc/classchart.doc +++ b/doc/classchart.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/classes.doc b/doc/classes.doc index 580d82f3..6a169eae 100644 --- a/doc/classes.doc +++ b/doc/classes.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/collect.doc b/doc/collect.doc index 604740d7..7e050478 100644 --- a/doc/collect.doc +++ b/doc/collect.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/commercialeditions.doc b/doc/commercialeditions.doc index 31af3c57..438afac7 100644 --- a/doc/commercialeditions.doc +++ b/doc/commercialeditions.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/coordsys.doc b/doc/coordsys.doc index f614116a..01726f39 100644 --- a/doc/coordsys.doc +++ b/doc/coordsys.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/credits.doc b/doc/credits.doc index 58385cd0..de118d86 100644 --- a/doc/credits.doc +++ b/doc/credits.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/customstyles.doc b/doc/customstyles.doc index e3ce114b..0c196da2 100644 --- a/doc/customstyles.doc +++ b/doc/customstyles.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/datastreamformat.doc b/doc/datastreamformat.doc index e2c062fd..fee35173 100644 --- a/doc/datastreamformat.doc +++ b/doc/datastreamformat.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/debug.doc b/doc/debug.doc index 882c8d32..d8779b94 100644 --- a/doc/debug.doc +++ b/doc/debug.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/distributingqt.doc b/doc/distributingqt.doc index b7b24cca..9223eb0d 100644 --- a/doc/distributingqt.doc +++ b/doc/distributingqt.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -43,7 +43,7 @@ This document lists the platform-specific files needed to distribute Qt applications. We do not include any compiler-specific files that -may also be retquired. (See also, \link winsystem.html Window +may also be required. (See also, \link winsystem.html Window System-specific Notes\endlink.) \tableofcontents @@ -85,7 +85,7 @@ version is prefixed with \e {-mt}. \section2 Distributing Plugins -You must include any plugin files retquired by the application. +You must include any plugin files required by the application. Plugins must be put into a subdirectory under a directory known to Qt as a plugin directory. The subdirectory must have the name of the diff --git a/doc/dnd.doc b/doc/dnd.doc index 9bddd90e..45acf8ad 100644 --- a/doc/dnd.doc +++ b/doc/dnd.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/editions.doc b/doc/editions.doc index 1128c968..bc3e65ae 100644 --- a/doc/editions.doc +++ b/doc/editions.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/embclasses.doc b/doc/embclasses.doc index 99d98b1b..f0430818 100644 --- a/doc/embclasses.doc +++ b/doc/embclasses.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -129,7 +129,7 @@ typically 2-20KB in size; they can be mmap'd direct from disk in order to save memory). If a QPF font is found which matches a font request no new QRenderedFont need be created for it. It's possible to strip out all QFontFactory support and simply use QPFs if your font needs are modest -(for instance, if you only retquire a few fixed point sizes). Note that +(for instance, if you only require a few fixed point sizes). Note that no best-match loading is performed with QPFs, as opposed to those loaded via QFontManager, so if you don't have the correct QPF for a point size, text in that size will simply not be displayed. diff --git a/doc/embporting.doc b/doc/embporting.doc index 37e39af6..a066a35f 100644 --- a/doc/embporting.doc +++ b/doc/embporting.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/envvars.doc b/doc/envvars.doc index 950582a5..b2950f11 100644 --- a/doc/envvars.doc +++ b/doc/envvars.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/faq.doc b/doc/faq.doc index e36d7504..5b097da1 100644 --- a/doc/faq.doc +++ b/doc/faq.doc @@ -229,7 +229,7 @@ project. Can we transfer the license to another developer? Yes. Qt licences are for the individual use of named developers. If the developer associated with a licence leaves the organization, or -moves on to another project that does not retquire a Qt license, +moves on to another project that does not require a Qt license, another developer can take over the licence. You can change the name of the developer using a licence at any time, but after a change you must wait at least six (6) months before changing again. @@ -342,7 +342,7 @@ software pool to do so without paying license fees. Although it is possible to write free software for internal use, it is difficult to ensure that such software is used and distributed legally. For example, if your free software -retquires any modules that impose conditions on you that +requires any modules that impose conditions on you that contradict the conditions of the GNU GPL, including, but not limited to, software patents, commercial license agreements, copyrighted interface definitions or any sort of diff --git a/doc/features.doc b/doc/features.doc index f6bf05f4..d049f0b7 100644 --- a/doc/features.doc +++ b/doc/features.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/focus.doc b/doc/focus.doc index fe4ed09f..6ba2c1b4 100644 --- a/doc/focus.doc +++ b/doc/focus.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/framebuffer-howto.doc b/doc/framebuffer-howto.doc index 4c855ddf..e37c22b2 100644 --- a/doc/framebuffer-howto.doc +++ b/doc/framebuffer-howto.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/functions.doc b/doc/functions.doc index 5f813903..266c763c 100644 --- a/doc/functions.doc +++ b/doc/functions.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/headers.doc b/doc/headers.doc index 1b412820..42420e83 100644 --- a/doc/headers.doc +++ b/doc/headers.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/hierarchy.doc b/doc/hierarchy.doc index 0dabdb06..1664efb9 100644 --- a/doc/hierarchy.doc +++ b/doc/hierarchy.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/how-to-learn-qt.doc b/doc/how-to-learn-qt.doc index f93986e5..8c5254fe 100644 --- a/doc/how-to-learn-qt.doc +++ b/doc/how-to-learn-qt.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/doc/html/activeqt-dotnet.html b/doc/html/activeqt-dotnet.html index a65d0d3c..e0cfa0d8 100644 --- a/doc/html/activeqt-dotnet.html +++ b/doc/html/activeqt-dotnet.html @@ -106,7 +106,7 @@ is presented, which includes using a thin MC++ wrapper class around the normal TQt/C++ class. Then, the automated way is presented, which utilizes the ActiveTQt framework as a generic bridge. The advantage of the first method is that it gives the application developer full -control, while the second method retquires less coding and relieves the +control, while the second method requires less coding and relieves the developer of dealing with the conversion between managed and normal data objects.

The impatient reader, who right away wants to see a TQPushButton and a @@ -405,7 +405,7 @@ available to .NET. This has the positive side effect that the same API is automatically available in TQSA, the cross platform scripting solution for TQt applications, and to COM clients in general.

When using the "IJW" method, in priciple the only limitation is the -time retquired to write the wrapper classes and data type conversion +time required to write the wrapper classes and data type conversion functions.

Performance Considerations

diff --git a/doc/html/activeqt-tools-idc.html b/doc/html/activeqt-tools-idc.html index aeec4bee..36ccb3f5 100644 --- a/doc/html/activeqt-tools-idc.html +++ b/doc/html/activeqt-tools-idc.html @@ -59,7 +59,7 @@ type library wll have version x.y. Unregister the COM server dll

It is usually never necessary to invoke IDC manually, as the -qmake build system takes care of adding the retquired post +qmake build system takes care of adding the required post processing steps to the build process. See the ActiveTQt build system documentation for details. diff --git a/doc/html/activeqt-tools-testcon.html b/doc/html/activeqt-tools-testcon.html index ca30181a..eea112aa 100644 --- a/doc/html/activeqt-tools-testcon.html +++ b/doc/html/activeqt-tools-testcon.html @@ -51,7 +51,7 @@ VBScript, Perl and Python to program the controls loaded. Example script files using the TQAxWidget2 class are available in the scripts subdirectory.

Note that the qmake project of this example includes a resource file -testcon.rc with a version resource. This is retquired by some +testcon.rc with a version resource. This is required by some ActiveX controls (ie. Shockwave ActiveX Controls), which might crash or misbehave otherwise if such version information is missing.

To build the tool you must first build the diff --git a/doc/html/assistant-6.html b/doc/html/assistant-6.html index 044ff206..266490db 100644 --- a/doc/html/assistant-6.html +++ b/doc/html/assistant-6.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }

  • Start Page- This property specifies which page TQt Assistant should initially display when the profile is used. Usually, this is the HTML file which contains the documentation's table of contents. This property also describes the default location to go to when pressing the home button in TQt Assistant's main user interface. The start page is specified relative to the location of the profile. The property name is startpage

  • About Menu Text- This property describes the text that appears in the Help menu, e.g. About Application. The property name is aboutmenutext

  • About URL- This property can be used to point to an HTML file that describes the contents in the About dialog that is opened for the Help menu, e.g. About Application. The url is specified relative to the location of the profile. The property name is abouturl

    -

  • TQt Assistant Documentation- This property describes the location of the TQt Assistant documentation. This is retquired since TQt Assistant provides self help, such as the full text search help and the TQt Assistant Manual option in the Help menu. The location is a directory relative to the location of the profile. The property name is assistantdocs.

    +

  • TQt Assistant Documentation- This property describes the location of the TQt Assistant documentation. This is required since TQt Assistant provides self help, such as the full text search help and the TQt Assistant Manual option in the Help menu. The location is a directory relative to the location of the profile. The property name is assistantdocs.

    To define a profile, one needs to specify a TQt Assistant Document Profile, usually abbreviated .adp. The profile is an extension of the Documentation Content File described above. We add a profile tag containing property tags to the format.

    An example of a document profile file is shown below:

    helpdemo.adp

    diff --git a/doc/html/canvas.html b/doc/html/canvas.html index a005896a..2e2dcf10 100644 --- a/doc/html/canvas.html +++ b/doc/html/canvas.html @@ -39,7 +39,7 @@ body { background: #ffffff; color: black; } shape, size and content, can be freely moved around in the canvas, and can be checked for collisions. Canvas items can be set to move across the canvas automatically and animated canvas items are -supported with TQCanvasSprite. (If you retquire 3D graphics see TQt's +supported with TQCanvasSprite. (If you require 3D graphics see TQt's OpenGL module.)

    The canvas module uses a document/view model. The TQCanvasView class is used to show a particular view of a canvas. Multiple views can operate diff --git a/doc/html/commonproblems.html b/doc/html/commonproblems.html index 2c14de6a..9670d1cf 100644 --- a/doc/html/commonproblems.html +++ b/doc/html/commonproblems.html @@ -75,7 +75,7 @@ tools are usually located in the bin subdirectory of TQt distributions. Either run "$QTDIR"/bin/moc and "$QTDIR"/bin/uic or add "$QTDIR"/bin to your PATH and run moc and uic. If you use qmake the appropriate lines will be added to your Makefiles so that uic and -moc will be executed as retquired. +moc will be executed as required.

    Static or shared libraries - Link time

    Programmers need to link with the TQt static or shared libraries. The TQt libraries are usually located in the lib subdirectory of TQt distributions. diff --git a/doc/html/customlayout.html b/doc/html/customlayout.html index b846fe30..188b7f2b 100644 --- a/doc/html/customlayout.html +++ b/doc/html/customlayout.html @@ -136,7 +136,7 @@ TQLayoutIterator CardLayout::iterator() It must be implemented. It is used by TQLayout::add(), by the TQLayout constructor that takes a layout as parent, and it is used to implement the auto-add feature. If your layout -has advanced placement options that retquire parameters, you must +has advanced placement options that require parameters, you must provide extra access functions such as TQGridLayout::addMultiCell(). 

     void CardLayout::addItem( TQLayoutItem *item )
diff --git a/doc/html/designer-manual-1.html b/doc/html/designer-manual-1.html
index 54ac5563..c6153854 100644
--- a/doc/html/designer-manual-1.html
+++ b/doc/html/designer-manual-1.html
@@ -32,12 +32,12 @@ body { background: #ffffff; color: black; }
 
    [Home] [Next: Quick Start]
    
 
    Preface
    
 
    Introduction
    
-
    This manual presents TQt Designer, a tool for designing and implementing user interfaces built with the TQt multiplatform GUI toolkit. TQt Designer makes it easy to experiment with user interface design. At any time you can generate the code retquired to reproduce the user interface from the files TQt Designer produces, changing your design as often as you like. If you used an earlier version you will find yourself immediately productive in the new version since the interface is very similar. And you will also find new widgets and new and improved functionality which have been developed as a result of your feedback.
    
+
    This manual presents TQt Designer, a tool for designing and implementing user interfaces built with the TQt multiplatform GUI toolkit. TQt Designer makes it easy to experiment with user interface design. At any time you can generate the code required to reproduce the user interface from the files TQt Designer produces, changing your design as often as you like. If you used an earlier version you will find yourself immediately productive in the new version since the interface is very similar. And you will also find new widgets and new and improved functionality which have been developed as a result of your feedback.
    
 
    TQt Designer helps you build user interfaces with layout tools that move and scale your widgets (controls in Windows terminology) automatically at runtime. The resulting interfaces are both functional and attractive, comfortably suiting your users' operating environments and preferences. TQt Designer supports TQt's signals and slots mechanism for type-safe communication between widgets. TQt Designer includes a code editor which you can use to embed your own custom slots inside the generated code. Those who prefer to separate generated code from hand crafted code can continue to use the subclassing approach pioneered in the first version of TQt Designer.
    
 
    The manual introduces you to TQt Designer by leading you through the development of example applications. The first seven chapters are tutorials, each designed to be as self-contained as possible. Every chapter, except the first three, assumes that you are familiar with the material in chapters two and three which cover the basics of building a TQt application with TQt Designer. Here's a brief overview of the chapters:
    
 
    • Chapter one, Quick Start, is a fast hands-on tutorial that takes you through the creation of a short, simple dialog application. The aim of this chapter is to give you a feel for how TQt Designer works, with explanations and details deferred to later chapters.
      
 
    • Chapter two, Creating a Main Window Application, introduces TQt Designer and takes you step by step through the creation of a small but fully functional application. Along the way you will learn how to create a main window with menus, toolbars and a status bar. Most of the application's implementation will be covered, but the custom dialogs are deferred until chapter three. In the course of this chapter you will use the form and property editors to customize the application. You'll also learn how to use TQt's signals and slots mechanism and TQt Designer's built-in code editor to make the application functional. We will also explain how to use qmake to generate a Makefile so that you can compile and run the application.
      
-
    • In chapter three, Creating Dialogs, we will create the custom dialogs retquired by the main window application created in chapter two. In addition to demonstrating various ways of creating dialogs, you will also learn how to lay out forms using the layout tools.
      
+
    • In chapter three, Creating Dialogs, we will create the custom dialogs required by the main window application created in chapter two. In addition to demonstrating various ways of creating dialogs, you will also learn how to lay out forms using the layout tools.
      
 
    • Chapter four, The Designer Approach, provides information on the TQt Designer approach to developing applications, and explains some of the rationale behind TQt Designer.
      
 
    • Chapter five, Subclassing and Dynamic Dialogs, will show you how to subclass a form; this allows you to clearly separate the user interface from the underlying code that implements its functionality. Additional information on qmake and uic is included in this chapter. This chapter will also explain how you can dynamically load dialogs from .ui files into your application using TQWidgetFactory and how to access the widgets and sub-widgets of these dialogs.
      
 
    • Chapter six, Creating Custom Widgets, explains how you can create your own custom widgets. Both the simple method, that was introduced with the first version of TQt Designer, and the new more powerful method using plugins, are explained.
      
@@ -46,7 +46,7 @@ body { background: #ffffff; color: black; }
 
    The remaining chapters provide reference material that explains TQt Designer's menu options, toolbars, key bindings, dialogs, wizards, and windows in detail.
    
 
    What You Should Know
    
 
    This manual assumes that you have some basic knowledge of C++ and the TQt GUI toolkit. If you need to learn more about C++ or TQt there are a vast number of C++ books available, and a small but increasing number of TQt books. TQt comes with extensive online documentation and many example applications that you can try.
    
-
    The Enterprise Edition of TQt includes the TQt SQL module. In Creating Database Applications we demonstrate how to build SQL applications with TQt Designer; this chapter retquires some knowledge of SQL and relational databases.
    
+
    The Enterprise Edition of TQt includes the TQt SQL module. In Creating Database Applications we demonstrate how to build SQL applications with TQt Designer; this chapter requires some knowledge of SQL and relational databases.
    
 
    What's New in TQt Designer for TQt 3.0?
    
 
    This version of TQt Designer has a great deal more functionality than its predecessor. For example, the code for custom slots can be edited directly in TQt Designer; main windows with actions, toolbars and menus can be created; layouts that incorporate splitters can be used; and plugins allow you to package any number of custom widgets and make them available to TQt Designer. Many other enhancements have been incorporated, from small improvements in the user interface to improved efficiency, for example the ability to share pixmaps across all the forms in an application.
    
 
    This version of TQt Designer introduces project files which make it easy to switch between all the forms in an application, and to maintain a common set of database settings and images. Although subclassing is fully supported, writing code directly in TQt Designer offers a number of benefits which are covered in The Designer Approach chapter. A new library, libtqui, has also been introduced which allows you to load dialogs dynamically at runtime from TQt Designer's .ui files. This allows you to provide your application's users with considerable interface customizability without them needing to use C++.
    
diff --git a/doc/html/designer-manual-13.html b/doc/html/designer-manual-13.html
index c52bbb45..19f2fb74 100644
--- a/doc/html/designer-manual-13.html
+++ b/doc/html/designer-manual-13.html
@@ -127,7 +127,7 @@ body { background: #ffffff; color: black; }
 
    
 
    Edit Functions
    
 
    Click Edit|Slots to invoke the Edit Functions dialog. Use this dialog to edit or create slots and functions which are used in conjunction with signals to provide communication between objects.
    
-
    When this dialog is invoked, all existing slots and functions are shown in the listview. The column headers Function, Return Type, Specifier, Access, Type, and In Use provide details about each function that is listed. Click on any of the column headers to sort the functions. To create a new function, click the New Function button. The new function has a default name that you should replace by typing the new name in the 'Function' line edit. The 'Return Type' is also a default that can be changed by typing in the line edit. To change the 'Specifier' or 'Access', click the combobox and choose the retquired specifier or access. To change the type of a function (function or slot), click the Type combobox. To remove a function, click the function you want to delete, and then click the Delete Function button.
    
+
    When this dialog is invoked, all existing slots and functions are shown in the listview. The column headers Function, Return Type, Specifier, Access, Type, and In Use provide details about each function that is listed. Click on any of the column headers to sort the functions. To create a new function, click the New Function button. The new function has a default name that you should replace by typing the new name in the 'Function' line edit. The 'Return Type' is also a default that can be changed by typing in the line edit. To change the 'Specifier' or 'Access', click the combobox and choose the required specifier or access. To change the type of a function (function or slot), click the Type combobox. To remove a function, click the function you want to delete, and then click the Delete Function button.
    
 
    Click OK to save all changes made to the functions. Click Cancel to leave the dialog without making any changes to the functions.
    
 
    View and Edit Connections Dialog
    
 
    
@@ -142,10 +142,10 @@ body { background: #ffffff; color: black; }
 
    Form Settings
    
 
    Click Edit|Form Settings to invoke the Form Settings dialog. Use this dialog to save the form's settings, pixmap, and layout properties.
    
 
    Settings
    
-
    In the Settings section, you can change or add the name of the class that will be created by typing in the 'Class Name' line edit. Note that the default name is the form name, but it can be changed. You can also enter text to the 'Comment' and 'Author' line edits or leave them blank, since they are not retquired.
    
+
    In the Settings section, you can change or add the name of the class that will be created by typing in the 'Class Name' line edit. Note that the default name is the form name, but it can be changed. You can also enter text to the 'Comment' and 'Author' line edits or leave them blank, since they are not required.
    
 
    Pixmaps
    
 
    The default (for projects) is 'Project Imagefile'. This is the recommended option. Images are handled automatically, with TQt Designer storing the images in a subdirectory, and uic producing code that contains the images and the necessary supporting code. Each image is stored just once, no matter how many forms it is used in.
    
-
    If you do not want TQt Designer to handle the images, (or are not using a project) choose either 'Save Inline' or 'Use Function'. 'Save Inline' saves the pixmaps in the .ui files. The disadvantage of this approach is that it stores images in the forms in which they're used, meaning that images cannot be shared across forms. Click 'Use Function' to use your own icon-loader function for loading pixmaps. Type the function's name (with no signature) in the 'Use Function' line edit. This function will be used in the generated code for loading pixmaps. Your function will be called with the text you put in the pixmap property (e.g. the image name) whenever an image is retquired.
    
+
    If you do not want TQt Designer to handle the images, (or are not using a project) choose either 'Save Inline' or 'Use Function'. 'Save Inline' saves the pixmaps in the .ui files. The disadvantage of this approach is that it stores images in the forms in which they're used, meaning that images cannot be shared across forms. Click 'Use Function' to use your own icon-loader function for loading pixmaps. Type the function's name (with no signature) in the 'Use Function' line edit. This function will be used in the generated code for loading pixmaps. Your function will be called with the text you put in the pixmap property (e.g. the image name) whenever an image is required.
    
 
    Layouts
    
 
    Click the 'Default Margin' spinbox or the 'Default Spacing' spinbox to change the default layout settings of the current form.
    
 
    To use the functions in the generated code to dynamically retrieve values for the layout's default margin and spacing, check the Use Functions chechbox. In the Margin and Spacing line edits, specify the function names (no signatures or parantheses) which should be used to retrieve the margin and spacing.
    
@@ -233,7 +233,7 @@ body { background: #ffffff; color: black; }
 
    The Tools Dialog
    
 
    Edit Custom Widgets Dialog
    
 
    The Edit Custom Widgets dialog is invoked by clicking Tools|Custom|Edit Custom Widgets. Use this dialog to create custom widgets.
    
-
    Custom widgets are created in code. They may contain a combination of existing widgets but with additional functionality, slots and signals, or they may be written from scratch, or a mixture of both. A custom widget is often a specialization (subclass) of another widget or a combination of widgets working together or a blend of both these approaches. If you simply want a collection of widgets in a particular configuration it is easiest to create them, select them as a group, and copy and paste them as retquired within TQt Designer. Custom widgets are generally created when you need to add new functionality to existing widgets or groups of widgets. To add create a new widget, click the New Widget button. You will find more information about adding new widgets in the 'Definitions Section'. To load a file which contains descriptions of custom widgets, click the Load Descriptions button. Clicking this button invokes the Open Dialog. To save the descriptions of the listed custom widgets, click the Save Descriptions button, which invokes the Save As Dialog. To delete a widget, click the widget in the listbox and then click the Delete Widget button.
    
+
    Custom widgets are created in code. They may contain a combination of existing widgets but with additional functionality, slots and signals, or they may be written from scratch, or a mixture of both. A custom widget is often a specialization (subclass) of another widget or a combination of widgets working together or a blend of both these approaches. If you simply want a collection of widgets in a particular configuration it is easiest to create them, select them as a group, and copy and paste them as required within TQt Designer. Custom widgets are generally created when you need to add new functionality to existing widgets or groups of widgets. To add create a new widget, click the New Widget button. You will find more information about adding new widgets in the 'Definitions Section'. To load a file which contains descriptions of custom widgets, click the Load Descriptions button. Clicking this button invokes the Open Dialog. To save the descriptions of the listed custom widgets, click the Save Descriptions button, which invokes the Save As Dialog. To delete a widget, click the widget in the listbox and then click the Delete Widget button.
    
 
    Click Close to leave the Edit Custom Widgets dialog.
    
 
    The Definition Tab
    
 
    
diff --git a/doc/html/designer-manual-14.html b/doc/html/designer-manual-14.html
index c58d13c9..471ff732 100644
--- a/doc/html/designer-manual-14.html
+++ b/doc/html/designer-manual-14.html
@@ -43,7 +43,7 @@ body { background: #ffffff; color: black; }
 
    
 
    
 
    Setup Toolbar
    
-
    The 'Setup Toolbar' wizard page is used to populate a toolbar with actions from each of the default action categories. Click the Category combobox to select which set of actions you wish to work on. The Actions listbox lists the actions available for the current category. The Toolbar listbox lists the toolbar buttons you want to create. Click the blue left and right arrow buttons to move actions into or out of the Toolbar list box. Click the blue up and down arrow buttons to move actions up and down within the Toolbar list box. Note that the '<Separator>' item in the Actions list box may be moved to the Toolbar list box as often as retquired and will cause a separator to appear in the finished toolbar.
    
+
    The 'Setup Toolbar' wizard page is used to populate a toolbar with actions from each of the default action categories. Click the Category combobox to select which set of actions you wish to work on. The Actions listbox lists the actions available for the current category. The Toolbar listbox lists the toolbar buttons you want to create. Click the blue left and right arrow buttons to move actions into or out of the Toolbar list box. Click the blue up and down arrow buttons to move actions up and down within the Toolbar list box. Note that the '<Separator>' item in the Actions list box may be moved to the Toolbar list box as often as required and will cause a separator to appear in the finished toolbar.
    
 
    Click Back if you want to return to the 'Choose available menus and toolbars' wizard page. Click Finish to populate the main window and to exit the wizard. Click Cancel on any of the wizard pages to leave the wizard without making any changes.
    
 
    Data Table Wizard
    
 
    The Data Table Wizard is automatically invoked by clicking the datatable widget and placing it on the form. The datatable widget is used to create tabular views of database data.
    
diff --git a/doc/html/designer-manual-16.html b/doc/html/designer-manual-16.html
index 7d472cbc..df37d5e9 100644
--- a/doc/html/designer-manual-16.html
+++ b/doc/html/designer-manual-16.html
@@ -123,7 +123,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
@@ -185,7 +185,7 @@ body { background: #ffffff; color: black; }

    exportmacro

    This tag is only relevant to Windows users.

    -

    If you have a class that retquires some Windows-specific export macro, e.g. for classes in a DLL that need to be declared like this: class win_specific_declaration_goes_here Class, you can use the <exportmacro> tag. (In standard TQt we use the Q_EXPORT macro, e.g. class Q_EXPORT TQWidget.) If you use this tag you must also:

    +

    If you have a class that requires some Windows-specific export macro, e.g. for classes in a DLL that need to be declared like this: class win_specific_declaration_goes_here Class, you can use the <exportmacro> tag. (In standard TQt we use the Q_EXPORT macro, e.g. class Q_EXPORT TQWidget.) If you use this tag you must also:

    1. include the file which contains the macro definition;

    2. add the export macro to the form -- this is achieved by entering the macro's name in the 'export macro' sub-property of the form's name property.

    Following these steps will ensure that uic will create the correct class YOUR_MACRO Form declarations.

    diff --git a/doc/html/designer-manual-3.html b/doc/html/designer-manual-3.html index 4d584665..c46a8a8c 100644 --- a/doc/html/designer-manual-3.html +++ b/doc/html/designer-manual-3.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; }

    Main Window Wizard- Choosing menus and toolbars

    -

  • The Setup Toolbar wizard page is used to populate a toolbar with actions from each of the default action categories. The Category combobox is used to select which set of actions you wish to choose from. The Actions list box lists the actions available for the current category. The Toolbar listbox lists the toolbar buttons you want to create. The blue left and right arrow buttons are used to move actions into or out of the Toolbar list box. The blue up and down arrow buttons are used to move actions up and down within the Toolbar list box. Note that the '<Separator>' item in the Actions list box may be moved to the Toolbar list box as often as retquired and will cause a separator to appear in the finished toolbar.

    +

  • The Setup Toolbar wizard page is used to populate a toolbar with actions from each of the default action categories. The Category combobox is used to select which set of actions you wish to choose from. The Actions list box lists the actions available for the current category. The Toolbar listbox lists the toolbar buttons you want to create. The blue left and right arrow buttons are used to move actions into or out of the Toolbar list box. The blue up and down arrow buttons are used to move actions up and down within the Toolbar list box. Note that the '<Separator>' item in the Actions list box may be moved to the Toolbar list box as often as required and will cause a separator to appear in the finished toolbar.

    Copy the New, Open, and Save Actions to the Toolbar list box. Copy a <Separator> to the Toolbar list box. Change the Category to Edit and copy the Cut, Copy, and Find actions to the Toolbar list box. Click Next and then click Finish.

    Click File|Save and save the form as mainform.ui.

    @@ -126,8 +126,8 @@ body { background: #ffffff; color: black; }

    Object Explorer

    -

    In the original version of TQt Designer if you wanted to provide code for a form you had to subclass the form and put your code in the subclass. This version fully supports the subclassing approach, but now provides an alternative: placing your code directly into forms. Writing code in TQt Designer is not quite the same as subclassing, for example you cannot get direct access to the form's constructor or destructor. If you need code to be executed by the constructor create a slot called void init(); if it exists it will be called from the constructor. Similarly, if you need code to be executed before destruction create a slot called void destroy(). You can also add your own class variables which will be put in the generated constructor's code, and you can add forward declarations and any includes you retquire. To add a variable or declaration, right click the appropriate item, e.g. Class Variables, then click New then enter your text, e.g. TQString m_filename. If one or more items exist, right click to pop up a menu that has New, Edit and Delete options. If you want to enter multiple items, e.g. multiple include files or multiple data members, it is easiest to right click in the relevant section, then click Edit to invoke an Edit dialog. To edit code, just click the name of a function to invoke the code editor. Code editing and creating slots are covered later in the chapter.

    -

    If you subclass the form you create your own .cpp files which can contain your own constructor, destructor, functions, slots, declarations and variables as your retquirements dictate. (See Subclassing for more information.)

    +

    In the original version of TQt Designer if you wanted to provide code for a form you had to subclass the form and put your code in the subclass. This version fully supports the subclassing approach, but now provides an alternative: placing your code directly into forms. Writing code in TQt Designer is not quite the same as subclassing, for example you cannot get direct access to the form's constructor or destructor. If you need code to be executed by the constructor create a slot called void init(); if it exists it will be called from the constructor. Similarly, if you need code to be executed before destruction create a slot called void destroy(). You can also add your own class variables which will be put in the generated constructor's code, and you can add forward declarations and any includes you require. To add a variable or declaration, right click the appropriate item, e.g. Class Variables, then click New then enter your text, e.g. TQString m_filename. If one or more items exist, right click to pop up a menu that has New, Edit and Delete options. If you want to enter multiple items, e.g. multiple include files or multiple data members, it is easiest to right click in the relevant section, then click Edit to invoke an Edit dialog. To edit code, just click the name of a function to invoke the code editor. Code editing and creating slots are covered later in the chapter.

    +

    If you subclass the form you create your own .cpp files which can contain your own constructor, destructor, functions, slots, declarations and variables as your requirements dictate. (See Subclassing for more information.)

    Adding Custom Actions

    We want to provide the user with actions that are specific to our application. We want to provide the ability to switch between the two views we will be offering, and allow the user to add colors and set their preferred options. We'll prepare the way by creating a new menu for the view options and by adding a separator to the toolbar.

    @@ -301,7 +301,7 @@ body { background: #ffffff; color: black; }

    Editing the Code: Setting Up

    -

    There is quite a lot of code to include in the application, but this does not mean that a lot of typing is retquired! All the code is reproduced here so, if you're reading an electronic copy, you can simply cut and paste. If you're reading a print copy, all the code is provided in /tools/designer/examples/colortool; simply open the relevant .ui.h files and copy and paste from there into your own version of the project.

    +

    There is quite a lot of code to include in the application, but this does not mean that a lot of typing is required! All the code is reproduced here so, if you're reading an electronic copy, you can simply cut and paste. If you're reading a print copy, all the code is provided in /tools/designer/examples/colortool; simply open the relevant .ui.h files and copy and paste from there into your own version of the project.

    Cutting & Pasting Into the Code Editor

    If you cut and paste code from this manual, because we've indented the code for readability, the code will be over-indented in TQt Designer. This is easily solved. Simply select the function containing the pasted code (either with the mouse, or Shift+Arrows) and press Tab: this will make TQt Designer fix the indentation. Note that you must select the entire function, including its name and parameters.

    @@ -421,7 +421,7 @@ body { background: #ffffff; color: black; } } } -

    This function is at the heart of the application. It visually presents the data to the user. If the table is "dirty" (e.g. if the user has added or deleted colors in the icon view, or has opened a color file) we will populate the table. We start by deleting the contents of every cell. Next we change the number of rows to equal the number of colors in the colors map. For each color we want to display a little square that shows the color, so we create a pixmap of the retquired size.

    +

    This function is at the heart of the application. It visually presents the data to the user. If the table is "dirty" (e.g. if the user has added or deleted colors in the icon view, or has opened a color file) we will populate the table. We start by deleting the contents of every cell. Next we change the number of rows to equal the number of colors in the colors map. For each color we want to display a little square that shows the color, so we create a pixmap of the required size.

    We now create an iterator for our colors map, and iterate over every color. The colors map has the user's color names as its keys, and TQColor instances as values. We retrieve the color and fill our pixmap with that color. We then set the "Name" column (column COL_NAME), to have the color's name (it.key()) and the pixmap we've just filled with that color. TQColor's name() function returns a string that is the hex representation of a color, e.g. "#12AB2F"; we retrieve this and set the second ("Hex") column to this value.

    If the user wants to see if which colors are web colors we create a TQCheckTableItem, and check it if it is a web color. (We'll cover isWebColor() shortly.) We then insert this TQCheckTableItem into the "Web" column.

    Having populated the table we call adjustColumn() to ensure that each column is just wide enough to show its widest entry, and show or hide the "Web" column depending on the user's preference.

    @@ -762,7 +762,7 @@ Captures: cap(1) cap(2) cap(3) cap(4)

    This is the second revision of this function. Now we only exit if the user has had the opportunity to save any unsaved changes. (We'll make a third and final version of this function later, when we deal with saving user settings.)

    Try making and running the program. If you have rgb.txt on your system try loading it and saving it under a new name for testing purposes. If you don't have this file, save the standard colors and use those. In the next section we'll cover adding and deleting colors so that you can create your own color files. (If it doesn't build see the Troubleshooting section.)

    Editing the Code: The Edit Options

    -

    Adding a new color, finding a color and handling user options all retquire custom dialogs, so we'll defer them until chapter three when we deal with dialogs.

    +

    Adding a new color, finding a color and handling user options all require custom dialogs, so we'll defer them until chapter three when we deal with dialogs.

    editCut()

        void MainForm::editCut()
     {
diff --git a/doc/html/designer-manual-4.html b/doc/html/designer-manual-4.html
index 17b27fcf..4f1f7102 100644
--- a/doc/html/designer-manual-4.html
+++ b/doc/html/designer-manual-4.html
@@ -396,7 +396,7 @@ body { background: #ffffff; color: black; }
         }
     }
    -

    We create a new options form, passing it TRUE to make it modal. We set the radio buttons depending on the current setting of the m_clip_as variable. We set the check box to correspond with the m_show_web variable. We execute the form, and if the user clicks OK, we reflect their choices back into the relevant main form variables. If the user changed the m_show_web variable (by clicking the webCheckBox), we mark the table as "dirty" since it will need updating. We then call populate() which will update the table view if retquired.

    +

    We create a new options form, passing it TRUE to make it modal. We set the radio buttons depending on the current setting of the m_clip_as variable. We set the check box to correspond with the m_show_web variable. We execute the form, and if the user clicks OK, we reflect their choices back into the relevant main form variables. If the user changed the m_show_web variable (by clicking the webCheckBox), we mark the table as "dirty" since it will need updating. We then call populate() which will update the table view if required.

    Because we use our OptionsForm and access its radio buttons and checkbox we must add "optionsform.h", "qradiobutton.h" and "qcheckbox.h" to our includes in implementation. (Click Object Explorer's Members tab, right click "Includes (in Implementation)", then click Edit. Click Add and enter "optionsform.h"; click Add again and enter "qradiobutton.h"; click Add again and enter "qcheckbox.h". Press Enter, then click Close.)

    You should now have added the following declarations to your includes (in implementation):

    • "optionsform.h"

      diff --git a/doc/html/designer-manual-5.html b/doc/html/designer-manual-5.html index 61b38dff..96337521 100644 --- a/doc/html/designer-manual-5.html +++ b/doc/html/designer-manual-5.html @@ -45,11 +45,11 @@ body { background: #ffffff; color: black; }

      • Grouping forms that belong together.

      • Sharing images between different forms.

      • Sharing database information between different forms.

        -

      The following sections explain these benefits in more detail, and why project management is retquired to achieve them.

      +

    The following sections explain these benefits in more detail, and why project management is required to achieve them.

    Grouping forms

    Grouping forms means that TQt Designer maintains a list of the .ui files that belong to the same project. This makes it easy to switch between forms with a single mouse click.

    Sharing images in a image collection

    -

    In TQt 2.x's TQt Designer each form included the images it retquired and no images were shared. This led to duplication when several forms needed to use the same images. Furthermore the images were stored in the XML .ui files which made them large.

    +

    In TQt 2.x's TQt Designer each form included the images it required and no images were shared. This led to duplication when several forms needed to use the same images. Furthermore the images were stored in the XML .ui files which made them large.

    As a workaround, we introduced a pixmap-loading function that you could define in TQt Designer. It then was your responsibility to provide the implementation of this function in your application code. The big disadvantage of this approach was that you couldn't see the images during the design process in TQt Designer. This not only makes designing a form less visually interesting, but also has a noticeable impact on geometry management.

    In the TQt 3.0 version of TQt Designer we've introduced the concept of a project image collection. If you use a project you can add images to the project's image collection, and these images can be shared and used by any of the forms you include in the project. The images are stored as PNGs (portable network graphics) in a subdirectory, images/, inside the project's directory. Whenever you modify the image collection, TQt Designer creates a source file which contains both the image data in binary format and a function to instantiate the images. The images are accessible by all forms in the project and the data is shared.

    A further benefit of using an image collection is that the images are added to the default TQMimeSourceFactory. This way they are accessible from rich-text labels, What's This? context help and even tooltips through standard HTML image tags. The source argument of the image tag is simply the image's name in the image collection. This also works during the design process in TQt Designer.

    @@ -59,7 +59,7 @@ body { background: #ffffff; color: black; }

    In most non-trivial database applications you will want to access the database from more than one form. This is why the .db file is part of a project, not just part of a single form.

    .pro files

    TQt Designer needs to store information on projects, for example, the list of forms, the image collection and information about available databases and how to access them. The majority of TQt users already use a project file format to create multiplatform makefiles: tmake (and with TQt 3.0 qmake) project .pro files. These files already contain the list of forms, .ui files, used in the project for uic.

    -

    We've extended the sections in the .pro file to include the extra information that TQt Designer needs to manage projects. For example, when you add a form to your project in TQt Designer, it is automatically added to the FORMS section of the project file, and thus qmake will generate the retquired build rules without any further work. Similarly, the images are added to the IMAGES section and thus gets automatically compiled into your executable.

    +

    We've extended the sections in the .pro file to include the extra information that TQt Designer needs to manage projects. For example, when you add a form to your project in TQt Designer, it is automatically added to the FORMS section of the project file, and thus qmake will generate the required build rules without any further work. Similarly, the images are added to the IMAGES section and thus gets automatically compiled into your executable.

    We don't force you to use qmake; if you prefer another build system, for example automake/autoconf or jam, you can still continue to use it. Look upon the .pro file as a file that describes the GUI part of your application. All you need to do -- as previously -- is add the .ui files and the images collection to your own Makefiles.

    Extending the functionality of a form

    First let us look at a small figure that shows the relationship between .ui files, generated code and application code:

    diff --git a/doc/html/designer-manual-6.html b/doc/html/designer-manual-6.html index 9c9845df..e6825b8e 100644 --- a/doc/html/designer-manual-6.html +++ b/doc/html/designer-manual-6.html @@ -95,7 +95,7 @@ int main( int argc, char *argv[] ) }

    Note that we're including creditformbase.h and instantiating a CreditFormBase object; once we've written our subclass we'll replace the header with our subclass, creditform.h, and instantiate a CreditForm.

    -

    We can now generate the application with qmake, e.g. qmake -o Makefile credit.pro, make it and run it. The form should run fine, but doesn't yet have the behaviour we retquire.

    +

    We can now generate the application with qmake, e.g. qmake -o Makefile credit.pro, make it and run it. The form should run fine, but doesn't yet have the behaviour we require.

    Creating the Subclass

    We need to create a header and an implementation file for our subclass. The code for our subclass is minimal. The header file is qt/tools/designer/examples/credit/creditform.h:

        #include "creditformbase.h"
@@ -174,7 +174,7 @@ FORMS      = mainform.ui
 LANGUAGE    = C++
 INCLUDEPATH += $(QTDIR)/tools/designer/uilib
    -

    We do not include the creditformbase.ui file since this file will be read at runtime, as we'll see shortly. We must include the tqui library since the functionality we retquire is not part of the standard TQt library.

    +

    We do not include the creditformbase.ui file since this file will be read at runtime, as we'll see shortly. We must include the tqui library since the functionality we require is not part of the standard TQt library.

    Creating main.cpp

    The main.cpp is quite standard. It will invoke the form we're going to create in TQt Designer as its main form. This form will then load and execute the dynamic dialog.

        #include <qapplication.h>
@@ -217,7 +217,7 @@ INCLUDEPATH += $(QTDIR)/tools/designer/uilib
         delete creditForm;
     }
    -

    The create() function is a static TQWidgetFactory function. It loads the specified .ui file and returns a pointer to the toplevel TQWidget created from the .ui file. We have cast the pointer to TQDialog since we know that the creditformbase.ui file defines a TQDialog. After creating the dialog we exec() it. If the user clicked OK the dialog returns Accepted and we enter the body of the if statement. We want to know the amount of credit that the user selected. We call the child() function on the dialog passing it the name of the widget we're interested in. The child() function returns a pointer to the widget with the name we passed, or returns 0 if no widget of that name was found. In the example we call child() to get a pointer to the 'amountSpinBox'. If the pointer we get back is not 0 we set the rating text to the amount in the dialog's spin box. At the end we delete the dynamic dialog. Deleting the dialog ensures that we free up its resources as soon as it is no longer retquired.

    +

    The create() function is a static TQWidgetFactory function. It loads the specified .ui file and returns a pointer to the toplevel TQWidget created from the .ui file. We have cast the pointer to TQDialog since we know that the creditformbase.ui file defines a TQDialog. After creating the dialog we exec() it. If the user clicked OK the dialog returns Accepted and we enter the body of the if statement. We want to know the amount of credit that the user selected. We call the child() function on the dialog passing it the name of the widget we're interested in. The child() function returns a pointer to the widget with the name we passed, or returns 0 if no widget of that name was found. In the example we call child() to get a pointer to the 'amountSpinBox'. If the pointer we get back is not 0 we set the rating text to the amount in the dialog's spin box. At the end we delete the dynamic dialog. Deleting the dialog ensures that we free up its resources as soon as it is no longer required.

    We used the child() to gain access to a widget within the dynamic dialog, passing it the name of the widget we were interested in. In some situations we might not know what a widget is called. We can access the first widget of a specified class by calling child() with a null widget name and a classname, e.g. child(0,"TQPushButton"). This will return a pointer to the first TQPushButton it finds (or 0 if there isn't one). If you want pointers to all the widgets of a given class you can call the TQObject::queryList() function, passing it the name of the class. It returns a TQObjectList pointer which points to every object in the dialog that is derived from the given class. See the online TQObject documentation for further details.

    Implementing Slots for Dynamic Dialogs

    There is one outstanding issue that we haven't addressed: the dynamic dialog does not have the behaviour of the original credit dialog because we have not implemented the setAmount() slot. We can implement slots for dynamic dialogs by creating a TQObject subclass. We then create an instance of this subclass and pass a pointer to it to the TQWidgetFactory::create() function which will connect the dynamic dialog's signals to the slots implemented in our subclass.

    @@ -260,7 +260,7 @@ private: };

    Our class must be a TQObject subclass and because we're using signals and slots it must include the Q_OBJECT macro. We declare a function and the setAmount() slot that we wish to implement as well as a private TQDialog pointer.

    -

    The implementation retquires the header files of the classes it uses:

    +

    The implementation requires the header files of the classes it uses:

        #include <qradiobutton.h>
     #include <qspinbox.h>
     #include "receiver.h"
diff --git a/doc/html/designer-manual-7.html b/doc/html/designer-manual-7.html
index 8471e5eb..5f28e2d8 100644
--- a/doc/html/designer-manual-7.html
+++ b/doc/html/designer-manual-7.html
@@ -68,8 +68,8 @@ body { background: #ffffff; color: black; }
         TQPushButton *rewind = new TQPushButton( TQPixmap( rewind_xpm ), 0, this, "vcr_rewind" );
         layout->addWidget( rewind );
    -

    We create a TQHBoxLayout in which we'll place the buttons. We've only shown the rewind button in the code above since all the others are identical except for the names of the buttons, pixmaps and signals. For each of the buttons we retquire we call the TQPushButton constructor passing it the appropriate embedded pixmap. We then add it to the layout. Finally we connect the button's clicked() signal to the appropriate signal. Since the clicked() signals aren't specific to our widget we want to emit signals that reflect the widget's use. The rewind(), play(), etc. signals are meaningful in the context of our widget so we propagate each button's clicked() signal to the appropriate widget-specific signal.

    -

    The implementation is complete, but to make sure that our widget compiles and runs we'll create a tiny test harness. The test harness will retquire two files, a .pro project file and a main.cpp. The qt/tools/designer/examples/vcr/vcr.pro project file:

    +

    We create a TQHBoxLayout in which we'll place the buttons. We've only shown the rewind button in the code above since all the others are identical except for the names of the buttons, pixmaps and signals. For each of the buttons we require we call the TQPushButton constructor passing it the appropriate embedded pixmap. We then add it to the layout. Finally we connect the button's clicked() signal to the appropriate signal. Since the clicked() signals aren't specific to our widget we want to emit signals that reflect the widget's use. The rewind(), play(), etc. signals are meaningful in the context of our widget so we propagate each button's clicked() signal to the appropriate widget-specific signal.

    +

    The implementation is complete, but to make sure that our widget compiles and runs we'll create a tiny test harness. The test harness will require two files, a .pro project file and a main.cpp. The qt/tools/designer/examples/vcr/vcr.pro project file:

    TEMPLATE = app
 LANGUAGE = C++
 TARGET   = vcr
@@ -104,12 +104,12 @@ DBFILE   = vcr.db
 
    The remaining items to be completed will depend on the characteristics of the widget you've created. If, for example, your widget can be used to contain other widgets you'd check the Container Widget checkbox. In the case of our Vcr example the only items we need to add are its signals.
    
 
    Click the Signals tab. Click the New Signal button and type in the signal name 'rewind()'. Click New Signal again and this time type in 'play()'. Add the 'next()' and 'stop()' signals in the same way.
    
 
    Since our example hasn't any slots or properties we've finished and can click Close. A new icon will appear in TQt Designer's toolbars which represents the new widget. If you create a new form you can add Vcr widgets and connect the Vcr's signals to your slots.
    
-
    Incorporating custom widgets that have their own slots and properties is achieved in a similar way to adding signals. All the retquired information is in our custom widget's header file.
    
+
    Incorporating custom widgets that have their own slots and properties is achieved in a similar way to adding signals. All the required information is in our custom widget's header file.
    
 
    Creating Custom Widgets with Plugins
    
 
    This section will show you how to write a custom widget and how to embed the custom widget into a plugin. There are no restrictions or special considerations that must be taken into account when creating a widget that is destined to become a plugin. If you are an experienced TQt programmer you can safely skip the section on creating a custom widget and go directly to Creating a Plugin.
    
 
    Be aware that if you use the plugin approach to custom widgets, the plugin needs to be available not only to TQt Designer but also to uic at compile-time.
    
 
    Creating a Custom Widget
    
-
    A custom widget is often a specialization (subclass) of another widget or a combination of widgets working together or a blend of both these approaches. If you simply want a collection of widgets in a particular configuration it is easiest to create them, select them as a group, and copy and paste them as retquired within TQt Designer. Custom widgets are generally created when you need to add new functionality to existing widgets or groups of widgets.
    
+
    A custom widget is often a specialization (subclass) of another widget or a combination of widgets working together or a blend of both these approaches. If you simply want a collection of widgets in a particular configuration it is easiest to create them, select them as a group, and copy and paste them as required within TQt Designer. Custom widgets are generally created when you need to add new functionality to existing widgets or groups of widgets.
    
 
    We have two recommendations that you should consider when creating a custom widget for a plugin:
    
 
    1. Using TQt's property system will provide TQt Designer users with a direct means of configuring the widget through the property editor. (See the TQt Properties documentation.)
      
 
    2. Consider making your widget's public 'set' functions into public slots so that you can perform signal-slot connections with the widget in TQt Designer.
      
@@ -128,7 +128,7 @@ DBFILE   = vcr.db

    Our widget will be derived from TQWidget so we include the qwidget.h header file. We also forward declare the two classes that our widget will be built from.

    
- 
    We include the Q_OBJECT macro since this is retquired for classes that declare signals or slots. The Q_ENUMS declaration is used to register the Mode enumeration. Our widget has two properties, mode, to store whether the user should select a File or a Directory and fileName which stores the file or directory they chose.
    
+ 
    We include the Q_OBJECT macro since this is required for classes that declare signals or slots. The Q_ENUMS declaration is used to register the Mode enumeration. Our widget has two properties, mode, to store whether the user should select a File or a Directory and fileName which stores the file or directory they chose.
    
 
        class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget
     {
         Q_OBJECT
@@ -222,7 +222,7 @@ DBFILE   = vcr.db
  
    When chooseFile() is called it presents the user with a file or directory dialog depending on the mode. If the user chooses a file or directory the TQLineEdit is updated with the chosen file or directory and the fileNameChanged() signal is emitted.
    
 
    Although these two files complete the implementation of the FileChooser widget it is good practice to write a test harness to check that the widget behaves as expected before attempting to put it into a plugin.
    
 
    Testing the Implementation
    
-
    We present a rudimentary test harness which will allow us to run our custom widget. The test harness retquires two files, a main.cpp to contain the FileChooser, and a .pro file to create the Makefile from. Here is qt/tools/designer/examples/filechooser/widget/main.cpp:
    
+
    We present a rudimentary test harness which will allow us to run our custom widget. The test harness requires two files, a main.cpp to contain the FileChooser, and a .pro file to create the Makefile from. Here is qt/tools/designer/examples/filechooser/widget/main.cpp:
    
 
        #include <qapplication.h>
     #include "filechooser.h"
 
@@ -245,13 +245,13 @@ CONFIG  += qt warn_on release
 DBFILE  = filechooser.db
 DEFINES += FILECHOOSER_IS_WIDGET
 
    
-
    We can create the makefile using qmake: qmake -o Makefile filechooser.pro, then we can make and run the harness to test our new widget. Once we're satisfied that the custom widget is robust and has the behaviour we retquire we can embed it into a plugin.
    
+
    We can create the makefile using qmake: qmake -o Makefile filechooser.pro, then we can make and run the harness to test our new widget. Once we're satisfied that the custom widget is robust and has the behaviour we require we can embed it into a plugin.
    
 
    Creating a Plugin
    
 
    TQt Plugins can be used to provide self-contained software components for TQt applications. TQt currently supports the creation of five kinds of plugins: codecs, image formats, database drivers, styles and custom widgets. In this section we will explain how to convert our filechooser custom widget into a TQt Designer custom widget plugin.
    
 
    A TQt Designer custom widget plugin is always derived from TQWidgetPlugin. The amout of code that needs to be written is minimal.
    
-
    To make your own plugin it is probably easiest to start by copying our example plugin.h and plugin.cpp files and changing 'CustomWidgetPlugin' to the name you wish to use for your widget plugin implementation class. Below we provide an introduction to the header file although it needs no changes beyond class renaming. The implementation file retquires simple changes, mostly more class renaming; we will review each function in turn and explain what you need to do.
    
+
    To make your own plugin it is probably easiest to start by copying our example plugin.h and plugin.cpp files and changing 'CustomWidgetPlugin' to the name you wish to use for your widget plugin implementation class. Below we provide an introduction to the header file although it needs no changes beyond class renaming. The implementation file requires simple changes, mostly more class renaming; we will review each function in turn and explain what you need to do.
    
 
    The CustomWidgetPlugin Implementation
    
-
    We have called our header file plugin.h and we've called our plugin class CustomWidgetPlugin since we will be using our plugin class to wrap our custom widgets. We present the entire header file to give you an impression of the scope of the implementation retquired. Most of the functions retquire just a few lines of code.
    
+
    We have called our header file plugin.h and we've called our plugin class CustomWidgetPlugin since we will be using our plugin class to wrap our custom widgets. We present the entire header file to give you an impression of the scope of the implementation required. Most of the functions require just a few lines of code.
    
 
        #include <qwidgetplugin.h>
 
     class CustomWidgetPlugin : public TQWidgetPlugin
diff --git a/doc/html/designer-manual-8.html b/doc/html/designer-manual-8.html
index 9886c384..5f2cd553 100644
--- a/doc/html/designer-manual-8.html
+++ b/doc/html/designer-manual-8.html
@@ -113,7 +113,7 @@ bool createConnections()
 
    You do not need to keep a reference to database connections. If you use a single database connection, this becomes the default connection and database functions will use this connection automatically. We can always get a pointer to any of our connections by calling TQSqlDatabase::database().
    
 
    If you create a main.cpp file using TQt Designer, this file will not include createConnections(). We do not include this function because it needs the username and password for the database connection, and you may prefer to handle these differently from our simple example function. As a result, applications that preview correctly in TQt Designer will not run unless you implement your own database connections function.
    
 
    Using TQDataTable
    
-
    TQDataTables may be placed on any form to provide browsing of database tables and views. TQDataTables can also be used to update or delete records in-place, i.e. inside the cells themselves. Inserting records via a TQDataTable usually retquires connecting to the primeInsert() signal, so that we can generate primary keys for example, or provide default values. If we wish to present records using a form view (perhaps combining data from several tables and views) we might use several TQDataBrowsers and TQDataViews.
    
+
    TQDataTables may be placed on any form to provide browsing of database tables and views. TQDataTables can also be used to update or delete records in-place, i.e. inside the cells themselves. Inserting records via a TQDataTable usually requires connecting to the primeInsert() signal, so that we can generate primary keys for example, or provide default values. If we wish to present records using a form view (perhaps combining data from several tables and views) we might use several TQDataBrowsers and TQDataViews.
    
 
    Quickly Viewing a Database Table
    
 
    This example, along with all the other examples in this chapter, has the project name 'book' and uses the database created by the book.sql script. As we work through the chapter we will build the 'book' application step by step. Create or copy the qt/tools/designer/examples/book/book1/main.cpp file shown earlier. The project file for this first example is qt/tools/designer/examples/book/book1/book.pro. Start a new project by clicking File|New, then click the 'C++ Project' icon to invoke the Project Settings dialog. Click the ellipsis button to invoke the Save As dialog; navigate to the project's directory (creating it if necessary). Make sure you're in the project's directory, then enter a project name of 'book.pro'. Click the Save button to return to the Project Settings dialog, then click OK. Now click Project|Database Connections. Fill in the connection information appropriate to your database then press Connect. The connection name should now appear in the left hand list box. (If this doesn't happen you'll need to contact your database systems administrator for help.) Close the dialog.
    
 
    We will now create a new form with a TQDataTable that's connected to one of our database tables.
    
@@ -144,7 +144,7 @@ bool createConnections()
 
    In most relational databases tables contain fields which are foreign keys into other tables. In our 'book' database example the authorid in the book table is a foreign key into the author table. When we present a form to the end user we do not usually want the foreign key itself to be visible but rather the text associated with it. Thus, we would want the author's name to appear rather than the author id when we show book information. In many databases, this can be achieved by using a view. See your database's documentation for details.
    
 
    
 
    Inserting Records in TQDataTables
    
-
    Record insertion into a relational database usually retquires the generation of a primary key value which uniquely identifies the record in the table. Also we often want to create default values for some fields to minimize the user's work. We will create a slot to capture the TQDataTables primeInsert() signal and populate the TQSqlRecord insertion buffer with a unique primary key.
    
+
    Record insertion into a relational database usually requires the generation of a primary key value which uniquely identifies the record in the table. Also we often want to create default values for some fields to minimize the user's work. We will create a slot to capture the TQDataTables primeInsert() signal and populate the TQSqlRecord insertion buffer with a unique primary key.
    
 
    1. Click Edit|Slots to invoke the Edit Functions dialog. Click New Function, then enter the slot name primeInsertAuthor(TQSqlRecord*) into the Function Properties' Function line edit box. Click OK.
      
 
    2. Click the Connect Signals/Slots toolbar button, then click the AuthorDataTable, drag to the form and release the mouse. The Edit Connections dialog will now appear. Click the primeInsert() signal and then the primeInsertAuthor() slot to make the connection. Now click OK.
      
 
    3. Click the Members tab of the Object Explorer window (click Window|Views|Object Explorer to make the window visible if necessary). Click the primeInsertAuthor() slot and an editor window will appear.
      
@@ -161,15 +161,15 @@ bool createConnections()
 
  
      A TQSqlQuery object is used to increment and retrieve a unique 'sequence' number for the author table. The signal passed us a pointer to the insertion buffer and we then put the value we've retrieved, i.e. the next sequence number, into the buffer's id field. (Again, note that SQL databases often support a native 'sequence' function. The method used here is inappropriate for production systems, and is for example purposes only. See your database's documentation for details on how to generate unique keys in code. In many cases, the database can generate them automatically, or the database may provide a special syntax for dealing with sequences.)
      
 
    If we rebuild the application it will now support INSERT as well as UPDATE and DELETE. We could easily have added additional code to insert default values, e.g. today's date into a date field, if necessary.
    
-
    Browsing is supported by clicking records and by using the arrow keys. Once a record is active (highlighted) we can edit the it. Press the Insert key to INSERT a new record; press F2 to UPDATE the current record; press the Del key to DELETE the current record. All these operations take place immediately. Users can be given the opportunity to confirm their edits by setting the TQDataTable's confirmEdits property to True. If the confirmEdits property is True then user confirmation will be retquired for all insertions, updates and deletes. For finer control you can set the confirmInsert, confirmUpdate and confirmDelete properties individually.
    
+
    Browsing is supported by clicking records and by using the arrow keys. Once a record is active (highlighted) we can edit the it. Press the Insert key to INSERT a new record; press F2 to UPDATE the current record; press the Del key to DELETE the current record. All these operations take place immediately. Users can be given the opportunity to confirm their edits by setting the TQDataTable's confirmEdits property to True. If the confirmEdits property is True then user confirmation will be required for all insertions, updates and deletes. For finer control you can set the confirmInsert, confirmUpdate and confirmDelete properties individually.
    
 
    
 
     TQDataTable User Interface Interaction
    
 
    The default user-interface behavior for TQDataTables is as follows:
    
 
    • Users can move to records by clicking the scrollbar and clicking records with the mouse. They can also use the keyboard's navigation keys, e.g. Left Arrow, Right Arrow, Up Arrow, Down Arrow, Page Up, Page Down, Home and End.
      
-
    • INSERT is initiated by right-clicking the record and clicking Insert or by pressing the Ins (Insert) key. The user moves between fields using Tab and Shift+Tab. The INSERT will take place if the user presses Enter or Tabs off the last field. If autoEdit is TRUE the insert will take place if the user navigates to another record. INSERT is cancelled by pressing Esc (Escape). If autoEdit is FALSE navigating to another record also cancels the INSERT. Setting confirmInsert to TRUE will retquire the user to confirm each INSERT.
      
-
    • UPDATE is initiated by right-clicking the record and clicking Update or by pressing F2. The update will take place if the user presses Enter or Tabs off the last field. If autoEdit is TRUE the update will take place if the user navigates to another record. UPDATE is cancelled by pressing Esc. If autoEdit is FALSE navigating to another record also cancels the UPDATE. Setting confirmUpdate to TRUE will retquire the user to confirm each UPDATE.
      
-
    • DELETE is achieved by right-clicking the record and clicking Delete or by pressing the Del (Delete) key. Setting confirmDelete to TRUE will retquire the user to confirm each DELETE.
      
-
    You can change this default behavior programmatically if retquired.
    
+
  • INSERT is initiated by right-clicking the record and clicking Insert or by pressing the Ins (Insert) key. The user moves between fields using Tab and Shift+Tab. The INSERT will take place if the user presses Enter or Tabs off the last field. If autoEdit is TRUE the insert will take place if the user navigates to another record. INSERT is cancelled by pressing Esc (Escape). If autoEdit is FALSE navigating to another record also cancels the INSERT. Setting confirmInsert to TRUE will require the user to confirm each INSERT.
    
+
  • UPDATE is initiated by right-clicking the record and clicking Update or by pressing F2. The update will take place if the user presses Enter or Tabs off the last field. If autoEdit is TRUE the update will take place if the user navigates to another record. UPDATE is cancelled by pressing Esc. If autoEdit is FALSE navigating to another record also cancels the UPDATE. Setting confirmUpdate to TRUE will require the user to confirm each UPDATE.
    
+
  • DELETE is achieved by right-clicking the record and clicking Delete or by pressing the Del (Delete) key. Setting confirmDelete to TRUE will require the user to confirm each DELETE.
    
+
    You can change this default behavior programmatically if required.
    
 
    • 
 
    Relating Two Tables Together (Master-Detail)
    
 
    Databases often have pairs of tables that are related. For example, an invoice table might list the numbers, dates and customers for invoices, but not the actual invoice items, which an invoice item table might store. In the 'book' application we wish to have a TQDataTable that we can use to browse through the authors table and a second TQDataTable to show the books they've written.
    
@@ -210,7 +210,7 @@ bool createConnections()
         BookDataTable->refresh();
     }
 
- 
    All that's retquired now is to change the BookDataTable's filter and refresh the TQDataTable to show the results of the filter.
    
+ 
    All that's required now is to change the BookDataTable's filter and refresh the TQDataTable to show the results of the filter.
    
 
    Preparing the Interface for Drilldown
    
 
    We can now browse and edit authors and see their books in the BookDataTable. In the next section we explore TQDataBrowser, which will allow us to drill down to a dialog through which we can edit books. For now we will add some buttons to the main BookForm which we will use to invoke the book editing dialog.
    
 
    1. Click the form, then click the Break Layout toolbar button. Resize the form to make room for some buttons at the bottom.
      
@@ -250,9 +250,9 @@ bool createConnections()
 
    2. readFields() to read data from the cursor's edit buffer and writeFields() to write the form's data to the cursor's edit buffer;
      
 
    3. clearValues() to clear the form's values.
      
 
      If you use TQt Designer's TQDataBrowser wizard you will be given the option of creating a default set of buttons for navigation and editing. The behavior of these buttons is set up using the slots described above to provide the following functionality:
      
-
      • INSERT is initiated by pressing the Ins (Insert) key. The user moves between fields using Tab and Shift+Tab. If the user presses the Update button the INSERT will take place and the user will be taken to the record they have just inserted. If the user presses the Insert button (i.e. a second time) the INSERT will take place and a new insertion will be initiated. If autoEdit is TRUE the INSERT will take place if the user navigates to another record. INSERT is cancelled by pressing the Esc key or by pressing the Del (Delete) key. If autoEdit is FALSE then navigating to another record also cancels the INSERT. Setting confirmInsert to TRUE will retquire the user to confirm each INSERT.
        
-
      • UPDATE is automatically initiated whenever the user navigates to a record. An update will take place if the user presses the Update button. If autoEdit is TRUE the update will take place if the user navigates to another record. UPDATE is cancelled by pressing the Esc key or by pressing the Del button. If autoEdit is FALSE then navigating to another record also cancels the UPDATE. Setting confirmUpdate to TRUE will retquire the user to confirm each UPDATE.
        
-
      • DELETE is achieved by pressing the Del key. Setting confirmDelete to TRUE will retquire the user to confirm each DELETE.
        
+
        • INSERT is initiated by pressing the Ins (Insert) key. The user moves between fields using Tab and Shift+Tab. If the user presses the Update button the INSERT will take place and the user will be taken to the record they have just inserted. If the user presses the Insert button (i.e. a second time) the INSERT will take place and a new insertion will be initiated. If autoEdit is TRUE the INSERT will take place if the user navigates to another record. INSERT is cancelled by pressing the Esc key or by pressing the Del (Delete) key. If autoEdit is FALSE then navigating to another record also cancels the INSERT. Setting confirmInsert to TRUE will require the user to confirm each INSERT.
          
+
        • UPDATE is automatically initiated whenever the user navigates to a record. An update will take place if the user presses the Update button. If autoEdit is TRUE the update will take place if the user navigates to another record. UPDATE is cancelled by pressing the Esc key or by pressing the Del button. If autoEdit is FALSE then navigating to another record also cancels the UPDATE. Setting confirmUpdate to TRUE will require the user to confirm each UPDATE.
          
+
        • DELETE is achieved by pressing the Del key. Setting confirmDelete to TRUE will require the user to confirm each DELETE.
          
 
        
 
        Performing the Drilldown
        
 
        We now have a working form for editing book records. We need to start the form when the user clicks our 'Edit Books' button, and to navigate to the record they have selected in the BookDataTable. We also need to provide a means of editing the foreign keys, e.g. authorid.
        
@@ -344,7 +344,7 @@ bool createConnections()
     }
 
  
        Firstly we look up the book's author and secondly we iterate through the ComboBox's items until we find the author and set the ComboBox's current item to the matching author.
        
-
    If the author name has changed or been deleted the query will fail and no author id will be inserted into the buffer causing the INSERT to fail. An alternative is to record the author id's as we populate the ComboBox and store them in a TQMap which we can then look up as retquired. This approach retquires changes to the init(), beforeUpdateBook() and primeInsertBook() functions and the addition of a new function, mapAuthor(). The relevant code from qt/tools/designer/examples/book/book8/editbook.ui is shown below.
    
+
    If the author name has changed or been deleted the query will fail and no author id will be inserted into the buffer causing the INSERT to fail. An alternative is to record the author id's as we populate the ComboBox and store them in a TQMap which we can then look up as required. This approach requires changes to the init(), beforeUpdateBook() and primeInsertBook() functions and the addition of a new function, mapAuthor(). The relevant code from qt/tools/designer/examples/book/book8/editbook.ui is shown below.
    
 
    1. First we need to create a class variable to map author names to author id's. Click in the Members tab of the Object Explorer, then right click the Class Variables item and click New. Type in 'TQMap<TQString,int> authorMap;'.
      
 
    2. We now record the author id's in the init() function.
      
 
          void EditBookForm::init()
@@ -389,7 +389,7 @@ bool createConnections()
         }
     }
 
      
-
     
    Another approach which is especially useful if the same foreign key lookups are retquired in different parts of the application is to subclass a cursor and use this for our lookups. This is described in the TQt SQL Module documentation, particulary the section on subclassing TQSqlCursor.
    
+ 
    Another approach which is especially useful if the same foreign key lookups are required in different parts of the application is to subclass a cursor and use this for our lookups. This is described in the TQt SQL Module documentation, particulary the section on subclassing TQSqlCursor.
    
 
    The 'book' example demonstrates the basic techniques needed for SQL programming with TQt. Additional information on the TQt SQL classes, especially the TQSqlQuery and TQSqlCursor classes is provided in the TQt SQL Module documentation.
    
 
 
    [Prev: Creating Custom Widgets] [Home] [Next: Customizing and Integrating TQt Designer]
    
diff --git a/doc/html/designer-manual-9.html b/doc/html/designer-manual-9.html
index 3900eb31..ac66684e 100644
--- a/doc/html/designer-manual-9.html
+++ b/doc/html/designer-manual-9.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
 
    Creating and Using Templates
    
 
    TQt Designer supports two approaches to creating template forms. The simplest approach involves little more than saving a .ui file into the templates directory. The second approach involves creating a container widget class to be used as a base class for forms that use the template. We will explain both techniques.
    
 
    Simple Templates
    
-
    These templates are most useful when you want to create a whole set of forms which all have some common widgets. For example, you might have a project that will retquire many forms, all of which need to be branded with a company name and logo.
    
+
    These templates are most useful when you want to create a whole set of forms which all have some common widgets. For example, you might have a project that will require many forms, all of which need to be branded with a company name and logo.
    
 
    First we'll create the simple template.
    
 
    1. Click File|New to invoke the New File dialog. Click the Dialog template then click OK.
      
 
    2. Click the Text Label toolbar button, then click near the top left of the form. Change the font Point Size property to 16 and change the text property to your or your company's name. Click the Line toolbar button, then click the form below the label; click Horizontal on the pop-up menu.
      
@@ -111,7 +111,7 @@ body { background: #ffffff; color: black; }
 
      If you wish to delete the add-in remove it from the toolbar then delete the qmsdev.dll file from the add-ins directory.
      
 
      Creating Makefiles without qmake
      
 
      The qmake tool provided with TQt can create Makefiles appropriate to your platform based on .pro project files. This section describes the dependencies involved in building a TQt application and gives a couple of simple example Makefiles. This section assumes that you have a good understanding of Makefiles.
      
-
      TQt Designer produces .ui files which are used to generate .h and .cpp files for the compiler to compile. The .ui files are processed by uic. Classes which inherit from TQObject, e.g. those which use slots and signals, retquire an additional .cpp file to be generated. These files are generated by the moc and are named 'moc_file.cpp' where the original .cpp file is called 'file.cpp'. If your .cpp file contains the Q_OBJECT macro an additional file 'file.moc' should be generated which must be #included in the .cpp, normally at the end. This retquires an extra dependency being created.
      
+
      TQt Designer produces .ui files which are used to generate .h and .cpp files for the compiler to compile. The .ui files are processed by uic. Classes which inherit from TQObject, e.g. those which use slots and signals, require an additional .cpp file to be generated. These files are generated by the moc and are named 'moc_file.cpp' where the original .cpp file is called 'file.cpp'. If your .cpp file contains the Q_OBJECT macro an additional file 'file.moc' should be generated which must be #included in the .cpp, normally at the end. This requires an extra dependency being created.
      
 
      Processing .ui files with uic is done twice:
      
 
       uic myform.ui -o myform.h
@@ -172,7 +172,7 @@ myform.h: myform.ui
 
      
 
      To see more sophisticated Makefiles simply generate them using qmake on any of your TQt projects or any of the examples supplied with TQt.
      
 
      Importing Foreign File Formats
      
-
      To import a file in a supported foreign file format click File|Open, then click the File Type combobox to choose the file type you wish to load. Click the retquired file and TQt Designer will convert and load the file.
      
+
      To import a file in a supported foreign file format click File|Open, then click the File Type combobox to choose the file type you wish to load. Click the required file and TQt Designer will convert and load the file.
      
 
      The filters that TQt Designer uses to read foreign file formats are 'works in progress'. You may have different filters available in your version of TQt Designer than those described here. The easiest way to see which filters are available is to invoke the file open dialog; all your filters are listed in the File Type combobox.
      
 
      Importing TQt Architect Files
      
 
      TQt Architect is a free GUI builder for TQt written by Jeff Harris and Klaus Ebner. The .dlg extension is associated with TQt Architect dialog files.
      
diff --git a/doc/html/distributingqt.html b/doc/html/distributingqt.html
index a002535d..5e040bd7 100644
--- a/doc/html/distributingqt.html
+++ b/doc/html/distributingqt.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
 
 
       This document lists the platform-specific files needed to distribute
 TQt applications. We do not include any compiler-specific files that
-may also be retquired. (See also, Window
+may also be required. (See also, Window
 System-specific Notes.)
 
       
 
        
@@ -81,7 +81,7 @@ path.
 version is prefixed with -mt.
 
         
         Distributing Plugins
 
        
-
         You must include any plugin files retquired by the application.
+
         You must include any plugin files required by the application.
 
         Plugins must be put into a subdirectory under a directory known to
 TQt as a plugin directory. The subdirectory must have the name of the
 plugin category (e.g. styles, sqldrivers, designer, etc.). 
diff --git a/doc/html/emb-classes.html b/doc/html/emb-classes.html
index 0b9001bf..57ef5180 100644
--- a/doc/html/emb-classes.html
+++ b/doc/html/emb-classes.html
@@ -163,7 +163,7 @@ typically 2-20KB in size; they can be mmap'd direct from disk in order
 to save memory). If a TQPF font is found which matches a font request
 no new TQRenderedFont need be created for it. It's possible to strip out
 all TQFontFactory support and simply use TQPFs if your font needs are modest
-(for instance, if you only retquire a few fixed point sizes). Note that
+(for instance, if you only require a few fixed point sizes). Note that
 no best-match loading is performed with TQPFs, as opposed to those
 loaded via TQFontManager, so if you don't have the correct TQPF for a point
 size, text in that size will simply not be displayed. 
diff --git a/doc/html/emb-performance.html b/doc/html/emb-performance.html
index 51904cf1..3311941c 100644
--- a/doc/html/emb-performance.html
+++ b/doc/html/emb-performance.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
 When building embedded applications on low-powered devices, a number
 of options are available that would not be considered in a desktop
 application environment. These options reduce the memory and/or CPU
-retquirements at the cost of other factors.
+requirements at the cost of other factors.
 
         
          
 
        •  Tuning the functionality of TQt
 
        •  General programming style
diff --git a/doc/html/emb-porting.html b/doc/html/emb-porting.html
index 0e1081b4..a48584ee 100644
--- a/doc/html/emb-porting.html
+++ b/doc/html/emb-porting.html
@@ -32,7 +32,7 @@ body { background: #ffffff; color: black; }
 
          Porting your applications to TQt/Embedded
          
 
  
-
           Existing TQt applications should retquire no porting provided there is no
+
           Existing TQt applications should require no porting provided there is no
 platform dependent code. Platform dependent code includes system calls,
 calls to the underlying window system (Windows or X11), and TQt platform
 specific methods such as TQApplication::x11EventFilter().
@@ -45,7 +45,7 @@ using #ifdef directives:
  TQt/Windows Q_WS_WIN
  TQt/Embedded Q_WS_QWS
 
-
           TQt/Embedded also retquires the following flags to be defined when compiling
+
           TQt/Embedded also requires the following flags to be defined when compiling
 applications:
 
           -DTQWS -fno-exceptions -fno-rtti
diff --git a/doc/html/emb-running.html b/doc/html/emb-running.html
index 44a20c04..e1d887ea 100644
--- a/doc/html/emb-running.html
+++ b/doc/html/emb-running.html
@@ -32,7 +32,7 @@ body { background: #ffffff; color: black; }
 
          Running TQt/Embedded applications
          
 
  
-
           A TQt/Embedded application retquires a master application to be running
+
           A TQt/Embedded application requires a master application to be running
 or to be a master application itself. The master application is
 primarily responsible for managing top-level window regions, and
 pointer and keyboard input.
diff --git a/doc/html/faq.html b/doc/html/faq.html
index d49d3985..f05c2263 100644
--- a/doc/html/faq.html
+++ b/doc/html/faq.html
@@ -330,7 +330,7 @@ project. Can we transfer the license to another developer?
 
 
           Yes. TQt licences are for the individual use of named developers. If
 the developer associated with a licence leaves the organization, or
-moves on to another project that does not retquire a TQt license,
+moves on to another project that does not require a TQt license,
 another developer can take over the licence. You can change the name
 of the developer using a licence at any time, but after a change you
 must wait at least six (6) months before changing again.
@@ -420,7 +420,7 @@ software pool to do so without paying license fees.
 
           Although it is possible to write free software for internal
 use, it is difficult to ensure that such software is used and
 distributed legally. For example, if your free software
-retquires any modules that impose conditions on you that
+requires any modules that impose conditions on you that
 contradict the conditions of the GNU GPL, including, but not
 limited to, software patents, commercial license agreements,
 copyrighted interface definitions or any sort of
diff --git a/doc/html/gpl.html b/doc/html/gpl.html
index fd4e7874..752e94e1 100644
--- a/doc/html/gpl.html
+++ b/doc/html/gpl.html
@@ -151,9 +151,9 @@ above, provided that you also meet all of these conditions:
     these conditions, and telling the user how to view a copy of this
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
-    the Program is not retquired to print an announcement.)
+    the Program is not required to print an announcement.)
 
-These retquirements apply to the modified work as a whole.  If
+These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
@@ -219,7 +219,7 @@ However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-  5. You are not retquired to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
diff --git a/doc/html/helpsystem-example.html b/doc/html/helpsystem-example.html
index 2c24cfc6..3713cea6 100644
--- a/doc/html/helpsystem-example.html
+++ b/doc/html/helpsystem-example.html
@@ -476,7 +476,7 @@ and use the make tool to build the library.
 
 
          
 
             
          1. 
-Note that moc retquires that TQObject
+Note that moc requires that TQObject
 is the first base class.  Back... 
          2. 
 
 Note that we have to explicitly scope the orientation
diff --git a/doc/html/i18n.html b/doc/html/i18n.html
index 6f81c334..c2203cf8 100644
--- a/doc/html/i18n.html
+++ b/doc/html/i18n.html
@@ -73,10 +73,10 @@ the application usable by people in countries other than one's own.
 
 
 
             In some cases internationalization is simple, for example, making a US
-application accessible to Australian or British users may retquire
+application accessible to Australian or British users may require
 little more than a few spelling corrections. But to make a US
 application usable by Japanese users, or a Korean application usable
-by German users, will retquire that the software operate not only in
+by German users, will require that the software operate not only in
 different languages, but use different input techniques, character
 encodings and presentation conventions.
 
             TQt tries to make internationalization as painless as possible for
@@ -94,7 +94,7 @@ time.
 
          3.  Greek
 
          4.  Hebrew
 
          5.  Thai and Lao
-
          6.  All scripts in Unicode 3.2 that do not retquire special processing
+
          7.  All scripts in Unicode 3.2 that do not require special processing
 
        
 
         On Windows NT/2000/XP and Unix/X11 with Xft (client side font support)
 the following languages are also supported:
@@ -149,7 +149,7 @@ takes a TQRect since this will align in accordance with
 
         
      •  When you write your own text input controls, use TQFontMetrics::charWidth() to determine the width of a character in a
 string. In some languages (e.g. Arabic or languages from the Indian
 subcontinent), the width and shape of a glyph changes depending on the
-surrounding characters. Writing input controls usually retquires a
+surrounding characters. Writing input controls usually requires a
 certain knowledge of the scripts it is going to be used in. Usually
 the easiest way is to subclass TQLineEdit or TQTextEdit.
 
         
      
@@ -394,7 +394,7 @@ support many input and output encodings for your users' data. When an
 application starts, the locale of the machine will determine the 8-bit
 encoding used when dealing with 8-bit data: such as for font
 selection, text display, 8-bit text I/O and character input.
-
       The application may occasionally retquire encodings other than the
+
       The application may occasionally require encodings other than the
 default local 8-bit encoding. For example, an application in a
 Cyrillic KOI8-R locale (the de-facto standard locale in Russia) might
 need to output Cyrillic in the ISO 8859-5 encoding. Code for this
diff --git a/doc/html/keyfeatures30.html b/doc/html/keyfeatures30.html
index 84118941..0a549956 100644
--- a/doc/html/keyfeatures30.html
+++ b/doc/html/keyfeatures30.html
@@ -151,7 +151,7 @@ existing code which uses these classes will continue to work.
 
       
       Regular Expressions
 
      
 
       TQt has always provided regular expression support, but that support
-was pretty much limited to what was retquired in common GUI control
+was pretty much limited to what was required in common GUI control
 elements such as file dialogs. TQt 3.0 introduces a new regular
 expression engine, TQRegExp, that supports most of Perl's regex
 features and is Unicode based. The most useful additions are support
diff --git a/doc/html/layout.html b/doc/html/layout.html
index 12de2a5c..749cd3c4 100644
--- a/doc/html/layout.html
+++ b/doc/html/layout.html
@@ -103,11 +103,11 @@ only get more space if no other widgets want the space. Of these,
 space is allocated to widgets with an Expanding size policy first.
 
    3.  Any widgets that are allocated less space than their minimum size
 (or minimum size hint if no minimum size is specified) are allocated
-this minimum size they retquire. (Widgets don't have to have a minimum
+this minimum size they require. (Widgets don't have to have a minimum
 size or minimum size hint in which case the strech factor is their
 determining factor.)
 
    4.  Any widgets that are allocated more space than their maximum size
-are allocated the maximum size space they retquire. (Widgets don't have
+are allocated the maximum size space they require. (Widgets don't have
 to have a maximum size in which case the strech factor is their
 determining factor.)
 
    
@@ -201,7 +201,7 @@ layout, you should reimplement the following TQWidget
 
  •  TQWidget::sizeHint() returns the preferred size of the widget.
 
  •  TQWidget::minimumSizeHint() returns the smallest size the widget can have.
 
  •  TQWidget::sizePolicy() returns a TQSizePolicy; a value describing
-the space retquirements of the widget.
+the space requirements of the widget.
 
 
     Call TQWidget::updateGeometry() whenever the size hint, minimum size
 hint or size policy changes. This will cause a layout recalculation.
@@ -215,12 +215,12 @@ of the widget, and it is used by TQLayout subclasses
 support heightForWidth() (both TQGridLayout and TQBoxLayout support it).
 
     For further guidance when implementing these functions, see their
 implementations in existing TQt classes that have similar layout
-retquirements to your new widget.
+requirements to your new widget.
 
     
     Manual Layout
 
    
 
     If you are making a one-of-a-kind special layout, you can also make a
 custom widget as described above. Reimplement TQWidget::resizeEvent()
-to calculate the retquired distribution of sizes and call setGeometry() on each child.
+to calculate the required distribution of sizes and call setGeometry() on each child.
 
     The widget will get an event with type
 LayoutHint when the layout needs to be recalculated. Reimplement
 TQWidget::event() to be notified of LayoutHint events.
diff --git a/doc/html/license.html b/doc/html/license.html
index 74950aba..9b1bc08c 100644
--- a/doc/html/license.html
+++ b/doc/html/license.html
@@ -107,7 +107,7 @@ or by others.
 
     6. You may develop application programs, reusable components and other
 software items that link with the original or modified versions of the
 Software.  These items, when distributed, are subject to the following
-retquirements:
+requirements:
 
     
    
 a. You must ensure that all recipients of machine-executable forms of
 these items are also able to receive and use the complete
diff --git a/doc/html/licenses.html b/doc/html/licenses.html
index c5b008fb..6813b516 100644
--- a/doc/html/licenses.html
+++ b/doc/html/licenses.html
@@ -302,13 +302,13 @@ above.
 
 
    
 
     TQt supports GIF reading if it is configured that way during
-installation (see qgif.h). If it is, we are retquired to state that
+installation (see qgif.h). If it is, we are required to state that
 "The Graphics Interchange Format(c) is the Copyright property of
 CompuServe Incorporated. GIF(sm) is a Service Mark property of
 CompuServe Incorporated."
 
     Warning: If you are in a country that recognizes software patents
 and in which Unisys holds a patent on LZW compression and/or
-decompression and you want to use GIF, Unisys may retquire you to
+decompression and you want to use GIF, Unisys may require you to
 license that technology. Such countries include Canada, Japan,
 the USA, France, Germany, Italy and the UK.
 
     GIF support may be removed completely in a future version of TQt.
diff --git a/doc/html/linguist-manual-1.html b/doc/html/linguist-manual-1.html
index 6980fb07..f2c8bf79 100644
--- a/doc/html/linguist-manual-1.html
+++ b/doc/html/linguist-manual-1.html
@@ -33,11 +33,11 @@ body { background: #ffffff; color: black; }
 
    Introduction
    
 
    TQt provides excellent support for translating applications into local languages. This Guide explains how to use TQt's translation tools for each of the roles involved in translating an application. The Guide begins with a brief overview of the issues that must be considered, followed by chapters devoted to each role and the supporting tools provided.
    
 
    Chapter 2: Release Manager is aimed at the person with overall responsibility for the release of the application. They will typically coordinate the work of the software engineers and the translator. The chapter describes the use of two tools. The lupdate tool is used to synchronize source code and translations. The lrelease tool is used to create runtime translation files for use by the released application.
    
-
    Chapter 3: Translators is for translators. It describes the use of the TQt Linguist tool. No computer knowledge beyond the ability to start a program and use a text editor or word processor is retquired.
    
+
    Chapter 3: Translators is for translators. It describes the use of the TQt Linguist tool. No computer knowledge beyond the ability to start a program and use a text editor or word processor is required.
    
 
    Chapter 4: Programmers is for TQt programmers. It explains how to create TQt applications that are able to use translated text. It also provides guidance on how to help the translator identify the context in which phrases appear. This chapter's three short tutorials cover everything the programmer needs to do.
    
 
    Overview of the Translation Process
    
 
    Most of the text that must be translated in an application program consists of either single words or short phrases. These typically appear as window titles, menu items, pop-up help text (balloon help), and labels to buttons, check boxes and radio buttons.
    
-
    The phrases are entered into the source code by the programmer in their native language using a simple but special syntax to identify that the phrases retquire translation. The TQt tools provide context information for each of the phrases to help the translator, and the programmer is able to add additional context information to phrases when necessary. The release manager generates a set of translation files that are produced from the source files and passes these to the translator. The translator opens the translation files using TQt Linguist, enters their translations and saves the results back into the translation files, which they pass back to the release manager. The release manager then generates fast compact versions of these translation files ready for use by the application. The tools are designed to be used in repeated cycles as applications change and evolve, preserving existing translations and making it easy to identify which new translations are retquired. TQt Linguist also provides a phrase book facility to help ensure consistent translations across multiple applications and projects.
    
+
    The phrases are entered into the source code by the programmer in their native language using a simple but special syntax to identify that the phrases require translation. The TQt tools provide context information for each of the phrases to help the translator, and the programmer is able to add additional context information to phrases when necessary. The release manager generates a set of translation files that are produced from the source files and passes these to the translator. The translator opens the translation files using TQt Linguist, enters their translations and saves the results back into the translation files, which they pass back to the release manager. The release manager then generates fast compact versions of these translation files ready for use by the application. The tools are designed to be used in repeated cycles as applications change and evolve, preserving existing translations and making it easy to identify which new translations are required. TQt Linguist also provides a phrase book facility to help ensure consistent translations across multiple applications and projects.
    
 
    Translators and programmers must address a number of issues because of the subtleties and complexities of human language:
    
 
    • A single phrase may need to be translated into several different forms depending on context, e.g. open in English might become öffnen, "open file", or aufbauen, "open internet connection", in German.
      
 
    • Keyboard accelerators may need to be changed but without introducing conflicts, e.g. "&Quit" in English becomes "Avslutt" in Norwegian which doesn't contain a "Q". We cannot use a letter that is already in use -- unless we change several accelerators.
      
diff --git a/doc/html/linguist-manual-2.html b/doc/html/linguist-manual-2.html
index a08b3b17..5ee79c54 100644
--- a/doc/html/linguist-manual-2.html
+++ b/doc/html/linguist-manual-2.html
@@ -61,12 +61,12 @@ body { background: #ffffff; color: black; }
 
      Usage: lupdate myproject.pro
      
 
      This is a simple command line tool. lupdate reads a TQt .pro project file, finds the translatable strings in the specified source, header and TQt Designer interface files, and produces or updates the .ts translation files listed in the project file. The translation files are given to the translator who uses TQt Linguist to read the files and insert the translations.
      
 
      Companies that have their own translators in-house may find it useful to run lupdate regularly, perhaps monthly, as the application develops. This will lead to a fairly low volume of translation work spread evenly over the life of the project and will allow the translators to support a number of projects simultaneously.
      
-
      Companies that hire in translators as retquired may prefer to run lupdate only a few times in the application's life cycle, the first time might be just before the first test phase. This will provide the translator with a substantial single block of work and any bugs that the translator detects may easily be included with those found during the initial test phase. The second and any subsequent lupdate runs would probably take place during the final beta phase.
      
-
      The .ts file format is a simple human-readable XML format that can be used with version control systems if retquired.
      
+
      Companies that hire in translators as required may prefer to run lupdate only a few times in the application's life cycle, the first time might be just before the first test phase. This will provide the translator with a substantial single block of work and any bugs that the translator detects may easily be included with those found during the initial test phase. The second and any subsequent lupdate runs would probably take place during the final beta phase.
      
+
      The .ts file format is a simple human-readable XML format that can be used with version control systems if required.
      
 
      lrelease
      
 
      Usage: lrelease myproject.pro
      
 
      This is another simple command line tool. It reads a TQt .pro project file and produces the .qm files used by the application, one for each .ts translation source file listed in the project file. The .qm file format is a compact binary format that provides extremely fast lookups for translations.
      
-
      This tool is run whenever a release of the application is to be made, from initial test version through to final release version. If the .qm files are not created, e.g. because an alpha release is retquired before any translation has been undertaken, the application will run perfectly well using the text the programmers placed in the source files. Once the .qm files are available the application will detect them and use them automatically.
      
+
      This tool is run whenever a release of the application is to be made, from initial test version through to final release version. If the .qm files are not created, e.g. because an alpha release is required before any translation has been undertaken, the application will run perfectly well using the text the programmers placed in the source files. Once the .qm files are available the application will detect them and use them automatically.
      
 
      Note that lrelease will only incorporate translations that are marked as "done". If a translation is missing, or has failed validation, the original text will be used instead.
      
 
      Missing Translations
      
 
      Both lupdate and lrelease may be used with .ts translation source files which are incomplete. Missing translations will be replaced with the native language phrases at runtime.
      
diff --git a/doc/html/linguist-manual-3.html b/doc/html/linguist-manual-3.html
index 1a9d36a5..73cee991 100644
--- a/doc/html/linguist-manual-3.html
+++ b/doc/html/linguist-manual-3.html
@@ -38,7 +38,7 @@ body { background: #ffffff; color: black; }
 
      TQt Linguist is a tool for adding translations to TQt applications. It introduces the concept of a translation "context" which means a group of phrases that appear together on the screen e.g. in the same menu or dialog.
      
 
      To start, run TQt Linguist, either from the taskbar menu, or by double clicking the desktop icon, or type linguist (followed by Enter) at the command line. Once TQt Linguist has started choose File|Open from the menu bar and select a .ts translation source file to work on.
      
 
      TQt Linguist's main window is divided into four main areas. The left hand side contains the Context list, the top right is the Source text area, the middle right is the translation area and the bottom right is the phrases and guesses area. We'll describe them in detail later.
      
-
      Click on one of the contexts in the context list (left hand side) and then click on one of the phrases that appears in the Source text area (top right). The phrase will be copied into the translation area (middle right). Click under the word 'Translation' and type in the translation. Click Ctrl+Enter (Done & Next) to confirm that you have completed the translation and to move on to the next phrase that retquires translation.
      
+
      Click on one of the contexts in the context list (left hand side) and then click on one of the phrases that appears in the Source text area (top right). The phrase will be copied into the translation area (middle right). Click under the word 'Translation' and type in the translation. Click Ctrl+Enter (Done & Next) to confirm that you have completed the translation and to move on to the next phrase that requires translation.
      
 
      The cycle of entering a translation then pressing Ctrl+Enter can be repeated until all the translations are done or until you finish the session. Linguist will attempt to fill the "phrases and guesses" area with possible translations from any open phrase books and any previous translations. Each has a keyboard shortcut, e.g. Ctrl+1, Ctrl+2, etc., which you can use to copy the guess into the Translation area. (Mouse users can double click a phrase or guess to move it into the Translation area.) At the end of the session choose File|Save from the menu bar and then File|Exit to quit.
      
 
      TQt Linguist's Main Window
      
 
      Context List
      
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
 
      To add a new phrase click the New Phrase button (or press Alt+N) and type in a new source phrase. Press Tab and type in the translation. Optionally press Tab and enter a definition -- this is useful to distinguish different translations of the same source phrase. This process may be repeated as often as necessary.
      
 
      You can delete a phrase by selecting it in the phrases list and clicking Remove Phrase.
      
 
      Click the Save button (press Alt+S) and then click the Close button (press Esc) once you've finished adding (and removing) phrases.
      
-
      When a phrase or set of phrases appears in the phrase book double clicking the retquired target phrase will copy it to the translation pane at the text cursor position. If you want to replace the text in the translation pane with the target phrase, click the translation pane, choose Edit|Select All (press Alt+A) and then double click the target phrase.
      
+
      When a phrase or set of phrases appears in the phrase book double clicking the required target phrase will copy it to the translation pane at the text cursor position. If you want to replace the text in the translation pane with the target phrase, click the translation pane, choose Edit|Select All (press Alt+A) and then double click the target phrase.
      
 
      Validation
      
 
      TQt Linguist provides three kinds of validation on translated phrases.
      
 
      1. Accelerator validation detects translated phrases that do not have an ampersand when the source phrase does and vice versa.
        
diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html
index b31088a1..bffd3062 100644
--- a/doc/html/linguist-manual-4.html
+++ b/doc/html/linguist-manual-4.html
@@ -32,11 +32,11 @@ body { background: #ffffff; color: black; }
 
        [Prev: Translators] [Home]
        
 
        Programmers
        
 
        Support for multiple languages is extremely simple in TQt applications, and adds little overhead to the programmer's workload.
        
-
        TQt minimizes the performance cost of using translations by translating the phrases for each window as they are created. In most applications the main window is created just once. Dialogs are often created once and then shown and hidden as retquired. Once the initial translation has taken place there is no further runtime overhead for the translated windows. Only those windows that are created, destroyed and subsequently created will have a translation performance cost.
        
-
        Creating applications that can switch language at runtime is possible with TQt, but retquires a certain amount of programmer intervention and will of course incur some runtime performance cost.
        
+
        TQt minimizes the performance cost of using translations by translating the phrases for each window as they are created. In most applications the main window is created just once. Dialogs are often created once and then shown and hidden as required. Once the initial translation has taken place there is no further runtime overhead for the translated windows. Only those windows that are created, destroyed and subsequently created will have a translation performance cost.
        
+
        Creating applications that can switch language at runtime is possible with TQt, but requires a certain amount of programmer intervention and will of course incur some runtime performance cost.
        
 
        Making the Application Translation Aware
        
 
        Programmers should make their application look for and load the appropriate translation file and mark user-visible text and Ctrl keyboard accelerators as targets for translation.
        
-
        Each piece of text that retquires translating retquires context to help the translator identify where in the program the text occurs. In the case of multiple identical texts that retquire different translations, the translator also retquires some information to disambiguate the source texts. Marking text for translation will automatically cause the class name to be used as basic context information. In some cases the programmer may be retquired to add additional information to help the translator.
        
+
        Each piece of text that requires translating requires context to help the translator identify where in the program the text occurs. In the case of multiple identical texts that require different translations, the translator also requires some information to disambiguate the source texts. Marking text for translation will automatically cause the class name to be used as basic context information. In some cases the programmer may be required to add additional information to help the translator.
        
 
        Creating Translation Files
        
 
        Translation files consist of all the user-visible text and Ctrl key accelerators in an application and translations of that text. Translation files are created as follows:
        
 
        1. Run lupdate initially to generate the first set of .ts translation source files with all the user-visible text but no translations.
          
@@ -447,7 +447,7 @@ TRANSLATIONS    = tt3_pt.ts
         but = new TQRadioButton( tr("Disabled"), colors );
         but->toggle();
 
- 
          Notice the two occurrences of tr("Enabled") and of tr("Disabled") in PrintPanel. Since both "Enabled"s and "Disabled"s appear in the same context TQt Linguist will only display one occurrence of each and will use the same translations for the duplicates that it doesn't display. Whilst this is a useful timesaver, in some languages, such as Portuguese, the second occurrence retquires a separate translation. We will see how TQt Linguist can be made to display all the occurrences for separate translation shortly.
          
+ 
          Notice the two occurrences of tr("Enabled") and of tr("Disabled") in PrintPanel. Since both "Enabled"s and "Disabled"s appear in the same context TQt Linguist will only display one occurrence of each and will use the same translations for the duplicates that it doesn't display. Whilst this is a useful timesaver, in some languages, such as Portuguese, the second occurrence requires a separate translation. We will see how TQt Linguist can be made to display all the occurrences for separate translation shortly.
          
 
          The header file for MainWindow, mainwindow.h, contains no surprises. In the implementation, mainwindow.cpp, we have some user-visible source texts that must be marked for translation.
          
 
                  setCaption( tr("Troll Print 1.0") );
 
          
diff --git a/doc/html/mac-differences.html b/doc/html/mac-differences.html
index 967462ed..c9a6eced 100644
--- a/doc/html/mac-differences.html
+++ b/doc/html/mac-differences.html
@@ -139,7 +139,7 @@ settings, same with any other default paths such as a lookup of dynamic
 libraries inside /usr/lib and similar default locations.
 
           We still strongly recommend to build static applications where the library
 code is incorporated into the Mac OS X binary. However, in case you ship
-applications that retquire plugin support,then you need to use dynamic
+applications that require plugin support,then you need to use dynamic
 libraries as part of your application.
 
           
           Combining Libraries
 
          
@@ -213,7 +213,7 @@ do this:
 
           
           Translating the Application Menu and native dialogs
 
          
 
           You need to do a little extra to get the Application Menu and native dialogs
-localized. This is a retquirement of Mac OS X and not of TQt.
+localized. This is a requirement of Mac OS X and not of TQt.
 
           First, you must add a localized resource folder inside the Bundle see:
 
           http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/index.html
 
           And look for the heading: Adding Localized Resources
diff --git a/doc/html/moc.html b/doc/html/moc.html
index 322c570e..ad5bdd95 100644
--- a/doc/html/moc.html
+++ b/doc/html/moc.html
@@ -40,14 +40,14 @@ handles TQt's C++ extensions.
 declarations that contain the Q_OBJECT macro, it produces another
 C++ source file which contains the meta object code for the classes
 that use the Q_OBJECT macro. Among other things, meta object code is
-retquired for the signal/slot mechanism, runtime type information and
+required for the signal/slot mechanism, runtime type information and
 the dynamic property system.
 
           The C++ source file generated by the moc must be compiled and linked
 with the implementation of the class (or it can be #included into the
 class's source file).
 
           If you use qmake to create your
 Makefiles, build rules will be included that call the moc when
-retquired, so you will not need to use the moc directly. For more
+required, so you will not need to use the moc directly. For more
 background information on moc, see Why doesn't TQt
 use templates for signals and slots?.
 
           
           Usage
@@ -265,7 +265,7 @@ templates cannot have signals or slots. Here is an example:
 
           Less importantly, the following constructs are illegal.  All of them
 have alternatives which we think are usually better, so removing these
 limitations is not a high priority for us.
-
           
           Multiple inheritance retquires TQObject to be first
+
           
           Multiple inheritance requires TQObject to be first
 
          
 
           If you are using multiple inheritance, moc assumes that the first
 inherited class is a subclass of TQObject.  Also, be sure that only
diff --git a/doc/html/motif-walkthrough-10.html b/doc/html/motif-walkthrough-10.html
index 5baecdf8..35ab043c 100644
--- a/doc/html/motif-walkthrough-10.html
+++ b/doc/html/motif-walkthrough-10.html
@@ -68,7 +68,7 @@ uses delete or qstrdup() when stori
 
           Almost all of the functions in our application are affected by this
 change.  In most cases, we end up removing more code than we are
 adding.  To keep the size of this walkthrough reasonable, we've only
-shown a small portion of the retquired changes, since the changes are
+shown a small portion of the required changes, since the changes are
 very similar to those shown above.
 
           
           Writing Platform-Independent Code
 
          
diff --git a/doc/html/motif-walkthrough-3.html b/doc/html/motif-walkthrough-3.html
index 2c0cdba3..8427c5cf 100644
--- a/doc/html/motif-walkthrough-3.html
+++ b/doc/html/motif-walkthrough-3.html
@@ -100,7 +100,7 @@ now use TQFileDialog.
 
           The Page Delete dialog is created and used in actions.c. We
 need to migrate this file to C++. We rename it to actions.cpp,
 modify the project file and regenerate the Makefile.
-
           The changes retquired to make actions.cpp compile are minimal. We
+
           The changes required to make actions.cpp compile are minimal. We
 need to wrap more C header files and global variables in an extern "C" block.
 
           
 
@@ -131,7 +131,7 @@ completely.
 
           The IO Error dialog is created and used in io.c. We need to
 migrate this file to C++. We rename it to io.cpp, modify the
 project file and regenerate the Makefile.
-
           The changes retquired to make io.cpp compile are minimal. We need
+
           The changes required to make io.cpp compile are minimal. We need
 to wrap more C header files and global variables in an extern "C"
 block.
 
           
diff --git a/doc/html/motif-walkthrough.html b/doc/html/motif-walkthrough.html
index 6ec13d12..b0add895 100644
--- a/doc/html/motif-walkthrough.html
+++ b/doc/html/motif-walkthrough.html
@@ -38,7 +38,7 @@ body { background: #ffffff; color: black; }
 to the TQt toolkit using the TQt Motif Extension.
 
           It is rarely practical for a large project with hundreds of thousands
 or even millions of lines of code to be migrated all at once; such an
-endeavor would retquire too many development resources and would incur
+endeavor would require too many development resources and would incur
 significant risks. Every line of code would have to be rewritten,
 every user interface redesigned, and quality assurance tests and
 procedures all rewritten. The TQt Motif Extension provides a
@@ -79,7 +79,7 @@ references to the source code, which is included in the extensions/motif/exa
 
           
           Preretquisites
 
          
 
           Before we can start using the TQt Motif Extension, we must satisfy
-these retquirements:
+these requirements:
 
           
            
 
          1.  We are using the X11R6.x and Motif 2.x libraries.
 
          2.  The project is compilable by a C++ compiler.
@@ -88,7 +88,7 @@ these retquirements:
 
          
 
           
           X11R6.x and Motif 2.x Libraries
 
          
-
           The mechanisms used by the TQt Motif Extension retquire development
+
           The mechanisms used by the TQt Motif Extension require development
 headers and libraries from the X11R6 release and the Motif 2.0
 release. Newer versions of these can also be used.
 
           
           C++ Compiler
diff --git a/doc/html/network.html b/doc/html/network.html
index 833a5693..5d395af9 100644
--- a/doc/html/network.html
+++ b/doc/html/network.html
@@ -315,7 +315,7 @@ some special signals and at the end you must always emit a finished
 change the state of the TQNetworkOperation during processing. You 
 can also get and set TQNetworkOperation arguments as the operation
 progresses.
-
           It may occur that the network protocol you implement only retquires a
+
           It may occur that the network protocol you implement only requires a
 subset of these operations. In such cases, simply reimplement the
 operations which are supported by the protocol. Additionally you must
 specify which operations you support. This is achieved by
diff --git a/doc/html/object.html b/doc/html/object.html
index ceb8cffb..f89a61c9 100644
--- a/doc/html/object.html
+++ b/doc/html/object.html
@@ -36,7 +36,7 @@ body { background: #ffffff; color: black; }
 
           The standard C++ Object Model provides very efficient runtime support
 for the object paradigm. But the C++ Object Model's static nature is
 inflexibile in certain problem domains. Graphical User Interface
-programming is a domain that retquires both runtime efficiency and a
+programming is a domain that requires both runtime efficiency and a
 high level of flexibility. TQt provides this, by combining the speed of
 C++ with the flexibility of the TQt Object Model.
 
           TQt adds these features to C++:
@@ -60,7 +60,7 @@ pointers which become "dangling pointers" when their objects are destroyed.
 
           Many of these TQt features are implemented with standard C++
 techniques, based on inheritance from TQObject. Others, like the
 object communication mechanism and the dynamic property system,
-retquire the Meta Object System provided
+require the Meta Object System provided
 by TQt's own Meta Object Compiler (moc). 
 
           The Meta Object System is a C++ extension that makes the language
 better suited to true component GUI programming. Although templates can
diff --git a/doc/html/opengl-x11-overlays.html b/doc/html/opengl-x11-overlays.html
index 38158289..df139e84 100644
--- a/doc/html/opengl-x11-overlays.html
+++ b/doc/html/opengl-x11-overlays.html
@@ -46,7 +46,7 @@ following is a discussion on how to use non-TQGL widgets in overlay
 planes.
 
           In the typical case, X11 overlays can easily be used together with the
 current version of TQt and the TQt OpenGL Extension. The following
-retquirements apply:
+requirements apply:
 
           
            
 
          1.  Your X server and graphics card/hardware must support overlays. 
 For many X servers, overlay support can be turned on with
diff --git a/doc/html/opengl.html b/doc/html/opengl.html
index d1e73ba0..5cc85536 100644
--- a/doc/html/opengl.html
+++ b/doc/html/opengl.html
@@ -59,13 +59,13 @@ it will include the TQt OpenGL module in the TQt library. (If your
 OpenGL headers or libraries are placed in a non-standard directory,
 you may need to change the QMAKE_INCDIR_OPENGL and/or
 QMAKE_LIBDIR_OPENGL in the config file for your system). Some
-configurations retquire threading to be enabled for OpenGL, so if
+configurations require threading to be enabled for OpenGL, so if
 OpenGL is not detected, try configure -thread.
 
             When you install TQt for Windows, the TQt OpenGL module is always
 included.
 
             The TQt OpenGL module is not licensed for use with the TQt Professional
 Edition. Consider upgrading to the TQt Enterprise Edition if you
-retquire OpenGL support.
+require OpenGL support.
 
             Note about using Mesa on X11: Mesa versions earlier than 3.1 would use
 the name "MesaGL" and "MesaGLU" for the libraries, instead of "GL" and
 "GLU". If you want to use a pre-3.1 version of Mesa, you must change
diff --git a/doc/html/picture-example.html b/doc/html/picture-example.html
index b851d4cb..6734d4a1 100644
--- a/doc/html/picture-example.html
+++ b/doc/html/picture-example.html
@@ -141,7 +141,7 @@ void PictureDisplay::paintEvent( TQApplication a( argc, argv );               // TQApplication retquired!
+    TQApplication a( argc, argv );               // TQApplication required!
 
     const char *fileName = "car.pic";           // default picture file name
 
diff --git a/doc/html/plugins-howto.html b/doc/html/plugins-howto.html
index 97ecd683..6ab263e8 100644
--- a/doc/html/plugins-howto.html
+++ b/doc/html/plugins-howto.html
@@ -71,7 +71,7 @@ with calls to TQApplication::addLibra
 set your own path or paths you can use
 TQApplication::setLibraryPaths().
 
             Suppose that you have a new style class called 'MyStyle' that you want
-to make available as a plugin. The retquired code is straightforward:
+to make available as a plugin. The required code is straightforward:
 
                 class MyStylePlugin : public TQStylePlugin
     {
@@ -101,21 +101,21 @@ empty. There are only two virtual functions that must be implemented.
 The first is keys() which returns a string list of the classes
 implemented in the plugin. (We've just implemented one class in the
 example above.) The second is a function that returns an object of the
-retquired class (or 0 if the plugin is asked to create an object of a
+required class (or 0 if the plugin is asked to create an object of a
 class that it doesn't implement). For TQStylePlugin, this second
 function is called create(). 
 
             It is possible to implement any number of plugin subclasses in a
 single plugin, providing they are all derived from the same base
 class, e.g. TQStylePlugin.
 
             For database drivers, image formats, custom widgets and text codecs,
-no explicit object creation is retquired. TQt will find and create them
-as retquired. Styles are an exception, since you might want to set a
+no explicit object creation is required. TQt will find and create them
+as required. Styles are an exception, since you might want to set a
 style explicitly in code. To apply a style, use code like this:
 
                 TQApplication::setStyle( TQStyleFactory::create( "MyStyle" ) );
 
            
  
-
             Some plugin classes retquire additional functions to be implemented.
+
             Some plugin classes require additional functions to be implemented.
 See the TQt Designer manual's,
 'Creating Custom Widgets' section in the 'Creating Custom Widgets'
 chapter, for a complete example of a TQWidgetPlugin, which implements
@@ -126,7 +126,7 @@ TQWidgetPlugins.
 must be reimplemented for each type of plugin.
 
             TQt applications automatically know which plugins are available,
 because plugins are stored in the standard plugin subdirectories.
-Because of this applications don't retquire any code to find and load
+Because of this applications don't require any code to find and load
 plugins, since TQt handles them automatically.
 
             The default directory for plugins is QTDIR/plugins*,
 with each type of plugin in a subdirectory for that type, e.g. styles. If you want your applications to use plugins and you don't
@@ -210,7 +210,7 @@ determine if the plugin is binary compatible.
 available in two different configurations. However, the
 developer writing plugins would need to know which features are
 in use, both in their plugin and internally by the utility
-classes in TQt. The TQt library would retquire complex feature
+classes in TQt. The TQt library would require complex feature
 and dependency queries and verification when loading plugins.
 Retquiring this would place an unnecessary burden on the developer, and
 increase the overhead of loading a plugin. To reduce both
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 2bbe632a..c812b21c 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -458,7 +458,7 @@ parameter list.
 The echo parameter is the third parameter and defaults to 
 TQLineEdit::Normal. 
 
             If you used calls to TQInputDialog::getText(...) that provided more 
-than the first two retquired parameters you will must add a value 
+than the first two required parameters you will must add a value 
 for the echo parameter.
 
             
             TQLayout and Other Abstract Layout Classes
 
            
@@ -497,7 +497,7 @@ now work on paragraphs.
 published the internal data structure.
 
             In most cases, applications that used TQMultiLineEdit will continue to
 work without problems. Applications that worked in terms of lines may
-retquire some porting.
+require some porting.
 
             The source code for the old 2.x version of TQMultiLineEdit can be found
 in $QTDIR/src/attic/qtmultilineedit.h/cpp. Note that the class has
 been renamed to TQtMultiLineEdit to avoid name clashes. If you really
diff --git a/doc/html/porting2.html b/doc/html/porting2.html
index 9f44766e..723a4e0a 100644
--- a/doc/html/porting2.html
+++ b/doc/html/porting2.html
@@ -64,7 +64,7 @@ compiler errors (rather than mysterious results), or produce run-time
 messages.  The result is that TQt 2.x includes many additional features,
 discards obsolete functionality that is easily converted to use the new
 features, and that porting an application from TQt 1.x to TQt 2.x is
-a simple task well worth the amount of effort retquired.
+a simple task well worth the amount of effort required.
 
             To port code using TQt 1.x to use TQt 2.x:
 
             
          
 
           The control requested in TQAxBase::setControl() is not installed
 on this system, or is not accessible for the current user.
-
           The control might retquire administrator rights, or a license key.
+
           The control might require administrator rights, or a license key.
 If the control is licensed, reimplement initialize() and use the
 COM APIs to call the IClassFactory2 interface functions.
 
           
           TQAxBase::internalInvoke: No such method
diff --git a/doc/html/qaxserver-example-hierarchy.html b/doc/html/qaxserver-example-hierarchy.html
index 3179e127..1bede5f0 100644
--- a/doc/html/qaxserver-example-hierarchy.html
+++ b/doc/html/qaxserver-example-hierarchy.html
@@ -190,7 +190,7 @@ interface of TQParentWidget objects.
 
             return TQUuid();
         }
-COM however retquires the IDs for the interfaces of the sub types as
+COM however requires the IDs for the interfaces of the sub types as
 well to be able to marshal calls correctly.
 
           
                  TQString exposeToSuperClass( const TQString &key ) const
         {
@@ -208,7 +208,7 @@ macro.
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/multiple.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 WebBrowser to support ActiveX controls, and scripting to be enabled.
 
           
 
diff --git a/doc/html/qaxserver-example-menus.html b/doc/html/qaxserver-example-menus.html
index c111baf3..b2b4a1ca 100644
--- a/doc/html/qaxserver-example-menus.html
+++ b/doc/html/qaxserver-example-menus.html
@@ -39,7 +39,7 @@ a TQMainWindow to implement an in-place active co
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/menus.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 WebBrowser to support ActiveX controls, and scripting to be enabled.
 
           
 
diff --git a/doc/html/qaxserver-example-multiple.html b/doc/html/qaxserver-example-multiple.html
index 457342dd..0754c627 100644
--- a/doc/html/qaxserver-example-multiple.html
+++ b/doc/html/qaxserver-example-multiple.html
@@ -150,7 +150,7 @@ macro.
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/multiple.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 WebBrowser to support ActiveX controls, and scripting to be enabled.
 
           
 
diff --git a/doc/html/qaxserver-example-opengl.html b/doc/html/qaxserver-example-opengl.html
index 52f73083..82c69458 100644
--- a/doc/html/qaxserver-example-opengl.html
+++ b/doc/html/qaxserver-example-opengl.html
@@ -163,7 +163,7 @@ with information about supported and enabled safety options, and returns
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/wrapper.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 WebBrowser to support ActiveX controls, and scripting to be enabled.
 
           In contrast to the other TQAxServer examples Internet Explorer will not
 open a dialog box to ask the user whether or not the scripting of the GLBox
diff --git a/doc/html/qaxserver-example-simple.html b/doc/html/qaxserver-example-simple.html
index 4cc86423..7a4caf05 100644
--- a/doc/html/qaxserver-example-simple.html
+++ b/doc/html/qaxserver-example-simple.html
@@ -130,7 +130,7 @@ and TQAxBindable::propertyChanged
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/simple.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 WebBrowser to support ActiveX controls, and scripting to be enabled.
 
           The simple ActiveX control is embedded using the <object> tag.
 
diff --git a/doc/html/qaxserver-example-tetrax.html b/doc/html/qaxserver-example-tetrax.html
index bbe994a0..4f8418d0 100644
--- a/doc/html/qaxserver-example-tetrax.html
+++ b/doc/html/qaxserver-example-tetrax.html
@@ -47,7 +47,7 @@ tetrax.cpp file.
 
 The default implementation of the TQAxFactory is used through the 
 TQAXFACTORY_DEFAULT macro, and exports the TQTetrax object specifying
-the five unique IDs retquired by COM to instantiate and communicate with
+the five unique IDs required by COM to instantiate and communicate with
 the server.
 
              #include "qtetrax.h"
     #include "qdragapp.h"
@@ -86,7 +86,7 @@ the program has been started by the user, not by COM).
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/tetrix.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 Web browser to support ActiveX controls, and scripting to be enabled.
 
           
 
diff --git a/doc/html/qaxserver-example-wrapper.html b/doc/html/qaxserver-example-wrapper.html
index dad6313b..f74c8043 100644
--- a/doc/html/qaxserver-example-wrapper.html
+++ b/doc/html/qaxserver-example-wrapper.html
@@ -144,7 +144,7 @@ IDs of the COM classes and interfaces for each control.
 
           To build the example you must first build the TQAxServer library. Then run qmake and your make tool in 
 examples/wrapper.
 
           
          
-
           The demonstration retquires your
+
           The demonstration requires your
 WebBrowser to support ActiveX controls, and scripting to be enabled.
 
           
 
diff --git a/doc/html/qaxserver.html b/doc/html/qaxserver.html
index 766a1e04..ad20e4c4 100644
--- a/doc/html/qaxserver.html
+++ b/doc/html/qaxserver.html
@@ -141,7 +141,7 @@ body { background: #ffffff; color: black; }
 
           
           Introduction
 
          
 
           The TQAxServer module provides a static library implementing the
-functions retquired to turn a standard TQt binary into an ActiveX
+functions required to turn a standard TQt binary into an ActiveX
 control server. 
 
           This module is part of the ActiveTQt
     framework. (To incorporate ActiveX controls in a TQt
@@ -195,7 +195,7 @@ You can modify these files as long as it includes any file as the
 type library entry, ie. you can add version information or use a
 different toolbox icon.
 
           The activeqt configuration will cause the qmake tool to add the 
-retquired build steps to the build system:
+required build steps to the build system:
 
            
 
          •  link the binary against qaxserver.lib
 
          •  generate an interface definition and link the type library into
@@ -226,7 +226,7 @@ continue to run.
 
             An in-process server is usually smaller and has faster startup
 time. The communication between client and server is done directly
 through virtual function calls and does not introduce the overhead
-retquired for remote procedure calls. But if the server crashes the
+required for remote procedure calls. But if the server crashes the
 client application is likely to crash as well.
 
             Both server types can use TQt either as a shared library, or
 statically linked into the server binary.
@@ -259,7 +259,7 @@ Microsoft Visual C++ 6.0 compiler.
 
             When the error occurs in code that uses the TQAXFACTORY_DEFAULT
 macro, the widget class had no constructor that can be used by the
 default factory. Either add a standard widget constructor or
-implement a custom factory that doesn't retquire one.
+implement a custom factory that doesn't require one.
 
             When the error occurs in code that uses the TQAXFACTORY_EXPORT
 macro, the TQAxFactory subclass had no appropriate constructor.
 Provide a public class constructor like
@@ -304,18 +304,18 @@ of the binary to make it into an ActiveX server.
 
          •  Attach the type library as a binary resource to the server
 
          •  Register the server
 
          
-
           For this to work the server has to meet some retquirements:
+
           For this to work the server has to meet some requirements:
 
           
            
 
          •  All controls exposed can be created with nothing but a TQApplication
 instance being present
 
          •  The initial linking of the server includes a temporary type 
 library resource
-
          •  All dependencies retquired to run the server are in the system path 
+
          •  All dependencies required to run the server are in the system path 
 (or in the path used by the calling environment; note that Visual 
 Studio has it's own set of environment variables listed in the
 Tools|Options|Directories dialog).
 
          
-
           If those retquirements are not met one ore more of the following 
+
           If those requirements are not met one ore more of the following 
 errors are likely to occure:
 
           
           The server executable crashes
 
          
@@ -341,7 +341,7 @@ the interface definition, and to register the server. If a dynamic
 link library the server links against is not in the path this
 might fail (e.g. Visual Studio calls the server using the
 enivronment settings specified in the "Directories" option). Make
-sure that all DLLs retquired by your server are located in a
+sure that all DLLs required by your server are located in a
 directory that is listed in the path as printed in the error
 message box.
 
           
           The Server does not respond
@@ -386,7 +386,7 @@ or any existing TQWidget subclass:
         Q_OBJECT
     
          
  
-
           The Q_OBJECT macro is retquired to provide the meta object information
+
           The Q_OBJECT macro is required to provide the meta object information
 about the widget to the ActiveTQt framework.
 Use the Q_PROPERTY macro to declare properties for the ActiveX control:
 
           
          @@ -640,7 +640,7 @@ server must export an implementation of a TQAxFactory<
 default factory when the server provides only a single ActiveX
 control, and implement a subclass of TQAxFactory to provide
 multiple ActiveX controls. The default factory is available
-through a macro that takes the identifiers COM retquires to locate
+through a macro that takes the identifiers COM requires to locate
 the ActiveX control on the target system:
 
           
               TQAXFACTORY_DEFAULT ( MyActiveX,
@@ -734,7 +734,7 @@ make the server available to the browser used to view your page, and
 you need to specify the location of the server package in your page.
 
           To specify the location of a server, use the CODEBASE attribute in
 the OBJECT tag of your web-site. The value can point to the server
-file itself, to an INF file listing other files the server retquires
+file itself, to an INF file listing other files the server requires
 (e.g. the TQt DLL), or a compressed CAB archive.
 
           INF and CAB files are documented in almost every book available about
 ActiveX and COM programming as well as in the MSDN library and various
@@ -873,8 +873,8 @@ Ie. the default property of a push button would be "text".
 Ie. the default signal of a push button would be "clicked".
 
 LicenseKey
-Object creation retquires the specified license key. The key can be
-empty to retquire a licensed machine. By default classes are not
+Object creation requires the specified license key. The key can be
+empty to require a licensed machine. By default classes are not
 licensed. Also see the following section.
 
 StockEvents
@@ -951,14 +951,14 @@ macro.
     };
     
          
     
-The key is retquired to be able to create an instance of MyLicensedControl
+The key is required to be able to create an instance of MyLicensedControl
 on a machine that is not licensed itself. The licensed developer can now 
 redistributes the server binary with his application, which creates the control 
 using the value of "LicenseKey", while users of the application cannot create
 the control without the license key.
 
           If a single license key for the control is not sufficient (ie. you want 
 differnet developers to receive different license keys) you can specify an 
-empty key to indicate that the control retquires a license, and reimplement 
+empty key to indicate that the control requires a license, and reimplement 
 TQAxFactory::validateLicenseKey() to verify that a license exists on the 
 system (ie. through a license file).
 
           
           More Interfaces
@@ -1056,10 +1056,10 @@ Microsoft
 OLE needs to marshal user defined types by reference (ByRef), and cannot 
 marshal them by value (ByVal). This is why const-references and object
 parameters are not supported for TQRect, TQSize and TQPoint. Also note that
-servers with this datatype retquire Windows 98 or DCOM 1.2 to be installed.
+servers with this datatype require Windows 98 or DCOM 1.2 to be installed.
  Back... 
        2. 
 
-This is not retquired, but gives the client more control over 
+This is not required, but gives the client more control over 
 the ActiveX control.
  Back...
        
 
diff --git a/doc/html/qaxwidget.html b/doc/html/qaxwidget.html
index 006e57f9..9870c0b4 100644
--- a/doc/html/qaxwidget.html
+++ b/doc/html/qaxwidget.html
@@ -235,7 +235,7 @@ VK_CONTROL or VK_MENU
 
 
         This table is the result of experimenting with popular ActiveX controls,
 ie. Internet Explorer and Microsoft Office applications, but for some
-controls it might retquire modification.
+controls it might require modification.
 
 
 
        
diff --git a/doc/html/qbig5codec-h.html b/doc/html/qbig5codec-h.html
index f815aadb..6e05ce67 100644
--- a/doc/html/qbig5codec-h.html
+++ b/doc/html/qbig5codec-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qbitarray-h.html b/doc/html/qbitarray-h.html
index 754bf12d..e0b4397b 100644
--- a/doc/html/qbitarray-h.html
+++ b/doc/html/qbitarray-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qbitarray.html b/doc/html/qbitarray.html
index 7584aa87..8ea0a68b 100644
--- a/doc/html/qbitarray.html
+++ b/doc/html/qbitarray.html
@@ -84,7 +84,7 @@ arrays or bits.
 
         Bits can be manipulated by the setBit() and clearBit() functions,
 but it is also possible to use the indexing [] operator to test
 and set individual bits. The [] operator is a little slower than
-setBit() and clearBit() because some tricks are retquired to
+setBit() and clearBit() because some tricks are required to
 implement single-bit assignments.
 
         Example:
 
        diff --git a/doc/html/qbitmap-h.html b/doc/html/qbitmap-h.html
index cd46a33f..c4b991eb 100644
--- a/doc/html/qbitmap-h.html
+++ b/doc/html/qbitmap-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qbitval.html b/doc/html/qbitval.html
index 759a7427..641bdd2d 100644
--- a/doc/html/qbitval.html
+++ b/doc/html/qbitval.html
@@ -49,7 +49,7 @@ body { background: #ffffff; color: black; }
 
 The TQBitVal class is an internal class, used with TQBitArray.
 
         
-
         The TQBitVal is retquired by the indexing [] operator on bit arrays.
+
         The TQBitVal is required by the indexing [] operator on bit arrays.
 It is not for use in any other context.
 
        See also Collection Classes.
 
diff --git a/doc/html/qbrush-h.html b/doc/html/qbrush-h.html
index 50938b22..ca33253c 100644
--- a/doc/html/qbrush-h.html
+++ b/doc/html/qbrush-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qbuffer-h.html b/doc/html/qbuffer-h.html
index b7ec7c80..5fafba80 100644
--- a/doc/html/qbuffer-h.html
+++ b/doc/html/qbuffer-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qbutton-h.html b/doc/html/qbutton-h.html
index bad80e7e..6476f2e1 100644
--- a/doc/html/qbutton-h.html
+++ b/doc/html/qbutton-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qbuttongroup-h.html b/doc/html/qbuttongroup-h.html
index 9061a805..da29b22c 100644
--- a/doc/html/qbuttongroup-h.html
+++ b/doc/html/qbuttongroup-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcache-h.html b/doc/html/qcache-h.html
index 3eb240fe..96a63fe9 100644
--- a/doc/html/qcache-h.html
+++ b/doc/html/qcache-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html
index 1b1f4ffa..c6fdf861 100644
--- a/doc/html/qcanvas-h.html
+++ b/doc/html/qcanvas-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcanvas.html b/doc/html/qcanvas.html
index 5c68676f..fbfdbd12 100644
--- a/doc/html/qcanvas.html
+++ b/doc/html/qcanvas.html
@@ -266,7 +266,7 @@ item is an item that is in motion; see setVelocity().)
 canvas item is called with paramater 0. Then all these canvas
 items are called again, with parameter 1. In phase 0, the canvas
 items should not change position, merely examine other items on
-the canvas for which special processing is retquired, such as
+the canvas for which special processing is required, such as
 collisions between items. In phase 1, all canvas items should
 change positions, ignoring any other items on the canvas. This
 two-phase approach allows for considerations of "fairness",
@@ -408,10 +408,10 @@ many objects on the canvas.
 
         The canvas is divided into chunks which are rectangular areas chunksze wide by chunksze high. Use a chunk size which is about
 the average size of the canvas items. If you choose a chunk size
 which is too small it will increase the amount of calculation
-retquired when drawing since each change will affect many chunks.
+required when drawing since each change will affect many chunks.
 If you choose a chunk size which is too large the amount of
-drawing retquired will increase because for each change, a lot of
-drawing will be retquired since there will be many (unchanged)
+drawing required will increase because for each change, a lot of
+drawing will be required since there will be many (unchanged)
 canvas items which are in the same chunk as the changed canvas
 items.
 
         Internally, a canvas uses a low-resolution "chunk matrix" to keep
diff --git a/doc/html/qcanvaspolygonalitem.html b/doc/html/qcanvaspolygonalitem.html
index 213ffd47..a24b3024 100644
--- a/doc/html/qcanvaspolygonalitem.html
+++ b/doc/html/qcanvaspolygonalitem.html
@@ -79,7 +79,7 @@ handling, etc., which is much faster for non-rectangular items.
 
         Derived classes should try to define as small an area as possible
 to maximize efficiency, but the polygon must definitely be
 contained completely within the polygonal area. Calculating the
-exact retquirements is usually difficult, but if you allow a small
+exact requirements is usually difficult, but if you allow a small
 overestimate it can be easy and tquick, while still getting almost
 all of TQCanvasPolygonalItem's speed.
 
         Note that all subclasses must call hide() in their destructor
diff --git a/doc/html/qcanvasspline.html b/doc/html/qcanvasspline.html
index 40ec0666..3fafc390 100644
--- a/doc/html/qcanvasspline.html
+++ b/doc/html/qcanvasspline.html
@@ -101,11 +101,11 @@ Set the spline control points to ctrl.
 
         If close is TRUE, then the first point in ctrl will be
 re-used as the last point, and the number of control points must
 be a multiple of 3. If close is FALSE, one additional control
-point is retquired, and the number of control points must be one of
+point is required, and the number of control points must be one of
 (4, 7, 10, 13, ...).
 
         If the number of control points doesn't meet the above conditions,
 the number of points will be truncated to the largest number of
-points that do meet the retquirement.
+points that do meet the requirement.
 
 
        Example: canvas/canvas.cpp.
 
diff --git a/doc/html/qcdestyle-h.html b/doc/html/qcdestyle-h.html
index 5ad1dedb..0148ce80 100644
--- a/doc/html/qcdestyle-h.html
+++ b/doc/html/qcdestyle-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcheckbox-h.html b/doc/html/qcheckbox-h.html
index 1044e650..109f3ee0 100644
--- a/doc/html/qcheckbox-h.html
+++ b/doc/html/qcheckbox-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qclipboard-h.html b/doc/html/qclipboard-h.html
index 6345160c..94ea7737 100644
--- a/doc/html/qclipboard-h.html
+++ b/doc/html/qclipboard-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcolor-h.html b/doc/html/qcolor-h.html
index cb40dd6c..6759c8f9 100644
--- a/doc/html/qcolor-h.html
+++ b/doc/html/qcolor-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcolor.html b/doc/html/qcolor.html
index 421cbde1..c296808a 100644
--- a/doc/html/qcolor.html
+++ b/doc/html/qcolor.html
@@ -262,7 +262,7 @@ don't need to call this function.
 
 
        void TQColor::cleanup () [static]
 
        
-Internal clean up retquired for TQColor.
+Internal clean up required for TQColor.
 This function is called from the TQApplication destructor.
 
         
        See also initialize().
 
@@ -390,7 +390,7 @@ Use getHsv() instead.
 
        Example: themes/metal.cpp.
 
        void TQColor::initialize () [static]
 
        
-Internal initialization retquired for TQColor.
+Internal initialization required for TQColor.
 This function is called from the TQApplication constructor.
 
         
        See also cleanup().
 
diff --git a/doc/html/qcolordialog-h.html b/doc/html/qcolordialog-h.html
index 89a80390..05366627 100644
--- a/doc/html/qcolordialog-h.html
+++ b/doc/html/qcolordialog-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcombobox-h.html b/doc/html/qcombobox-h.html
index fcd4dd37..73f25bea 100644
--- a/doc/html/qcombobox-h.html
+++ b/doc/html/qcombobox-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcommonstyle-h.html b/doc/html/qcommonstyle-h.html
index 34638c1c..1b1a0a6e 100644
--- a/doc/html/qcommonstyle-h.html
+++ b/doc/html/qcommonstyle-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcopchannel.html b/doc/html/qcopchannel.html
index 44b9b660..4de884fb 100644
--- a/doc/html/qcopchannel.html
+++ b/doc/html/qcopchannel.html
@@ -122,7 +122,7 @@ This example assumes that the msg is a DCOP-style function
 signature and the data contains the function's arguments. (See
 send().)
 
         Using the DCOP convention is a recommendation, but not a
-retquirement. Whatever convention you use the sender and receiver
+requirement. Whatever convention you use the sender and receiver
 must agree on the argument types.
 
         
        See also send().
 
@@ -154,7 +154,7 @@ functionname(types) where types is a list of zero or more
 comma-separated type names, with no whitespace, no consts and no
 pointer or reference marks, i.e. no "*" or "&".
 
         Using the DCOP convention is a recommendation, but not a
-retquirement. Whatever convention you use the sender and receiver
+requirement. Whatever convention you use the sender and receiver
 must agree on the argument types.
 
         
        See also receive().
 
diff --git a/doc/html/qcopchannel_qws-h.html b/doc/html/qcopchannel_qws-h.html
index 00c0b316..e68bd7d9 100644
--- a/doc/html/qcopchannel_qws-h.html
+++ b/doc/html/qcopchannel_qws-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html
index 15756a83..0d0682d3 100644
--- a/doc/html/qcstring-h.html
+++ b/doc/html/qcstring-h.html
@@ -55,7 +55,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qcursor-h.html b/doc/html/qcursor-h.html
index bbd490de..3adf6a19 100644
--- a/doc/html/qcursor-h.html
+++ b/doc/html/qcursor-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdatabrowser-h.html b/doc/html/qdatabrowser-h.html
index 1d7ebede..cf110818 100644
--- a/doc/html/qdatabrowser-h.html
+++ b/doc/html/qdatabrowser-h.html
@@ -53,7 +53,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdatastream-h.html b/doc/html/qdatastream-h.html
index c2175e6a..c37ab7b1 100644
--- a/doc/html/qdatastream-h.html
+++ b/doc/html/qdatastream-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdatastream.html b/doc/html/qdatastream.html
index 316e9351..7f710323 100644
--- a/doc/html/qdatastream.html
+++ b/doc/html/qdatastream.html
@@ -201,7 +201,7 @@ number to give yourself room for future expansion. For example:
 default setting is big endian (MSB first). Changing it to little
 endian breaks the portability (unless the reader also changes to
 little endian). We recommend keeping this setting unless you have
-special retquirements.
+special requirements.
 
         
 
         Reading and writing raw binary data
 
        
@@ -486,7 +486,7 @@ reference to the stream.
 Sets the serialization byte order to bo.
 
         The bo parameter can be TQDataStream::BigEndian or TQDataStream::LittleEndian.
 
         The default setting is big endian. We recommend leaving this
-setting unless you have special retquirements.
+setting unless you have special requirements.
 
         
        See also byteOrder().
 
 
        void TQDataStream::setDevice ( TQIODevice * d )
diff --git a/doc/html/qdatatable-h.html b/doc/html/qdatatable-h.html
index d47ae226..be5eb8b7 100644
--- a/doc/html/qdatatable-h.html
+++ b/doc/html/qdatatable-h.html
@@ -53,7 +53,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdataview-h.html b/doc/html/qdataview-h.html
index b4dea455..a4b604e1 100644
--- a/doc/html/qdataview-h.html
+++ b/doc/html/qdataview-h.html
@@ -53,7 +53,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdatetime-h.html b/doc/html/qdatetime-h.html
index 011f246e..44c382f5 100644
--- a/doc/html/qdatetime-h.html
+++ b/doc/html/qdatetime-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdatetimeedit-h.html b/doc/html/qdatetimeedit-h.html
index 55eb0860..dc4d6efd 100644
--- a/doc/html/qdatetimeedit-h.html
+++ b/doc/html/qdatetimeedit-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdeepcopy-h.html b/doc/html/qdeepcopy-h.html
index 7a31b6b1..a0248c39 100644
--- a/doc/html/qdeepcopy-h.html
+++ b/doc/html/qdeepcopy-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdesktopwidget-h.html b/doc/html/qdesktopwidget-h.html
index a1ea27ef..72ae4975 100644
--- a/doc/html/qdesktopwidget-h.html
+++ b/doc/html/qdesktopwidget-h.html
@@ -52,7 +52,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdial-h.html b/doc/html/qdial-h.html
index 14693fb1..25a4374b 100644
--- a/doc/html/qdial-h.html
+++ b/doc/html/qdial-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdialog-h.html b/doc/html/qdialog-h.html
index 1c4925d4..662001c0 100644
--- a/doc/html/qdialog-h.html
+++ b/doc/html/qdialog-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdialog.html b/doc/html/qdialog.html
index 01945715..79f1c0dc 100644
--- a/doc/html/qdialog.html
+++ b/doc/html/qdialog.html
@@ -158,7 +158,7 @@ controlled with setExtension(), 
         Modal dialogs are often used in situations where a return value is
-retquired, e.g. to indicate whether the user pressed "OK" or
+required, e.g. to indicate whether the user pressed "OK" or
 "Cancel". A dialog can be closed by calling the accept() or the
 reject() slots, and exec() will return Accepted or Rejected
 as appropriate. The exec() call returns the result of the dialog.
diff --git a/doc/html/qdict-h.html b/doc/html/qdict-h.html
index 3975ed2f..863f7f7f 100644
--- a/doc/html/qdict-h.html
+++ b/doc/html/qdict-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdir-h.html b/doc/html/qdir-h.html
index 953cccf3..1213471a 100644
--- a/doc/html/qdir-h.html
+++ b/doc/html/qdir-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdirectpainter_qws-h.html b/doc/html/qdirectpainter_qws-h.html
index dde44f48..31ff6628 100644
--- a/doc/html/qdirectpainter_qws-h.html
+++ b/doc/html/qdirectpainter_qws-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html
index 8f57d2bd..99c24e2f 100644
--- a/doc/html/qdns-h.html
+++ b/doc/html/qdns-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html
index 1beab2a5..ca976754 100644
--- a/doc/html/qdockarea-h.html
+++ b/doc/html/qdockarea-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdockwindow-h.html b/doc/html/qdockwindow-h.html
index 31e3a6a1..f8ba5a47 100644
--- a/doc/html/qdockwindow-h.html
+++ b/doc/html/qdockwindow-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdockwindow.html b/doc/html/qdockwindow.html
index a22281b0..59de4f32 100644
--- a/doc/html/qdockwindow.html
+++ b/doc/html/qdockwindow.html
@@ -443,7 +443,7 @@ proper behavior and even then TQDockWindow does not limit stretchablilty.
 
        Set this property's value with setMovingEnabled() and get this property's value with isMovingEnabled().
 
        bool newLine
        
 
        This property holds whether the dock window prefers to start a new line in the dock area.
-
        The default is FALSE, i.e. the dock window doesn't retquire a new
+
        The default is FALSE, i.e. the dock window doesn't require a new
 line in the dock area.
 
 
        Set this property's value with setNewLine() and get this property's value with newLine().
diff --git a/doc/html/qdom-h.html b/doc/html/qdom-h.html
index bdd2cb8e..4f4d0619 100644
--- a/doc/html/qdom-h.html
+++ b/doc/html/qdom-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdomdocument.html b/doc/html/qdomdocument.html
index 6427a8c1..e236b109 100644
--- a/doc/html/qdomdocument.html
+++ b/doc/html/qdomdocument.html
@@ -392,7 +392,7 @@ will also change the other. If you want to make a TQDomDocument::setContent ( const TQByteArray & buffer, bool namespaceProcessing, TQString * errorMsg = 0, int * errorLine = 0, int * errorColumn = 0 )
 
 This function parses the XML document from the byte array buffer and sets it as the content of the document. It tries to
-detect the encoding of the document as retquired by the XML
+detect the encoding of the document as required by the XML
 specification.
 
         If namespaceProcessing is TRUE, the parser recognizes
 namespaces in the XML file and sets the prefix name, local name
diff --git a/doc/html/qdomnodelist.html b/doc/html/qdomnodelist.html
index a3050b42..38c3104b 100644
--- a/doc/html/qdomnodelist.html
+++ b/doc/html/qdomnodelist.html
@@ -57,7 +57,7 @@ The TQDomNodeList class is a list of TQDomNode objec
 
         
 
 
         Lists can be obtained by TQDomDocument::elementsByTagName() and
-TQDomNode::childNodes(). The Document Object Model (DOM) retquires
+TQDomNode::childNodes(). The Document Object Model (DOM) requires
 these lists to be "live": whenever you change the underlying
 document, the contents of the list will get updated.
 
         You can get a particular node from the list with item(). The
diff --git a/doc/html/qdragobject-h.html b/doc/html/qdragobject-h.html
index 295ef4c3..7a868a27 100644
--- a/doc/html/qdragobject-h.html
+++ b/doc/html/qdragobject-h.html
@@ -52,7 +52,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdrawutil-h.html b/doc/html/qdrawutil-h.html
index 73d8d96d..a9a3f955 100644
--- a/doc/html/qdrawutil-h.html
+++ b/doc/html/qdrawutil-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qdropsite-h.html b/doc/html/qdropsite-h.html
index 43689c34..2c3e5112 100644
--- a/doc/html/qdropsite-h.html
+++ b/doc/html/qdropsite-h.html
@@ -52,7 +52,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qeditorfactory-h.html b/doc/html/qeditorfactory-h.html
index 347e2eed..71d6469b 100644
--- a/doc/html/qeditorfactory-h.html
+++ b/doc/html/qeditorfactory-h.html
@@ -53,7 +53,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qerrormessage-h.html b/doc/html/qerrormessage-h.html
index cc6d4f02..d466f018 100644
--- a/doc/html/qerrormessage-h.html
+++ b/doc/html/qerrormessage-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qeucjpcodec-h.html b/doc/html/qeucjpcodec-h.html
index 4f55c57e..3fb00617 100644
--- a/doc/html/qeucjpcodec-h.html
+++ b/doc/html/qeucjpcodec-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qeuckrcodec-h.html b/doc/html/qeuckrcodec-h.html
index fade5071..95e0011b 100644
--- a/doc/html/qeuckrcodec-h.html
+++ b/doc/html/qeuckrcodec-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qevent-h.html b/doc/html/qevent-h.html
index b700cf3d..2f0e57c7 100644
--- a/doc/html/qevent-h.html
+++ b/doc/html/qevent-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html
index b9383976..f0c15f05 100644
--- a/doc/html/qeventloop-h.html
+++ b/doc/html/qeventloop-h.html
@@ -52,7 +52,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfile-h.html b/doc/html/qfile-h.html
index 12a8b0de..b871d35a 100644
--- a/doc/html/qfile-h.html
+++ b/doc/html/qfile-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfiledialog-h.html b/doc/html/qfiledialog-h.html
index 52fcf5b5..f44db2e8 100644
--- a/doc/html/qfiledialog-h.html
+++ b/doc/html/qfiledialog-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfiledialog.html b/doc/html/qfiledialog.html
index c9bb992c..2f624f2a 100644
--- a/doc/html/qfiledialog.html
+++ b/doc/html/qfiledialog.html
@@ -379,7 +379,7 @@ to the bottom of the file dialog.
 
 Returns the current directory shown in the file dialog.
 
         The ownership of the TQDir pointer is transferred to the caller, so
-it must be deleted by the caller when no longer retquired.
+it must be deleted by the caller when no longer required.
 
         
        See also setDir().
 
 
        void TQFileDialog::dirEntered ( const TQString & ) [signal]
diff --git a/doc/html/qfileinfo-h.html b/doc/html/qfileinfo-h.html
index 43f65f73..2077d6da 100644
--- a/doc/html/qfileinfo-h.html
+++ b/doc/html/qfileinfo-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfocusdata-h.html b/doc/html/qfocusdata-h.html
index 4296e082..c900dc19 100644
--- a/doc/html/qfocusdata-h.html
+++ b/doc/html/qfocusdata-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfont-h.html b/doc/html/qfont-h.html
index af4c5a1e..00d34475 100644
--- a/doc/html/qfont-h.html
+++ b/doc/html/qfont-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfont.html b/doc/html/qfont.html
index c410d5c9..3f60643f 100644
--- a/doc/html/qfont.html
+++ b/doc/html/qfont.html
@@ -642,7 +642,7 @@ Saves the glyphs in the font that have previously been accessed as
 a TQPF file. If all is TRUE (the default), then before saving,
 all glyphs are marked as used.
 
         If the font is large and you are sure that only a subset of
-characters will ever be retquired on the target device, passing
+characters will ever be required on the target device, passing
 FALSE for the all parameter can save a significant amount of
 disk space.
 
         Note that this function is only applicable on TQt/Embedded.
diff --git a/doc/html/qfontdatabase-h.html b/doc/html/qfontdatabase-h.html
index a0e67731..cc2bbd06 100644
--- a/doc/html/qfontdatabase-h.html
+++ b/doc/html/qfontdatabase-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfontdialog-h.html b/doc/html/qfontdialog-h.html
index bdc2c340..cc934c43 100644
--- a/doc/html/qfontdialog-h.html
+++ b/doc/html/qfontdialog-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfontinfo-h.html b/doc/html/qfontinfo-h.html
index 4489ea9e..e16a52df 100644
--- a/doc/html/qfontinfo-h.html
+++ b/doc/html/qfontinfo-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfontmanager_qws-h.html b/doc/html/qfontmanager_qws-h.html
index 0b102e67..05ee1cb0 100644
--- a/doc/html/qfontmanager_qws-h.html
+++ b/doc/html/qfontmanager_qws-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qfontmetrics-h.html b/doc/html/qfontmetrics-h.html
index 78ee858d..b173fbae 100644
--- a/doc/html/qfontmetrics-h.html
+++ b/doc/html/qfontmetrics-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qframe-h.html b/doc/html/qframe-h.html
index 3edc3110..01c1161a 100644
--- a/doc/html/qframe-h.html
+++ b/doc/html/qframe-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qftp-h.html b/doc/html/qftp-h.html
index b1aa13fa..39d08fe0 100644
--- a/doc/html/qftp-h.html
+++ b/doc/html/qftp-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgb18030codec-h.html b/doc/html/qgb18030codec-h.html
index 635e2458..c46d0f0a 100644
--- a/doc/html/qgb18030codec-h.html
+++ b/doc/html/qgb18030codec-h.html
@@ -52,7 +52,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgfx_qws-h.html b/doc/html/qgfx_qws-h.html
index 4551ca62..68bcb4b3 100644
--- a/doc/html/qgfx_qws-h.html
+++ b/doc/html/qgfx_qws-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgfxdriverfactory_qws-h.html b/doc/html/qgfxdriverfactory_qws-h.html
index 66f2e1a7..b54dcec2 100644
--- a/doc/html/qgfxdriverfactory_qws-h.html
+++ b/doc/html/qgfxdriverfactory_qws-h.html
@@ -52,7 +52,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgfxdriverplugin_qws-h.html b/doc/html/qgfxdriverplugin_qws-h.html
index 9c3db4f4..46078e67 100644
--- a/doc/html/qgfxdriverplugin_qws-h.html
+++ b/doc/html/qgfxdriverplugin_qws-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html
index 2459aab6..86ba13ce 100644
--- a/doc/html/qgl-h.html
+++ b/doc/html/qgl-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qglcolormap-h.html b/doc/html/qglcolormap-h.html
index dde9d0af..81fa6299 100644
--- a/doc/html/qglcolormap-h.html
+++ b/doc/html/qglcolormap-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qglcontext.html b/doc/html/qglcontext.html
index 8f0ab6bf..215ef3d6 100644
--- a/doc/html/qglcontext.html
+++ b/doc/html/qglcontext.html
@@ -137,7 +137,7 @@ visual that matches the format using the given device handle,
 reducing the demands if the original request cannot be met.
 
         The algorithm for reducing the demands of the format is quite
 simple-minded, so override this method in your subclass if your
-application has specific retquirements on visual selection.
+application has specific requirements on visual selection.
 
         
        See also chooseContext().
 
 
        int TQGLContext::choosePixelFormat ( void * dummyPfd, HDC pdc ) [virtual protected]
@@ -157,7 +157,7 @@ visual that matches the format, reducing the demands if the original
 request cannot be met.
 
         The algorithm for reducing the demands of the format is quite
 simple-minded, so override this method in your subclass if your
-application has spcific retquirements on visual selection.
+application has spcific requirements on visual selection.
 
         
        See also chooseContext().
 
 
        bool TQGLContext::create ( const TQGLContext * shareContext = 0 ) [virtual]
diff --git a/doc/html/qglformat.html b/doc/html/qglformat.html
index 76ebe9c3..4eb3057e 100644
--- a/doc/html/qglformat.html
+++ b/doc/html/qglformat.html
@@ -131,7 +131,7 @@ requested features the system was able to provide:
     if ( !w->format().stereo() ) {
         // ok, goggles off
         if ( !w->format().hasOverlay() ) {
-            qFatal( "Cool hardware retquired" );
+            qFatal( "Cool hardware required" );
         }
     }
     
        
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 1d5932b8..285a4d9b 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
@@ -601,7 +601,7 @@ body { background: #ffffff; color: black; }
 #  define Q_WS_MAC9
 #elif defined(Q_OS_MSDOS)
 #  define Q_WS_WIN16
-#  error "TQt retquires Win32 and does not work with Windows 3.x"
+#  error "TQt requires Win32 and does not work with Windows 3.x"
 #elif defined(_WIN32_X11_)
 #  define Q_WS_X11
 #elif defined(Q_OS_WIN32)
@@ -1116,7 +1116,7 @@ Q_EXPORT const char *qInstallPathSysconf();
 
 /*
  compilers which follow outdated template instantiation rules
- retquire a class to have a comparison operator to exist when
+ require a class to have a comparison operator to exist when
  a TQValueList of this type is instantiated. It's not actually
  used in the list, though. Hence the dummy implementation.
  Just in case other code relies on it we better trigger a warning
diff --git a/doc/html/qglwidget.html b/doc/html/qglwidget.html
index a9fa0e7e..694f7182 100644
--- a/doc/html/qglwidget.html
+++ b/doc/html/qglwidget.html
@@ -356,7 +356,7 @@ function.
 This virtual function is called once before the first call to
 paintGL() or resizeGL(), and then once whenever the widget has
 been assigned a new TQGLContext. Reimplement it in a subclass.
-
         This function should set up any retquired OpenGL context rendering
+
         This function should set up any required OpenGL context rendering
 flags, defining display lists, etc.
 
         There is no need to call makeCurrent() because this has already
 been done when this function is called.
@@ -368,7 +368,7 @@ except that it operates on the widget's overlay context instead of
 the widget's main context. This means that initializeOverlayGL()
 is called once before the first call to paintOverlayGL() or
 resizeOverlayGL(). Reimplement it in a subclass.
-
         This function should set up any retquired OpenGL context rendering
+
         This function should set up any required OpenGL context rendering
 flags, defining display lists, etc. for the overlay context.
 
         There is no need to call makeOverlayCurrent() because this has
 already been done when this function is called.
diff --git a/doc/html/qgrid-h.html b/doc/html/qgrid-h.html
index 3f9bf0d7..31316c95 100644
--- a/doc/html/qgrid-h.html
+++ b/doc/html/qgrid-h.html
@@ -50,7 +50,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgridview-h.html b/doc/html/qgridview-h.html
index 0d699493..68921e88 100644
--- a/doc/html/qgridview-h.html
+++ b/doc/html/qgridview-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qgroupbox-h.html b/doc/html/qgroupbox-h.html
index a943c0e6..1584eb2e 100644
--- a/doc/html/qgroupbox-h.html
+++ b/doc/html/qgroupbox-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qguardedptr-h.html b/doc/html/qguardedptr-h.html
index 311a16e3..d3588910 100644
--- a/doc/html/qguardedptr-h.html
+++ b/doc/html/qguardedptr-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qguardedptr.html b/doc/html/qguardedptr.html
index b62e9586..4b5ebed3 100644
--- a/doc/html/qguardedptr.html
+++ b/doc/html/qguardedptr.html
@@ -93,7 +93,7 @@ them using either the *x or the x->member notation.
 
         A guarded pointer will automatically cast to an X*, so you can
 freely mix guarded and unguarded pointers. This means that if you
 have a TQGuardedPtr, you can pass it to a function that
-retquires a TQWidget*. For this reason, it is of little value to
+requires a TQWidget*. For this reason, it is of little value to
 declare functions to take a TQGuardedPtr as a parameter; just use
 normal pointers. Use a TQGuardedPtr when you are storing a pointer
 over time.
@@ -139,7 +139,7 @@ there is no referenced object; otherwise returns FALSE.
 
 
         Cast operator; implements pointer semantics. Because of this
 function you can pass a TQGuardedPtr<X> to a function where an X*
-is retquired.
+is required.
 
 
        bool TQGuardedPtr::operator!= ( const TQGuardedPtr<T> & p ) const
 
        
diff --git a/doc/html/qhbox-h.html b/doc/html/qhbox-h.html
index 0fde00b4..f83b4ddb 100644
--- a/doc/html/qhbox-h.html
+++ b/doc/html/qhbox-h.html
@@ -50,7 +50,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qhbuttongroup-h.html b/doc/html/qhbuttongroup-h.html
index 863c7cb0..e79ed3de 100644
--- a/doc/html/qhbuttongroup-h.html
+++ b/doc/html/qhbuttongroup-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qheader-h.html b/doc/html/qheader-h.html
index f6cb9137..3fecd36e 100644
--- a/doc/html/qheader-h.html
+++ b/doc/html/qheader-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qhgroupbox-h.html b/doc/html/qhgroupbox-h.html
index e05cf2a0..01db686a 100644
--- a/doc/html/qhgroupbox-h.html
+++ b/doc/html/qhgroupbox-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qhostaddress-h.html b/doc/html/qhostaddress-h.html
index 97788675..ffbed3a3 100644
--- a/doc/html/qhostaddress-h.html
+++ b/doc/html/qhostaddress-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qhttp-h.html b/doc/html/qhttp-h.html
index e25d9527..3bb8b34a 100644
--- a/doc/html/qhttp-h.html
+++ b/doc/html/qhttp-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qhttp.html b/doc/html/qhttp.html
index 9d830fc9..3d20edba 100644
--- a/doc/html/qhttp.html
+++ b/doc/html/qhttp.html
@@ -309,7 +309,7 @@ connection and want to close it.
 
         For the requests issued with get(), post() and head(), TQHttp sets
 the connection to be keep-alive. You can also do this using the
 header you pass to the request() function. TQHttp only closes the
-connection to the HTTP server if the response header retquires it
+connection to the HTTP server if the response header requires it
 to do so.
 
         The function does not block and returns immediately. The request
 is scheduled, and its execution is performed asynchronously. The
diff --git a/doc/html/qiconset-h.html b/doc/html/qiconset-h.html
index 6fb45c52..c28ed7ac 100644
--- a/doc/html/qiconset-h.html
+++ b/doc/html/qiconset-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qiconset.html b/doc/html/qiconset.html
index 2389f062..63a11a44 100644
--- a/doc/html/qiconset.html
+++ b/doc/html/qiconset.html
@@ -77,7 +77,7 @@ from the set of icons it is given. Such pixmaps are used by
 TQToolButton, TQHeader, TQPopupMenu, etc. to show an icon representing a
 particular action.
 
         The simplest use of TQIconSet is to create one from a TQPixmap and then
-use it, allowing TQt to work out all the retquired icon styles and
+use it, allowing TQt to work out all the required icon styles and
 sizes. For example:
 
         
             TQToolButton *but = new TQToolButton( TQIconSet( TQPixmap("open.xpm") ), ... );
@@ -174,7 +174,7 @@ pixel size. This is a useful default.
 
      2. TQIconSet::Large - The pixmap is the larger of two.
 
     If a Small pixmap is not set by TQIconSet::setPixmap(), the Large
 pixmap will be automatically scaled down to the size of a small pixmap
-to generate the Small pixmap when retquired.  Similarly, a Small pixmap
+to generate the Small pixmap when required.  Similarly, a Small pixmap
 will be automatically scaled up to generate a Large pixmap. The
 preferred sizes for large/small generated icons can be set using
 setIconSize().
diff --git a/doc/html/qiconview-h.html b/doc/html/qiconview-h.html
index 5dc5eb20..bf10e5dc 100644
--- a/doc/html/qiconview-h.html
+++ b/doc/html/qiconview-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qimage-h.html b/doc/html/qimage-h.html
index 0892e74d..adb34b33 100644
--- a/doc/html/qimage-h.html
+++ b/doc/html/qimage-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
diff --git a/doc/html/qimage.html b/doc/html/qimage.html
index a050b5b3..1624d7a3 100644
--- a/doc/html/qimage.html
+++ b/doc/html/qimage.html
@@ -242,7 +242,7 @@ operations that are independent of endianness.
 
 
     The functions scale() and smoothScale() use different modes for
 scaling the image. The purpose of these modes is to retain the
-ratio of the image if this is retquired.
+ratio of the image if this is required.