From 029f5d5058ffe10de206047602d91b1dbba4cf50 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Mon, 28 Sep 2026 23:24:54 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- examples/aclock/aclock.h | 2 +- examples/action/application.cpp | 2 +- examples/addressbook/centralwidget.h | 2 +- examples/addressbook/mainwindow.cpp | 2 +- examples/application/application.cpp | 2 +- examples/biff/biff.h | 2 +- examples/buttongroups/buttongroups.h | 2 +- examples/canvas/canvas.cpp | 30 +-- examples/canvas/canvas.h | 4 +- examples/chart/canvasview.cpp | 2 +- examples/chart/canvasview.h | 4 +- examples/chart/chartform.cpp | 4 +- examples/chart/optionsform.cpp | 8 +- examples/chart/optionsform.h | 2 +- examples/chart/setdataform.cpp | 2 +- examples/chart/setdataform.h | 2 +- examples/checklists/checklists.cpp | 2 +- examples/checklists/checklists.h | 2 +- examples/customlayout/border.cpp | 16 +- examples/customlayout/border.h | 6 +- examples/customlayout/card.cpp | 10 +- examples/customlayout/flow.cpp | 8 +- examples/customlayout/flow.h | 6 +- examples/dclock/dclock.h | 2 +- examples/demo/display.h | 6 +- examples/demo/dnd/dnd.h | 2 +- examples/demo/dnd/iconview.h | 2 +- examples/demo/dnd/listview.h | 2 +- examples/demo/dnd/styledbutton.h | 4 +- examples/demo/frame.cpp | 4 +- examples/demo/frame.h | 2 +- examples/demo/graph.cpp | 8 +- examples/demo/graph.h | 2 +- examples/demo/i18n/wrapper.h | 2 +- examples/demo/opengl/glbox.h | 2 +- examples/demo/opengl/glcontrolwidget.h | 2 +- examples/demo/opengl/glgear.h | 2 +- examples/demo/opengl/glinfo_x11.cpp | 2 +- examples/demo/opengl/gllandscape.h | 2 +- examples/demo/opengl/gltexobj.h | 2 +- examples/demo/opengl/glworkspace.h | 2 +- examples/demo/qasteroids/toplevel.h | 2 +- examples/demo/qasteroids/view.cpp | 2 +- examples/demo/qasteroids/view.h | 2 +- examples/demo/qthumbwheel.h | 2 +- examples/demo/sql/sqlex.ui.h | 4 +- examples/demo/textdrawing/helpwindow.h | 2 +- examples/demo/textdrawing/textedit.h | 2 +- examples/desktop/desktop.cpp | 4 +- examples/dirview/dirview.cpp | 28 +-- examples/dirview/dirview.h | 6 +- examples/distributor/distributor.ui.h | 6 +- examples/dragdrop/dropsite.h | 2 +- examples/dragdrop/secret.h | 4 +- examples/drawdemo/drawdemo.cpp | 8 +- examples/drawlines/connect.cpp | 2 +- examples/fileiconview/tqfileiconview.cpp | 26 +-- examples/fileiconview/tqfileiconview.h | 4 +- examples/forever/forever.h | 2 +- examples/hello/hello.h | 2 +- examples/helpdemo/helpdemo.cpp | 4 +- examples/helpdemo/helpdemo.h | 2 +- examples/helpsystem/tooltip.h | 4 +- examples/helpsystem/whatsthis.h | 2 +- examples/helpviewer/helpwindow.cpp | 2 +- examples/helpviewer/helpwindow.h | 2 +- examples/helpviewer/main.cpp | 2 +- examples/i18n/main.cpp | 18 +- examples/i18n/mywidget.cpp | 2 +- examples/i18n/mywidget.h | 2 +- examples/iconview/simple_dd/main.h | 4 +- examples/layout/layout.cpp | 2 +- examples/life/life.h | 2 +- examples/life/lifedlg.h | 2 +- examples/lineedits/lineedits.cpp | 2 +- examples/lineedits/lineedits.h | 2 +- examples/listbox/listbox.cpp | 4 +- examples/listboxcombo/listboxcombo.h | 2 +- examples/listviews/listviews.cpp | 2 +- examples/listviews/listviews.h | 2 +- examples/mdi/application.cpp | 8 +- examples/menu/menu.h | 2 +- examples/movies/main.cpp | 12 +- examples/network/clientserver/server/server.cpp | 4 +- examples/network/httpd/httpd.cpp | 2 +- .../network/infoprotocol/infoclient/client.cpp | 2 +- examples/network/infoprotocol/infoclient/client.h | 2 +- examples/network/infoprotocol/infoserver/main.cpp | 2 +- .../network/infoprotocol/infoserver/server.cpp | 2 +- examples/network/infoprotocol/infoserver/server.h | 6 +- .../network/infoprotocol/infourlclient/client.cpp | 2 +- .../network/infoprotocol/infourlclient/client.h | 2 +- examples/network/mail/composer.h | 2 +- examples/network/networkprotocol/view.cpp | 2 +- examples/network/remotecontrol/startup.cpp | 4 +- examples/opengl/box/globjwin.h | 2 +- examples/opengl/gear/gear.cpp | 2 +- examples/opengl/glpixmap/glbox.h | 4 +- examples/opengl/glpixmap/globjwin.h | 2 +- examples/opengl/overlay/globjwin.cpp | 2 +- examples/opengl/overlay/globjwin.h | 2 +- examples/opengl/overlay/main.cpp | 2 +- examples/opengl/overlay_x11/gearwidget.h | 2 +- examples/opengl/overlay_x11/rubberbandwidget.h | 4 +- examples/opengl/sharedbox/glbox.h | 2 +- examples/opengl/sharedbox/globjwin.cpp | 2 +- examples/opengl/sharedbox/globjwin.h | 2 +- examples/opengl/texture/globjwin.h | 2 +- examples/picture/picture.cpp | 4 +- examples/popup/popup.cpp | 2 +- examples/popup/popup.h | 6 +- examples/process/process.cpp | 2 +- examples/progress/progress.cpp | 4 +- examples/progressbar/progressbar.h | 2 +- examples/qfd/fontdisplayer.h | 4 +- examples/qmag/qmag.cpp | 6 +- examples/qwerty/qwerty.cpp | 4 +- examples/qwerty/qwerty.h | 2 +- examples/rangecontrols/rangecontrols.h | 2 +- examples/regexptester/regexptester.cpp | 6 +- examples/regexptester/regexptester.h | 2 +- examples/richtext/richtext.cpp | 4 +- examples/richtext/richtext.h | 2 +- examples/scribble/scribble.cpp | 2 +- examples/scribble/scribble.h | 4 +- examples/scrollview/scrollview.cpp | 16 +- examples/showimg/imagefip.h | 2 +- examples/showimg/imagetexteditor.h | 2 +- examples/showimg/main.cpp | 4 +- examples/showimg/showimg.cpp | 12 +- examples/showimg/showimg.h | 2 +- examples/splitter/splitter.cpp | 4 +- examples/sql/overview/custom1/main.h | 2 +- examples/sql/overview/table3/main.h | 2 +- examples/sql/overview/table4/main.h | 4 +- examples/tabdialog/main.cpp | 2 +- examples/table/statistics/statistics.cpp | 6 +- examples/tablet/canvas.h | 2 +- examples/tablet/scribble.h | 2 +- examples/tablet/tabletstats.h | 4 +- examples/tetrix/qtetrix.h | 4 +- examples/tetrix/qtetrixb.cpp | 12 +- examples/tetrix/qtetrixb.h | 2 +- examples/tetrix/tqdragapp.cpp | 18 +- examples/textedit/textedit.cpp | 2 +- examples/textedit/textedit.h | 2 +- examples/themes/metal.h | 6 +- examples/themes/themes.cpp | 4 +- examples/themes/themes.h | 2 +- examples/themes/wood.cpp | 4 +- examples/themes/wood.h | 10 +- examples/thread/prodcons/prodcons.cpp | 8 +- examples/tictac/tictac.h | 4 +- examples/tooltip/tooltip.cpp | 2 +- examples/tooltip/tooltip.h | 2 +- examples/toplevel/options.ui.h | 4 +- examples/tqdir/tqdir.cpp | 6 +- examples/tux/tux.cpp | 4 +- examples/widgets/main.cpp | 2 +- examples/widgets/widgets.cpp | 2 +- examples/widgets/widgets.h | 6 +- examples/wizard/wizard.h | 2 +- examples/xform/xform.cpp | 6 +- examples/xml/outliner/outlinetree.cpp | 10 +- examples/xml/outliner/outlinetree.h | 2 +- plugins/src/accessible/widgets/main.cpp | 4 +- .../src/accessible/widgets/tqaccessiblemenu.cpp | 6 +- .../src/accessible/widgets/tqaccessiblewidget.cpp | 38 ++-- plugins/src/codecs/cn/main.cpp | 4 +- plugins/src/codecs/jp/main.cpp | 4 +- plugins/src/codecs/kr/main.cpp | 4 +- plugins/src/codecs/tw/main.cpp | 4 +- .../inputmethods/imsw-multi/qmultiinputcontext.cpp | 12 +- .../inputmethods/imsw-multi/qmultiinputcontext.h | 2 +- .../imsw-none/qnoneinputcontextplugin.cpp | 4 +- .../src/inputmethods/simple/qsimpleinputcontext.h | 2 +- plugins/src/inputmethods/xim/qximinputcontext.h | 2 +- .../src/inputmethods/xim/qximinputcontext_x11.cpp | 54 ++--- 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 +- plugins/src/sqldrivers/sqlite3/smain.cpp | 2 +- plugins/src/styles/cde/main.cpp | 2 +- plugins/src/styles/compact/main.cpp | 2 +- plugins/src/styles/motif/main.cpp | 2 +- plugins/src/styles/motifplus/main.cpp | 2 +- plugins/src/styles/platinum/main.cpp | 2 +- plugins/src/styles/sgi/main.cpp | 2 +- plugins/src/styles/windows/main.cpp | 2 +- qmake/examples/tutorial/hello.cpp | 2 +- qmake/generators/win32/msvc_objectmodel.cpp | 2 +- src/canvas/tqcanvas.cpp | 86 +++---- src/canvas/tqcanvas.h | 10 +- src/codecs/tqbig5codec.cpp | 4 +- src/codecs/tqeucjpcodec.cpp | 4 +- src/codecs/tqeuckrcodec.cpp | 2 +- src/codecs/tqfontjpcodec.cpp | 2 +- src/codecs/tqgb18030codec.cpp | 6 +- src/codecs/tqhebrewcodec.cpp | 2 +- src/codecs/tqjiscodec.cpp | 4 +- src/codecs/tqjpunicode.cpp | 62 ++--- src/codecs/tqsjiscodec.cpp | 4 +- src/codecs/tqtextcodec.cpp | 96 ++++---- src/codecs/tqtextcodecfactory.cpp | 8 +- src/codecs/tqtextcodecplugin.cpp | 2 +- src/dialogs/tqcolordialog.cpp | 28 +-- src/dialogs/tqcolordialog.h | 8 +- src/dialogs/tqdialog.cpp | 14 +- src/dialogs/tqdialog.h | 2 +- src/dialogs/tqerrormessage.cpp | 10 +- src/dialogs/tqerrormessage.h | 2 +- src/dialogs/tqfiledialog.cpp | 152 ++++++------- src/dialogs/tqfiledialog.h | 46 ++-- src/dialogs/tqfontdialog.cpp | 4 +- src/dialogs/tqfontdialog.h | 8 +- src/dialogs/tqinputdialog.cpp | 8 +- src/dialogs/tqinputdialog.h | 10 +- src/dialogs/tqmessagebox.cpp | 16 +- src/dialogs/tqmessagebox.h | 8 +- src/dialogs/tqprintdialog.cpp | 50 ++--- src/dialogs/tqprintdialog.h | 4 +- src/dialogs/tqprogressdialog.cpp | 4 +- src/dialogs/tqprogressdialog.h | 4 +- src/dialogs/tqtabdialog.cpp | 26 +-- src/dialogs/tqtabdialog.h | 2 +- src/dialogs/tqwizard.cpp | 16 +- src/dialogs/tqwizard.h | 2 +- src/inputmethod/tqinputcontextfactory.cpp | 6 +- src/inputmethod/tqinputcontextplugin.cpp | 2 +- src/kernel/tqabstractlayout.cpp | 28 +-- src/kernel/tqaccel.cpp | 24 +- src/kernel/tqaccel.h | 4 +- src/kernel/tqaccessible.cpp | 16 +- src/kernel/tqapplication.cpp | 192 ++++++++-------- src/kernel/tqapplication.h | 12 +- src/kernel/tqapplication_p.h | 2 +- src/kernel/tqapplication_x11.cpp | 214 +++++++++--------- src/kernel/tqasyncimageio.cpp | 10 +- src/kernel/tqasyncio.cpp | 2 +- src/kernel/tqbitmap.h | 2 +- src/kernel/tqclipboard.h | 2 +- src/kernel/tqclipboard_x11.cpp | 70 +++--- src/kernel/tqcolor.h | 2 +- src/kernel/tqcolor_x11.cpp | 20 +- src/kernel/tqconnection.cpp | 2 +- src/kernel/tqconnection.h | 2 +- src/kernel/tqcursor_x11.cpp | 12 +- src/kernel/tqdesktopwidget.h | 2 +- src/kernel/tqdesktopwidget_x11.cpp | 12 +- src/kernel/tqdnd_x11.cpp | 138 ++++++------ src/kernel/tqdragobject.cpp | 42 ++-- src/kernel/tqdragobject.h | 20 +- src/kernel/tqdrawutil.cpp | 2 +- src/kernel/tqdrawutil.h | 22 +- src/kernel/tqevent.cpp | 2 +- src/kernel/tqevent.h | 2 +- src/kernel/tqeventloop.cpp | 4 +- src/kernel/tqeventloop.h | 2 +- src/kernel/tqeventloop_unix.cpp | 28 +-- src/kernel/tqeventloop_unix_glib.cpp | 18 +- src/kernel/tqeventloop_x11.cpp | 12 +- src/kernel/tqeventloop_x11_glib.cpp | 6 +- src/kernel/tqfont.cpp | 122 +++++----- src/kernel/tqfont_x11.cpp | 28 +-- src/kernel/tqfontdata_p.h | 2 +- src/kernel/tqfontdatabase.cpp | 80 +++---- src/kernel/tqfontdatabase_x11.cpp | 56 ++--- src/kernel/tqfontengine_p.h | 8 +- src/kernel/tqfontengine_x11.cpp | 62 ++--- src/kernel/tqfontmetrics.h | 4 +- src/kernel/tqgplugin.cpp | 2 +- src/kernel/tqguardedptr.cpp | 4 +- src/kernel/tqguardedptr.h | 8 +- src/kernel/tqiconset.cpp | 44 ++-- src/kernel/tqimage.cpp | 74 +++--- src/kernel/tqimage.h | 16 +- src/kernel/tqimageformatplugin.cpp | 2 +- src/kernel/tqinputcontext.cpp | 12 +- src/kernel/tqinputcontext.h | 4 +- src/kernel/tqinputcontext_p.h | 4 +- src/kernel/tqinternal.cpp | 56 ++--- src/kernel/tqinternal_p.h | 4 +- src/kernel/tqjpegio.cpp | 6 +- src/kernel/tqkeysequence.cpp | 2 +- src/kernel/tqlayout.cpp | 54 ++--- src/kernel/tqlayout.h | 36 +-- src/kernel/tqlocalfs.cpp | 2 +- src/kernel/tqmetaobject.cpp | 88 ++++---- src/kernel/tqmetaobject.h | 6 +- src/kernel/tqmime.cpp | 20 +- src/kernel/tqmngio.cpp | 18 +- src/kernel/tqmotifdnd_x11.cpp | 22 +- src/kernel/tqmovie.cpp | 28 +-- src/kernel/tqmovie.h | 6 +- src/kernel/tqnetworkprotocol.cpp | 16 +- src/kernel/tqobject.cpp | 122 +++++----- src/kernel/tqobject.h | 16 +- src/kernel/tqobjectcleanuphandler.cpp | 6 +- src/kernel/tqobjectdefs.h | 4 +- src/kernel/tqpaintdevice.h | 2 +- src/kernel/tqpaintdevice_x11.cpp | 32 +-- src/kernel/tqpainter.cpp | 44 ++-- src/kernel/tqpainter.h | 12 +- src/kernel/tqpainter_x11.cpp | 96 ++++---- src/kernel/tqpalette.cpp | 4 +- src/kernel/tqpicture.cpp | 2 +- src/kernel/tqpicture.h | 8 +- src/kernel/tqpixmap.cpp | 8 +- src/kernel/tqpixmap.h | 8 +- src/kernel/tqpixmap_x11.cpp | 78 +++---- src/kernel/tqpixmapcache.cpp | 8 +- src/kernel/tqpngio.cpp | 76 +++---- src/kernel/tqpointarray.cpp | 6 +- src/kernel/tqpolygonscanner.cpp | 20 +- src/kernel/tqprinter.h | 2 +- src/kernel/tqprinter_unix.cpp | 24 +- src/kernel/tqprocess.cpp | 12 +- src/kernel/tqprocess.h | 12 +- src/kernel/tqprocess_unix.cpp | 94 ++++---- src/kernel/tqpsprinter.cpp | 94 ++++---- src/kernel/tqregion_x11.cpp | 26 +-- src/kernel/tqrichtext.cpp | 210 ++++++++--------- src/kernel/tqrichtext_p.cpp | 22 +- src/kernel/tqrichtext_p.h | 62 ++--- src/kernel/tqscriptengine_x11.cpp | 102 ++++----- src/kernel/tqsignal.cpp | 2 +- src/kernel/tqsignal.h | 4 +- src/kernel/tqsignalmapper.h | 2 +- src/kernel/tqsignalslotimp.h | 2 +- src/kernel/tqsimplerichtext.cpp | 8 +- src/kernel/tqsimplerichtext.h | 6 +- src/kernel/tqsizegrip.cpp | 2 +- src/kernel/tqsizegrip.h | 2 +- src/kernel/tqsocketnotifier.h | 2 +- src/kernel/tqsound.cpp | 6 +- src/kernel/tqsound.h | 2 +- src/kernel/tqsound_x11.cpp | 4 +- src/kernel/tqstyle.cpp | 12 +- src/kernel/tqstyle.h | 36 +-- src/kernel/tqstylesheet.cpp | 12 +- src/kernel/tqstylesheet.h | 2 +- src/kernel/tqtextengine_p.h | 4 +- src/kernel/tqtextlayout.cpp | 2 +- src/kernel/tqtextlayout_p.h | 6 +- src/kernel/tqthread_unix.cpp | 38 ++-- src/kernel/tqtimer.cpp | 6 +- src/kernel/tqtimer.h | 2 +- src/kernel/tqtranslator.cpp | 56 ++--- src/kernel/tqtranslator.h | 8 +- src/kernel/tqucomextra.cpp | 4 +- src/kernel/tqurl.cpp | 2 +- src/kernel/tqurlinfo.cpp | 12 +- src/kernel/tqurloperator.cpp | 34 +-- src/kernel/tqurloperator.h | 2 +- src/kernel/tqvariant.cpp | 6 +- src/kernel/tqvariant.h | 12 +- src/kernel/tqwidget.cpp | 110 ++++----- src/kernel/tqwidget.h | 8 +- src/kernel/tqwidget_x11.cpp | 48 ++-- src/kernel/tqwmatrix.h | 2 +- src/network/tqdns.cpp | 88 ++++---- src/network/tqftp.cpp | 32 +-- src/network/tqftp.h | 4 +- src/network/tqhttp.cpp | 52 ++--- src/network/tqhttp.h | 14 +- src/network/tqserversocket.cpp | 6 +- src/network/tqserversocket.h | 6 +- src/network/tqsocket.cpp | 64 +++--- src/network/tqsocket.h | 2 +- src/network/tqsocketdevice.cpp | 2 +- src/network/tqsocketdevice.h | 2 +- src/network/tqsocketdevice_unix.cpp | 8 +- src/opengl/tqgl.cpp | 8 +- src/opengl/tqgl.h | 22 +- src/opengl/tqgl_x11.cpp | 58 ++--- src/opengl/tqglcolormap.cpp | 10 +- src/sql/drivers/cache/tqsqlcachedresult.cpp | 10 +- src/sql/drivers/ibase/tqsql_ibase.cpp | 24 +- src/sql/drivers/ibase/tqsql_ibase.h | 4 +- src/sql/drivers/mysql/tqsql_mysql.cpp | 12 +- src/sql/drivers/mysql/tqsql_mysql.h | 4 +- src/sql/drivers/odbc/tqsql_odbc.cpp | 8 +- src/sql/drivers/odbc/tqsql_odbc.h | 4 +- src/sql/drivers/psql/tqsql_psql.cpp | 8 +- src/sql/drivers/psql/tqsql_psql.h | 4 +- src/sql/drivers/sqlite/tqsql_sqlite.cpp | 36 +-- src/sql/drivers/sqlite/tqsql_sqlite.h | 4 +- src/sql/drivers/sqlite3/tqsql_sqlite3.cpp | 20 +- src/sql/drivers/sqlite3/tqsql_sqlite3.h | 4 +- src/sql/tqdatabrowser.h | 2 +- src/sql/tqdatatable.cpp | 42 ++-- src/sql/tqdatatable.h | 6 +- src/sql/tqdataview.h | 2 +- src/sql/tqeditorfactory.cpp | 12 +- src/sql/tqeditorfactory.h | 2 +- src/sql/tqsqlcursor.cpp | 10 +- src/sql/tqsqlcursor.h | 2 +- src/sql/tqsqldatabase.cpp | 26 +-- src/sql/tqsqldatabase.h | 4 +- src/sql/tqsqldriver.h | 2 +- src/sql/tqsqldriverplugin.cpp | 2 +- src/sql/tqsqleditorfactory.cpp | 14 +- src/sql/tqsqleditorfactory.h | 2 +- src/sql/tqsqlform.cpp | 22 +- src/sql/tqsqlform.h | 2 +- src/sql/tqsqlmanager_p.cpp | 4 +- src/sql/tqsqlpropertymap.cpp | 8 +- src/sql/tqsqlquery.cpp | 8 +- src/sql/tqsqlquery.h | 2 +- src/sql/tqsqlrecord.cpp | 12 +- src/sql/tqsqlselectcursor.h | 10 +- src/styles/tqcdestyle.h | 4 +- src/styles/tqcommonstyle.cpp | 78 +++---- src/styles/tqcommonstyle.h | 18 +- src/styles/tqcompactstyle.h | 4 +- src/styles/tqinterlacestyle.cpp | 2 +- src/styles/tqinterlacestyle.h | 6 +- src/styles/tqmotifplusstyle.cpp | 4 +- src/styles/tqmotifplusstyle.h | 10 +- src/styles/tqmotifstyle.cpp | 2 +- src/styles/tqmotifstyle.h | 14 +- src/styles/tqplatinumstyle.h | 8 +- src/styles/tqsgistyle.cpp | 2 +- src/styles/tqsgistyle.h | 10 +- src/styles/tqstylefactory.cpp | 10 +- src/styles/tqstyleplugin.cpp | 2 +- src/styles/tqwindowsstyle.cpp | 2 +- src/styles/tqwindowsstyle.h | 12 +- src/table/tqtable.cpp | 104 ++++----- src/table/tqtable.h | 4 +- src/tools/tqasciidict.h | 2 +- src/tools/tqbuffer.cpp | 4 +- src/tools/tqcleanuphandler.h | 16 +- src/tools/tqcom_p.h | 2 +- src/tools/tqcomlibrary.cpp | 28 +-- src/tools/tqcomponentfactory.cpp | 12 +- src/tools/tqcomponentfactory_p.h | 2 +- src/tools/tqcstring.cpp | 10 +- src/tools/tqcstring.h | 22 +- src/tools/tqdatastream.cpp | 6 +- src/tools/tqdatetime.cpp | 14 +- src/tools/tqdatetime.h | 2 +- src/tools/tqdict.h | 4 +- src/tools/tqdir.cpp | 14 +- src/tools/tqdir_unix.cpp | 2 +- src/tools/tqfile.cpp | 6 +- src/tools/tqfile_unix.cpp | 2 +- src/tools/tqfileinfo.cpp | 22 +- src/tools/tqfileinfo_unix.cpp | 2 +- src/tools/tqgarray.cpp | 18 +- src/tools/tqgarray.h | 2 +- src/tools/tqgcache.cpp | 58 ++--- src/tools/tqgdict.cpp | 100 ++++----- src/tools/tqgdict.h | 22 +- src/tools/tqglist.cpp | 100 ++++----- src/tools/tqglist.h | 16 +- src/tools/tqglobal.cpp | 10 +- src/tools/tqglobal.h | 2 +- src/tools/tqgpluginmanager.cpp | 18 +- src/tools/tqgvector.cpp | 42 ++-- src/tools/tqintdict.h | 4 +- src/tools/tqlibrary.cpp | 8 +- src/tools/tqlibrary_unix.cpp | 6 +- src/tools/tqlocale.cpp | 84 +++---- src/tools/tqlocale.h | 20 +- src/tools/tqmap.cpp | 28 +-- src/tools/tqmap.h | 38 ++-- src/tools/tqmemarray.h | 2 +- src/tools/tqmutexpool.cpp | 8 +- src/tools/tqptrdict.h | 4 +- src/tools/tqptrlist.h | 2 +- src/tools/tqregexp.cpp | 58 ++--- src/tools/tqregexp.h | 2 +- src/tools/tqsettings.h | 24 +- src/tools/tqstring.cpp | 70 +++--- src/tools/tqstring.h | 22 +- src/tools/tqtextstream.cpp | 30 +-- src/tools/tqthreadstorage_unix.cpp | 8 +- src/tools/tqucom.cpp | 8 +- src/tools/tqvaluelist.h | 4 +- src/tools/tqvaluevector.h | 24 +- src/tools/tqwaitcondition_unix.cpp | 4 +- src/widgets/tqaction.cpp | 46 ++-- src/widgets/tqaction.h | 12 +- src/widgets/tqbutton.cpp | 12 +- src/widgets/tqbutton.h | 2 +- src/widgets/tqbuttongroup.cpp | 24 +- src/widgets/tqbuttongroup.h | 8 +- src/widgets/tqcheckbox.cpp | 2 +- src/widgets/tqcheckbox.h | 4 +- src/widgets/tqcombobox.cpp | 34 +-- src/widgets/tqcombobox.h | 4 +- src/widgets/tqdatetimeedit.cpp | 24 +- src/widgets/tqdatetimeedit.h | 16 +- src/widgets/tqdial.h | 6 +- src/widgets/tqdockarea.cpp | 38 ++-- src/widgets/tqdockarea.h | 6 +- src/widgets/tqdockwindow.cpp | 38 ++-- src/widgets/tqdockwindow.h | 6 +- src/widgets/tqeffects.cpp | 14 +- src/widgets/tqframe.h | 2 +- src/widgets/tqgrid.h | 4 +- src/widgets/tqgridview.h | 2 +- src/widgets/tqgroupbox.cpp | 30 +-- src/widgets/tqgroupbox.h | 8 +- src/widgets/tqhbox.h | 2 +- src/widgets/tqhbuttongroup.h | 4 +- src/widgets/tqheader.cpp | 6 +- src/widgets/tqheader.h | 4 +- src/widgets/tqhgroupbox.h | 4 +- src/widgets/tqiconview.cpp | 204 ++++++++--------- src/widgets/tqiconview.h | 12 +- src/widgets/tqlabel.cpp | 44 ++-- src/widgets/tqlabel.h | 6 +- src/widgets/tqlcdnumber.cpp | 6 +- src/widgets/tqlcdnumber.h | 6 +- src/widgets/tqlineedit.cpp | 8 +- src/widgets/tqlineedit.h | 6 +- src/widgets/tqlistbox.cpp | 114 +++++----- src/widgets/tqlistbox.h | 4 +- src/widgets/tqlistview.cpp | 250 ++++++++++----------- src/widgets/tqlistview.h | 2 +- src/widgets/tqmainwindow.cpp | 44 ++-- src/widgets/tqmainwindow.h | 2 +- src/widgets/tqmenubar.cpp | 26 +-- src/widgets/tqmenubar.h | 2 +- src/widgets/tqmenudata.cpp | 70 +++--- src/widgets/tqmenudata.h | 4 +- src/widgets/tqmultilineedit.h | 2 +- src/widgets/tqpopupmenu.cpp | 64 +++--- src/widgets/tqpopupmenu.h | 2 +- src/widgets/tqprogressbar.h | 4 +- src/widgets/tqpushbutton.cpp | 18 +- src/widgets/tqpushbutton.h | 6 +- src/widgets/tqradiobutton.h | 4 +- src/widgets/tqrangecontrol.cpp | 4 +- src/widgets/tqrangecontrol.h | 2 +- src/widgets/tqscrollbar.cpp | 6 +- src/widgets/tqscrollbar.h | 6 +- src/widgets/tqscrollview.cpp | 24 +- src/widgets/tqscrollview.h | 2 +- src/widgets/tqslider.cpp | 4 +- src/widgets/tqslider.h | 6 +- src/widgets/tqspinbox.cpp | 4 +- src/widgets/tqspinbox.h | 4 +- src/widgets/tqspinwidget.cpp | 4 +- src/widgets/tqsplashscreen.cpp | 2 +- src/widgets/tqsplitter.cpp | 18 +- src/widgets/tqsplitter.h | 6 +- src/widgets/tqstatusbar.cpp | 16 +- src/widgets/tqstatusbar.h | 2 +- src/widgets/tqsyntaxhighlighter.cpp | 10 +- src/widgets/tqsyntaxhighlighter_p.h | 4 +- src/widgets/tqtabbar.cpp | 62 ++--- src/widgets/tqtabbar.h | 4 +- src/widgets/tqtabwidget.cpp | 10 +- src/widgets/tqtabwidget.h | 2 +- src/widgets/tqtextbrowser.cpp | 4 +- src/widgets/tqtextbrowser.h | 2 +- src/widgets/tqtextedit.cpp | 88 ++++---- src/widgets/tqtextedit.h | 14 +- src/widgets/tqtextview.h | 4 +- src/widgets/tqtitlebar.cpp | 10 +- src/widgets/tqtitlebar_p.h | 2 +- src/widgets/tqtoolbar.cpp | 28 +-- src/widgets/tqtoolbar.h | 6 +- src/widgets/tqtoolbox.cpp | 26 +-- src/widgets/tqtoolbox.h | 2 +- src/widgets/tqtoolbutton.cpp | 12 +- src/widgets/tqtoolbutton.h | 6 +- src/widgets/tqtooltip.cpp | 62 ++--- src/widgets/tqtooltip.h | 2 +- src/widgets/tqvalidator.h | 14 +- src/widgets/tqvbox.h | 2 +- src/widgets/tqvbuttongroup.h | 4 +- src/widgets/tqvgroupbox.h | 4 +- src/widgets/tqwhatsthis.cpp | 28 +-- src/widgets/tqwhatsthis.h | 4 +- src/widgets/tqwidgetinterface_p.h | 2 +- src/widgets/tqwidgetplugin.cpp | 2 +- src/widgets/tqwidgetplugin.h | 2 +- src/widgets/tqwidgetresizehandler.cpp | 2 +- src/widgets/tqwidgetresizehandler_p.h | 2 +- src/widgets/tqwidgetstack.cpp | 20 +- src/widgets/tqwidgetstack.h | 2 +- src/workspace/tqworkspace.cpp | 124 +++++----- src/workspace/tqworkspace.h | 4 +- src/xml/tqdom.cpp | 194 ++++++++-------- src/xml/tqdom.h | 20 +- src/xml/tqsvgdevice.cpp | 18 +- src/xml/tqsvgdevice_p.h | 2 +- src/xml/tqxml.cpp | 112 ++++----- src/xml/tqxml.h | 8 +- tools/assistant/config.cpp | 2 +- tools/assistant/finddialog.ui.h | 2 +- tools/assistant/helpdialogimpl.cpp | 4 +- tools/assistant/helpdialogimpl.h | 2 +- tools/assistant/helpwindow.h | 2 +- tools/assistant/index.cpp | 6 +- tools/assistant/lib/tqassistantclient.cpp | 4 +- tools/assistant/lib/tqassistantclient.h | 2 +- tools/assistant/main.cpp | 8 +- tools/assistant/mainwindow.ui.h | 10 +- tools/assistant/settingsdialogimpl.h | 2 +- tools/assistant/tabbedbrowser.ui.h | 2 +- tools/designer/designer/actiondnd.cpp | 44 ++-- tools/designer/designer/actiondnd.h | 8 +- tools/designer/designer/actioneditorimpl.cpp | 14 +- tools/designer/designer/actioneditorimpl.h | 2 +- tools/designer/designer/actionlistview.cpp | 8 +- tools/designer/designer/actionlistview.h | 10 +- tools/designer/designer/asciivalidator.h | 6 +- tools/designer/designer/command.cpp | 68 +++--- tools/designer/designer/configtoolboxdialog.ui.h | 10 +- tools/designer/designer/connectiondialog.ui.h | 6 +- tools/designer/designer/connectionitems.cpp | 6 +- tools/designer/designer/customwidgeteditorimpl.cpp | 18 +- tools/designer/designer/database.cpp | 6 +- tools/designer/designer/dbconnectionimpl.h | 4 +- tools/designer/designer/dbconnectionsimpl.cpp | 2 +- tools/designer/designer/dbconnectionsimpl.h | 4 +- tools/designer/designer/designerapp.cpp | 8 +- tools/designer/designer/designerappiface.cpp | 22 +- tools/designer/designer/designerappiface.h | 2 +- tools/designer/designer/editfunctionsimpl.cpp | 4 +- tools/designer/designer/finddialog.ui.h | 4 +- tools/designer/designer/formfile.cpp | 24 +- tools/designer/designer/formfile.h | 2 +- tools/designer/designer/formsettingsimpl.cpp | 2 +- tools/designer/designer/formwindow.cpp | 92 ++++---- tools/designer/designer/formwindow.h | 8 +- tools/designer/designer/gotolinedialog.ui.h | 2 +- tools/designer/designer/hierarchyview.cpp | 124 +++++----- tools/designer/designer/hierarchyview.h | 2 +- tools/designer/designer/iconvieweditorimpl.cpp | 6 +- tools/designer/designer/layout.cpp | 20 +- tools/designer/designer/listboxdnd.cpp | 6 +- tools/designer/designer/listboxdnd.h | 2 +- tools/designer/designer/listboxeditorimpl.cpp | 12 +- tools/designer/designer/listboxrename.cpp | 4 +- tools/designer/designer/listboxrename.h | 2 +- tools/designer/designer/listdnd.cpp | 2 +- tools/designer/designer/listdnd.h | 2 +- tools/designer/designer/listeditor.ui.h | 6 +- tools/designer/designer/listviewdnd.cpp | 18 +- tools/designer/designer/listviewdnd.h | 2 +- tools/designer/designer/listvieweditorimpl.cpp | 12 +- tools/designer/designer/mainwindow.cpp | 142 ++++++------ tools/designer/designer/mainwindow.h | 4 +- tools/designer/designer/mainwindowactions.cpp | 172 +++++++------- tools/designer/designer/menubareditor.cpp | 30 +-- tools/designer/designer/menubareditor.h | 10 +- tools/designer/designer/metadatabase.cpp | 36 +-- tools/designer/designer/multilineeditorimpl.cpp | 4 +- tools/designer/designer/multilineeditorimpl.h | 2 +- tools/designer/designer/newformimpl.cpp | 10 +- tools/designer/designer/outputwindow.cpp | 12 +- .../designer/paletteeditoradvancedimpl.cpp | 6 +- .../designer/designer/paletteeditoradvancedimpl.h | 4 +- tools/designer/designer/paletteeditorimpl.h | 4 +- tools/designer/designer/pixmapchooser.cpp | 10 +- tools/designer/designer/pixmapchooser.h | 4 +- .../designer/designer/pixmapcollectioneditor.ui.h | 2 +- tools/designer/designer/popupmenueditor.cpp | 78 +++---- tools/designer/designer/popupmenueditor.h | 12 +- tools/designer/designer/previewframe.h | 4 +- tools/designer/designer/previewwidgetimpl.cpp | 2 +- tools/designer/designer/previewwidgetimpl.h | 2 +- tools/designer/designer/project.cpp | 24 +- tools/designer/designer/project.h | 10 +- tools/designer/designer/projectsettingsimpl.h | 2 +- tools/designer/designer/propertyeditor.cpp | 180 +++++++-------- tools/designer/designer/propertyeditor.h | 2 +- tools/designer/designer/propertyobject.cpp | 2 +- tools/designer/designer/replacedialog.ui.h | 8 +- tools/designer/designer/resource.cpp | 94 ++++---- tools/designer/designer/resource.h | 8 +- tools/designer/designer/sizehandle.cpp | 6 +- tools/designer/designer/sourceeditor.cpp | 22 +- tools/designer/designer/sourcefile.cpp | 6 +- tools/designer/designer/startdialogimpl.cpp | 4 +- tools/designer/designer/styledbutton.cpp | 8 +- tools/designer/designer/styledbutton.h | 4 +- tools/designer/designer/syntaxhighlighter_html.cpp | 2 +- tools/designer/designer/tableeditorimpl.h | 4 +- tools/designer/designer/tqcompletionedit.cpp | 2 +- tools/designer/designer/tqcompletionedit.h | 2 +- tools/designer/designer/variabledialogimpl.cpp | 6 +- tools/designer/designer/variabledialogimpl.h | 2 +- tools/designer/designer/widgetaction.cpp | 2 +- tools/designer/designer/widgetaction.h | 6 +- tools/designer/designer/widgetfactory.cpp | 66 +++--- tools/designer/designer/widgetfactory.h | 14 +- tools/designer/designer/wizardeditorimpl.cpp | 2 +- tools/designer/designer/workspace.cpp | 20 +- tools/designer/editor/browser.cpp | 8 +- tools/designer/editor/cindent.cpp | 4 +- tools/designer/editor/completion.cpp | 10 +- tools/designer/editor/editor.h | 4 +- tools/designer/editor/markerwidget.cpp | 10 +- tools/designer/editor/viewmanager.cpp | 2 +- tools/designer/editor/yyindent.cpp | 20 +- .../designer/examples/addressbook/addressbook.ui.h | 4 +- tools/designer/examples/colortool/mainform.ui.h | 2 +- tools/designer/examples/credit/creditform.h | 2 +- tools/designer/examples/credit/creditformbase.h | 2 +- .../examples/filechooser/plugin/plugin.cpp | 2 +- .../designer/examples/filechooser/plugin/plugin.h | 2 +- .../examples/filechooser/widget/filechooser.h | 2 +- tools/designer/examples/opengl/main.cpp | 6 +- tools/designer/examples/sizeaware/main.cpp | 2 +- tools/designer/examples/sizeaware/sizeaware.h | 2 +- tools/designer/examples/vcr/vcr.cpp | 8 +- tools/designer/examples/vcr/vcr.h | 2 +- tools/designer/interfaces/actioninterface.h | 2 +- tools/designer/interfaces/designerinterface.h | 2 +- tools/designer/plugins/cppeditor/common.cpp | 2 +- tools/designer/plugins/cppeditor/cppcompletion.cpp | 4 +- tools/designer/plugins/cppeditor/cppeditor.cpp | 4 +- .../plugins/cppeditor/editorinterfaceimpl.cpp | 6 +- .../plugins/cppeditor/languageinterfaceimpl.cpp | 8 +- .../plugins/cppeditor/languageinterfaceimpl.h | 2 +- .../plugins/cppeditor/mainfilesettings.ui.h | 2 +- .../plugins/cppeditor/preferenceinterfaceimpl.cpp | 8 +- .../plugins/cppeditor/preferenceinterfaceimpl.h | 2 +- .../plugins/cppeditor/projectsettings.ui.h | 4 +- .../cppeditor/projectsettingsinterfaceimpl.cpp | 8 +- .../cppeditor/projectsettingsinterfaceimpl.h | 2 +- .../cppeditor/sourcetemplateinterfaceimpl.cpp | 6 +- .../plugins/cppeditor/syntaxhighliter_cpp.cpp | 6 +- tools/designer/plugins/cppeditor/yyreg.cpp | 2 +- tools/designer/plugins/dlg/dlg2ui.cpp | 102 ++++----- tools/designer/plugins/dlg/main.cpp | 2 +- tools/designer/plugins/glade/glade2ui.cpp | 24 +- tools/designer/plugins/glade/main.cpp | 2 +- tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp | 4 +- tools/designer/plugins/kdevdlg/main.cpp | 2 +- tools/designer/plugins/rc/main.cpp | 2 +- tools/designer/plugins/rc/rc2ui.cpp | 6 +- tools/designer/plugins/wizards/main.cpp | 6 +- .../designer/plugins/wizards/mainwindowwizard.ui.h | 32 +-- .../designer/plugins/wizards/sqlformwizardimpl.cpp | 2 +- tools/designer/plugins/wizards/sqlformwizardimpl.h | 4 +- tools/designer/shared/globaldefs.h | 6 +- tools/designer/shared/uib.h | 2 +- tools/designer/shared/widgetdatabase.cpp | 20 +- tools/designer/tools/tqtconv2ui/main.cpp | 6 +- tools/designer/tquic/form.cpp | 4 +- tools/designer/tquic/main.cpp | 14 +- tools/designer/tquic/object.cpp | 4 +- tools/designer/tquic/tquic.cpp | 2 +- tools/designer/tquic/tquic.h | 6 +- tools/designer/uilib/tqwidgetfactory.cpp | 180 +++++++-------- tools/designer/uilib/tqwidgetfactory.h | 8 +- tools/linguist/linguist/finddialog.cpp | 6 +- tools/linguist/linguist/finddialog.h | 2 +- tools/linguist/linguist/main.cpp | 4 +- tools/linguist/linguist/msgedit.cpp | 12 +- tools/linguist/linguist/msgedit.h | 12 +- tools/linguist/linguist/phrase.cpp | 4 +- tools/linguist/linguist/phrasebookbox.cpp | 22 +- tools/linguist/linguist/phrasebookbox.h | 2 +- tools/linguist/linguist/phraselv.cpp | 2 +- tools/linguist/linguist/trwindow.cpp | 108 ++++----- tools/linguist/lupdate/fetchtr.cpp | 12 +- tools/linguist/shared/metatranslator.cpp | 22 +- tools/linguist/tqm2ts/main.cpp | 4 +- tools/linguist/tutorial/tt1/main.cpp | 4 +- tools/linguist/tutorial/tt2/arrowpad.h | 2 +- tools/linguist/tutorial/tt2/main.cpp | 2 +- tools/linguist/tutorial/tt2/mainwindow.h | 2 +- tools/linguist/tutorial/tt3/main.cpp | 2 +- tools/linguist/tutorial/tt3/mainwindow.h | 2 +- tools/linguist/tutorial/tt3/printpanel.h | 2 +- tools/msg2tqm/msg2tqm.cpp | 8 +- tools/qtconfig/colorbutton.h | 4 +- tools/qtconfig/mainwindow.cpp | 10 +- tools/qtconfig/paletteeditoradvanced.cpp | 2 +- tools/qtconfig/paletteeditoradvanced.h | 4 +- tools/qtconfig/previewframe.h | 4 +- tools/qtconfig/previewwidget.cpp | 2 +- tools/qtconfig/previewwidget.h | 2 +- tools/tqconfig/main.cpp | 2 +- tools/tqconfig/main.h | 2 +- tutorial/t1/main.cpp | 2 +- tutorial/t10/cannon.h | 2 +- tutorial/t10/lcdrange.h | 2 +- tutorial/t10/main.cpp | 2 +- tutorial/t11/cannon.h | 2 +- tutorial/t11/lcdrange.h | 2 +- tutorial/t11/main.cpp | 2 +- tutorial/t12/cannon.h | 2 +- tutorial/t12/lcdrange.h | 6 +- tutorial/t12/main.cpp | 2 +- tutorial/t13/cannon.h | 2 +- tutorial/t13/gamebrd.h | 2 +- tutorial/t13/lcdrange.h | 4 +- tutorial/t14/cannon.h | 2 +- tutorial/t14/gamebrd.h | 2 +- tutorial/t14/lcdrange.h | 4 +- tutorial/t15/main.cpp | 2 +- tutorial/t2/main.cpp | 2 +- tutorial/t4/main.cpp | 2 +- tutorial/t5/main.cpp | 2 +- tutorial/t6/main.cpp | 4 +- tutorial/t7/lcdrange.h | 2 +- tutorial/t7/main.cpp | 4 +- tutorial/t8/cannon.h | 2 +- tutorial/t8/lcdrange.h | 2 +- tutorial/t8/main.cpp | 2 +- tutorial/t9/cannon.h | 2 +- tutorial/t9/lcdrange.h | 2 +- tutorial/t9/main.cpp | 2 +- 815 files changed, 6035 insertions(+), 6035 deletions(-) diff --git a/examples/aclock/aclock.h b/examples/aclock/aclock.h index a4c86c768..0bdbfded5 100644 --- a/examples/aclock/aclock.h +++ b/examples/aclock/aclock.h @@ -18,7 +18,7 @@ class AnalogClock : public TQWidget // analog clock widget { TQ_OBJECT public: - AnalogClock( TQWidget *parent=0, const char *name=0 ); + AnalogClock( TQWidget *parent=nullptr, const char *name=nullptr ); void setAutoMask(bool b); protected: diff --git a/examples/action/application.cpp b/examples/action/application.cpp index e1bc08022..55c9df808 100644 --- a/examples/action/application.cpp +++ b/examples/action/application.cpp @@ -36,7 +36,7 @@ ApplicationWindow::ApplicationWindow() - : TQMainWindow( 0, "example application main window", WDestructiveClose ) + : TQMainWindow( nullptr, "example application main window", WDestructiveClose ) { printer = new TQPrinter( TQPrinter::HighResolution ); diff --git a/examples/addressbook/centralwidget.h b/examples/addressbook/centralwidget.h index 3e2aa3b22..73c424789 100644 --- a/examples/addressbook/centralwidget.h +++ b/examples/addressbook/centralwidget.h @@ -26,7 +26,7 @@ class ABCentralWidget : public TQWidget TQ_OBJECT public: - ABCentralWidget( TQWidget *parent, const char *name = 0 ); + ABCentralWidget( TQWidget *parent, const char *name = nullptr ); void save( const TQString &filename ); void load( const TQString &filename ); diff --git a/examples/addressbook/mainwindow.cpp b/examples/addressbook/mainwindow.cpp index 894458413..fab15a7af 100644 --- a/examples/addressbook/mainwindow.cpp +++ b/examples/addressbook/mainwindow.cpp @@ -19,7 +19,7 @@ #include ABMainWindow::ABMainWindow() - : TQMainWindow( 0, "example addressbook application" ), + : TQMainWindow( nullptr, "example addressbook application" ), filename( TQString::null ) { setupMenuBar(); diff --git a/examples/application/application.cpp b/examples/application/application.cpp index 0fa030e5b..b6f2733df 100644 --- a/examples/application/application.cpp +++ b/examples/application/application.cpp @@ -34,7 +34,7 @@ #include "fileprint.xpm" ApplicationWindow::ApplicationWindow() - : TQMainWindow( 0, "example application main window", WDestructiveClose | WGroupLeader ) + : TQMainWindow( nullptr, "example application main window", WDestructiveClose | WGroupLeader ) { printer = new TQPrinter( TQPrinter::HighResolution ); TQPixmap openIcon, saveIcon, printIcon; diff --git a/examples/biff/biff.h b/examples/biff/biff.h index 26495881a..3a1293759 100644 --- a/examples/biff/biff.h +++ b/examples/biff/biff.h @@ -19,7 +19,7 @@ class Biff : public TQWidget { TQ_OBJECT public: - Biff( TQWidget *parent=0, const char *name=0 ); + Biff( TQWidget *parent=nullptr, const char *name=nullptr ); protected: void timerEvent( TQTimerEvent * ); diff --git a/examples/buttongroups/buttongroups.h b/examples/buttongroups/buttongroups.h index f7dd27653..a6a2cf95c 100644 --- a/examples/buttongroups/buttongroups.h +++ b/examples/buttongroups/buttongroups.h @@ -20,7 +20,7 @@ class ButtonsGroups : public TQWidget TQ_OBJECT public: - ButtonsGroups( TQWidget *parent = 0, const char *name = 0 ); + ButtonsGroups( TQWidget *parent = nullptr, const char *name = nullptr ); protected: TQCheckBox *state; diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp index 4b5566ecf..d70acd52a 100644 --- a/examples/canvas/canvas.cpp +++ b/examples/canvas/canvas.cpp @@ -15,8 +15,8 @@ // We use a global variable to save memory - all the brushes and pens in // the mesh are shared. -static TQBrush *tb = 0; -static TQPen *tp = 0; +static TQBrush *tb = nullptr; +static TQPen *tp = nullptr; class EdgeItem; class NodeItem; @@ -170,7 +170,7 @@ void FigureEditor::contentsMousePressEvent(TQMouseEvent* e) moving_start = p; return; } - moving = 0; + moving = nullptr; } void FigureEditor::clear() @@ -195,10 +195,10 @@ void FigureEditor::contentsMouseMoveEvent(TQMouseEvent* e) } static uint bouncyLogoCount = 0; -static TQCanvasPixmapArray *logoarr = 0; +static TQCanvasPixmapArray *logoarr = nullptr; BouncyLogo::BouncyLogo(TQCanvas* canvas) : - TQCanvasSprite(0,canvas) + TQCanvasSprite(nullptr,canvas) { if ( !logoarr ) { logoarr = new TQCanvasPixmapArray("qt-trans.xpm"); @@ -304,8 +304,8 @@ void BouncyLogo::advance(int stage) // Some objects to cache among different views static uint mainCount = 0; -static TQImage *butterflyimg = 0; -static TQImage *logoimg = 0; +static TQImage *butterflyimg = nullptr; +static TQImage *logoimg = nullptr; Main::Main(TQCanvas& c, TQWidget* parent, const char* name, WFlags f) : TQMainWindow(parent,name,f), @@ -368,7 +368,7 @@ Main::Main(TQCanvas& c, TQWidget* parent, const char* name, WFlags f) : setCentralWidget(editor); - printer = 0; + printer = nullptr; mainCount++; @@ -399,12 +399,12 @@ Main::~Main() delete printer; if ( !--mainCount ) { delete[] butterflyimg; - butterflyimg = 0; + butterflyimg = nullptr; delete[] logoimg; - logoimg = 0; + logoimg = nullptr; if ( bouncyLogoCount == 0 ) { delete logoarr; - logoarr = 0; + logoarr = nullptr; } } } @@ -412,10 +412,10 @@ Main::~Main() void Main::newView() { // Open a new view... have it delete when closed. - Main *m = new Main(canvas, 0, 0, WDestructiveClose); + Main *m = new Main(canvas, nullptr, nullptr, WDestructiveClose); tqApp->setMainWidget(m); m->show(); - tqApp->setMainWidget(0); + tqApp->setMainWidget(nullptr); } void Main::clear() @@ -433,7 +433,7 @@ void Main::help() "
  • Press ALT-L for some lines." "
  • Drag the objects around." "
  • Read the code!" - "", TQMessageBox::Information, 1, 0, 0, this, 0, false ); + "", TQMessageBox::Information, 1, 0, 0, this, nullptr, false ); about->setButtonText( 1, "Dismiss" ); about->show(); } @@ -701,7 +701,7 @@ void Main::addMesh() TQMemArray lastRow(cols); for ( int j = 0; j < rows; j++ ) { int n = j%2 ? cols-1 : cols; - NodeItem *prev = 0; + NodeItem *prev = nullptr; for ( int i = 0; i < n; i++ ) { NodeItem *el = new NodeItem( &canvas ); nodecount++; diff --git a/examples/canvas/canvas.h b/examples/canvas/canvas.h index 963e56e4f..877f1bd87 100644 --- a/examples/canvas/canvas.h +++ b/examples/canvas/canvas.h @@ -21,7 +21,7 @@ class FigureEditor : public TQCanvasView { TQ_OBJECT public: - FigureEditor(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0); + FigureEditor(TQCanvas&, TQWidget* parent=nullptr, const char* name=nullptr, WFlags f=0); void clear(); protected: @@ -40,7 +40,7 @@ class Main : public TQMainWindow { TQ_OBJECT public: - Main(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0); + Main(TQCanvas&, TQWidget* parent=nullptr, const char* name=nullptr, WFlags f=0); ~Main(); public slots: diff --git a/examples/chart/canvasview.cpp b/examples/chart/canvasview.cpp index 8207bc4e5..e6b086c2d 100644 --- a/examples/chart/canvasview.cpp +++ b/examples/chart/canvasview.cpp @@ -29,7 +29,7 @@ void CanvasView::contentsMousePressEvent( TQMouseEvent *e ) m_pos = e->pos(); return; } - m_movingItem = 0; + m_movingItem = nullptr; } diff --git a/examples/chart/canvasview.h b/examples/chart/canvasview.h index 0bb176275..200c2d6f8 100644 --- a/examples/chart/canvasview.h +++ b/examples/chart/canvasview.h @@ -15,9 +15,9 @@ class CanvasView : public TQCanvasView TQ_OBJECT public: CanvasView( TQCanvas *canvas, ElementVector *elements, - TQWidget* parent = 0, const char* name = "canvas view", + TQWidget* parent = nullptr, const char* name = "canvas view", WFlags f = 0 ) - : TQCanvasView( canvas, parent, name, f ), m_movingItem(0), + : TQCanvasView( canvas, parent, name, f ), m_movingItem(nullptr), m_elements( elements ) {} protected: diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp index 98ac96f6b..93b31505f 100644 --- a/examples/chart/chartform.cpp +++ b/examples/chart/chartform.cpp @@ -39,7 +39,7 @@ const TQString APP_KEY = "/Chart/"; ChartForm::ChartForm( const TQString& filename ) - : TQMainWindow( 0, 0, WDestructiveClose ) + : TQMainWindow( nullptr, nullptr, WDestructiveClose ) { setIcon( TQPixmap( options_piechart ) ); @@ -184,7 +184,7 @@ ChartForm::ChartForm( const TQString& filename ) helpMenu->insertItem( "About &TQt", this, TQ_SLOT(helpAboutTQt()) ); - m_printer = 0; + m_printer = nullptr; m_elements.resize( MAX_ELEMENTS ); TQSettings settings; diff --git a/examples/chart/optionsform.cpp b/examples/chart/optionsform.cpp index 2b65eaeec..3a7691f2c 100644 --- a/examples/chart/optionsform.cpp +++ b/examples/chart/optionsform.cpp @@ -25,7 +25,7 @@ OptionsForm::OptionsForm( TQWidget* parent, const char* name, optionsFormLayout = new TQVBoxLayout( this, 11, 6 ); - chartTypeLayout = new TQHBoxLayout( 0, 0, 6 ); + chartTypeLayout = new TQHBoxLayout( nullptr, 0, 6 ); chartTypeTextLabel = new TQLabel( "&Chart Type", this ); chartTypeLayout->addWidget( chartTypeTextLabel ); @@ -39,7 +39,7 @@ OptionsForm::OptionsForm( TQWidget* parent, const char* name, chartTypeLayout->addWidget( chartTypeComboBox ); optionsFormLayout->addLayout( chartTypeLayout ); - fontLayout = new TQHBoxLayout( 0, 0, 6 ); + fontLayout = new TQHBoxLayout( nullptr, 0, 6 ); fontPushButton = new TQPushButton( "&Font...", this ); fontLayout->addWidget( fontPushButton ); @@ -77,7 +77,7 @@ OptionsForm::OptionsForm( TQWidget* parent, const char* name, addValuesButtonGroupLayout->addWidget( asPercentageRadioButton ); addValuesFrameLayout->addWidget( addValuesButtonGroup ); - decimalPlacesLayout = new TQHBoxLayout( 0, 0, 6 ); + decimalPlacesLayout = new TQHBoxLayout( nullptr, 0, 6 ); decimalPlacesTextLabel = new TQLabel( "&Decimal Places", addValuesFrame ); decimalPlacesLayout->addWidget( decimalPlacesTextLabel ); @@ -91,7 +91,7 @@ OptionsForm::OptionsForm( TQWidget* parent, const char* name, optionsFormLayout->addWidget( addValuesFrame ); - buttonsLayout = new TQHBoxLayout( 0, 0, 6 ); + buttonsLayout = new TQHBoxLayout( nullptr, 0, 6 ); spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); buttonsLayout->addItem( spacer ); diff --git a/examples/chart/optionsform.h b/examples/chart/optionsform.h index 709f3c1ef..4a9eded8a 100644 --- a/examples/chart/optionsform.h +++ b/examples/chart/optionsform.h @@ -19,7 +19,7 @@ class OptionsForm : public TQDialog { TQ_OBJECT public: - OptionsForm( TQWidget* parent = 0, const char* name = "options form", + OptionsForm( TQWidget* parent = nullptr, const char* name = "options form", bool modal = false, WFlags f = 0 ); ~OptionsForm() {} diff --git a/examples/chart/setdataform.cpp b/examples/chart/setdataform.cpp index de357abd7..28571ffec 100644 --- a/examples/chart/setdataform.cpp +++ b/examples/chart/setdataform.cpp @@ -59,7 +59,7 @@ SetDataForm::SetDataForm( ElementVector *elements, int decimalPlaces, th->setLabel( 4, "Color" ); tableButtonBox->addWidget( table ); - buttonBox = new TQHBoxLayout( 0, 0, 6, "button box layout" ); + buttonBox = new TQHBoxLayout( nullptr, 0, 6, "button box layout" ); colorPushButton = new TQPushButton( this, "color button" ); colorPushButton->setText( "&Color..." ); diff --git a/examples/chart/setdataform.h b/examples/chart/setdataform.h index 4cf7a4f9b..13b3a3271 100644 --- a/examples/chart/setdataform.h +++ b/examples/chart/setdataform.h @@ -16,7 +16,7 @@ class SetDataForm: public TQDialog TQ_OBJECT public: SetDataForm( ElementVector *elements, int decimalPlaces, - TQWidget *parent = 0, const char *name = "set data form", + TQWidget *parent = nullptr, const char *name = "set data form", bool modal = true, WFlags f = 0 ); ~SetDataForm() {} diff --git a/examples/checklists/checklists.cpp b/examples/checklists/checklists.cpp index b584c6744..02b908591 100644 --- a/examples/checklists/checklists.cpp +++ b/examples/checklists/checklists.cpp @@ -50,7 +50,7 @@ CheckLists::CheckLists( TQWidget *parent, const char *name ) parentList.append( new TQCheckListItem( lv1, "Parent Item 3", TQCheckListItem::CheckBoxController ) ); parentList.append( new TQCheckListItem( lv1, "Parent Item 4", TQCheckListItem::CheckBoxController ) ); - TQListViewItem *item = 0; + TQListViewItem *item = nullptr; unsigned int num = 1; // go through the list of parent items... for ( TQValueList::Iterator it = parentList.begin(); it != parentList.end(); diff --git a/examples/checklists/checklists.h b/examples/checklists/checklists.h index 86bbd507e..1b299fa44 100644 --- a/examples/checklists/checklists.h +++ b/examples/checklists/checklists.h @@ -20,7 +20,7 @@ class CheckLists : public TQWidget TQ_OBJECT public: - CheckLists( TQWidget *parent = 0, const char *name = 0 ); + CheckLists( TQWidget *parent = nullptr, const char *name = nullptr ); protected: TQListView *lv1, *lv2; diff --git a/examples/customlayout/border.cpp b/examples/customlayout/border.cpp index 9e08c41c0..41a97135b 100644 --- a/examples/customlayout/border.cpp +++ b/examples/customlayout/border.cpp @@ -39,12 +39,12 @@ uint BorderLayoutIterator::count() const TQLayoutItem *BorderLayoutIterator::current() { - return idx < (int)count() ? list->at( idx )->item : 0; + return idx < (int)count() ? list->at( idx )->item : nullptr; } BorderLayout::BorderLayoutStruct *BorderLayoutIterator::currentStruct() { - return idx < (int)count() ? list->at( idx ) : 0; + return idx < (int)count() ? list->at( idx ) : nullptr; } void BorderLayoutIterator::toFirst() @@ -61,8 +61,8 @@ TQLayoutItem *BorderLayoutIterator::next() TQLayoutItem *BorderLayoutIterator::takeCurrent() { BorderLayout::BorderLayoutStruct *b - = idx < int( list->count() ) ? list->take( idx ) : 0; - TQLayoutItem *item = b ? b->item : 0; + = idx < int( list->count() ) ? list->take( idx ) : nullptr; + TQLayoutItem *item = b ? b->item : nullptr; delete b; return item; } @@ -135,8 +135,8 @@ void BorderLayout::doLayout( const TQRect &rct, bool /*testonly*/ ) BorderLayoutIterator it( &list ); BorderLayoutStruct *o; - BorderLayoutStruct *center = 0; - while ( ( o = it.currentStruct() ) != 0 ) { + BorderLayoutStruct *center = nullptr; + while ( ( o = it.currentStruct() ) ) { ++it; if ( o->pos == North ) { @@ -157,7 +157,7 @@ void BorderLayout::doLayout( const TQRect &rct, bool /*testonly*/ ) h = rct.height() - nh - sh; it.toFirst(); - while ( ( o = it.currentStruct() ) != 0 ) { + while ( ( o = it.currentStruct() ) ) { ++it; if ( o->pos == West ) { @@ -187,7 +187,7 @@ void BorderLayout::calcSize( SizeType st ) BorderLayoutIterator it( &list ); BorderLayoutStruct *o; - while ( ( o = it.currentStruct() ) != 0 ) { + while ( ( o = it.currentStruct() ) ) { ++it; if ( o->pos == North || o->pos == South ) { diff --git a/examples/customlayout/border.h b/examples/customlayout/border.h index d427bf1c4..8a6cb3af5 100644 --- a/examples/customlayout/border.h +++ b/examples/customlayout/border.h @@ -57,17 +57,17 @@ public: }; BorderLayout( TQWidget *parent, int border = 0, int autoBorder = -1, - const char *name = 0 ) + const char *name = nullptr ) : TQLayout( parent, border, autoBorder, name ), cached( 0, 0 ), mcached( 0, 0 ), sizeDirty( true ), msizeDirty( true ) {} - BorderLayout( TQLayout* parent, int autoBorder = -1, const char *name = 0 ) + BorderLayout( TQLayout* parent, int autoBorder = -1, const char *name = nullptr ) : TQLayout( parent, autoBorder, name ), cached( 0, 0 ), mcached( 0, 0 ), sizeDirty( true ), msizeDirty( true ) {} - BorderLayout( int autoBorder = -1, const char *name = 0 ) + BorderLayout( int autoBorder = -1, const char *name = nullptr ) : TQLayout( autoBorder, name ), cached( 0, 0 ), mcached( 0, 0 ), sizeDirty( true ), msizeDirty( true ) {} diff --git a/examples/customlayout/card.cpp b/examples/customlayout/card.cpp index dc3964e82..b1106bdbb 100644 --- a/examples/customlayout/card.cpp +++ b/examples/customlayout/card.cpp @@ -28,7 +28,7 @@ private: TQLayoutItem *CardLayoutIterator::current() { - return idx < int( list->count() ) ? list->at( idx ) : 0; + return idx < int( list->count() ) ? list->at( idx ) : nullptr; } TQLayoutItem *CardLayoutIterator::next() @@ -38,7 +38,7 @@ TQLayoutItem *CardLayoutIterator::next() TQLayoutItem *CardLayoutIterator::takeCurrent() { - return idx < int( list->count() ) ?list->take( idx ) : 0; + return idx < int( list->count() ) ?list->take( idx ) : nullptr; } @@ -73,7 +73,7 @@ void CardLayout::setGeometry( const TQRect &rct ) int w = rct.width() - ( list.count() - 1 ) * spacing(); int h = rct.height() - ( list.count() - 1 ) * spacing(); - while ( ( o=it.current() ) != 0 ) { + while ( ( o=it.current() ) ) { ++it; TQRect geom( rct.x() + i * spacing(), rct.y() + i * spacing(), w, h ); @@ -90,7 +90,7 @@ TQSize CardLayout::sizeHint() const s = TQSize(100,70); //start with a nice default size TQPtrListIterator it(list); TQLayoutItem *o; - while ( (o=it.current()) != 0 ) { + while ( (o=it.current()) ) { ++it; s = s.expandedTo( o->minimumSize() ); } @@ -103,7 +103,7 @@ TQSize CardLayout::minimumSize() const int n = list.count(); TQPtrListIterator it(list); TQLayoutItem *o; - while ( (o=it.current()) != 0 ) { + while ( (o=it.current()) ) { ++it; s = s.expandedTo( o->minimumSize() ); } diff --git a/examples/customlayout/flow.cpp b/examples/customlayout/flow.cpp index 9b5e5bc4d..45919bd57 100644 --- a/examples/customlayout/flow.cpp +++ b/examples/customlayout/flow.cpp @@ -33,7 +33,7 @@ uint SimpleFlowIterator::count() const TQLayoutItem *SimpleFlowIterator::current() { - return idx < int(count()) ? list->at(idx) : 0; + return idx < int(count()) ? list->at(idx) : nullptr; } TQLayoutItem *SimpleFlowIterator::next() @@ -43,7 +43,7 @@ TQLayoutItem *SimpleFlowIterator::next() TQLayoutItem *SimpleFlowIterator::takeCurrent() { - return idx < int(count()) ? list->take( idx ) : 0; + return idx < int(count()) ? list->take( idx ) : nullptr; } SimpleFlow::~SimpleFlow() @@ -103,7 +103,7 @@ int SimpleFlow::doLayout( const TQRect &r, bool testonly ) int h = 0; //height of this line so far. TQPtrListIterator it(list); TQLayoutItem *o; - while ( (o=it.current()) != 0 ) { + while ( (o=it.current()) ) { ++it; int nextX = x + o->sizeHint().width() + spacing(); if ( nextX - spacing() > r.right() && h > 0 ) { @@ -125,7 +125,7 @@ TQSize SimpleFlow::minimumSize() const TQSize s(0,0); TQPtrListIterator it(list); TQLayoutItem *o; - while ( (o=it.current()) != 0 ) { + while ( (o=it.current()) ) { ++it; s = s.expandedTo( o->minimumSize() ); } diff --git a/examples/customlayout/flow.h b/examples/customlayout/flow.h index ff5bc14f8..3dde827e4 100644 --- a/examples/customlayout/flow.h +++ b/examples/customlayout/flow.h @@ -21,13 +21,13 @@ class SimpleFlow : public TQLayout { public: SimpleFlow( TQWidget *parent, int border=0, int space=-1, - const char *name=0 ) + const char *name=nullptr ) : TQLayout( parent, border, space, name ), cached_width(0) {} - SimpleFlow( TQLayout* parent, int space=-1, const char *name=0 ) + SimpleFlow( TQLayout* parent, int space=-1, const char *name=nullptr ) : TQLayout( parent, space, name ), cached_width(0) {} - SimpleFlow( int space=-1, const char *name=0 ) + SimpleFlow( int space=-1, const char *name=nullptr ) : TQLayout( space, name ), cached_width(0) {} diff --git a/examples/dclock/dclock.h b/examples/dclock/dclock.h index 4a0aded50..a9dfa37e3 100644 --- a/examples/dclock/dclock.h +++ b/examples/dclock/dclock.h @@ -17,7 +17,7 @@ class DigitalClock : public TQLCDNumber // digital clock widget { TQ_OBJECT public: - DigitalClock( TQWidget *parent=0, const char *name=0 ); + DigitalClock( TQWidget *parent=nullptr, const char *name=nullptr ); protected: // event handlers void timerEvent( TQTimerEvent * ); diff --git a/examples/demo/display.h b/examples/demo/display.h index b4b405ae3..802f730e7 100644 --- a/examples/demo/display.h +++ b/examples/demo/display.h @@ -26,7 +26,7 @@ class Curve; class DisplayWidget : public TQWidget { TQ_OBJECT public: - DisplayWidget( TQWidget *parent=0, const char *name=0 ); + DisplayWidget( TQWidget *parent=nullptr, const char *name=nullptr ); void run(); void stop(); @@ -54,7 +54,7 @@ class Screen : public TQFrame { TQ_OBJECT public: enum { FrameWidth = 3 }; - Screen( TQWidget *parent=0, const char *name=0 ); + Screen( TQWidget *parent=nullptr, const char *name=nullptr ); ~Screen(); void animate(); @@ -77,7 +77,7 @@ class Curve : public TQFrame { TQ_OBJECT enum { FrameWidth = 3 }; public: - Curve( TQWidget *parent=0, const char *name=0 ); + Curve( TQWidget *parent=nullptr, const char *name=nullptr ); void animate(); public slots: diff --git a/examples/demo/dnd/dnd.h b/examples/demo/dnd/dnd.h index 96a86debc..8d6bb6493 100644 --- a/examples/demo/dnd/dnd.h +++ b/examples/demo/dnd/dnd.h @@ -26,7 +26,7 @@ class DnDDemo : public DnDDemoBase TQ_OBJECT public: - DnDDemo( TQWidget* parent = 0, const char* name = 0 ); + DnDDemo( TQWidget* parent = nullptr, const char* name = nullptr ); ~DnDDemo(); IconItem findItem( const TQString& tag ); diff --git a/examples/demo/dnd/iconview.h b/examples/demo/dnd/iconview.h index df27b2c51..ca4cca45f 100644 --- a/examples/demo/dnd/iconview.h +++ b/examples/demo/dnd/iconview.h @@ -21,7 +21,7 @@ class IconView : public TQIconView TQ_OBJECT public: - IconView( TQWidget* parent = 0, const char* name = 0 ); + IconView( TQWidget* parent = nullptr, const char* name = nullptr ); ~IconView(); TQDragObject *dragObject(); diff --git a/examples/demo/dnd/listview.h b/examples/demo/dnd/listview.h index 1b09e6b98..421443520 100644 --- a/examples/demo/dnd/listview.h +++ b/examples/demo/dnd/listview.h @@ -20,7 +20,7 @@ class ListView : public TQListView TQ_OBJECT public: - ListView( TQWidget* parent = 0, const char* name = 0 ); + ListView( TQWidget* parent = nullptr, const char* name = nullptr ); ~ListView(); void dragEnterEvent( TQDragEnterEvent * ); diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h index ead8c6f40..15acb5a4a 100644 --- a/examples/demo/dnd/styledbutton.h +++ b/examples/demo/dnd/styledbutton.h @@ -54,8 +54,8 @@ class StyledButton : public TQButton public: enum EditorType { ColorEditor, PixmapEditor }; - StyledButton( TQWidget* parent = 0, const char* name = 0 ); - StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + StyledButton( TQWidget* parent = nullptr, const char* name = nullptr ); + StyledButton( const TQBrush& b, TQWidget* parent = nullptr, const char* name = nullptr, WFlags f = 0 ); ~StyledButton(); void setEditor( EditorType ); diff --git a/examples/demo/frame.cpp b/examples/demo/frame.cpp index da87f184a..21ca2b5be 100644 --- a/examples/demo/frame.cpp +++ b/examples/demo/frame.cpp @@ -26,8 +26,8 @@ #include #include -static TQTranslator *translator = 0; -static TQTranslator *qt_translator = 0; +static TQTranslator *translator = nullptr; +static TQTranslator *qt_translator = nullptr; Frame::Frame( TQWidget *parent, const char *name ) : TQMainWindow( parent, name ) diff --git a/examples/demo/frame.h b/examples/demo/frame.h index 12170d789..ba0e3741d 100644 --- a/examples/demo/frame.h +++ b/examples/demo/frame.h @@ -20,7 +20,7 @@ class Frame : public TQMainWindow TQ_OBJECT public: - Frame( TQWidget *parent=0, const char *name=0 ); + Frame( TQWidget *parent=nullptr, const char *name=nullptr ); void setCategories( const TQPtrList &l ); static void updateTranslators(); diff --git a/examples/demo/graph.cpp b/examples/demo/graph.cpp index a228cbaf7..9b75ec399 100644 --- a/examples/demo/graph.cpp +++ b/examples/demo/graph.cpp @@ -12,8 +12,8 @@ const int bounce_rtti = 1234; // We use a global variable to save memory - all the brushes and pens in // the mesh are shared. -static TQBrush *tb = 0; -static TQPen *tp = 0; +static TQBrush *tb = nullptr; +static TQPen *tp = nullptr; class EdgeItem; class NodeItem; @@ -188,7 +188,7 @@ void NodeItem::calcForce() { class FigureEditor : public TQCanvasView { public: - FigureEditor( GraphWidgetPrivate *g, TQWidget* parent=0, const char* name=0, WFlags f=0); + FigureEditor( GraphWidgetPrivate *g, TQWidget* parent=nullptr, const char* name=nullptr, WFlags f=0); TQSize sizeHint() const; @@ -418,7 +418,7 @@ void FigureEditor::initialize() TQMemArray lastRow(cols); for ( int r = 0; r < rows; r++ ) { - NodeItem *prev = 0; + NodeItem *prev = nullptr; for ( int c = 0; c < cols; c++ ) { NodeItem *ni = new NodeItem( graph ); ni->setAnimated( true ); diff --git a/examples/demo/graph.h b/examples/demo/graph.h index 541662678..acc7b45cf 100644 --- a/examples/demo/graph.h +++ b/examples/demo/graph.h @@ -19,7 +19,7 @@ class GraphWidget : public TQWidget { TQ_OBJECT public: - GraphWidget( TQWidget *parent=0, const char *name=0 ); + GraphWidget( TQWidget *parent=nullptr, const char *name=nullptr ); ~GraphWidget(); private slots: diff --git a/examples/demo/i18n/wrapper.h b/examples/demo/i18n/wrapper.h index 155361ffa..2c05b1d5e 100644 --- a/examples/demo/i18n/wrapper.h +++ b/examples/demo/i18n/wrapper.h @@ -8,7 +8,7 @@ class Wrapper : public TQVBox { public: - Wrapper(TQWidget *parent, int i, const char *name = 0) + Wrapper(TQWidget *parent, int i, const char *name = nullptr) : TQVBox(parent, name, WDestructiveClose), translator(this), id(i) { } diff --git a/examples/demo/opengl/glbox.h b/examples/demo/opengl/glbox.h index d702665fb..9e9a0a446 100644 --- a/examples/demo/opengl/glbox.h +++ b/examples/demo/opengl/glbox.h @@ -24,7 +24,7 @@ class GLBox : public GLControlWidget public: - GLBox( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + GLBox( TQWidget* parent = nullptr, const char* name = nullptr, WFlags f = 0 ); ~GLBox(); protected: diff --git a/examples/demo/opengl/glcontrolwidget.h b/examples/demo/opengl/glcontrolwidget.h index 97cd129eb..eed15f751 100644 --- a/examples/demo/opengl/glcontrolwidget.h +++ b/examples/demo/opengl/glcontrolwidget.h @@ -8,7 +8,7 @@ class GLControlWidget : public TQGLWidget TQ_OBJECT public: - GLControlWidget( TQWidget *parent, const char *name = 0, TQGLWidget *share = 0, WFlags f = 0 ); + GLControlWidget( TQWidget *parent, const char *name = nullptr, TQGLWidget *share = nullptr, WFlags f = 0 ); virtual void transform(); diff --git a/examples/demo/opengl/glgear.h b/examples/demo/opengl/glgear.h index 9e21a7539..85ee27cbe 100644 --- a/examples/demo/opengl/glgear.h +++ b/examples/demo/opengl/glgear.h @@ -8,7 +8,7 @@ class GLGear : public GLControlWidget TQ_OBJECT public: - GLGear( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + GLGear( TQWidget *parent = nullptr, const char *name = nullptr, WFlags f = 0 ); protected: void draw(); diff --git a/examples/demo/opengl/glinfo_x11.cpp b/examples/demo/opengl/glinfo_x11.cpp index 2289adeba..581201f51 100644 --- a/examples/demo/opengl/glinfo_x11.cpp +++ b/examples/demo/opengl/glinfo_x11.cpp @@ -229,7 +229,7 @@ GLInfo::GLInfo() TQGLWidget gl((TQWidget *) 0); gl.makeCurrent(); Display *dpy; - char *displayName = 0; + char *displayName = nullptr; int numScreens, scrNum; dpy = gl.x11Display(); diff --git a/examples/demo/opengl/gllandscape.h b/examples/demo/opengl/gllandscape.h index 5288b5eba..0c54c1696 100644 --- a/examples/demo/opengl/gllandscape.h +++ b/examples/demo/opengl/gllandscape.h @@ -8,7 +8,7 @@ class GLLandscape : public TQGLWidget TQ_OBJECT public: - GLLandscape( TQWidget * parent = 0, const char * name = 0 ); + GLLandscape( TQWidget * parent = nullptr, const char * name = nullptr ); ~GLLandscape(); public slots: diff --git a/examples/demo/opengl/gltexobj.h b/examples/demo/opengl/gltexobj.h index a5e48a32b..f22578be9 100644 --- a/examples/demo/opengl/gltexobj.h +++ b/examples/demo/opengl/gltexobj.h @@ -23,7 +23,7 @@ class GLTexobj : public GLControlWidget TQ_OBJECT public: - GLTexobj( TQWidget* parent, const char* name = 0, WFlags f = 0 ); + GLTexobj( TQWidget* parent, const char* name = nullptr, WFlags f = 0 ); ~GLTexobj(); protected: diff --git a/examples/demo/opengl/glworkspace.h b/examples/demo/opengl/glworkspace.h index d83f2b60e..63f3526a3 100644 --- a/examples/demo/opengl/glworkspace.h +++ b/examples/demo/opengl/glworkspace.h @@ -10,7 +10,7 @@ class GLWorkspace : public TQMainWindow { TQ_OBJECT public: - GLWorkspace( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + GLWorkspace( TQWidget *parent = nullptr, const char *name = nullptr, WFlags f = 0 ); ~GLWorkspace(); protected: diff --git a/examples/demo/qasteroids/toplevel.h b/examples/demo/qasteroids/toplevel.h index b86d45b17..89d1b2393 100644 --- a/examples/demo/qasteroids/toplevel.h +++ b/examples/demo/qasteroids/toplevel.h @@ -21,7 +21,7 @@ class KAstTopLevel : public TQMainWindow { TQ_OBJECT public: - KAstTopLevel( TQWidget *parent=0, const char *name=0 ); + KAstTopLevel( TQWidget *parent=nullptr, const char *name=nullptr ); virtual ~KAstTopLevel(); private: diff --git a/examples/demo/qasteroids/view.cpp b/examples/demo/qasteroids/view.cpp index b96b47384..c9b0ff7a9 100644 --- a/examples/demo/qasteroids/view.cpp +++ b/examples/demo/qasteroids/view.cpp @@ -428,7 +428,7 @@ void KAsteroidsView::wrapSprite( TQCanvasItem *s ) void KAsteroidsView::rockHit( TQCanvasItem *hit ) { - KPowerup *nPup = 0; + KPowerup *nPup = nullptr; int rnd = int(randDouble()*30.0) % 30; switch( rnd ) { diff --git a/examples/demo/qasteroids/view.h b/examples/demo/qasteroids/view.h index f7c1ce802..e4780cf6e 100644 --- a/examples/demo/qasteroids/view.h +++ b/examples/demo/qasteroids/view.h @@ -20,7 +20,7 @@ class KAsteroidsView : public TQWidget { TQ_OBJECT public: - KAsteroidsView( TQWidget *parent = 0, const char *name = 0 ); + KAsteroidsView( TQWidget *parent = nullptr, const char *name = nullptr ); virtual ~KAsteroidsView(); int refreshRate; diff --git a/examples/demo/qthumbwheel.h b/examples/demo/qthumbwheel.h index 43a86bf39..d8fc39834 100644 --- a/examples/demo/qthumbwheel.h +++ b/examples/demo/qthumbwheel.h @@ -53,7 +53,7 @@ class TQThumbWheel : public TQFrame, public TQRangeControl TQ_OBJECT public: - TQThumbWheel( TQWidget *parent=0, const char *name=0 ); + TQThumbWheel( TQWidget *parent=nullptr, const char *name=nullptr ); ~TQThumbWheel(); virtual void setOrientation( Orientation ); diff --git a/examples/demo/sql/sqlex.ui.h b/examples/demo/sql/sqlex.ui.h index c59f6886b..52965f897 100644 --- a/examples/demo/sql/sqlex.ui.h +++ b/examples/demo/sql/sqlex.ui.h @@ -17,7 +17,7 @@ #include #include "connect.h" -static void showError( const TQSqlError& err, TQWidget* parent = 0 ) +static void showError( const TQSqlError& err, TQWidget* parent = nullptr ) { TQString errStr ( "The database reported an error\n" ); if ( !err.databaseText().isEmpty() ) @@ -27,7 +27,7 @@ static void showError( const TQSqlError& err, TQWidget* parent = 0 ) TQMessageBox::warning( parent, "Error", errStr ); } -ConnectDialog* conDiag = 0; +ConnectDialog* conDiag = nullptr; void SqlEx::init() { diff --git a/examples/demo/textdrawing/helpwindow.h b/examples/demo/textdrawing/helpwindow.h index 0bf41326d..6428ec660 100644 --- a/examples/demo/textdrawing/helpwindow.h +++ b/examples/demo/textdrawing/helpwindow.h @@ -23,7 +23,7 @@ class HelpWindow : public TQMainWindow { TQ_OBJECT public: - HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = 0, const char *name=0 ); + HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = nullptr, const char *name=nullptr ); ~HelpWindow(); private slots: diff --git a/examples/demo/textdrawing/textedit.h b/examples/demo/textdrawing/textedit.h index ef03f0a01..e8c39595b 100644 --- a/examples/demo/textdrawing/textedit.h +++ b/examples/demo/textdrawing/textedit.h @@ -23,7 +23,7 @@ class TextEdit : public TQMainWindow TQ_OBJECT public: - TextEdit( TQWidget *parent = 0, const char *name = 0 ); + TextEdit( TQWidget *parent = nullptr, const char *name = nullptr ); TQTextEdit *currentEditor() const; void load( const TQString &f ); diff --git a/examples/desktop/desktop.cpp b/examples/desktop/desktop.cpp index 963ac4cfd..a8bc3e6eb 100644 --- a/examples/desktop/desktop.cpp +++ b/examples/desktop/desktop.cpp @@ -188,7 +188,7 @@ void drawShadeText( TQPainter *p, int x, int y, const char *text, class DesktopWidget : public TQWidget, private TQDropSite { public: - DesktopWidget( const char *s, TQWidget *parent=0, const char *name=0 ); + DesktopWidget( const char *s, TQWidget *parent=nullptr, const char *name=nullptr ); ~DesktopWidget(); void paintEvent( TQPaintEvent * ); @@ -226,7 +226,7 @@ DesktopWidget::DesktopWidget( const char *s, TQWidget *parent, const char *name TQDropSite(this) { text = s; - pm = 0; + pm = nullptr; } DesktopWidget::~DesktopWidget() diff --git a/examples/dirview/dirview.cpp b/examples/dirview/dirview.cpp index c30a36b67..03cc4ed2a 100644 --- a/examples/dirview/dirview.cpp +++ b/examples/dirview/dirview.cpp @@ -136,10 +136,10 @@ static const char * pix_file []={ ".....##aa#......", ".......##......."}; -TQPixmap *folderLocked = 0; -TQPixmap *folderClosed = 0; -TQPixmap *folderOpen = 0; -TQPixmap *fileNormal = 0; +TQPixmap *folderLocked = nullptr; +TQPixmap *folderClosed = nullptr; +TQPixmap *folderOpen = nullptr; +TQPixmap *fileNormal = nullptr; /***************************************************************************** * @@ -150,7 +150,7 @@ TQPixmap *fileNormal = 0; Directory::Directory( Directory * parent, const TQString& filename ) : TQListViewItem( parent ), f(filename), showDirsOnly( parent->showDirsOnly ), - pix( 0 ) + pix( nullptr ) { p = parent; readable = TQDir( fullName() ).isReadable(); @@ -165,9 +165,9 @@ Directory::Directory( Directory * parent, const TQString& filename ) Directory::Directory( TQListView * parent, const TQString& filename ) : TQListViewItem( parent ), f(filename), showDirsOnly( ( (DirectoryView*)parent )->showDirsOnly() ), - pix( 0 ) + pix( nullptr ) { - p = 0; + p = nullptr; readable = TQDir( fullName() ).isReadable(); } @@ -185,7 +185,7 @@ void Directory::setPixmap( TQPixmap *px ) const TQPixmap *Directory::pixmap( int i ) const { if ( i ) - return 0; + return nullptr; return pix; } @@ -210,7 +210,7 @@ void Directory::setOpen( bool o ) if ( files ) { TQFileInfoListIterator it( *files ); TQFileInfo * fi; - while( (fi=it.current()) != 0 ) { + while( (fi=it.current()) ) { ++it; if ( fi->fileName() == "." || fi->fileName() == ".." ) ; // nothing @@ -273,8 +273,8 @@ TQString Directory::text( int column ) const *****************************************************************************/ DirectoryView::DirectoryView( TQWidget *parent, const char *name, bool sdo ) - : TQListView( parent, name ), dirsOnly( sdo ), oldCurrent( 0 ), - dropItem( 0 ), mousePressed( false ) + : TQListView( parent, name ), dirsOnly( sdo ), oldCurrent( nullptr ), + dropItem( nullptr ), mousePressed( false ) { autoopen_timer = new TQTimer( this ); if ( !folderLocked ) { @@ -366,14 +366,14 @@ void DirectoryView::contentsDragMoveEvent( TQDragMoveEvent *e ) } else { e->ignore(); autoopen_timer->stop(); - dropItem = 0; + dropItem = nullptr; } } void DirectoryView::contentsDragLeaveEvent( TQDragLeaveEvent * ) { autoopen_timer->stop(); - dropItem = 0; + dropItem = nullptr; setCurrentItem( oldCurrent ); setSelected( oldCurrent, true ); @@ -527,6 +527,6 @@ void FileItem::setPixmap( TQPixmap *p ) const TQPixmap *FileItem::pixmap( int i ) const { if ( i ) - return 0; + return nullptr; return pix; } diff --git a/examples/dirview/dirview.h b/examples/dirview/dirview.h index 57e0dc9e2..f5197bcbc 100644 --- a/examples/dirview/dirview.h +++ b/examples/dirview/dirview.h @@ -26,7 +26,7 @@ class FileItem : public TQListViewItem { public: FileItem( TQListViewItem *parent, const TQString &s1, const TQString &s2 ) - : TQListViewItem( parent, s1, s2 ), pix( 0 ) {} + : TQListViewItem( parent, s1, s2 ), pix( nullptr ) {} const TQPixmap *pixmap( int i ) const; #if !defined(Q_NO_USING_KEYWORD) @@ -44,7 +44,7 @@ class Directory : public TQListViewItem public: Directory( TQListView * parent, const TQString& filename ); Directory( Directory * parent, const TQString& filename, const TQString &col2 ) - : TQListViewItem( parent, filename, col2 ), pix( 0 ) {} + : TQListViewItem( parent, filename, col2 ), pix( nullptr ) {} Directory( Directory * parent, const TQString& filename ); TQString text( int column ) const; @@ -74,7 +74,7 @@ class DirectoryView : public TQListView TQ_OBJECT public: - DirectoryView( TQWidget *parent = 0, const char *name = 0, bool sdo = false ); + DirectoryView( TQWidget *parent = nullptr, const char *name = nullptr, bool sdo = false ); bool showDirsOnly() { return dirsOnly; } public slots: diff --git a/examples/distributor/distributor.ui.h b/examples/distributor/distributor.ui.h index 10a39207d..4a28c3916 100644 --- a/examples/distributor/distributor.ui.h +++ b/examples/distributor/distributor.ui.h @@ -100,7 +100,7 @@ void Distributor::browseLibFilename() static char *find_pattern( char *h, const char *n, ulong hlen ) { if ( ! h || ! n || hlen == 0 ) - return 0; + return nullptr; #ifdef Q_OS_UNIX size_t nlen; @@ -116,11 +116,11 @@ static char *find_pattern( char *h, const char *n, ulong hlen ) do { hc = *h++; if ( hlen-- < 1 ) - return 0; + return nullptr; } while ( hc != nc ); if ( nlen > hlen ) - return 0; + return nullptr; } while ( tqstrncmp( h, n, nlen ) != 0 ); return h + nlen; } diff --git a/examples/dragdrop/dropsite.h b/examples/dragdrop/dropsite.h index fa58eb25d..bb9b0514a 100644 --- a/examples/dragdrop/dropsite.h +++ b/examples/dragdrop/dropsite.h @@ -24,7 +24,7 @@ class DropSite: public TQLabel { TQ_OBJECT public: - DropSite( TQWidget * parent = 0, const char * name = 0 ); + DropSite( TQWidget * parent = nullptr, const char * name = nullptr ); ~DropSite(); signals: diff --git a/examples/dragdrop/secret.h b/examples/dragdrop/secret.h index b7d9d257a..03e1fe673 100644 --- a/examples/dragdrop/secret.h +++ b/examples/dragdrop/secret.h @@ -19,7 +19,7 @@ class SecretDrag: public TQStoredDrag { public: - SecretDrag( uchar, TQWidget * parent = 0, const char * name = 0 ); + SecretDrag( uchar, TQWidget * parent = nullptr, const char * name = nullptr ); ~SecretDrag() {}; static bool canDecode( TQDragMoveEvent* e ); @@ -30,7 +30,7 @@ public: class SecretSource: public TQLabel { public: - SecretSource( int secret, TQWidget *parent = 0, const char * name = 0 ); + SecretSource( int secret, TQWidget *parent = nullptr, const char * name = nullptr ); ~SecretSource(); protected: diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp index 4aced2154..8a79645d7 100644 --- a/examples/drawdemo/drawdemo.cpp +++ b/examples/drawdemo/drawdemo.cpp @@ -59,7 +59,7 @@ void drawColorWheel( TQPainter *p ) void drawFonts( TQPainter *p ) { - static const char *fonts[] = { "Helvetica", "Courier", "Times", 0 }; + static const char *fonts[] = { "Helvetica", "Courier", "Times", nullptr }; static int sizes[] = { 10, 12, 18, 24, 36, 0 }; int f = 0; int y = 0; @@ -124,7 +124,7 @@ DrawThing ourDrawFunctions[] = { { drawColorWheel, "Draw color wheel" }, { drawFonts, "Draw fonts" }, { drawShapes, "Draw shapes" }, - { 0, 0 } }; + { nullptr, nullptr } }; @@ -174,7 +174,7 @@ DrawView::DrawView() // Find out the longest function description. // Here we make use of the last "0,0"-entry in the // ourDrawFunctions-array. - for ( i=0; (n=ourDrawFunctions[i].name) != 0; i++ ) { + for ( i=0; (n=ourDrawFunctions[i].name); i++ ) { int w = fm.width( n ); maxwidth = TQMAX(w,maxwidth); // TQMAX is a macro defined in tqglobal.h // and returns the biggest of to values. @@ -184,7 +184,7 @@ DrawView::DrawView() maxwidth = maxwidth + 30; // allow 30 pixels for radiobuttons - for ( i=0; (n=ourDrawFunctions[i].name) != 0; i++ ) { + for ( i=0; (n=ourDrawFunctions[i].name); i++ ) { TQRadioButton *rb = new TQRadioButton( n, bgroup ); rb->setGeometry( 10, i*30+10, maxwidth, 30 ); diff --git a/examples/drawlines/connect.cpp b/examples/drawlines/connect.cpp index 4ac5c965f..cbd13d5a4 100644 --- a/examples/drawlines/connect.cpp +++ b/examples/drawlines/connect.cpp @@ -24,7 +24,7 @@ const int MAXCOLORS = 40; class ConnectWidget : public TQWidget { public: - ConnectWidget( TQWidget *parent=0, const char *name=0 ); + ConnectWidget( TQWidget *parent=nullptr, const char *name=nullptr ); ~ConnectWidget(); protected: void paintEvent( TQPaintEvent * ); diff --git a/examples/fileiconview/tqfileiconview.cpp b/examples/fileiconview/tqfileiconview.cpp index 20ac7b5e5..f33ed3664 100644 --- a/examples/fileiconview/tqfileiconview.cpp +++ b/examples/fileiconview/tqfileiconview.cpp @@ -216,14 +216,14 @@ static const char * folder_locked_icon[]={ "....................##d#b###....", "......................####......"}; -static TQPixmap *iconFolderLockedLarge = 0; -static TQPixmap *iconFolderLarge = 0; -static TQPixmap *iconFileLarge = 0; -static TQPixmap *iconLinkLarge = 0; -static TQPixmap *iconFolderLockedSmall = 0; -static TQPixmap *iconFolderSmall = 0; -static TQPixmap *iconFileSmall = 0; -static TQPixmap *iconLinkSmall = 0; +static TQPixmap *iconFolderLockedLarge = nullptr; +static TQPixmap *iconFolderLarge = nullptr; +static TQPixmap *iconFileLarge = nullptr; +static TQPixmap *iconLinkLarge = nullptr; +static TQPixmap *iconFolderLockedSmall = nullptr; +static TQPixmap *iconFolderSmall = nullptr; +static TQPixmap *iconFileSmall = nullptr; +static TQPixmap *iconLinkSmall = nullptr; static void cleanup() { @@ -263,7 +263,7 @@ const char* TQtFileIconDrag::format( int i ) const else if ( i == 1 ) return "text/uri-list"; else - return 0; + return nullptr; } TQByteArray TQtFileIconDrag::encodedData( const char* mime ) const @@ -512,7 +512,7 @@ TQtFileIconView::TQtFileIconView( const TQString &dir, TQWidget *parent, const c setAutoArrange( true ); setSorting( true ); - openItem = 0; + openItem = nullptr; } void TQtFileIconView::openFolder() @@ -608,7 +608,7 @@ void TQtFileIconView::readDir( const TQDir &dir ) TQFileInfoListIterator it( *filist ); TQFileInfo *fi; bool allowRename = false, allowRenameSet = false; - while ( ( fi = it.current() ) != 0 ) { + while ( ( fi = it.current() ) ) { ++it; if ( fi && fi->fileName() == ".." && ( fi->dirPath() == "/" || fi->dirPath().isEmpty() ) ) continue; @@ -657,7 +657,7 @@ void TQtFileIconView::itemDoubleClicked( TQIconViewItem *i ) TQDragObject *TQtFileIconView::dragObject() { if ( !currentItem() ) - return 0; + return nullptr; TQPoint orig = viewportToContents( viewport()->mapFromGlobal( TQCursor::pos() ) ); TQtFileIconDrag *drag = new TQtFileIconDrag( viewport() ); @@ -718,7 +718,7 @@ void TQtFileIconView::slotDropped( TQDropEvent *e, const TQValueListaction() == TQDropEvent::Move ) TQMessageBox::information( this, "Remove" , TQDir::convertSeparators(lst.join("\n")), "Not Implemented" ); e->acceptAction(); - openItem = 0; + openItem = nullptr; } void TQtFileIconView::viewLarge() diff --git a/examples/fileiconview/tqfileiconview.h b/examples/fileiconview/tqfileiconview.h index b5948011d..436931f26 100644 --- a/examples/fileiconview/tqfileiconview.h +++ b/examples/fileiconview/tqfileiconview.h @@ -33,7 +33,7 @@ class TQtFileIconDrag : public TQIconDrag TQ_OBJECT public: - TQtFileIconDrag( TQWidget * dragSource, const char* name = 0 ); + TQtFileIconDrag( TQWidget * dragSource, const char* name = nullptr ); const char* format( int i ) const; TQByteArray encodedData( const char* mime ) const; @@ -56,7 +56,7 @@ class TQtFileIconView : public TQIconView TQ_OBJECT public: - TQtFileIconView( const TQString &dir, TQWidget *parent = 0, const char *name = 0 ); + TQtFileIconView( const TQString &dir, TQWidget *parent = nullptr, const char *name = nullptr ); enum ViewMode { Large, Small }; diff --git a/examples/forever/forever.h b/examples/forever/forever.h index b976103c3..72c9951ee 100644 --- a/examples/forever/forever.h +++ b/examples/forever/forever.h @@ -24,7 +24,7 @@ class Forever : public TQWidget { TQ_OBJECT public: - Forever( TQWidget *parent=0, const char *name=0 ); + Forever( TQWidget *parent=nullptr, const char *name=nullptr ); protected: void paintEvent( TQPaintEvent * ); void timerEvent( TQTimerEvent * ); diff --git a/examples/hello/hello.h b/examples/hello/hello.h index 806b4c1e7..51ba821d6 100644 --- a/examples/hello/hello.h +++ b/examples/hello/hello.h @@ -17,7 +17,7 @@ class Hello : public TQWidget { TQ_OBJECT public: - Hello( const char *text, TQWidget *parent=0, const char *name=0 ); + Hello( const char *text, TQWidget *parent=nullptr, const char *name=nullptr ); signals: void clicked(); protected: diff --git a/examples/helpdemo/helpdemo.cpp b/examples/helpdemo/helpdemo.cpp index d5208fe1e..f85e78ef6 100644 --- a/examples/helpdemo/helpdemo.cpp +++ b/examples/helpdemo/helpdemo.cpp @@ -51,12 +51,12 @@ TQWidget* HelpDemo::lookForWidget() { TQPtrDictIterator it( widgets ); TQWidget *w; - while ( (w = (TQWidget*)(it.currentKey())) != 0 ) { + while ( (w = (TQWidget*)(it.currentKey())) ) { ++it; if ( w->hasMouse() ) return w; } - return 0; + return nullptr; } void HelpDemo::showHelp() diff --git a/examples/helpdemo/helpdemo.h b/examples/helpdemo/helpdemo.h index 4c808adb9..0dd36241c 100644 --- a/examples/helpdemo/helpdemo.h +++ b/examples/helpdemo/helpdemo.h @@ -13,7 +13,7 @@ class HelpDemo : public HelpDemoBase TQ_OBJECT public: - HelpDemo( TQWidget *parent = 0, const char *name = 0 ); + HelpDemo( TQWidget *parent = nullptr, const char *name = nullptr ); ~HelpDemo(); protected: diff --git a/examples/helpsystem/tooltip.h b/examples/helpsystem/tooltip.h index ab53a6f40..eb375934d 100644 --- a/examples/helpsystem/tooltip.h +++ b/examples/helpsystem/tooltip.h @@ -19,7 +19,7 @@ class TQHeader; class HeaderToolTip : public TQToolTip { public: - HeaderToolTip( TQHeader *header, TQToolTipGroup *group = 0 ); + HeaderToolTip( TQHeader *header, TQToolTipGroup *group = nullptr ); protected: void maybeTip ( const TQPoint &p ); @@ -28,7 +28,7 @@ protected: class TableToolTip : public TQToolTip { public: - TableToolTip( TQTable* table, TQToolTipGroup *group = 0 ); + TableToolTip( TQTable* table, TQToolTipGroup *group = nullptr ); protected: void maybeTip( const TQPoint &p ); diff --git a/examples/helpsystem/whatsthis.h b/examples/helpsystem/whatsthis.h index d9cda8ddc..4da157ba6 100644 --- a/examples/helpsystem/whatsthis.h +++ b/examples/helpsystem/whatsthis.h @@ -19,7 +19,7 @@ class WhatsThis : public TQObject, public TQWhatsThis { TQ_OBJECT public: - WhatsThis( TQWidget *w, TQWidget *watch = 0 ); + WhatsThis( TQWidget *w, TQWidget *watch = nullptr ); bool clicked( const TQString &link ); TQWidget *parentWidget() const; diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp index 9f935e9a1..74aa094f0 100644 --- a/examples/helpviewer/helpwindow.cpp +++ b/examples/helpviewer/helpwindow.cpp @@ -38,7 +38,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQWidget* parent, const char *name ) : TQMainWindow( parent, name, WDestructiveClose ), - pathCombo( 0 ) + pathCombo( nullptr ) { readHistory(); readBookmarks(); diff --git a/examples/helpviewer/helpwindow.h b/examples/helpviewer/helpwindow.h index 9b05c61e5..c592a41d9 100644 --- a/examples/helpviewer/helpwindow.h +++ b/examples/helpviewer/helpwindow.h @@ -23,7 +23,7 @@ class HelpWindow : public TQMainWindow { TQ_OBJECT public: - HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = 0, const char *name=0 ); + HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = nullptr, const char *name=nullptr ); ~HelpWindow(); private slots: diff --git a/examples/helpviewer/main.cpp b/examples/helpviewer/main.cpp index ee2e7ad85..ae7023c75 100644 --- a/examples/helpviewer/main.cpp +++ b/examples/helpviewer/main.cpp @@ -26,7 +26,7 @@ int main( int argc, char ** argv ) home = TQDir( "../../doc/html/index.html" ).absPath(); } - HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer"); + HelpWindow *help = new HelpWindow(home, ".", nullptr, "help viewer"); help->setCaption("TQt Example - Helpviewer"); if ( TQApplication::desktop()->width() > 400 && TQApplication::desktop()->height() > 500 ) diff --git a/examples/i18n/main.cpp b/examples/i18n/main.cpp index 36cb7cfb3..b4889d6c3 100644 --- a/examples/i18n/main.cpp +++ b/examples/i18n/main.cpp @@ -30,12 +30,12 @@ class TQVDialog : public TQDialog { public: - TQVDialog(TQWidget *parent=0, const char *name=0, bool modal=false, + TQVDialog(TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false, WFlags f=0) : TQDialog(parent,name,modal,f) { TQVBoxLayout* vb = new TQVBoxLayout(this,8); vb->setAutoAdd(true); - hb = 0; + hb = nullptr; sm = new TQSignalMapper(this); connect(sm,TQ_SIGNAL(mapped(int)),this,TQ_SLOT(done(int))); } @@ -69,7 +69,7 @@ private: MyWidget* showLang(TQString lang) { - static TQTranslator *translator = 0; + static TQTranslator *translator = nullptr; tqApp->setPalette(TQPalette(TQColor(220-rand()%64,220-rand()%64,220-rand()%64))); @@ -77,16 +77,16 @@ MyWidget* showLang(TQString lang) TQFileInfo fi( lang ); if ( !fi.exists() ) { - TQMessageBox::warning( 0, "File error", + TQMessageBox::warning( nullptr, "File error", TQString("Cannot find translation for language: "+lang+ "\n(try eg. 'de', 'ko' or 'no')") ); - return 0; + return nullptr; } if ( translator ) { tqApp->removeTranslator( translator ); delete translator; } - translator = new TQTranslator( 0 ); + translator = new TQTranslator( nullptr ); translator->load( lang, "." ); tqApp->installTranslator( translator ); MyWidget *m = new MyWidget; @@ -99,7 +99,7 @@ int main( int argc, char** argv ) TQApplication app( argc, argv ); const char* qm[]= - { "ar", "cs", "de", "el", "en", "eo", "fr", "it", "jp", "ko", "no", "ru", "sk", "zh", 0 }; + { "ar", "cs", "de", "el", "en", "eo", "fr", "it", "jp", "ko", "no", "ru", "sk", "zh", nullptr }; #if defined(Q_OS_UNIX) srand( getpid() << 2 ); @@ -110,7 +110,7 @@ int main( int argc, char** argv ) lang = argv[1]; if ( argc != 2 || lang == "all" ) { - TQVDialog dlg(0,0,true); + TQVDialog dlg(nullptr,nullptr,true); TQCheckBox* qmb[sizeof(qm)/sizeof(qm[0])]; int r; if ( lang == "all" ) { @@ -134,7 +134,7 @@ int main( int argc, char** argv ) if ( r == 2 || qmb[i]->isChecked() ) { MyWidget* w = showLang((const char*)qm[i]); - if( w == 0 ) exit( 0 ); + if( !w ) exit( 0 ); TQObject::connect(w, TQ_SIGNAL(closed()), tqApp, TQ_SLOT(quit())); w->setGeometry(x,y,197,356); w->show(); diff --git a/examples/i18n/mywidget.cpp b/examples/i18n/mywidget.cpp index b0aec85bb..4b68aa020 100644 --- a/examples/i18n/mywidget.cpp +++ b/examples/i18n/mywidget.cpp @@ -56,7 +56,7 @@ static const char* choices[] = { TQT_TRANSLATE_NOOP( "MyWidget", "First" ), TQT_TRANSLATE_NOOP( "MyWidget", "Second" ), TQT_TRANSLATE_NOOP( "MyWidget", "Third" ), - 0 + nullptr }; void MyWidget::initChoices(TQWidget* parent) diff --git a/examples/i18n/mywidget.h b/examples/i18n/mywidget.h index 9e781bf1c..b3087a18a 100644 --- a/examples/i18n/mywidget.h +++ b/examples/i18n/mywidget.h @@ -18,7 +18,7 @@ class MyWidget : public TQMainWindow TQ_OBJECT public: - MyWidget( TQWidget* parent=0, const char* name = 0 ); + MyWidget( TQWidget* parent=nullptr, const char* name = nullptr ); signals: void closed(); diff --git a/examples/iconview/simple_dd/main.h b/examples/iconview/simple_dd/main.h index e3fcdf512..09588af64 100644 --- a/examples/iconview/simple_dd/main.h +++ b/examples/iconview/simple_dd/main.h @@ -22,7 +22,7 @@ class DDListBox : public TQListBox { TQ_OBJECT public: - DDListBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + DDListBox( TQWidget * parent = nullptr, const char * name = nullptr, WFlags f = 0 ); // Low-level drag and drop void dragEnterEvent( TQDragEnterEvent *evt ); void dropEvent( TQDropEvent *evt ); @@ -50,7 +50,7 @@ class DDIconView : public TQIconView { TQ_OBJECT public: - DDIconView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : + DDIconView( TQWidget * parent = nullptr, const char * name = nullptr, WFlags f = 0 ) : TQIconView( parent, name, f ) {} // High-level drag and drop TQDragObject *dragObject(); diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp index 18fd487fe..c6804a8db 100644 --- a/examples/layout/layout.cpp +++ b/examples/layout/layout.cpp @@ -20,7 +20,7 @@ class ExampleWidget : public TQWidget { public: - ExampleWidget( TQWidget *parent = 0, const char *name = 0 ); + ExampleWidget( TQWidget *parent = nullptr, const char *name = nullptr ); ~ExampleWidget(); }; diff --git a/examples/life/life.h b/examples/life/life.h index 07e0cd650..c1f58eca6 100644 --- a/examples/life/life.h +++ b/examples/life/life.h @@ -17,7 +17,7 @@ class LifeWidget : public TQFrame { TQ_OBJECT public: - LifeWidget( int s = 10, TQWidget *parent = 0, const char *name = 0 ); + LifeWidget( int s = 10, TQWidget *parent = nullptr, const char *name = nullptr ); void setPoint( int i, int j ); diff --git a/examples/life/lifedlg.h b/examples/life/lifedlg.h index e00724e7d..0fc852e5a 100644 --- a/examples/life/lifedlg.h +++ b/examples/life/lifedlg.h @@ -41,7 +41,7 @@ class LifeDialog : public TQWidget { TQ_OBJECT public: - LifeDialog( int scale = 10, TQWidget *parent = 0, const char *name = 0 ); + LifeDialog( int scale = 10, TQWidget *parent = nullptr, const char *name = nullptr ); public slots: void getPattern( int ); diff --git a/examples/lineedits/lineedits.cpp b/examples/lineedits/lineedits.cpp index d7358335b..93ff643f1 100644 --- a/examples/lineedits/lineedits.cpp +++ b/examples/lineedits/lineedits.cpp @@ -179,7 +179,7 @@ void LineEdits::slotValidatorChanged( int i ) { switch ( i ) { case 0: - lined2->setValidator( 0 ); + lined2->setValidator( nullptr ); break; case 1: lined2->setValidator( new TQIntValidator( lined2 ) ); diff --git a/examples/lineedits/lineedits.h b/examples/lineedits/lineedits.h index 57c541e4f..3a15aba89 100644 --- a/examples/lineedits/lineedits.h +++ b/examples/lineedits/lineedits.h @@ -20,7 +20,7 @@ class LineEdits : public TQGroupBox TQ_OBJECT public: - LineEdits( TQWidget *parent = 0, const char *name = 0 ); + LineEdits( TQWidget *parent = nullptr, const char *name = nullptr ); protected: TQLineEdit *lined1, *lined2, *lined3, *lined4, *lined5; diff --git a/examples/listbox/listbox.cpp b/examples/listbox/listbox.cpp index 983e98498..c78ad9270 100644 --- a/examples/listbox/listbox.cpp +++ b/examples/listbox/listbox.cpp @@ -20,7 +20,7 @@ ListBoxDemo::ListBoxDemo() - : TQWidget( 0, 0 ) + : TQWidget( nullptr, nullptr ) { TQGridLayout * g = new TQGridLayout( this, 2, 2, 6 ); @@ -35,7 +35,7 @@ ListBoxDemo::ListBoxDemo() g->addLayout( v, 1, 0 ); TQRadioButton * b; - bg = new TQButtonGroup( 0 ); + bg = new TQButtonGroup( nullptr ); b = new TQRadioButton( "Fixed number of columns,\n" "as many rows as needed.", diff --git a/examples/listboxcombo/listboxcombo.h b/examples/listboxcombo/listboxcombo.h index 03074b1c5..7706ba37c 100644 --- a/examples/listboxcombo/listboxcombo.h +++ b/examples/listboxcombo/listboxcombo.h @@ -20,7 +20,7 @@ class ListBoxCombo : public TQVBox TQ_OBJECT public: - ListBoxCombo( TQWidget *parent = 0, const char *name = 0 ); + ListBoxCombo( TQWidget *parent = nullptr, const char *name = nullptr ); protected: TQListBox *lb1, *lb2; diff --git a/examples/listviews/listviews.cpp b/examples/listviews/listviews.cpp index 73c52fdff..3c6fbf3de 100644 --- a/examples/listviews/listviews.cpp +++ b/examples/listviews/listviews.cpp @@ -165,7 +165,7 @@ void ListViews::initFolders() for ( unsigned int i = 1; i < 20; i++ ) { TQString str; str = TQString( "Folder %1" ).arg( i ); - Folder *f = new Folder( 0, str ); + Folder *f = new Folder( nullptr, str ); for ( unsigned int j = 1; j < 5; j++ ) { TQString str2; str2 = TQString( "Sub Folder %1" ).arg( j ); diff --git a/examples/listviews/listviews.h b/examples/listviews/listviews.h index 510845228..83813b1d8 100644 --- a/examples/listviews/listviews.h +++ b/examples/listviews/listviews.h @@ -141,7 +141,7 @@ class ListViews : public TQSplitter TQ_OBJECT public: - ListViews( TQWidget *parent = 0, const char *name = 0 ); + ListViews( TQWidget *parent = nullptr, const char *name = nullptr ); ~ListViews() {} diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp index 0bfee4d54..caf05f67b 100644 --- a/examples/mdi/application.cpp +++ b/examples/mdi/application.cpp @@ -50,7 +50,7 @@ const char * filePrintText = "Click this button to print the file you " "You can also select the Print command from the File menu."; ApplicationWindow::ApplicationWindow() - : TQMainWindow( 0, "example application main window", WDestructiveClose ) + : TQMainWindow( nullptr, "example application main window", WDestructiveClose ) { int id; @@ -145,7 +145,7 @@ ApplicationWindow::~ApplicationWindow() MDIWindow* ApplicationWindow::newDoc() { - MDIWindow* w = new MDIWindow( ws, 0, WDestructiveClose ); + MDIWindow* w = new MDIWindow( ws, nullptr, WDestructiveClose ); connect( w, TQ_SIGNAL( message(const TQString&, int) ), statusBar(), TQ_SLOT( message(const TQString&, int )) ); w->setCaption("unnamed document"); w->setIcon( TQPixmap("document.xpm") ); @@ -285,7 +285,7 @@ void ApplicationWindow::closeEvent( TQCloseEvent *e ) MDIWindow::MDIWindow( TQWidget* parent, const char* name, int wflags ) : TQMainWindow( parent, name, wflags ) { - mmovie = 0; + mmovie = nullptr; medit = new TQTextEdit( this ); setFocusProxy( medit ); setCentralWidget( medit ); @@ -341,7 +341,7 @@ void MDIWindow::load( const TQString& fn ) tmp->show(); mmovie=qm; } else { - mmovie = 0; + mmovie = nullptr; TQTextStream t(&f); TQString s = t.read(); diff --git a/examples/menu/menu.h b/examples/menu/menu.h index 5bde69ec4..fea75f6a1 100644 --- a/examples/menu/menu.h +++ b/examples/menu/menu.h @@ -19,7 +19,7 @@ class MenuExample : public TQWidget { TQ_OBJECT public: - MenuExample( TQWidget *parent=0, const char *name=0 ); + MenuExample( TQWidget *parent=nullptr, const char *name=nullptr ); public slots: void open(); diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp index 552a4d80c..1629aefe3 100644 --- a/examples/movies/main.cpp +++ b/examples/movies/main.cpp @@ -24,7 +24,7 @@ class MovieScreen : public TQFrame { TQSize sh; public: - MovieScreen(const char* fname, TQMovie m, TQWidget* p=0, const char* name=0, WFlags f=0) : + MovieScreen(const char* fname, TQMovie m, TQWidget* p=nullptr, const char* name=nullptr, WFlags f=0) : TQFrame(p, name, f), sh(100,100) { @@ -82,7 +82,7 @@ protected: // The on-screen display - const char* message = 0; + const char* message = nullptr; if (movie.paused()) { message = "PAUSED"; @@ -197,7 +197,7 @@ private slots: class MoviePlayer : public TQVBox { MovieScreen* movie; public: - MoviePlayer(const char* fname, TQMovie m, TQWidget* p=0, const char* name=0, WFlags f=0) : + MoviePlayer(const char* fname, TQMovie m, TQWidget* p=nullptr, const char* name=nullptr, WFlags f=0) : TQVBox(p,name,f) { movie = new MovieScreen(fname, m, this); @@ -244,7 +244,7 @@ MovieStarter::MovieStarter(const char *dir) void MovieStarter::startMovie(const TQString& filename) { if ( filename ) // Start a new movie - have it delete when closed. - (new MoviePlayer( filename, TQMovie(filename), 0, 0, + (new MoviePlayer( filename, TQMovie(filename), nullptr, nullptr, WDestructiveClose))->show(); } @@ -270,10 +270,10 @@ int main(int argc, char **argv) if ( TQString(argv[arg]) == "-i" ) gui = !gui; else if ( gui ) - (void)new MoviePlayer(argv[arg], TQMovie(argv[arg]), 0, 0, + (void)new MoviePlayer(argv[arg], TQMovie(argv[arg]), nullptr, nullptr, TQt::WDestructiveClose); else - (void)new MovieScreen(argv[arg], TQMovie(argv[arg]), 0, 0, + (void)new MovieScreen(argv[arg], TQMovie(argv[arg]), nullptr, nullptr, TQt::WDestructiveClose); } TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp index 9f8d82a7f..fe31ff323 100644 --- a/examples/network/clientserver/server/server.cpp +++ b/examples/network/clientserver/server/server.cpp @@ -28,7 +28,7 @@ class ClientSocket : public TQSocket { TQ_OBJECT public: - ClientSocket( int sock, TQObject *parent=0, const char *name=0 ) : + ClientSocket( int sock, TQObject *parent=nullptr, const char *name=nullptr ) : TQSocket( parent, name ) { line = 0; @@ -75,7 +75,7 @@ class SimpleServer : public TQServerSocket { TQ_OBJECT public: - SimpleServer( TQObject* parent=0 ) : + SimpleServer( TQObject* parent=nullptr ) : TQServerSocket( 4242, 1, parent ) { if ( !ok() ) { diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp index dc65fb9e0..2fe7f2075 100644 --- a/examples/network/httpd/httpd.cpp +++ b/examples/network/httpd/httpd.cpp @@ -23,7 +23,7 @@ class HttpDaemon : public TQServerSocket { TQ_OBJECT public: - HttpDaemon( TQObject* parent=0 ) : + HttpDaemon( TQObject* parent=nullptr ) : TQServerSocket(8080,1,parent) { if ( !ok() ) { diff --git a/examples/network/infoprotocol/infoclient/client.cpp b/examples/network/infoprotocol/infoclient/client.cpp index 45d961136..e3e3347c5 100644 --- a/examples/network/infoprotocol/infoclient/client.cpp +++ b/examples/network/infoprotocol/infoclient/client.cpp @@ -20,7 +20,7 @@ ClientInfo::ClientInfo( TQWidget *parent, const char *name ) : - ClientInfoBase( parent, name ), socket( 0 ) + ClientInfoBase( parent, name ), socket( nullptr ) { edHost->setText( "localhost" ); edPort->setText( TQString::number( (uint)infoPort ) ); diff --git a/examples/network/infoprotocol/infoclient/client.h b/examples/network/infoprotocol/infoclient/client.h index 544d28ae7..ed7d1ca12 100644 --- a/examples/network/infoprotocol/infoclient/client.h +++ b/examples/network/infoprotocol/infoclient/client.h @@ -24,7 +24,7 @@ class ClientInfo : public ClientInfoBase { TQ_OBJECT public: - ClientInfo( TQWidget *parent = 0, const char *name = 0 ); + ClientInfo( TQWidget *parent = nullptr, const char *name = nullptr ); private: enum Operation { List, Get }; diff --git a/examples/network/infoprotocol/infoserver/main.cpp b/examples/network/infoprotocol/infoserver/main.cpp index b37776a7a..4e73b9566 100644 --- a/examples/network/infoprotocol/infoserver/main.cpp +++ b/examples/network/infoprotocol/infoserver/main.cpp @@ -15,7 +15,7 @@ int main( int argc, char** argv ) { TQApplication app( argc, argv ); TQ_UINT16 port = ( argc > 1 ) ? TQString( argv[ 1 ] ).toInt() : infoPort; - ServerInfo info( port, 0, "server info" ); + ServerInfo info( port, nullptr, "server info" ); app.setMainWidget( &info ); info.show(); return app.exec(); diff --git a/examples/network/infoprotocol/infoserver/server.cpp b/examples/network/infoprotocol/infoserver/server.cpp index 3637a0195..3ed477f5e 100644 --- a/examples/network/infoprotocol/infoserver/server.cpp +++ b/examples/network/infoprotocol/infoserver/server.cpp @@ -36,7 +36,7 @@ SimpleServer::SimpleServer( TQ_UINT16 port, TQObject* parent, const char *name ) TQServerSocket( port, 1, parent, name ) { if ( !ok() ) { - TQMessageBox::critical( 0, tr( "Error" ), tr( "Failed to bind to port %1" ).arg( port ) ); + TQMessageBox::critical( nullptr, tr( "Error" ), tr( "Failed to bind to port %1" ).arg( port ) ); exit(1); } } diff --git a/examples/network/infoprotocol/infoserver/server.h b/examples/network/infoprotocol/infoserver/server.h index c5662697f..a32aa7951 100644 --- a/examples/network/infoprotocol/infoserver/server.h +++ b/examples/network/infoprotocol/infoserver/server.h @@ -27,7 +27,7 @@ class ServerInfo : public ServerInfoBase { TQ_OBJECT public: - ServerInfo( TQ_UINT16 port = infoPort, TQWidget *parent = 0, const char *name = 0 ); + ServerInfo( TQ_UINT16 port = infoPort, TQWidget *parent = nullptr, const char *name = nullptr ); private slots: void newConnect(); @@ -38,7 +38,7 @@ class SimpleServer : public TQServerSocket { TQ_OBJECT public: - SimpleServer( TQ_UINT16 port = infoPort, TQObject* parent = 0, const char *name = 0 ); + SimpleServer( TQ_UINT16 port = infoPort, TQObject* parent = nullptr, const char *name = nullptr ); void newConnection( int socket ); signals: @@ -53,7 +53,7 @@ class ClientSocket : public TQSocket { TQ_OBJECT public: - ClientSocket( int sock, InfoData *i, TQObject *parent = 0, const char *name = 0 ); + ClientSocket( int sock, InfoData *i, TQObject *parent = nullptr, const char *name = nullptr ); private slots: void readClient(); diff --git a/examples/network/infoprotocol/infourlclient/client.cpp b/examples/network/infoprotocol/infourlclient/client.cpp index a4fcec5dc..57fb58e82 100644 --- a/examples/network/infoprotocol/infourlclient/client.cpp +++ b/examples/network/infoprotocol/infourlclient/client.cpp @@ -43,7 +43,7 @@ TQString ClientInfo::getOpenFileName() { static TQString workingDirectory( "qip://localhost/" ); - TQFileDialog dlg( workingDirectory, TQString::null, 0, 0, true ); + TQFileDialog dlg( workingDirectory, TQString::null, nullptr, nullptr, true ); dlg.setCaption( TQFileDialog::tr( "Open" ) ); dlg.setMode( TQFileDialog::ExistingFile ); TQString result; diff --git a/examples/network/infoprotocol/infourlclient/client.h b/examples/network/infoprotocol/infourlclient/client.h index ef8e01473..3ef63a66c 100644 --- a/examples/network/infoprotocol/infourlclient/client.h +++ b/examples/network/infoprotocol/infourlclient/client.h @@ -20,7 +20,7 @@ class ClientInfo : public ClientInfoBase TQ_OBJECT public: - ClientInfo( TQWidget *parent = 0, const char *name = 0 ); + ClientInfo( TQWidget *parent = nullptr, const char *name = nullptr ); private slots: void downloadFile(); diff --git a/examples/network/mail/composer.h b/examples/network/mail/composer.h index 9e523a15f..e22396a01 100644 --- a/examples/network/mail/composer.h +++ b/examples/network/mail/composer.h @@ -24,7 +24,7 @@ class Composer : public TQWidget TQ_OBJECT public: - Composer( TQWidget *parent = 0 ); + Composer( TQWidget *parent = nullptr ); private slots: void sendMessage(); diff --git a/examples/network/networkprotocol/view.cpp b/examples/network/networkprotocol/view.cpp index 939f802ff..7e1cce197 100644 --- a/examples/network/networkprotocol/view.cpp +++ b/examples/network/networkprotocol/view.cpp @@ -71,7 +71,7 @@ TQString View::getOpenFileName() static TQString workingDirectory = TQDir::currentDirPath(); TQFileDialog *dlg = new TQFileDialog( workingDirectory, - TQString::null, 0, 0, true ); + TQString::null, nullptr, nullptr, true ); dlg->setCaption( TQFileDialog::tr( "Open" ) ); dlg->setMode( TQFileDialog::ExistingFile ); TQString result; diff --git a/examples/network/remotecontrol/startup.cpp b/examples/network/remotecontrol/startup.cpp index 8f86840f3..3c80b0e4c 100644 --- a/examples/network/remotecontrol/startup.cpp +++ b/examples/network/remotecontrol/startup.cpp @@ -10,8 +10,8 @@ static const TQ_UINT16 ipcPort = 54923; StartUp::StartUp() { - remoteCtrl = 0; - mainDialog = 0; + remoteCtrl = nullptr; + mainDialog = nullptr; socket = new TQSocket( this ); connect( socket, TQ_SIGNAL(connected()), TQ_SLOT(startRemoteCtrl()) ); diff --git a/examples/opengl/box/globjwin.h b/examples/opengl/box/globjwin.h index fcc8aa3b0..b07314f12 100644 --- a/examples/opengl/box/globjwin.h +++ b/examples/opengl/box/globjwin.h @@ -24,7 +24,7 @@ class GLObjectWindow : public TQWidget { TQ_OBJECT public: - GLObjectWindow( TQWidget* parent = 0, const char* name = 0 ); + GLObjectWindow( TQWidget* parent = nullptr, const char* name = nullptr ); }; diff --git a/examples/opengl/gear/gear.cpp b/examples/opengl/gear/gear.cpp index a895e6465..6440cc718 100644 --- a/examples/opengl/gear/gear.cpp +++ b/examples/opengl/gear/gear.cpp @@ -195,7 +195,7 @@ static int timer_interval = 10; // timer interval (millisec) class GearWidget : public TQGLWidget { public: - GearWidget( TQWidget *parent=0, const char *name=0 ); + GearWidget( TQWidget *parent=nullptr, const char *name=nullptr ); protected: void initializeGL(); void resizeGL( int, int ); diff --git a/examples/opengl/glpixmap/glbox.h b/examples/opengl/glpixmap/glbox.h index a4c7da131..b59840d38 100644 --- a/examples/opengl/glpixmap/glbox.h +++ b/examples/opengl/glpixmap/glbox.h @@ -25,9 +25,9 @@ class GLBox : public TQGLWidget public: - GLBox( TQWidget* parent, const char* name, const TQGLWidget* shareWidget=0 ); + GLBox( TQWidget* parent, const char* name, const TQGLWidget* shareWidget=nullptr ); GLBox( const TQGLFormat& format, TQWidget* parent, const char* name, - const TQGLWidget* shareWidget=0 ); + const TQGLWidget* shareWidget=nullptr ); ~GLBox(); void copyRotation( const GLBox& fromBox ); diff --git a/examples/opengl/glpixmap/globjwin.h b/examples/opengl/glpixmap/globjwin.h index 3d6077f05..ec403da7f 100644 --- a/examples/opengl/glpixmap/globjwin.h +++ b/examples/opengl/glpixmap/globjwin.h @@ -27,7 +27,7 @@ class GLObjectWindow : public TQWidget { TQ_OBJECT public: - GLObjectWindow( TQWidget* parent = 0, const char* name = 0 ); + GLObjectWindow( TQWidget* parent = nullptr, const char* name = nullptr ); protected slots: diff --git a/examples/opengl/overlay/globjwin.cpp b/examples/opengl/overlay/globjwin.cpp index 04ca2059c..2c3a31188 100644 --- a/examples/opengl/overlay/globjwin.cpp +++ b/examples/opengl/overlay/globjwin.cpp @@ -39,7 +39,7 @@ GLObjectWindow::GLObjectWindow( TQWidget* parent, const char* name ) // Check if we obtained an overlay if ( !c->format().hasOverlay() ) { - TQMessageBox::warning( 0, tqApp->argv()[0], + TQMessageBox::warning( nullptr, tqApp->argv()[0], "Failed to get an OpenGL overlay", "OK" ); } diff --git a/examples/opengl/overlay/globjwin.h b/examples/opengl/overlay/globjwin.h index b30de27f2..0f44f3b7e 100644 --- a/examples/opengl/overlay/globjwin.h +++ b/examples/opengl/overlay/globjwin.h @@ -24,7 +24,7 @@ class GLObjectWindow : public TQWidget { TQ_OBJECT public: - GLObjectWindow( TQWidget* parent = 0, const char* name = 0 ); + GLObjectWindow( TQWidget* parent = nullptr, const char* name = nullptr ); }; diff --git a/examples/opengl/overlay/main.cpp b/examples/opengl/overlay/main.cpp index 5fb9e06bb..9b537572a 100644 --- a/examples/opengl/overlay/main.cpp +++ b/examples/opengl/overlay/main.cpp @@ -37,7 +37,7 @@ int main( int argc, char **argv ) // Check for existence of overlays if ( !TQGLFormat::hasOpenGLOverlays() ) { - TQMessageBox::critical( 0, tqApp->argv()[0], + TQMessageBox::critical( nullptr, tqApp->argv()[0], "This system does not support OpenGL overlays", "Exit" ); return 1; diff --git a/examples/opengl/overlay_x11/gearwidget.h b/examples/opengl/overlay_x11/gearwidget.h index 4c04fcbc8..652b3b1b0 100644 --- a/examples/opengl/overlay_x11/gearwidget.h +++ b/examples/opengl/overlay_x11/gearwidget.h @@ -17,7 +17,7 @@ class GearWidget : public TQGLWidget { public: - GearWidget( TQWidget *parent=0, const char *name=0 ); + GearWidget( TQWidget *parent=nullptr, const char *name=nullptr ); protected: void initializeGL(); diff --git a/examples/opengl/overlay_x11/rubberbandwidget.h b/examples/opengl/overlay_x11/rubberbandwidget.h index aba6f8ce0..0b379c5df 100644 --- a/examples/opengl/overlay_x11/rubberbandwidget.h +++ b/examples/opengl/overlay_x11/rubberbandwidget.h @@ -19,8 +19,8 @@ class RubberbandWidget : public TQWidget { public: - RubberbandWidget( TQColor transparentColor, TQWidget *parent=0, - const char *name=0, WFlags f=0 ); + RubberbandWidget( TQColor transparentColor, TQWidget *parent=nullptr, + const char *name=nullptr, WFlags f=0 ); protected: void mousePressEvent( TQMouseEvent* e ); diff --git a/examples/opengl/sharedbox/glbox.h b/examples/opengl/sharedbox/glbox.h index 46696e5af..c23731530 100644 --- a/examples/opengl/sharedbox/glbox.h +++ b/examples/opengl/sharedbox/glbox.h @@ -25,7 +25,7 @@ class GLBox : public TQGLWidget public: - GLBox( TQWidget* parent, const char* name, const TQGLWidget* shareWidget=0 ); + GLBox( TQWidget* parent, const char* name, const TQGLWidget* shareWidget=nullptr ); ~GLBox(); public slots: diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp index cc85082e3..239a3ecb1 100644 --- a/examples/opengl/sharedbox/globjwin.cpp +++ b/examples/opengl/sharedbox/globjwin.cpp @@ -94,6 +94,6 @@ void GLObjectWindow::deleteFirstWidget() // Delete only c1; c2 will keep working and use the shared display list if ( c1 ) { delete c1; - c1 = 0; + c1 = nullptr; } } diff --git a/examples/opengl/sharedbox/globjwin.h b/examples/opengl/sharedbox/globjwin.h index 745b01110..080cae10e 100644 --- a/examples/opengl/sharedbox/globjwin.h +++ b/examples/opengl/sharedbox/globjwin.h @@ -24,7 +24,7 @@ class GLObjectWindow : public TQWidget { TQ_OBJECT public: - GLObjectWindow( TQWidget* parent = 0, const char* name = 0 ); + GLObjectWindow( TQWidget* parent = nullptr, const char* name = nullptr ); protected slots: diff --git a/examples/opengl/texture/globjwin.h b/examples/opengl/texture/globjwin.h index fcc8aa3b0..b07314f12 100644 --- a/examples/opengl/texture/globjwin.h +++ b/examples/opengl/texture/globjwin.h @@ -24,7 +24,7 @@ class GLObjectWindow : public TQWidget { TQ_OBJECT public: - GLObjectWindow( TQWidget* parent = 0, const char* name = 0 ); + GLObjectWindow( TQWidget* parent = nullptr, const char* name = nullptr ); }; diff --git a/examples/picture/picture.cpp b/examples/picture/picture.cpp index db8b164fe..070607a6c 100644 --- a/examples/picture/picture.cpp +++ b/examples/picture/picture.cpp @@ -66,7 +66,7 @@ PictureDisplay::PictureDisplay( const char *fileName ) name = fileName; if ( !pict->load(fileName) ) { // cannot load picture delete pict; - pict = 0; + pict = nullptr; name.sprintf( "Not able to load picture: %s", fileName ); } } @@ -117,7 +117,7 @@ int main( int argc, char **argv ) paint.end(); // painting done pict.save( fileName ); // save picture - TQMessageBox::information(0, "TQt Example - Picture", "Saved. Run me again!"); + TQMessageBox::information(nullptr, "TQt Example - Picture", "Saved. Run me again!"); return 0; } else { PictureDisplay test( fileName ); // create picture display diff --git a/examples/popup/popup.cpp b/examples/popup/popup.cpp index c2b8bd7e6..f54b575a8 100644 --- a/examples/popup/popup.cpp +++ b/examples/popup/popup.cpp @@ -82,7 +82,7 @@ Frame::Frame(TQWidget* parent, const char* name): TQFrame(parent, name){ //create a very simple popup: it is just composed with other //widget and will be shown after clicking on button1 - popup1 = new TQFrame( this ,0, WType_Popup); + popup1 = new TQFrame( this ,nullptr, WType_Popup); popup1->setFrameStyle( WinPanel|Raised ); popup1->resize(150,100); TQLineEdit *tmpE = new TQLineEdit( popup1 ); diff --git a/examples/popup/popup.h b/examples/popup/popup.h index 819ca1e2f..abe2b1ee9 100644 --- a/examples/popup/popup.h +++ b/examples/popup/popup.h @@ -21,9 +21,9 @@ class FancyPopup : public TQLabel { TQ_OBJECT public: - FancyPopup( TQWidget* parent = 0, const char* name=0); + FancyPopup( TQWidget* parent = nullptr, const char* name=nullptr); - void popup( TQWidget* parent = 0); + void popup( TQWidget* parent = nullptr); protected: virtual void mouseMoveEvent( TQMouseEvent * ); virtual void mouseReleaseEvent( TQMouseEvent * ); @@ -39,7 +39,7 @@ private: { TQ_OBJECT public: - Frame( TQWidget *parent=0, const char* name=0); + Frame( TQWidget *parent=nullptr, const char* name=nullptr); protected: diff --git a/examples/process/process.cpp b/examples/process/process.cpp index dcdc39e15..bb69e06d2 100644 --- a/examples/process/process.cpp +++ b/examples/process/process.cpp @@ -62,7 +62,7 @@ UicManager::UicManager() if ( !proc->start() ) { // error handling - TQMessageBox::critical( 0, + TQMessageBox::critical( nullptr, tr("Fatal error"), tr("Could not start the tquic command."), tr("Quit") ); diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp index 9654f1633..3cd9d4441 100644 --- a/examples/progress/progress.cpp +++ b/examples/progress/progress.cpp @@ -139,7 +139,7 @@ class CPUWaster : public TQWidget public: CPUWaster() : - pb(0) + pb(nullptr) { menubar = new TQMenuBar( this, "menu" ); TQ_CHECK_PTR( menubar ); @@ -246,7 +246,7 @@ private: enableDrawingItems(true); killTimers(); delete pb; - pb = 0; + pb = nullptr; } } diff --git a/examples/progressbar/progressbar.h b/examples/progressbar/progressbar.h index d116a11b1..4451c807d 100644 --- a/examples/progressbar/progressbar.h +++ b/examples/progressbar/progressbar.h @@ -22,7 +22,7 @@ class ProgressBar : public TQButtonGroup TQ_OBJECT public: - ProgressBar( TQWidget *parent = 0, const char *name = 0 ); + ProgressBar( TQWidget *parent = nullptr, const char *name = nullptr ); protected: TQRadioButton *slow, *normal, *fast; diff --git a/examples/qfd/fontdisplayer.h b/examples/qfd/fontdisplayer.h index 39a3689b1..f488123fc 100644 --- a/examples/qfd/fontdisplayer.h +++ b/examples/qfd/fontdisplayer.h @@ -18,7 +18,7 @@ class TQSlider; class FontRowTable : public TQFrame { TQ_OBJECT public: - FontRowTable( TQWidget* parent=0, const char* name=0 ); + FontRowTable( TQWidget* parent=nullptr, const char* name=nullptr ); TQSize sizeHint() const; @@ -41,7 +41,7 @@ private: class FontDisplayer : public TQMainWindow { TQ_OBJECT public: - FontDisplayer( TQWidget* parent=0, const char* name=0 ); + FontDisplayer( TQWidget* parent=nullptr, const char* name=nullptr ); }; #endif diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp index 6b4011a84..b6206fade 100644 --- a/examples/qmag/qmag.cpp +++ b/examples/qmag/qmag.cpp @@ -24,7 +24,7 @@ class MagWidget : public TQWidget { TQ_OBJECT public: - MagWidget( TQWidget *parent=0, const char *name=0 ); + MagWidget( TQWidget *parent=nullptr, const char *name=nullptr ); public slots: void setZoom( int ); @@ -133,8 +133,8 @@ MagWidget::MagWidget( TQWidget *parent, const char *name ) quitButton->setGeometry( multiSaveButton->geometry().right() + 2, 2, 10+quitButton->fontMetrics().width("Quit"), 20 ); #else - zoom = 0; - multiSaveButton = 0; + zoom = nullptr; + multiSaveButton = nullptr; #endif setRefresh(1); diff --git a/examples/qwerty/qwerty.cpp b/examples/qwerty/qwerty.cpp index 0a0c61ce6..2d05790e6 100644 --- a/examples/qwerty/qwerty.cpp +++ b/examples/qwerty/qwerty.cpp @@ -23,7 +23,7 @@ const bool no_writing = false; -static TQPtrList *codecList = 0; +static TQPtrList *codecList = nullptr; enum { Uni = 0, MBug = 1, Lat1 = 2, Local = 3, Guess = 4, Codec = 5 }; @@ -229,7 +229,7 @@ void Editor::addEncoding() if (TQTextCodec::loadCharmap(&f)) { rebuildCodecList(); } else { - TQMessageBox::warning(0,"Charmap error", + TQMessageBox::warning(nullptr,"Charmap error", "The file did not contain a valid charmap.\n\n" "A charmap file should look like this:\n" " thename\n" diff --git a/examples/qwerty/qwerty.h b/examples/qwerty/qwerty.h index 6b5146f6f..4ac09b575 100644 --- a/examples/qwerty/qwerty.h +++ b/examples/qwerty/qwerty.h @@ -19,7 +19,7 @@ class Editor : public TQWidget { TQ_OBJECT public: - Editor( TQWidget *parent=0, const char *name="qwerty" ); + Editor( TQWidget *parent=nullptr, const char *name="qwerty" ); ~Editor(); void load( const TQString& fileName, int code=-1 ); diff --git a/examples/rangecontrols/rangecontrols.h b/examples/rangecontrols/rangecontrols.h index 6704b00b7..cb59a20c5 100644 --- a/examples/rangecontrols/rangecontrols.h +++ b/examples/rangecontrols/rangecontrols.h @@ -19,7 +19,7 @@ class RangeControls : public TQVBox TQ_OBJECT public: - RangeControls( TQWidget *parent = 0, const char *name = 0 ); + RangeControls( TQWidget *parent = nullptr, const char *name = nullptr ); private: TQCheckBox *notches, *wrapping; diff --git a/examples/regexptester/regexptester.cpp b/examples/regexptester/regexptester.cpp index 0c4e2f3e5..891718251 100644 --- a/examples/regexptester/regexptester.cpp +++ b/examples/regexptester/regexptester.cpp @@ -47,17 +47,17 @@ RegexpTester::RegexpTester(TQWidget* parent, const char* name, bool modal, gridLayout->addWidget(regexComboBox, 0, 1); gridLayout->addWidget(textLabel, 1, 0); gridLayout->addWidget(textComboBox, 1, 1); - TQHBoxLayout *checkboxLayout = new TQHBoxLayout(0, 6, 6); + TQHBoxLayout *checkboxLayout = new TQHBoxLayout(nullptr, 6, 6); checkboxLayout->addWidget(caseSensitiveCheckBox); checkboxLayout->addWidget(minimalCheckBox); checkboxLayout->addWidget(wildcardCheckBox); checkboxLayout->addStretch(1); - TQVBoxLayout *buttonLayout = new TQVBoxLayout(0, 6, 6); + TQVBoxLayout *buttonLayout = new TQVBoxLayout(nullptr, 6, 6); buttonLayout->addWidget(executePushButton); buttonLayout->addWidget(copyPushButton); buttonLayout->addWidget(quitPushButton); buttonLayout->addStretch(1); - TQHBoxLayout *middleLayout = new TQHBoxLayout(0, 6, 6); + TQHBoxLayout *middleLayout = new TQHBoxLayout(nullptr, 6, 6); middleLayout->addWidget(resultTable); middleLayout->addLayout(buttonLayout); TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 6, 6); diff --git a/examples/regexptester/regexptester.h b/examples/regexptester/regexptester.h index 0dbb50d05..48e3f8971 100644 --- a/examples/regexptester/regexptester.h +++ b/examples/regexptester/regexptester.h @@ -15,7 +15,7 @@ class RegexpTester : public TQDialog TQ_OBJECT public: - RegexpTester(TQWidget* parent=0, const char* name=0, bool modal=false, + RegexpTester(TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0); TQLabel *regexLabel; diff --git a/examples/richtext/richtext.cpp b/examples/richtext/richtext.cpp index d3483212f..9854555fe 100644 --- a/examples/richtext/richtext.cpp +++ b/examples/richtext/richtext.cpp @@ -70,7 +70,7 @@ static const char* sayings[] = { "what his grandson will be.

    " "
    -- Abraham Lincoln
    ", - 0 + nullptr }; @@ -83,7 +83,7 @@ MyRichText::MyRichText( TQWidget *parent, const char *name ) view->setText( "This is a Test with italic stuff" ); TQBrush paper; paper.setPixmap( TQPixmap( "../richtext/marble.png" ) ); - if ( paper.pixmap() != 0 ) + if ( paper.pixmap() ) view->setPaper( paper ); else view->setPaper( white ); diff --git a/examples/richtext/richtext.h b/examples/richtext/richtext.h index cb1ca6a39..377280cfd 100644 --- a/examples/richtext/richtext.h +++ b/examples/richtext/richtext.h @@ -20,7 +20,7 @@ class MyRichText : public TQVBox TQ_OBJECT public: - MyRichText( TQWidget *parent = 0, const char *name = 0 ); + MyRichText( TQWidget *parent = nullptr, const char *name = nullptr ); protected: TQTextView *view; diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp index 2d57c7305..f6af56c2e 100644 --- a/examples/scribble/scribble.cpp +++ b/examples/scribble/scribble.cpp @@ -146,7 +146,7 @@ Scribble::Scribble( TQWidget *parent, const char *name ) void Scribble::slotSave() { - TQPopupMenu *menu = new TQPopupMenu( 0 ); + TQPopupMenu *menu = new TQPopupMenu( nullptr ); TQIntDict formats; formats.setAutoDelete( true ); diff --git a/examples/scribble/scribble.h b/examples/scribble/scribble.h index be302fc63..5cb968c7b 100644 --- a/examples/scribble/scribble.h +++ b/examples/scribble/scribble.h @@ -29,7 +29,7 @@ class Canvas : public TQWidget TQ_OBJECT public: - Canvas( TQWidget *parent = 0, const char *name = 0 ); + Canvas( TQWidget *parent = nullptr, const char *name = nullptr ); void setPenColor( const TQColor &c ) { pen.setColor( c ); } @@ -68,7 +68,7 @@ class Scribble : public TQMainWindow TQ_OBJECT public: - Scribble( TQWidget *parent = 0, const char *name = 0 ); + Scribble( TQWidget *parent = nullptr, const char *name = nullptr ); protected: Canvas* canvas; diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp index 946b01d23..ea3a2490c 100644 --- a/examples/scrollview/scrollview.cpp +++ b/examples/scrollview/scrollview.cpp @@ -88,7 +88,7 @@ public: bg.load("bg.ppm"); resizeContents(400000,300000); - dragging = 0; + dragging = nullptr; } void viewportMousePressEvent(TQMouseEvent* e) @@ -104,7 +104,7 @@ public: void viewportMouseReleaseEvent(TQMouseEvent*) { - dragging = 0; + dragging = nullptr; } void viewportMouseMoveEvent(TQMouseEvent* e) @@ -198,7 +198,7 @@ class ScrollViewExample : public TQWidget { TQ_OBJECT public: - ScrollViewExample(int technique, TQWidget* parent=0, const char* name=0) : + ScrollViewExample(int technique, TQWidget* parent=nullptr, const char* name=nullptr) : TQWidget(parent,name) { TQMenuBar* menubar = new TQMenuBar(this); @@ -228,7 +228,7 @@ public: if (technique == 1) { vp = new TQScrollView(this); - BigShrinker *bs = new BigShrinker(0);//(vp->viewport()); + BigShrinker *bs = new BigShrinker(nullptr);//(vp->viewport()); vp->addChild(bs); bs->setAcceptDrops(true); TQObject::connect(bs, TQ_SIGNAL(clicked(int,int)), @@ -328,7 +328,7 @@ private slots: vp->setHScrollBarMode(TQScrollView::AlwaysOn); } else if (id == corn_id) { bool corn = !vp->cornerWidget(); - vp->setCornerWidget(corn ? corner : 0); + vp->setCornerWidget(corn ? corner : nullptr); } else { return; // Not for us to process. } @@ -423,9 +423,9 @@ int main( int argc, char **argv ) { TQApplication a( argc, argv ); - ScrollViewExample ve1(1,0,"ve1"); - ScrollViewExample ve2(2,0,"ve2"); - ScrollViewExample ve3(3,0,"ve3"); + ScrollViewExample ve1(1,nullptr,"ve1"); + ScrollViewExample ve2(2,nullptr,"ve2"); + ScrollViewExample ve3(3,nullptr,"ve3"); ve1.setCaption("TQt Example - Scrollviews"); ve1.show(); ve2.setCaption("TQt Example - Scrollviews"); diff --git a/examples/showimg/imagefip.h b/examples/showimg/imagefip.h index fad621681..b8aa473f5 100644 --- a/examples/showimg/imagefip.h +++ b/examples/showimg/imagefip.h @@ -21,7 +21,7 @@ class ImageIconProvider : public TQFileIconProvider TQPixmap imagepm; public: - ImageIconProvider( TQWidget *parent=0, const char *name=0 ); + ImageIconProvider( TQWidget *parent=nullptr, const char *name=nullptr ); ~ImageIconProvider(); const TQPixmap * pixmap( const TQFileInfo &fi ); diff --git a/examples/showimg/imagetexteditor.h b/examples/showimg/imagetexteditor.h index 7cc5c2489..7212d8404 100644 --- a/examples/showimg/imagetexteditor.h +++ b/examples/showimg/imagetexteditor.h @@ -22,7 +22,7 @@ class ImageTextEditor : public TQDialog { TQ_OBJECT public: - ImageTextEditor( TQImage& i, TQWidget *parent=0, const char *name=0, WFlags f=0 ); + ImageTextEditor( TQImage& i, TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0 ); ~ImageTextEditor(); void accept(); public slots: diff --git a/examples/showimg/main.cpp b/examples/showimg/main.cpp index c5ac5defc..fd2a93698 100644 --- a/examples/showimg/main.cpp +++ b/examples/showimg/main.cpp @@ -36,14 +36,14 @@ int main( int argc, char **argv ) if ( argc <= 1 ) { // Create a window which looks after its own existence. ImageViewer *w = - new ImageViewer(0, "new window", TQt::WDestructiveClose | TQt::WResizeNoErase ); + new ImageViewer(nullptr, "new window", TQt::WDestructiveClose | TQt::WResizeNoErase ); w->setCaption("TQt Example - Image Viewer"); w->show(); } else { for ( int i=1; isetCaption("TQt Example - Image Viewer"); w->loadImage( argv[i] ); w->show(); diff --git a/examples/showimg/showimg.cpp b/examples/showimg/showimg.cpp index a7288d68d..8ea4426b4 100644 --- a/examples/showimg/showimg.cpp +++ b/examples/showimg/showimg.cpp @@ -29,7 +29,7 @@ ImageViewer::ImageViewer( TQWidget *parent, const char *name, int wFlags ) : TQWidget( parent, name, wFlags ), conversion_flags( PreferDither ), - helpmsg( 0 ) + helpmsg( nullptr ) { pickx = -1; picky = -1; @@ -118,7 +118,7 @@ ImageViewer::~ImageViewer() if ( alloc_context ) TQColor::destroyAllocContext( alloc_context ); if ( other == this ) - other = 0; + other = nullptr; } /* @@ -311,7 +311,7 @@ void ImageViewer::savePixmap( int item ) void ImageViewer::newWindow() { - ImageViewer* that = new ImageViewer(0, "new window", WDestructiveClose); + ImageViewer* that = new ImageViewer(nullptr, "new window", WDestructiveClose); that->options->setItemChecked( that->cc, useColorContext() ); that->show(); } @@ -345,7 +345,7 @@ bool ImageViewer::loadImage( const TQString& fileName ) bool ok = false; if ( !filename.isEmpty() ) { TQApplication::setOverrideCursor( waitCursor ); // this might take time - ok = image.load(filename, 0); + ok = image.load(filename, nullptr); pickx = -1; clickx = -1; if ( ok ) @@ -550,7 +550,7 @@ void ImageViewer::giveHelp() helptext += ""; helpmsg = new TQMessageBox( "Help", helptext, - TQMessageBox::Information, TQMessageBox::Ok, 0, 0, 0, 0, false ); + TQMessageBox::Information, TQMessageBox::Ok, 0, 0, nullptr, nullptr, false ); } helpmsg->show(); helpmsg->raise(); @@ -578,7 +578,7 @@ void ImageViewer::copyFrom(ImageViewer* s) repaint( image.hasAlphaBuffer() ); } } -ImageViewer* ImageViewer::other = 0; +ImageViewer* ImageViewer::other = nullptr; void ImageViewer::hFlip() { diff --git a/examples/showimg/showimg.h b/examples/showimg/showimg.h index 70a22a8bc..e271a1c51 100644 --- a/examples/showimg/showimg.h +++ b/examples/showimg/showimg.h @@ -22,7 +22,7 @@ class ImageViewer : public TQWidget { TQ_OBJECT public: - ImageViewer( TQWidget *parent=0, const char *name=0, int wFlags=0 ); + ImageViewer( TQWidget *parent=nullptr, const char *name=nullptr, int wFlags=0 ); ~ImageViewer(); bool loadImage( const TQString& ); protected: diff --git a/examples/splitter/splitter.cpp b/examples/splitter/splitter.cpp index 01873c6d1..9fe67b806 100644 --- a/examples/splitter/splitter.cpp +++ b/examples/splitter/splitter.cpp @@ -17,7 +17,7 @@ class Test : public TQWidget { public: - Test(TQWidget* parent=0, const char* name=0, int f=0); + Test(TQWidget* parent=nullptr, const char* name=nullptr, int f=0); void paintEvent(TQPaintEvent* e); private: }; @@ -58,7 +58,7 @@ int main( int argc, char ** argv ) { TQApplication a( argc, argv ); - TQSplitter *s1 = new TQSplitter( TQSplitter::Vertical, 0 , "main" ); + TQSplitter *s1 = new TQSplitter( TQSplitter::Vertical, nullptr , "main" ); TQSplitter *s2 = new TQSplitter( TQSplitter::Horizontal, s1, "top" ); diff --git a/examples/sql/overview/custom1/main.h b/examples/sql/overview/custom1/main.h index fe397c689..d4fc3d356 100644 --- a/examples/sql/overview/custom1/main.h +++ b/examples/sql/overview/custom1/main.h @@ -24,7 +24,7 @@ class CustomEdit : public TQLineEdit TQ_OBJECT TQ_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine ) public: - CustomEdit( TQWidget *parent=0, const char *name=0 ); + CustomEdit( TQWidget *parent=nullptr, const char *name=nullptr ); TQString upperLine() const; void setUpperLine( const TQString &line ); public slots: diff --git a/examples/sql/overview/table3/main.h b/examples/sql/overview/table3/main.h index 546600bd8..c6c38b359 100644 --- a/examples/sql/overview/table3/main.h +++ b/examples/sql/overview/table3/main.h @@ -21,7 +21,7 @@ class StatusPicker : public TQComboBox TQ_OBJECT TQ_PROPERTY( int statusid READ statusId WRITE setStatusId ) public: - StatusPicker( TQWidget *parent=0, const char *name=0 ); + StatusPicker( TQWidget *parent=nullptr, const char *name=nullptr ); int statusId() const; void setStatusId( int id ); private: diff --git a/examples/sql/overview/table4/main.h b/examples/sql/overview/table4/main.h index 28e3ba2c0..fdc3a107f 100644 --- a/examples/sql/overview/table4/main.h +++ b/examples/sql/overview/table4/main.h @@ -23,7 +23,7 @@ class StatusPicker : public TQComboBox TQ_OBJECT TQ_PROPERTY( int statusid READ statusId WRITE setStatusId ) public: - StatusPicker( TQWidget *parent=0, const char *name=0 ); + StatusPicker( TQWidget *parent=nullptr, const char *name=nullptr ); int statusId() const; void setStatusId( int id ); private: @@ -37,7 +37,7 @@ class CustomTable : public TQDataTable public: CustomTable( TQSqlCursor *cursor, bool autoPopulate = false, - TQWidget * parent = 0, const char * name = 0 ) : + TQWidget * parent = nullptr, const char * name = nullptr ) : TQDataTable( cursor, autoPopulate, parent, name ) {} void paintField( TQPainter * p, const TQSqlField* field, const TQRect & cr, bool ); diff --git a/examples/tabdialog/main.cpp b/examples/tabdialog/main.cpp index 1cfd671b2..d5d4ae2df 100644 --- a/examples/tabdialog/main.cpp +++ b/examples/tabdialog/main.cpp @@ -16,7 +16,7 @@ int main( int argc, char **argv ) TQApplication a( argc, argv ); - TabDialog tabdialog( 0, "tabdialog", TQString( argc < 2 ? "." : argv[1] ) ); + TabDialog tabdialog( nullptr, "tabdialog", TQString( argc < 2 ? "." : argv[1] ) ); tabdialog.resize( 450, 350 ); tabdialog.setCaption( "TQt Example - Tabbed Dialog" ); a.setMainWidget( &tabdialog ); diff --git a/examples/table/statistics/statistics.cpp b/examples/table/statistics/statistics.cpp index 4fc34eeb0..dfbac79a9 100644 --- a/examples/table/statistics/statistics.cpp +++ b/examples/table/statistics/statistics.cpp @@ -25,11 +25,11 @@ const char* dirs[] = { "network", "opengl", "canvas", - 0 + nullptr }; Table::Table() - : TQTable( 10, 100, 0, "table" ) + : TQTable( 10, 100, nullptr, "table" ) { setSorting( true ); horizontalHeader()->setLabel( 0, tr( "File" ) ); @@ -130,7 +130,7 @@ void TableItem::paint( TQPainter *p, const TQColorGroup &cg, const TQRect &cr, b ComboItem::ComboItem( TQTable *t, EditType et ) - : TQTableItem( t, et, "Yes" ), cb( 0 ) + : TQTableItem( t, et, "Yes" ), cb( nullptr ) { // we do not want this item to be replaced setReplaceable( false ); diff --git a/examples/tablet/canvas.h b/examples/tablet/canvas.h index c7752f861..5e403f50f 100644 --- a/examples/tablet/canvas.h +++ b/examples/tablet/canvas.h @@ -23,7 +23,7 @@ class Canvas : public TQWidget TQ_OBJECT public: - Canvas( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); + Canvas( TQWidget *parent = nullptr, const char *name = nullptr, WFlags fl = 0 ); virtual ~Canvas() {}; void setPenColor( const TQColor &c ) diff --git a/examples/tablet/scribble.h b/examples/tablet/scribble.h index 3c999bda6..248292a0f 100644 --- a/examples/tablet/scribble.h +++ b/examples/tablet/scribble.h @@ -30,7 +30,7 @@ class Scribble : public TQMainWindow TQ_OBJECT public: - Scribble( TQWidget *parent = 0, const char *name = 0 ); + Scribble( TQWidget *parent = nullptr, const char *name = nullptr ); protected: Canvas* canvas; diff --git a/examples/tablet/tabletstats.h b/examples/tablet/tabletstats.h index 4d580554a..2afc70f0d 100644 --- a/examples/tablet/tabletstats.h +++ b/examples/tablet/tabletstats.h @@ -21,7 +21,7 @@ class MyOrientation : public TQFrame { TQ_OBJECT public: - MyOrientation( TQWidget *parent = 0, const char *name = 0 ); + MyOrientation( TQWidget *parent = nullptr, const char *name = nullptr ); virtual ~MyOrientation(); public slots: @@ -33,7 +33,7 @@ class StatsCanvas : public Canvas { TQ_OBJECT public: - StatsCanvas( TQWidget *parent = 0, const char* name = 0 ); + StatsCanvas( TQWidget *parent = nullptr, const char* name = nullptr ); ~StatsCanvas(); signals: void signalNewPressure( int ); diff --git a/examples/tetrix/qtetrix.h b/examples/tetrix/qtetrix.h index 5a8666bd3..e3885cfdc 100644 --- a/examples/tetrix/qtetrix.h +++ b/examples/tetrix/qtetrix.h @@ -23,7 +23,7 @@ class ShowNextPiece : public TQFrame TQ_OBJECT friend class TQTetrix; public: - ShowNextPiece( TQWidget *parent=0, const char *name=0 ); + ShowNextPiece( TQWidget *parent=nullptr, const char *name=nullptr ); public slots: void drawNextSquare( int x, int y,TQColor *color ); signals: @@ -41,7 +41,7 @@ class TQTetrix : public TQWidget { TQ_OBJECT public: - TQTetrix( TQWidget *parent=0, const char *name=0 ); + TQTetrix( TQWidget *parent=nullptr, const char *name=nullptr ); void startGame() { board->startGame(); } public slots: diff --git a/examples/tetrix/qtetrixb.cpp b/examples/tetrix/qtetrixb.cpp index 14d53ce89..97ad227c8 100644 --- a/examples/tetrix/qtetrixb.cpp +++ b/examples/tetrix/qtetrixb.cpp @@ -18,8 +18,8 @@ TQTetrixBoard::TQTetrixBoard( TQWidget *p, const char *name ) : TQFrame( p, name ) { setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - paint = 0; - paint_widget = 0; + paint = nullptr; + paint_widget = nullptr; timer = new TQTimer(this); connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); @@ -74,7 +74,7 @@ void TQTetrixBoard::drawSquare(int x,int y,int value) const int X = xOffset + x*blockWidth; const int Y = yOffset + (y - 1)*blockHeight; - bool localPainter = paint == 0; + bool localPainter = !paint; TQPainter *p; TQWidget *w; if ( localPainter ) { @@ -85,7 +85,7 @@ void TQTetrixBoard::drawSquare(int x,int y,int value) w = paint_widget; } drawTetrixButton( p, X, Y, blockWidth, blockHeight, - value == 0 ? 0 : &colors[value-1], w); + value == 0 ? nullptr : &colors[value-1], w); /* if ( value != 0 ) { TQColor tc, bc; @@ -104,7 +104,7 @@ void TQTetrixBoard::drawSquare(int x,int y,int value) void TQTetrixBoard::drawNextSquare( int x, int y, int value ) { if ( value == 0 ) - emit drawNextSquareSignal (x, y, 0 ); + emit drawNextSquareSignal (x, y, nullptr ); else emit drawNextSquareSignal( x, y, &colors[value-1] ); } @@ -193,7 +193,7 @@ void TQTetrixBoard::drawContents( TQPainter *p ) y2 = boardHeight() - 1; updateBoard( x1, y1, x2, y2, true ); - paint = 0; // reset widget painter + paint = nullptr; // reset widget painter return; } diff --git a/examples/tetrix/qtetrixb.h b/examples/tetrix/qtetrixb.h index c01c7023f..f6d20a657 100644 --- a/examples/tetrix/qtetrixb.h +++ b/examples/tetrix/qtetrixb.h @@ -19,7 +19,7 @@ class TQTetrixBoard : public TQFrame, public GenericTetrix { TQ_OBJECT public: - TQTetrixBoard( TQWidget *parent=0, const char *name=0 ); + TQTetrixBoard( TQWidget *parent=nullptr, const char *name=nullptr ); void gameOver(); void startGame(int gameType = 0,int fillRandomLines = 0); diff --git a/examples/tetrix/tqdragapp.cpp b/examples/tetrix/tqdragapp.cpp index 6c100ab79..fbd30b8aa 100644 --- a/examples/tetrix/tqdragapp.cpp +++ b/examples/tetrix/tqdragapp.cpp @@ -18,7 +18,7 @@ #include "tqcursor.h" #include "tqobjectlist.h" -TQWidget *cursorWidget( TQPoint * = 0 ); +TQWidget *cursorWidget( TQPoint * = nullptr ); class TQDragger; @@ -35,7 +35,7 @@ public: struct DropInfo { - DropInfo() { w=0; } + DropInfo() { w=nullptr; } ~DropInfo() { delete w; } DropWindow *w; bool userOpened; @@ -95,7 +95,7 @@ private: TQDragApplication::TQDragApplication( int &argc, char **argv ) - : TQApplication( argc, argv ), dragger( 0 ) + : TQApplication( argc, argv ), dragger( nullptr ) { dragger = new TQDragger; } @@ -130,7 +130,7 @@ void DropWindow::closeEvent( TQCloseEvent *e ) TQDragger::TQDragger() { - dragInfo.w = 0; + dragInfo.w = nullptr; killingDrop = false; sendingChild = false; draggedDict.setAutoDelete( true ); @@ -245,7 +245,7 @@ bool TQDragger::dragEvent( TQWidget *w, TQMouseEvent *e ) case TQEvent::MouseButtonPress: { if ( !noWidgets( w ) || // has widget children isParentToDragged( w ) || // has had widget children - w->parentWidget() == 0 ) { // is top level window + !w->parentWidget() ) { // is top level window hostWidget = w; menu->popup( w->mapToGlobal( e->pos() ) ); return true; @@ -265,13 +265,13 @@ bool TQDragger::dragEvent( TQWidget *w, TQMouseEvent *e ) clickOffset = e->pos(); dragInfo.w = w; TQPoint p = w->mapToGlobal(TQPoint(0,0)); - w->reparent( 0, WType_Popup, p, true ); + w->reparent( nullptr, WType_Popup, p, true ); return true; } case TQEvent::MouseButtonRelease: case TQEvent::MouseMove: { - if ( dragInfo.w != 0 ) { + if ( dragInfo.w ) { TQPoint p = TQCursor::pos() - clickOffset; dragInfo.w->move( p ); if ( e->type() == TQEvent::MouseMove ) @@ -283,7 +283,7 @@ bool TQDragger::dragEvent( TQWidget *w, TQMouseEvent *e ) return false; if ( w != dragInfo.w ) w = dragInfo.w; - dragInfo.w = 0; + dragInfo.w = nullptr; w->hide(); TQPoint pos; TQWidget *target = cursorWidget( &pos ); @@ -372,7 +372,7 @@ bool TQDragger::startGrab() { if ( !hostWidget ) return false; - clickedWidget = 0; + clickedWidget = nullptr; cursor = hostWidget->cursor(); hostWidget->grabMouse(); hostWidget->setCursor( TQCursor( CrossCursor ) ); diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp index c01e2cd59..73fefcf45 100644 --- a/examples/textedit/textedit.cpp +++ b/examples/textedit/textedit.cpp @@ -207,7 +207,7 @@ TQTextEdit *TextEdit::currentEditor() const if ( tabWidget->currentPage() && tabWidget->currentPage()->inherits( "TQTextEdit" ) ) return (TQTextEdit*)tabWidget->currentPage(); - return 0; + return nullptr; } void TextEdit::doConnections( TQTextEdit *e ) diff --git a/examples/textedit/textedit.h b/examples/textedit/textedit.h index bfe0e9569..3287b4e7f 100644 --- a/examples/textedit/textedit.h +++ b/examples/textedit/textedit.h @@ -23,7 +23,7 @@ class TextEdit : public TQMainWindow TQ_OBJECT public: - TextEdit( TQWidget *parent = 0, const char *name = 0 ); + TextEdit( TQWidget *parent = nullptr, const char *name = nullptr ); private: void setupFileActions(); diff --git a/examples/themes/metal.h b/examples/themes/metal.h index 80b05af69..1fbc39249 100644 --- a/examples/themes/metal.h +++ b/examples/themes/metal.h @@ -48,7 +48,7 @@ public: const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; void drawComplexControl( ComplexControl cc, TQPainter *p, @@ -60,8 +60,8 @@ public: SCFlags sub = SC_All, SCFlags subActive = SC_None, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; - int pixelMetric( PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; + const TQWidget *widget = nullptr ) const; + int pixelMetric( PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = nullptr ) const; private: diff --git a/examples/themes/themes.cpp b/examples/themes/themes.cpp index 16b9b1ff4..839c718ee 100644 --- a/examples/themes/themes.cpp +++ b/examples/themes/themes.cpp @@ -54,7 +54,7 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) menuBar()->insertItem( "&Style" , style ); style->setCheckable( true ); - TQActionGroup *ag = new TQActionGroup( this, 0 ); + TQActionGroup *ag = new TQActionGroup( this, nullptr ); ag->setExclusive( true ); TQSignalMapper *styleMapper = new TQSignalMapper( this ); connect( styleMapper, TQ_SIGNAL( mapped( const TQString& ) ), this, TQ_SLOT( makeStyle( const TQString& ) ) ); @@ -80,7 +80,7 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) stylesDict.insert(styleAccel.left(1), (const int *)1); styleAccel = "&"+styleAccel; } - TQAction *a = new TQAction( styleStr, TQIconSet(), styleAccel, 0, ag, 0, ag->isExclusive() ); + TQAction *a = new TQAction( styleStr, TQIconSet(), styleAccel, 0, ag, nullptr, ag->isExclusive() ); connect( a, TQ_SIGNAL( activated() ), styleMapper, TQ_SLOT(map()) ); styleMapper->setMapping( a, a->text() ); } diff --git a/examples/themes/themes.h b/examples/themes/themes.h index 93e21dde3..d8d478a79 100644 --- a/examples/themes/themes.h +++ b/examples/themes/themes.h @@ -20,7 +20,7 @@ class Themes: public TQMainWindow TQ_OBJECT public: - Themes( TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel ); + Themes( TQWidget *parent = nullptr, const char *name = nullptr, WFlags f = WType_TopLevel ); protected: TQTabWidget *tabwidget; diff --git a/examples/themes/wood.cpp b/examples/themes/wood.cpp index 2ca8fd7fc..4fb8f7a87 100644 --- a/examples/themes/wood.cpp +++ b/examples/themes/wood.cpp @@ -757,7 +757,7 @@ static void get_combo_parameters( const TQRect &r, int &ay, int &sh, int &dh, int &sy ); -static int get_combo_extra_width( int h, int *return_awh = 0 ); +static int get_combo_extra_width( int h, int *return_awh = nullptr ); enum { PointUp, PointDown, PointLeft, PointRight }; @@ -1206,7 +1206,7 @@ TQRect NorwegianWoodStyle::querySubControlMetrics( ComplexControl control, case SC_ComboBoxEditField: { rect = subRect( SR_PushButtonContents, ceData, elementFlags, widget ); - int ew = get_combo_extra_width( rect.height(), 0 ); + int ew = get_combo_extra_width( rect.height(), nullptr ); rect.setRect( rect.x() + 1, rect.y() + 1, rect.width() - 2 - ew, rect.height() - 2 ); break; diff --git a/examples/themes/wood.h b/examples/themes/wood.h index 6fd769a26..549992706 100644 --- a/examples/themes/wood.h +++ b/examples/themes/wood.h @@ -48,7 +48,7 @@ public: const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; void drawControlMask( ControlElement element, TQPainter *p, @@ -56,7 +56,7 @@ public: ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; void drawComplexControl( ComplexControl cc, TQPainter *p, @@ -68,7 +68,7 @@ public: SCFlags sub = SC_All, SCFlags subActive = SC_None, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; void drawComplexControlMask( ComplexControl control, TQPainter *p, @@ -76,14 +76,14 @@ public: const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption& = TQStyleOption::Default, - const TQWidget *widget = 0 ) const; + const TQWidget *widget = nullptr ) const; TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const; diff --git a/examples/thread/prodcons/prodcons.cpp b/examples/thread/prodcons/prodcons.cpp index 30652ac72..0a549ad5d 100644 --- a/examples/thread/prodcons/prodcons.cpp +++ b/examples/thread/prodcons/prodcons.cpp @@ -250,8 +250,8 @@ private: ProdCons::ProdCons() - : TQWidget(0, "producer consumer widget"), - prod(0), cons(0), stopped(false), redraw(true) + : TQWidget(nullptr, "producer consumer widget"), + prod(nullptr), cons(nullptr), stopped(false), redraw(true) { startbutton = new TQPushButton("&Start", this); connect(startbutton, TQ_SIGNAL(clicked()), TQ_SLOT(go())); @@ -285,12 +285,12 @@ ProdCons::~ProdCons() if (prod) { delete prod; - prod = 0; + prod = nullptr; } if (cons) { delete cons; - cons = 0; + cons = nullptr; } } diff --git a/examples/tictac/tictac.h b/examples/tictac/tictac.h index b14820281..ddce0bbdf 100644 --- a/examples/tictac/tictac.h +++ b/examples/tictac/tictac.h @@ -57,7 +57,7 @@ class TicTacGameBoard : public TQWidget { TQ_OBJECT public: - TicTacGameBoard( int n, TQWidget *parent=0, const char *name=0 ); + TicTacGameBoard( int n, TQWidget *parent=nullptr, const char *name=nullptr ); ~TicTacGameBoard(); enum State { Init, HumansTurn, HumanWon, ComputerWon, NobodyWon }; State state() const { return st; } @@ -90,7 +90,7 @@ class TicTacToe : public TQWidget { TQ_OBJECT public: - TicTacToe( int boardSize=3, TQWidget *parent=0, const char *name=0 ); + TicTacToe( int boardSize=3, TQWidget *parent=nullptr, const char *name=nullptr ); private slots: void newGameClicked(); void gameOver(); diff --git a/examples/tooltip/tooltip.cpp b/examples/tooltip/tooltip.cpp index 897b7c654..d1aa62c15 100644 --- a/examples/tooltip/tooltip.cpp +++ b/examples/tooltip/tooltip.cpp @@ -52,7 +52,7 @@ TellMe::TellMe( TQWidget * parent , const char * name ) TellMe::~TellMe() { delete t; - t = 0; + t = nullptr; } diff --git a/examples/tooltip/tooltip.h b/examples/tooltip/tooltip.h index 40b738c57..74825a1f7 100644 --- a/examples/tooltip/tooltip.h +++ b/examples/tooltip/tooltip.h @@ -25,7 +25,7 @@ class TellMe : public TQWidget { TQ_OBJECT public: - TellMe( TQWidget * parent = 0, const char * name = 0 ); + TellMe( TQWidget * parent = nullptr, const char * name = nullptr ); ~TellMe(); TQRect tip( const TQPoint & ); diff --git a/examples/toplevel/options.ui.h b/examples/toplevel/options.ui.h index 225b3ca25..bb2d7c185 100644 --- a/examples/toplevel/options.ui.h +++ b/examples/toplevel/options.ui.h @@ -45,7 +45,7 @@ void OptionsDialog::apply() TQWidget *parent = this; if ( cbBehaviorTaskbar->isChecked() ) { - parent = 0; + parent = nullptr; f |= WGroupLeader; flagList += "WGroupLeader"; } @@ -72,7 +72,7 @@ void OptionsDialog::apply() flagList.push_front("WStyle_Customize"); if ( !widget ) { - widget = new TQVBox( parent, 0, f ); + widget = new TQVBox( parent, nullptr, f ); widget->setMargin( 20 ); TQLabel *label = new TQLabel(flagList.join(" | "), widget); label->setTextFormat(RichText); diff --git a/examples/tqdir/tqdir.cpp b/examples/tqdir/tqdir.cpp index f0f8415ea..c76b93f10 100644 --- a/examples/tqdir/tqdir.cpp +++ b/examples/tqdir/tqdir.cpp @@ -183,11 +183,11 @@ void PreviewWidget::previewUrl( const TQUrl &u ) // **************************************************************************************************** CustomFileDialog::CustomFileDialog() - : TQFileDialog( 0, 0, true ) + : TQFileDialog( nullptr, nullptr, true ) { setDir( "/" ); - dirView = new DirectoryView( this, 0, true ); + dirView = new DirectoryView( this, nullptr, true ); dirView->addColumn( "" ); dirView->header()->hide(); ::Directory *root = new ::Directory( dirView, "/" ); @@ -333,7 +333,7 @@ int main( int argc, char ** argv ) ? "Choose directory..." : "Choose file..."; if ( !custom ) { - TQFileDialog fd( TQString::null, filter, 0, 0, true ); + TQFileDialog fd( TQString::null, filter, nullptr, nullptr, true ); fd.setMode( mode ); if ( preview ) { fd.setContentsPreviewEnabled( true ); diff --git a/examples/tux/tux.cpp b/examples/tux/tux.cpp index 36e116ec7..e76470933 100644 --- a/examples/tux/tux.cpp +++ b/examples/tux/tux.cpp @@ -10,7 +10,7 @@ class MoveMe : public TQWidget { public: - MoveMe( TQWidget *parent=0, const char *name=0, WFlags f = 0) + MoveMe( TQWidget *parent=nullptr, const char *name=nullptr, WFlags f = 0) :TQWidget(parent,name, f) {} protected: @@ -57,7 +57,7 @@ int main( int argc, char **argv ) bm = img.createHeuristicMask(); p.setMask( bm ); } - MoveMe w(0,0,TQt::WStyle_Customize|TQt::WStyle_NoBorder); + MoveMe w(nullptr,nullptr,TQt::WStyle_Customize|TQt::WStyle_NoBorder); w.setBackgroundPixmap( p ); w.setFixedSize( p.size() ); if ( p.mask() ) diff --git a/examples/widgets/main.cpp b/examples/widgets/main.cpp index 524c024d0..f98b37fdf 100644 --- a/examples/widgets/main.cpp +++ b/examples/widgets/main.cpp @@ -15,7 +15,7 @@ class MyWidgetView : public WidgetView { int s; public: - MyWidgetView( TQWidget *parent=0, const char *name=0 ) + MyWidgetView( TQWidget *parent=nullptr, const char *name=nullptr ) :WidgetView(parent, name), s(0) { setToolBarsMovable( true ); diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp index 7f18818cc..6f7ddf1f1 100644 --- a/examples/widgets/widgets.cpp +++ b/examples/widgets/widgets.cpp @@ -238,7 +238,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) TQPixmap pm; bool pix = pm.load("qt.png"); if ( !pix ) { - TQMessageBox::information( 0, "TQt Widgets Example", + TQMessageBox::information( nullptr, "TQt Widgets Example", "Could not load the file \"qt.png\", which\n" "contains an icon used...\n\n" "The text \"line 42\" will be substituted.", diff --git a/examples/widgets/widgets.h b/examples/widgets/widgets.h index 61c72e4aa..efc0aa86b 100644 --- a/examples/widgets/widgets.h +++ b/examples/widgets/widgets.h @@ -29,8 +29,8 @@ class MyListView : public TQListView { TQ_OBJECT public: - MyListView( TQWidget * parent = 0, const char *name = 0 ) - : TQListView( parent, name ), selected(0) + MyListView( TQWidget * parent = nullptr, const char *name = nullptr ) + : TQListView( parent, name ), selected(nullptr) {} ~MyListView() {} @@ -66,7 +66,7 @@ class WidgetView : public TQMainWindow { TQ_OBJECT public: - WidgetView( TQWidget *parent=0, const char *name=0 ); + WidgetView( TQWidget *parent=nullptr, const char *name=nullptr ); public slots: void setStatus(const TQString&); diff --git a/examples/wizard/wizard.h b/examples/wizard/wizard.h index 28366cb9a..bf3a1c357 100644 --- a/examples/wizard/wizard.h +++ b/examples/wizard/wizard.h @@ -22,7 +22,7 @@ class Wizard : public TQWizard TQ_OBJECT public: - Wizard( TQWidget *parent = 0, const char *name = 0 ); + Wizard( TQWidget *parent = nullptr, const char *name = nullptr ); void showPage(TQWidget* page); diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp index 6360dcd56..7ba1449cf 100644 --- a/examples/xform/xform.cpp +++ b/examples/xform/xform.cpp @@ -41,7 +41,7 @@ class XFormControl : public TQVBox, public ModeNames { TQ_OBJECT public: - XFormControl( const TQFont &initialFont, TQWidget *parent=0, const char *name=0 ); + XFormControl( const TQFont &initialFont, TQWidget *parent=nullptr, const char *name=nullptr ); ~XFormControl() {} TQWMatrix matrix(); @@ -85,7 +85,7 @@ class ShowXForm : public TQWidget, public ModeNames { TQ_OBJECT public: - ShowXForm( const TQFont &f, TQWidget *parent=0, const char *name=0 ); + ShowXForm( const TQFont &f, TQWidget *parent=nullptr, const char *name=nullptr ); ~ShowXForm() {} void showIt(); // (Re)displays text or pixmap @@ -436,7 +436,7 @@ class XFormCenter : public TQHBox, public ModeNames { TQ_OBJECT public: - XFormCenter( TQWidget *parent=0, const char *name=0 ); + XFormCenter( TQWidget *parent=nullptr, const char *name=nullptr ); public slots: void setFont( const TQFont &f ) { sx->setFont( f ); } void newMode( int ); diff --git a/examples/xml/outliner/outlinetree.cpp b/examples/xml/outliner/outlinetree.cpp index 8142807bc..42d37e399 100644 --- a/examples/xml/outliner/outlinetree.cpp +++ b/examples/xml/outliner/outlinetree.cpp @@ -22,13 +22,13 @@ OutlineTree::OutlineTree( const TQString fileName, TQWidget *parent, const char // read the XML file and create DOM tree TQFile opmlFile( fileName ); if ( !opmlFile.open( IO_ReadOnly ) ) { - TQMessageBox::critical( 0, + TQMessageBox::critical( nullptr, tr( "Critical Error" ), tr( "Cannot open file %1" ).arg( fileName ) ); return; } if ( !domTree.setContent( &opmlFile ) ) { - TQMessageBox::critical( 0, + TQMessageBox::critical( nullptr, tr( "Critical Error" ), tr( "Parsing error for file %1" ).arg( fileName ) ); opmlFile.close(); @@ -53,7 +53,7 @@ OutlineTree::OutlineTree( const TQString fileName, TQWidget *parent, const char while ( !node.isNull() ) { if ( node.isElement() && node.nodeName() == "body" ) { TQDomElement body = node.toElement(); - buildTree( 0, body ); + buildTree( nullptr, body ); break; } node = node.nextSibling(); @@ -85,12 +85,12 @@ void OutlineTree::getHeaderInformation( const TQDomElement &header ) void OutlineTree::buildTree( TQListViewItem *parentItem, const TQDomElement &parentElement ) { - TQListViewItem *thisItem = 0; + TQListViewItem *thisItem = nullptr; TQDomNode node = parentElement.firstChild(); while ( !node.isNull() ) { if ( node.isElement() && node.nodeName() == "outline" ) { // add a new list view item for the outline - if ( parentItem == 0 ) + if ( !parentItem ) thisItem = new TQListViewItem( this, thisItem ); else thisItem = new TQListViewItem( parentItem, thisItem ); diff --git a/examples/xml/outliner/outlinetree.h b/examples/xml/outliner/outlinetree.h index bb281bd15..ab3932e97 100644 --- a/examples/xml/outliner/outlinetree.h +++ b/examples/xml/outliner/outlinetree.h @@ -18,7 +18,7 @@ class OutlineTree : public TQListView TQ_OBJECT public: - OutlineTree( const TQString fileName, TQWidget *parent = 0, const char *name = 0 ); + OutlineTree( const TQString fileName, TQWidget *parent = nullptr, const char *name = nullptr ); ~OutlineTree(); private: diff --git a/plugins/src/accessible/widgets/main.cpp b/plugins/src/accessible/widgets/main.cpp index 0a936b315..82dd92dee 100644 --- a/plugins/src/accessible/widgets/main.cpp +++ b/plugins/src/accessible/widgets/main.cpp @@ -27,7 +27,7 @@ AccessibleFactory::AccessibleFactory() TQRESULT AccessibleFactory::queryInterface( const TQUuid &iid, TQUnknownInterface **iface ) { - *iface = 0; + *iface = nullptr; if ( iid == IID_QUnknown ) *iface = (TQUnknownInterface*)(TQFeatureListInterface*)(TQAccessibleFactoryInterface*)this; else if ( iid == IID_QFeatureList ) @@ -96,7 +96,7 @@ TQStringList AccessibleFactory::featureList() const TQRESULT AccessibleFactory::createAccessibleInterface( const TQString &classname, TQObject *object, TQAccessibleInterface **iface ) { - *iface = 0; + *iface = nullptr; if ( classname == "TQLineEdit" ) { *iface = new TQAccessibleText( object, EditableText ); diff --git a/plugins/src/accessible/widgets/tqaccessiblemenu.cpp b/plugins/src/accessible/widgets/tqaccessiblemenu.cpp index c7d7670a6..d6cd1f45f 100644 --- a/plugins/src/accessible/widgets/tqaccessiblemenu.cpp +++ b/plugins/src/accessible/widgets/tqaccessiblemenu.cpp @@ -27,7 +27,7 @@ int TQAccessiblePopup::childCount() const TQRESULT TQAccessiblePopup::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -78,7 +78,7 @@ TQString TQAccessiblePopup::text( Text t, int control ) const return tx; int id; - TQMenuItem *item = 0; + TQMenuItem *item = nullptr; if ( control ) { id = popupMenu()->idAt( control - 1 ); item = popupMenu()->findItem( id ); @@ -191,7 +191,7 @@ int TQAccessibleMenuBar::childCount() const TQRESULT TQAccessibleMenuBar::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } diff --git a/plugins/src/accessible/widgets/tqaccessiblewidget.cpp b/plugins/src/accessible/widgets/tqaccessiblewidget.cpp index 02c57eff8..71cbe01c2 100644 --- a/plugins/src/accessible/widgets/tqaccessiblewidget.cpp +++ b/plugins/src/accessible/widgets/tqaccessiblewidget.cpp @@ -33,7 +33,7 @@ TQString buddyString( TQWidget *widget ) { TQWidget *parent = widget->parentWidget(); - TQObjectList *ol = parent->queryList( "TQLabel", 0, false, false ); + TQObjectList *ol = parent->queryList( "TQLabel", nullptr, false, false ); if ( !ol || !ol->count() ) { delete ol; return TQString::null; @@ -139,13 +139,13 @@ int TQAccessibleWidget::controlAt( int x, int y ) const TQPoint rp = w->mapFromGlobal( TQPoint( x, y ) ); - TQObjectList *list = w->queryList( "TQWidget", 0, false, false ); + TQObjectList *list = w->queryList( "TQWidget", nullptr, false, false ); if ( !list || list->isEmpty() ) return 0; TQObjectListIt it( *list ); - TQWidget *child = 0; + TQWidget *child = nullptr; int index = 1; while ( ( child = (TQWidget*)it.current() ) ) { if ( !child->isTopLevel() && !child->isHidden() && child->geometry().contains( rp ) ) { @@ -187,14 +187,14 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const switch ( dir ) { case NavFirstChild: { - TQObjectList *list = w->queryList( "TQWidget", 0, false, false ); + TQObjectList *list = w->queryList( "TQWidget", nullptr, false, false ); bool has = !list->isEmpty(); delete list; return has ? 1 : -1; } case NavLastChild: { - TQObjectList *list = w->queryList( "TQWidget", 0, false, false ); + TQObjectList *list = w->queryList( "TQWidget", nullptr, false, false ); bool has = !list->isEmpty(); delete list; return has ? childCount() : -1; @@ -203,7 +203,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const case NavPrevious: { TQWidget *parent = w->parentWidget(); - TQObjectList *sl = parent ? parent->queryList( "TQWidget", 0, false, false ) : 0; + TQObjectList *sl = parent ? parent->queryList( "TQWidget", nullptr, false, false ) : nullptr; if ( !sl ) return -1; TQObject *sib; @@ -243,7 +243,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const if ( !w2 ) return -1; - TQObjectList *list = w->queryList( "TQWidget", 0, false, false ); + TQObjectList *list = w->queryList( "TQWidget", nullptr, false, false ); int index = list->findRef( w2 ); delete list; return ( index != -1 ) ? index+1 : -1; @@ -258,7 +258,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const /*! \reimp */ int TQAccessibleWidget::childCount() const { - TQObjectList *cl = widget()->queryList( "TQWidget", 0, false, false ); + TQObjectList *cl = widget()->queryList( "TQWidget", nullptr, false, false ); if ( !cl ) return 0; @@ -270,12 +270,12 @@ int TQAccessibleWidget::childCount() const /*! \reimp */ TQRESULT TQAccessibleWidget::queryChild( int control, TQAccessibleInterface **iface ) const { - *iface = 0; - TQObjectList *cl = widget()->queryList( "TQWidget", 0, false, false ); + *iface = nullptr; + TQObjectList *cl = widget()->queryList( "TQWidget", nullptr, false, false ); if ( !cl ) return TQS_FALSE; - TQObject *o = 0; + TQObject *o = nullptr; if ( cl->count() >= (uint)control ) o = cl->at( control-1 ); delete cl; @@ -719,7 +719,7 @@ int TQAccessibleSpinWidget::childCount() const /*! \reimp */ TQRESULT TQAccessibleSpinWidget::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -927,7 +927,7 @@ int TQAccessibleScrollBar::childCount() const /*! \reimp */ TQRESULT TQAccessibleScrollBar::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -1111,7 +1111,7 @@ int TQAccessibleSlider::childCount() const /*! \reimp */ TQRESULT TQAccessibleSlider::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -1392,7 +1392,7 @@ int TQAccessibleHeader::childCount() const /*! \reimp */ TQRESULT TQAccessibleHeader::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -1486,7 +1486,7 @@ TQRect TQAccessibleTabBar::rect( int control ) const /*! \reimp */ TQRESULT TQAccessibleTabBar::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -1741,7 +1741,7 @@ int TQAccessibleComboBox::childCount() const /*! \reimp */ TQRESULT TQAccessibleComboBox::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -1923,7 +1923,7 @@ int TQAccessibleTitleBar::childCount() const /*! \reimp */ TQRESULT TQAccessibleTitleBar::queryChild( int /*control*/, TQAccessibleInterface **iface ) const { - *iface = 0; + *iface = nullptr; return TQS_FALSE; } @@ -2046,7 +2046,7 @@ TQAccessibleViewport::TQAccessibleViewport( TQObject *o, TQObject *sv ) TQAccessibleScrollView *TQAccessibleViewport::scrollView() const { - TQAccessibleInterface *iface = 0; + TQAccessibleInterface *iface = nullptr; queryAccessibleInterface( scrollview, &iface ); Q_ASSERT(iface); return (TQAccessibleScrollView *)iface; diff --git a/plugins/src/codecs/cn/main.cpp b/plugins/src/codecs/cn/main.cpp index 3c9064c6a..4a6dbb332 100644 --- a/plugins/src/codecs/cn/main.cpp +++ b/plugins/src/codecs/cn/main.cpp @@ -32,7 +32,7 @@ TQTextCodec *CNTextCodecs::createForMib( int mib ) ; } - return 0; + return nullptr; } @@ -45,7 +45,7 @@ TQTextCodec *CNTextCodecs::createForName( const TQString &name ) if (name == "gb2312.1980-0") return new TQGb2312Codec; - return 0; + return nullptr; } diff --git a/plugins/src/codecs/jp/main.cpp b/plugins/src/codecs/jp/main.cpp index 8b0f8f941..7ee8887f9 100644 --- a/plugins/src/codecs/jp/main.cpp +++ b/plugins/src/codecs/jp/main.cpp @@ -34,7 +34,7 @@ TQTextCodec *JPTextCodecs::createForMib( int mib ) ; } - return 0; + return nullptr; } @@ -49,7 +49,7 @@ TQTextCodec *JPTextCodecs::createForName( const TQString &name ) if (name == "jisx0208.1983-0") return new TQFontJis0208Codec; - return 0; + return nullptr; } diff --git a/plugins/src/codecs/kr/main.cpp b/plugins/src/codecs/kr/main.cpp index fa76ad551..943343732 100644 --- a/plugins/src/codecs/kr/main.cpp +++ b/plugins/src/codecs/kr/main.cpp @@ -29,7 +29,7 @@ TQTextCodec *KRTextCodecs::createForMib( int mib ) ; } - return 0; + return nullptr; } @@ -40,7 +40,7 @@ TQTextCodec *KRTextCodecs::createForName( const TQString &name ) if (name == "ksc5601.1987-0") return new TQFontKsc5601Codec; - return 0; + return nullptr; } diff --git a/plugins/src/codecs/tw/main.cpp b/plugins/src/codecs/tw/main.cpp index 6991b33f1..b3b721a27 100644 --- a/plugins/src/codecs/tw/main.cpp +++ b/plugins/src/codecs/tw/main.cpp @@ -28,7 +28,7 @@ TQTextCodec *TWTextCodecs::createForMib( int mib ) ; } - return 0; + return nullptr; } @@ -39,7 +39,7 @@ TQTextCodec *TWTextCodecs::createForName( const TQString &name ) if (name == "big5*-0") return new TQFontBig5Codec; - return 0; + return nullptr; } diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index 96d6ba2cb..59206e77b 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -54,8 +54,8 @@ #define TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX TQMultiInputContext::TQMultiInputContext() - : TQInputContext(), _slave( 0 ), imIndex( 0 ), cachedFocus( false ), - cachedFocusWidget( 0 ), cachedHolderWidget( 0 ), + : TQInputContext(), _slave( nullptr ), imIndex( 0 ), cachedFocus( false ), + cachedFocusWidget( nullptr ), cachedHolderWidget( nullptr ), beIndirectlyConnected( false ), popup( nullptr ), currentIMKey( TQString::null ) { keyDict.setAutoDelete( true ); @@ -173,7 +173,7 @@ void TQMultiInputContext::destroyInputContext() emit imEventGenerated( _slave->focusWidget(), terminator ); } _slave->deleteLater(); - _slave = 0; + _slave = nullptr; } } @@ -192,12 +192,12 @@ void TQMultiInputContext::postIMEvent( TQObject *receiver, TQIMEvent *event ) #if defined(TQ_WS_X11) TQWidget *TQMultiInputContext::focusWidget() const { - return ( slave() ) ? slave()->focusWidget() : 0; + return ( slave() ) ? slave()->focusWidget() : nullptr; } TQWidget *TQMultiInputContext::holderWidget() const { - return ( slave() ) ? slave()->holderWidget() : 0; + return ( slave() ) ? slave()->holderWidget() : nullptr; } @@ -320,7 +320,7 @@ TQPtrList *TQMultiInputContext::menus() TQPtrList *result = new TQPtrList; result->append( imSelMenu ); - TQPtrList *slaveMenus = ( slave() ) ? slave()->menus() : 0; + TQPtrList *slaveMenus = ( slave() ) ? slave()->menus() : nullptr; if ( slaveMenus ) { for ( TQPtrList::Iterator it = slaveMenus->begin(); it != slaveMenus->end(); diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h index aaf16506b..d1e8d0bb6 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h @@ -71,7 +71,7 @@ public: void setFocus(); void unsetFocus(); - void setMicroFocus( int x, int y, int w, int h, TQFont *f = 0 ); + void setMicroFocus( int x, int y, int w, int h, TQFont *f = nullptr ); void mouseHandler( int x, TQEvent::Type type, TQt::ButtonState button, TQt::ButtonState state ); TQFont font() const; diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp index d6f6e064c..4b354e73c 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp @@ -68,7 +68,7 @@ TQInputContext *TQNoneInputContextPlugin::create( const TQString &key ) bool isIMSwitcher = key.startsWith( "imsw-" ); if ( ! isIMSwitcher ) - return 0; + return nullptr; if ( getenv( "TQT_IM_MODULE" ) ) { actuallySpecifiedKey = getenv( "TQT_IM_MODULE" ); @@ -77,7 +77,7 @@ TQInputContext *TQNoneInputContextPlugin::create( const TQString &key ) actuallySpecifiedKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" ); } - return TQInputContextFactory::create( actuallySpecifiedKey, 0 ); + return TQInputContextFactory::create( actuallySpecifiedKey, nullptr ); } TQStringList TQNoneInputContextPlugin::languages( const TQString &key ) diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.h b/plugins/src/inputmethods/simple/qsimpleinputcontext.h index fb3faaefe..54da42fe7 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontext.h +++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.h @@ -73,7 +73,7 @@ public: virtual void reset(); virtual void setFocus(); virtual void unsetFocus(); - virtual void setMicroFocus( int x, int y, int w, int h, TQFont *f = 0 ); + virtual void setMicroFocus( int x, int y, int w, int h, TQFont *f = nullptr ); virtual void mouseHandler( int x, TQEvent::Type type, TQt::ButtonState button, TQt::ButtonState state ); diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h index 3cef8dd81..f30815861 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext.h +++ b/plugins/src/inputmethods/xim/qximinputcontext.h @@ -84,7 +84,7 @@ public: void setFocus(); void unsetFocus(); - void setMicroFocus( int x, int y, int w, int h, TQFont *f = 0 ); + void setMicroFocus( int x, int y, int w, int h, TQFont *f = nullptr ); void mouseHandler( int x, TQEvent::Type type, TQt::ButtonState button, TQt::ButtonState state ); bool isPreeditRelocationEnabled(); diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp index c8fa3b76b..e1142a7bd 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp @@ -64,12 +64,12 @@ const int XKeyRelease = KeyRelease; // #define QT_XIM_DEBUG // from tqapplication_x11.cpp -static XIM tqt_xim = 0; +static XIM tqt_xim = nullptr; extern XIMStyle tqt_xim_style; extern XIMStyle tqt_xim_preferred_style; extern char *tqt_ximServer; static bool isInitXIM = false; -static TQPtrList *ximContextList = 0; +static TQPtrList *ximContextList = nullptr; #endif extern int tqt_ximComposingKeycode; extern TQTextCodec * tqt_input_mapper; @@ -97,8 +97,8 @@ extern "C" { // tqDebug("xim_destroy_callback"); TQXIMInputContext::close_xim(); Display *dpy = TQPaintDevice::x11AppDisplay(); - XRegisterIMInstantiateCallback(dpy, 0, 0, 0, - (XIMProc) xim_create_callback, 0); + XRegisterIMInstantiateCallback(dpy, nullptr, nullptr, nullptr, + (XIMProc) xim_create_callback, nullptr); } #endif // USE_X11R6_XIM @@ -115,7 +115,7 @@ extern "C" { XFreeFontSet call, so we avoid creating and deletion of fontsets as much as possible */ -static XFontSet fontsetCache[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +static XFontSet fontsetCache[8] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; static int fontsetCacheRefCount = 0; static const char * const fontsetnames[] = { @@ -144,18 +144,18 @@ static XFontSet getFontSet( const TQFont &f ) Display* dpy = TQPaintDevice::x11AppDisplay(); int missCount; char** missList; - fontsetCache[i] = XCreateFontSet(dpy, fontsetnames[i], &missList, &missCount, 0); + fontsetCache[i] = XCreateFontSet(dpy, fontsetnames[i], &missList, &missCount, nullptr); if(missCount > 0) XFreeStringList(missList); if ( !fontsetCache[i] ) { - fontsetCache[i] = XCreateFontSet(dpy, "-*-fixed-*-*-*-*-16-*", &missList, &missCount, 0); + fontsetCache[i] = XCreateFontSet(dpy, "-*-fixed-*-*-*-*-16-*", &missList, &missCount, nullptr); if(missCount > 0) XFreeStringList(missList); if ( !fontsetCache[i] ) fontsetCache[i] = (XFontSet)-1; } } - return (fontsetCache[i] == (XFontSet)-1) ? 0 : fontsetCache[i]; + return (fontsetCache[i] == (XFontSet)-1) ? nullptr : fontsetCache[i]; } @@ -234,7 +234,7 @@ extern "C" { } if (text) { - char *str = 0; + char *str = nullptr; if (text->encoding_is_wchar) { int l = wcstombs(nullptr, text->string.wide_char, text->length); if (l != -1) { @@ -339,7 +339,7 @@ extern "C" { TQXIMInputContext::TQXIMInputContext() - : TQInputContext(), ic(0), fontset(0) + : TQInputContext(), ic(nullptr), fontset(nullptr) { if(!isInitXIM) TQXIMInputContext::init_xim(); @@ -374,7 +374,7 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget ) XPoint spot; XRectangle rect; - XVaNestedList preedit_attr = 0; + XVaNestedList preedit_attr = nullptr; XIMCallback startcallback, drawcallback, donecallback; font = widget->font(); @@ -447,7 +447,7 @@ TQXIMInputContext::~TQXIMInputContext() for ( int i = 0; i < 8; i++ ) { if ( fontsetCache[i] && fontsetCache[i] != (XFontSet)-1 ) { XFreeFontSet(dpy, fontsetCache[i]); - fontsetCache[i] = 0; + fontsetCache[i] = nullptr; } } } @@ -459,17 +459,17 @@ TQXIMInputContext::~TQXIMInputContext() // XCloseIM( tqt_xim ); // We prefer a less serious memory leak if( tqt_xim ) { - tqt_xim = 0; + tqt_xim = nullptr; isInitXIM = false; } delete ximContextList; - ximContextList = 0; + ximContextList = nullptr; } } #endif // !TQT_NO_XIM - ic = 0; + ic = nullptr; } void TQXIMInputContext::init_xim() @@ -478,7 +478,7 @@ void TQXIMInputContext::init_xim() if(!isInitXIM) isInitXIM = true; - tqt_xim = 0; + tqt_xim = nullptr; TQString ximServerName(tqt_ximServer); if (tqt_ximServer) ximServerName.prepend("@im="); @@ -489,15 +489,15 @@ void TQXIMInputContext::init_xim() tqWarning("TQt: Locales not supported on X server"); #ifdef USE_X11R6_XIM - else if ( XSetLocaleModifiers (ximServerName.ascii()) == 0 ) + else if ( !XSetLocaleModifiers (ximServerName.ascii()) ) tqWarning( "TQt: Cannot set locale modifiers: %s", ximServerName.ascii()); else { Display *dpy = TQPaintDevice::x11AppDisplay(); XWindowAttributes attr; // XIM unselects all events on the root window XGetWindowAttributes( dpy, TQPaintDevice::x11AppRootWindow(),&attr ); - XRegisterIMInstantiateCallback(dpy, 0, 0, 0, - (XIMProc) xim_create_callback, 0); + XRegisterIMInstantiateCallback(dpy, nullptr, nullptr, nullptr, + (XIMProc) xim_create_callback, nullptr); XSelectInput( dpy, TQPaintDevice::x11AppRootWindow(), attr.your_event_mask ); } #else // !USE_X11R6_XIM @@ -517,18 +517,18 @@ void TQXIMInputContext::create_xim() { #ifndef TQT_NO_XIM Display *appDpy = TQPaintDevice::x11AppDisplay(); - tqt_xim = XOpenIM( appDpy, 0, 0, 0 ); + tqt_xim = XOpenIM( appDpy, nullptr, nullptr, nullptr ); if ( tqt_xim ) { #ifdef USE_X11R6_XIM XIMCallback destroy; destroy.callback = (XIMProc) xim_destroy_callback; - destroy.client_data = 0; - if ( XSetIMValues( tqt_xim, XNDestroyCallback, &destroy, (char *) 0 ) != 0 ) + destroy.client_data = nullptr; + if ( XSetIMValues( tqt_xim, XNDestroyCallback, &destroy, (char *) 0 ) ) tqWarning( "Xlib doesn't support destroy callback"); #endif // USE_X11R6_XIM - XIMStyles *styles = 0; + XIMStyles *styles = nullptr; XGetIMValues(tqt_xim, XNQueryInputStyle, &styles, (char *) 0, (char *) 0); if ( styles ) { int i; @@ -563,8 +563,8 @@ void TQXIMInputContext::create_xim() if ( tqt_xim_style ) { #ifdef USE_X11R6_XIM - XUnregisterIMInstantiateCallback(appDpy, 0, 0, 0, - (XIMProc) xim_create_callback, 0); + XUnregisterIMInstantiateCallback(appDpy, nullptr, nullptr, nullptr, + (XIMProc) xim_create_callback, nullptr); #endif // USE_X11R6_XIM } else { @@ -590,7 +590,7 @@ void TQXIMInputContext::close_xim() // XCloseIM( tqt_xim ); // We prefer a less serious memory leak - tqt_xim = 0; + tqt_xim = nullptr; if( ximContextList ) { TQPtrList contexts( *ximContextList ); TQPtrList::Iterator it = contexts.begin(); @@ -752,7 +752,7 @@ void TQXIMInputContext::close( const TQString &errMsg ) bool TQXIMInputContext::hasFocus() const { - return ( focusWidget() != 0 ); + return ( focusWidget() ); } diff --git a/plugins/src/sqldrivers/ibase/main.cpp b/plugins/src/sqldrivers/ibase/main.cpp index 7cca63c45..9158e8c4f 100644 --- a/plugins/src/sqldrivers/ibase/main.cpp +++ b/plugins/src/sqldrivers/ibase/main.cpp @@ -61,7 +61,7 @@ TQSqlDriver* TQIBaseDriverPlugin::create( const TQString &name ) TQIBaseDriver* driver = new TQIBaseDriver(); return driver; } - return 0; + return nullptr; } TQStringList TQIBaseDriverPlugin::keys() const diff --git a/plugins/src/sqldrivers/mysql/main.cpp b/plugins/src/sqldrivers/mysql/main.cpp index 214724393..3a02dbd56 100644 --- a/plugins/src/sqldrivers/mysql/main.cpp +++ b/plugins/src/sqldrivers/mysql/main.cpp @@ -61,7 +61,7 @@ TQSqlDriver* TQMYSQLDriverPlugin::create( const TQString &name ) TQMYSQLDriver* driver = new TQMYSQLDriver(); return driver; } - return 0; + return nullptr; } TQStringList TQMYSQLDriverPlugin::keys() const diff --git a/plugins/src/sqldrivers/odbc/main.cpp b/plugins/src/sqldrivers/odbc/main.cpp index 9b26ec984..80d3c35ee 100644 --- a/plugins/src/sqldrivers/odbc/main.cpp +++ b/plugins/src/sqldrivers/odbc/main.cpp @@ -61,7 +61,7 @@ TQSqlDriver* TQODBCDriverPlugin::create( const TQString &name ) TQODBCDriver* driver = new TQODBCDriver(); return driver; } - return 0; + return nullptr; } TQStringList TQODBCDriverPlugin::keys() const diff --git a/plugins/src/sqldrivers/psql/main.cpp b/plugins/src/sqldrivers/psql/main.cpp index a0c73b24b..d4b6d77b2 100644 --- a/plugins/src/sqldrivers/psql/main.cpp +++ b/plugins/src/sqldrivers/psql/main.cpp @@ -61,7 +61,7 @@ TQSqlDriver* TQPSQLDriverPlugin::create( const TQString &name ) TQPSQLDriver* driver = new TQPSQLDriver(); return driver; } - return 0; + return nullptr; } TQStringList TQPSQLDriverPlugin::keys() const diff --git a/plugins/src/sqldrivers/sqlite/smain.cpp b/plugins/src/sqldrivers/sqlite/smain.cpp index 40586e23a..14efdd584 100644 --- a/plugins/src/sqldrivers/sqlite/smain.cpp +++ b/plugins/src/sqldrivers/sqlite/smain.cpp @@ -61,7 +61,7 @@ TQSqlDriver* TQSQLiteDriverPlugin::create( const TQString &name ) TQSQLiteDriver* driver = new TQSQLiteDriver(); return driver; } - return 0; + return nullptr; } TQStringList TQSQLiteDriverPlugin::keys() const diff --git a/plugins/src/sqldrivers/sqlite3/smain.cpp b/plugins/src/sqldrivers/sqlite3/smain.cpp index 9ecee7f57..4af095438 100644 --- a/plugins/src/sqldrivers/sqlite3/smain.cpp +++ b/plugins/src/sqldrivers/sqlite3/smain.cpp @@ -57,7 +57,7 @@ TQSqlDriver* TQSQLite3DriverPlugin::create( const TQString &name ) TQSQLite3Driver* driver = new TQSQLite3Driver(); return driver; } - return 0; + return nullptr; } TQStringList TQSQLite3DriverPlugin::keys() const diff --git a/plugins/src/styles/cde/main.cpp b/plugins/src/styles/cde/main.cpp index a079a82df..f8757b357 100644 --- a/plugins/src/styles/cde/main.cpp +++ b/plugins/src/styles/cde/main.cpp @@ -27,7 +27,7 @@ TQStyle* CDEStyle::create( const TQString& s ) if ( s.lower() == "cde" ) return new TQCDEStyle(); - return 0; + return nullptr; } TQ_EXPORT_PLUGIN( CDEStyle ) diff --git a/plugins/src/styles/compact/main.cpp b/plugins/src/styles/compact/main.cpp index 8d6358917..dc5313125 100644 --- a/plugins/src/styles/compact/main.cpp +++ b/plugins/src/styles/compact/main.cpp @@ -27,7 +27,7 @@ TQStyle* CompactStyle::create( const TQString& s ) if ( s.lower() == "compact" ) return new TQCompactStyle(); - return 0; + return nullptr; } diff --git a/plugins/src/styles/motif/main.cpp b/plugins/src/styles/motif/main.cpp index 73e25e64a..2c060e461 100644 --- a/plugins/src/styles/motif/main.cpp +++ b/plugins/src/styles/motif/main.cpp @@ -27,7 +27,7 @@ TQStyle* MotifStyle::create( const TQString& s ) if ( s.lower() == "motif" ) return new TQMotifStyle(); - return 0; + return nullptr; } TQ_EXPORT_PLUGIN( MotifStyle ) diff --git a/plugins/src/styles/motifplus/main.cpp b/plugins/src/styles/motifplus/main.cpp index 60b1e5395..a2941497f 100644 --- a/plugins/src/styles/motifplus/main.cpp +++ b/plugins/src/styles/motifplus/main.cpp @@ -28,7 +28,7 @@ TQStyle* MotifPlusStyle::create( const TQString& s ) if ( s.lower() == "motifplus" ) return new TQMotifPlusStyle(); - return 0; + return nullptr; } TQ_EXPORT_PLUGIN( MotifPlusStyle ) diff --git a/plugins/src/styles/platinum/main.cpp b/plugins/src/styles/platinum/main.cpp index aaf168968..53698bbaf 100644 --- a/plugins/src/styles/platinum/main.cpp +++ b/plugins/src/styles/platinum/main.cpp @@ -27,7 +27,7 @@ TQStyle* PlatinumStyle::create( const TQString& s ) if ( s.lower() == "platinum" ) return new TQPlatinumStyle(); - return 0; + return nullptr; } diff --git a/plugins/src/styles/sgi/main.cpp b/plugins/src/styles/sgi/main.cpp index 9e4331f82..3ab61e62b 100644 --- a/plugins/src/styles/sgi/main.cpp +++ b/plugins/src/styles/sgi/main.cpp @@ -27,7 +27,7 @@ TQStyle* SGIStyle::create( const TQString& s ) if ( s.lower() == "sgi" ) return new TQSGIStyle(); - return 0; + return nullptr; } TQ_EXPORT_PLUGIN( SGIStyle ) diff --git a/plugins/src/styles/windows/main.cpp b/plugins/src/styles/windows/main.cpp index efb82e432..a2d18bafb 100644 --- a/plugins/src/styles/windows/main.cpp +++ b/plugins/src/styles/windows/main.cpp @@ -27,7 +27,7 @@ TQStyle* WindowsStyle::create( const TQString& s ) if ( s.lower() == "windows" ) return new TQWindowsStyle(); - return 0; + return nullptr; } TQ_EXPORT_PLUGIN( WindowsStyle ) diff --git a/qmake/examples/tutorial/hello.cpp b/qmake/examples/tutorial/hello.cpp index 8ab5e5a5a..3d2cd938d 100644 --- a/qmake/examples/tutorial/hello.cpp +++ b/qmake/examples/tutorial/hello.cpp @@ -1,7 +1,7 @@ #include "hello.h" MyPushButton::MyPushButton( const TQString& text ) - : TQPushButton( text, 0, "mypushbutton" ) + : TQPushButton( text, nullptr, "mypushbutton" ) { tqDebug( "My PushButton has been constructed" ); } diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index d2e9bd8b5..3da940776 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -370,7 +370,7 @@ VCCLCompilerTool::VCCLCompilerTool() WarnAsError( unset ), WarningLevel( warningLevel_0 ), WholeProgramOptimization( unset ), - config( 0 ) + config( nullptr ) { } diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp index d3d4c6b70..a1cb78e63 100644 --- a/src/canvas/tqcanvas.cpp +++ b/src/canvas/tqcanvas.cpp @@ -279,7 +279,7 @@ const TQRect& TQCanvasClusterizer::operator[](int i) class TQM_EXPORT_CANVAS TQCanvasItemPtr { public: - TQCanvasItemPtr() : ptr(0) { } + TQCanvasItemPtr() : ptr(nullptr) { } TQCanvasItemPtr( TQCanvasItem* p ) : ptr(p) { } bool operator<=(const TQCanvasItemPtr& that) const @@ -345,7 +345,7 @@ void TQCanvasItemList::sort() */ void TQCanvasItemList::drawUnique( TQPainter& painter ) { - TQCanvasItem* prev=0; + TQCanvasItem* prev=nullptr; for (Iterator it=fromLast(); it!=end(); --it) { TQCanvasItem *g=*it; if (g!=prev) { @@ -608,9 +608,9 @@ void TQCanvas::init(int w, int h, int chunksze, int mxclusters) chwidth=(w+chunksize-1)/chunksize; chheight=(h+chunksize-1)/chunksize; chunks=new TQCanvasChunk[chwidth*chheight]; - update_timer = 0; + update_timer = nullptr; bgcolor = white; - grid = 0; + grid = nullptr; htiles = 0; vtiles = 0; dblbuf = true; @@ -670,8 +670,8 @@ TQCanvas::TQCanvas( TQPixmap p, void tqt_unview(TQCanvas* c) { - for (TQCanvasView* view=c->d->viewList.first(); view != 0; view=c->d->viewList.next()) { - view->viewing = 0; + for (TQCanvasView* view=c->d->viewList.first(); view; view=c->d->viewList.next()) { + view->viewing = nullptr; } } @@ -752,7 +752,7 @@ void TQCanvas::resize(int w, int h) delete [] chunks; chunks=newchunks; - for (item=hidden.first(); item != 0; item=hidden.next()) { + for (item=hidden.first(); item; item=hidden.next()) { item->show(); } @@ -828,7 +828,7 @@ void TQCanvas::retune(int chunksze, int mxclusters) delete [] chunks; chunks=newchunks; - for (TQCanvasItem* item=hidden.first(); item != 0; item=hidden.next()) { + for (TQCanvasItem* item=hidden.first(); item; item=hidden.next()) { item->show(); } } @@ -1159,7 +1159,7 @@ void TQCanvas::update() TQPtrListIterator it(d->viewList); TQCanvasView* view; - while( (view=it.current()) != 0 ) { + while( (view=it.current()) ) { ++it; #ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wm = view->worldMatrix(); @@ -1191,7 +1191,7 @@ void TQCanvas::update() drawChanges(clusterizer[i]); #ifndef TQT_NO_TRANSFORMATIONS - for ( TQRect* r=doneareas.first(); r != 0; r=doneareas.next() ) + for ( TQRect* r=doneareas.first(); r; r=doneareas.next() ) setUnchanged(*r); #endif } @@ -1596,7 +1596,7 @@ void TQCanvas::setBackgroundColor( const TQColor& c ) if ( bgcolor != c ) { bgcolor = c; TQCanvasView* view=d->viewList.first(); - while ( view != 0 ) { + while ( view ) { /* XXX this doesn't look right. Shouldn't this be more like setBackgroundPixmap? : Ian */ view->viewport()->setEraseColor( bgcolor ); @@ -1627,7 +1627,7 @@ void TQCanvas::setBackgroundPixmap( const TQPixmap& p ) { setTiles(p, 1, 1, p.width(), p.height()); TQCanvasView* view = d->viewList.first(); - while ( view != 0 ) { + while ( view ) { view->updateContents(); view = d->viewList.next(); } @@ -1757,7 +1757,7 @@ void TQCanvas::setTiles( TQPixmap p, tilew = tilewidth; tileh = tileheight; } else { - grid = 0; + grid = nullptr; } if ( h + v > 10 ) { int s = scm(tilewidth,tileheight); @@ -1949,7 +1949,7 @@ TQCanvasItem::TQCanvasItem(TQCanvas* canvas) : ena=0; act=0; - ext = 0; + ext = nullptr; if (cnv) cnv->addItem(this); } @@ -2352,7 +2352,7 @@ bool tqt_testCollision(const TQCanvasSprite* s1, const TQCanvasSprite* s2) t=x1; x1=x2; x2=t; t=y1; x1=y2; y2=t; s2image = s1image; - s1image = 0; + s1image = nullptr; } // s2image != 0 @@ -2540,7 +2540,7 @@ static bool collision_double_dispatch( const TQCanvasSprite* s1, */ bool TQCanvasSprite::collidesWith( const TQCanvasItem* i ) const { - return i->collidesWith(this,0,0,0,0); + return i->collidesWith(this,nullptr,nullptr,nullptr,nullptr); } /*! @@ -2555,7 +2555,7 @@ bool TQCanvasSprite::collidesWith( const TQCanvasSprite* s, const TQCanvasEllipse* e, const TQCanvasText* t ) const { - return collision_double_dispatch(s,p,r,e,t,this,0,0,0,0); + return collision_double_dispatch(s,p,r,e,t,this,nullptr,nullptr,nullptr,nullptr); } /*! @@ -2563,7 +2563,7 @@ bool TQCanvasSprite::collidesWith( const TQCanvasSprite* s, */ bool TQCanvasPolygonalItem::collidesWith( const TQCanvasItem* i ) const { - return i->collidesWith(0,this,0,0,0); + return i->collidesWith(nullptr,this,nullptr,nullptr,nullptr); } bool TQCanvasPolygonalItem::collidesWith( const TQCanvasSprite* s, @@ -2572,7 +2572,7 @@ bool TQCanvasPolygonalItem::collidesWith( const TQCanvasSprite* s, const TQCanvasEllipse* e, const TQCanvasText* t ) const { - return collision_double_dispatch(s,p,r,e,t,0,this,0,0,0); + return collision_double_dispatch(s,p,r,e,t,nullptr,this,nullptr,nullptr,nullptr); } /*! @@ -2580,7 +2580,7 @@ bool TQCanvasPolygonalItem::collidesWith( const TQCanvasSprite* s, */ bool TQCanvasRectangle::collidesWith( const TQCanvasItem* i ) const { - return i->collidesWith(0,this,this,0,0); + return i->collidesWith(nullptr,this,this,nullptr,nullptr); } bool TQCanvasRectangle::collidesWith( const TQCanvasSprite* s, @@ -2589,7 +2589,7 @@ bool TQCanvasRectangle::collidesWith( const TQCanvasSprite* s, const TQCanvasEllipse* e, const TQCanvasText* t ) const { - return collision_double_dispatch(s,p,r,e,t,0,this,this,0,0); + return collision_double_dispatch(s,p,r,e,t,nullptr,this,this,nullptr,nullptr); } @@ -2598,7 +2598,7 @@ bool TQCanvasRectangle::collidesWith( const TQCanvasSprite* s, */ bool TQCanvasEllipse::collidesWith( const TQCanvasItem* i ) const { - return i->collidesWith(0,this,0,this,0); + return i->collidesWith(nullptr,this,nullptr,this,nullptr); } bool TQCanvasEllipse::collidesWith( const TQCanvasSprite* s, @@ -2607,7 +2607,7 @@ bool TQCanvasEllipse::collidesWith( const TQCanvasSprite* s, const TQCanvasEllipse* e, const TQCanvasText* t ) const { - return collision_double_dispatch(s,p,r,e,t,0,this,0,this,0); + return collision_double_dispatch(s,p,r,e,t,nullptr,this,nullptr,this,nullptr); } /*! @@ -2615,7 +2615,7 @@ bool TQCanvasEllipse::collidesWith( const TQCanvasSprite* s, */ bool TQCanvasText::collidesWith( const TQCanvasItem* i ) const { - return i->collidesWith(0,0,0,0,this); + return i->collidesWith(nullptr,nullptr,nullptr,nullptr,this); } bool TQCanvasText::collidesWith( const TQCanvasSprite* s, @@ -2624,7 +2624,7 @@ bool TQCanvasText::collidesWith( const TQCanvasSprite* s, const TQCanvasEllipse* e, const TQCanvasText* t ) const { - return collision_double_dispatch(s,p,r,e,t,0,0,0,0,this); + return collision_double_dispatch(s,p,r,e,t,nullptr,nullptr,nullptr,nullptr,this); } /*! @@ -2882,7 +2882,7 @@ void TQCanvasPixmap::init(const TQImage& image) collision_mask = new TQImage(i); } else #endif - collision_mask = 0; + collision_mask = nullptr; } void TQCanvasPixmap::init(const TQPixmap& pixmap, int hx, int hy) @@ -2894,7 +2894,7 @@ void TQCanvasPixmap::init(const TQPixmap& pixmap, int hx, int hy) TQImage i = mask()->convertToImage(); collision_mask = new TQImage(i); } else - collision_mask = 0; + collision_mask = nullptr; } /*! @@ -2967,7 +2967,7 @@ TQCanvasPixmap::~TQCanvasPixmap() TQCanvasPixmapArray. */ TQCanvasPixmapArray::TQCanvasPixmapArray() -: framecount( 0 ), img( 0 ) +: framecount( 0 ), img( nullptr ) { } @@ -2994,7 +2994,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray() TQCanvasPixmapArray::TQCanvasPixmapArray( const TQString& datafilenamepattern, int fc ) -: framecount( 0 ), img( 0 ) +: framecount( 0 ), img( nullptr ) { readPixmaps(datafilenamepattern,fc); } @@ -3015,7 +3015,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray(TQPtrList list, TQPtrList list, TQPointArra if (have_hotspots && list.count() != hotspots.count()) { tqWarning("TQCanvasPixmapArray: lists have different lengths"); reset(); - img = 0; + img = nullptr; } else { TQValueList::iterator it; it = list.begin(); @@ -3068,7 +3068,7 @@ void TQCanvasPixmapArray::reset() for (int i=0; i #endif -static TQValueList *all = 0; +static TQValueList *all = nullptr; static bool codecs_destroyed = false; -static TQTextCodec * localeMapper = 0; +static TQTextCodec * localeMapper = nullptr; class TQTextCodecCleanup { public: @@ -129,16 +129,16 @@ void TQTextCodec::deleteAllCodecs() #endif // TQT_THREAD_SUPPORT TQValueList *ball = all; - all = 0; + all = nullptr; TQValueList::Iterator it; for ( it = ball->begin(); it != ball->end(); ++it ) { delete *it; - *it = 0; + *it = nullptr; } ball->clear(); delete ball; - localeMapper = 0; + localeMapper = nullptr; } static void setup(); @@ -530,7 +530,7 @@ TQTextCodec* TQTextCodec::codecForIndex(int i) } setup(); - return (uint)i >= all->count() ? 0 : *all->at(i); + return (uint)i >= all->count() ? nullptr : *all->at(i); } @@ -547,7 +547,7 @@ TQTextCodec* TQTextCodec::codecForMib(int mib) setup(); TQValueList::ConstIterator i; - TQTextCodec* result=0; + TQTextCodec* result=nullptr; for ( i = all->begin(); i != all->end(); ++i ) { result = *i; if ( result->mibEnum()==mib ) @@ -710,37 +710,37 @@ static const char * const iso8859_2locales[] = { "croatian", "cs", "cs_CS", "cs_CZ","cz", "cz_CZ", "czech", "hr", "hr_HR", "hu", "hu_HU", "hungarian", "pl", "pl_PL", "polish", "ro", "ro_RO", "rumanian", "serbocroatian", "sh", "sh_SP", "sh_YU", "sk", - "sk_SK", "sl", "sl_CS", "sl_SI", "slovak", "slovene", "sr_SP", 0 }; + "sk_SK", "sl", "sl_CS", "sl_SI", "slovak", "slovene", "sr_SP", nullptr }; static const char * const iso8859_3locales[] = { - "eo", 0 }; + "eo", nullptr }; static const char * const iso8859_4locales[] = { - "ee", "ee_EE", 0 }; + "ee", "ee_EE", nullptr }; static const char * const iso8859_5locales[] = { - "mk", "mk_MK", "sp", "sp_YU", 0 }; + "mk", "mk_MK", "sp", "sp_YU", nullptr }; static const char * const cp_1251locales[] = { - "be", "be_BY", "bg", "bg_BG", "bulgarian", 0 }; + "be", "be_BY", "bg", "bg_BG", "bulgarian", nullptr }; static const char * const pt_154locales[] = { - "ba_RU", "ky", "ky_KG", "kk", "kk_KZ", 0 }; + "ba_RU", "ky", "ky_KG", "kk", "kk_KZ", nullptr }; static const char * const iso8859_6locales[] = { - "ar_AA", "ar_SA", "arabic", 0 }; + "ar_AA", "ar_SA", "arabic", nullptr }; static const char * const iso8859_7locales[] = { - "el", "el_GR", "greek", 0 }; + "el", "el_GR", "greek", nullptr }; static const char * const iso8859_8locales[] = { - "hebrew", "he", "he_IL", "iw", "iw_IL", 0 }; + "hebrew", "he", "he_IL", "iw", "iw_IL", nullptr }; static const char * const iso8859_9locales[] = { - "tr", "tr_TR", "turkish", 0 }; + "tr", "tr_TR", "turkish", nullptr }; static const char * const iso8859_13locales[] = { - "lt", "lt_LT", "lv", "lv_LV", 0 }; + "lt", "lt_LT", "lv", "lv_LV", nullptr }; static const char * const iso8859_15locales[] = { "et", "et_EE", @@ -749,23 +749,23 @@ static const char * const iso8859_15locales[] = { "es", "es_ES", "eu_ES", "fi", "fi_FI", "finnish", "fr", "fr_FR", "fr_BE", "fr_LU", "french", "ga_IE", "gl_ES", "it", "it_IT", "oc_FR", "nl", "nl_BE", "nl_NL", "pt", "pt_PT", "sv_FI", "wa_BE", - 0 }; + nullptr }; static const char * const koi8_ulocales[] = { - "uk", "uk_UA", "ru_UA", "ukrainian", 0 }; + "uk", "uk_UA", "ru_UA", "ukrainian", nullptr }; static const char * const tis_620locales[] = { - "th", "th_TH", "thai", 0 }; + "th", "th_TH", "thai", nullptr }; static const char * const tcvnlocales[] = { - "vi", "vi_VN", 0 }; + "vi", "vi_VN", nullptr }; static bool try_locale_list( const char * const locale[], const char * lang ) { int i; for( i=0; locale[i] && *locale[i] && strcmp(locale[i], lang); i++ ) ; - return locale[i] != 0; + return locale[i]; } // For the probably_koi8_locales we have to look. the standard says @@ -780,10 +780,10 @@ static bool try_locale_list( const char * const locale[], const char * lang ) // ru_RU.KOI8-R. static const char * const probably_koi8_rlocales[] = { - "ru", "ru_SU", "ru_RU", "russian", 0 }; + "ru", "ru_SU", "ru_RU", "russian", nullptr }; static TQTextCodec * ru_RU_hack( const char * i ) { - TQTextCodec * ru_RU_codec = 0; + TQTextCodec * ru_RU_codec = nullptr; TQCString origlocale = setlocale( LC_CTYPE, i ); // unicode koi8r latin5 name @@ -854,11 +854,11 @@ TQTextCodec* TQTextCodec::codecForName( const char* name, int accuracy ) } if ( !name || !*name ) - return 0; + return nullptr; setup(); TQValueList::ConstIterator i; - TQTextCodec* result = 0; + TQTextCodec* result = nullptr; int best = accuracy; TQTextCodec* cursor; for ( i = all->begin(); i != all->end(); ++i ) { @@ -901,7 +901,7 @@ TQTextCodec* TQTextCodec::codecForContent(const char* chars, int len) setup(); TQValueList::ConstIterator i; - TQTextCodec* result = 0; + TQTextCodec* result = nullptr; int best=0; TQTextCodec* cursor; for ( i = all->begin(); i != all->end(); ++i ) { @@ -1020,7 +1020,7 @@ TQTextEncoder* TQTextCodec::makeEncoder() const */ TQString TQTextCodec::toUnicode(const char* chars, int len) const { - if ( chars == 0 ) + if ( !chars ) return TQString::null; TQTextDecoder* i = makeDecoder(); TQString result = i->toUnicode(chars,len); @@ -1247,7 +1247,7 @@ TQTextDecoder::~TQTextDecoder() struct TQMultiByteUnicodeTable { // If multiByte, ignore unicode and index into multiByte // with the next character. - TQMultiByteUnicodeTable() : unicode(0xfffd), multiByte(0) { } + TQMultiByteUnicodeTable() : unicode(0xfffd), multiByte(nullptr) { } ~TQMultiByteUnicodeTable() { @@ -1305,10 +1305,10 @@ class TQTextCodecFromIOD : public TQTextCodec { public: TQTextCodecFromIOD(TQIODevice* iod) { - from_unicode_page = 0; - to_unicode_multiByte = 0; - to_unicode = 0; - from_unicode_page_multiByte = 0; + from_unicode_page = nullptr; + to_unicode_multiByte = nullptr; + to_unicode = nullptr; + from_unicode_page_multiByte = nullptr; max_bytes_per_char = 1; const int maxlen=100; @@ -1329,7 +1329,7 @@ public: if (!from_unicode_page) { from_unicode_page = new char*[256]; for (int i=0; i<256; i++) - from_unicode_page[i]=0; + from_unicode_page[i]=nullptr; } if (!to_unicode) { to_unicode = new ushort[256]; @@ -1340,7 +1340,7 @@ public: else if (incmap) { char* cursor = line; int byte=-1,unicode=-1; - ushort* mb_unicode=0; + ushort* mb_unicode=nullptr; const int maxmb=8; // more -> we'll need to improve datastructures char mb[maxmb+1]; int nmb=0; @@ -1363,10 +1363,10 @@ public: for (int i=0; i<256; i++) { to_unicode_multiByte[i].unicode = to_unicode[i]; - to_unicode_multiByte[i].multiByte = 0; + to_unicode_multiByte[i].multiByte = nullptr; } delete [] to_unicode; - to_unicode = 0; + to_unicode = nullptr; } TQMultiByteUnicodeTable* mbut = to_unicode_multiByte+byte; @@ -1406,12 +1406,12 @@ public: if (!from_unicode_page_multiByte) { from_unicode_page_multiByte = new char**[256]; for (int i=0; i<256; i++) - from_unicode_page_multiByte[i]=0; + from_unicode_page_multiByte[i]=nullptr; } if (!from_unicode_page_multiByte[ch.row()]) { from_unicode_page_multiByte[ch.row()] = new char*[256]; for (int i=0; i<256; i++) - from_unicode_page_multiByte[ch.row()][i] = 0; + from_unicode_page_multiByte[ch.row()][i] = nullptr; } mb[nmb++] = 0; from_unicode_page_multiByte[ch.row()][ch.cell()] @@ -1529,7 +1529,7 @@ public: int rlen = lenInOut*max_bytes_per_char; TQCString rstr(rlen+1); char* cursor = rstr.data(); - char* s=0; + char* s=nullptr; int l = lenInOut; int lout = 0; for (int i=0; i -static TQPluginManager *manager = 0; +static TQPluginManager *manager = nullptr; static TQSingleCleanupHandler< TQPluginManager > cleanup_manager; static void create_manager() @@ -66,7 +66,7 @@ static void create_manager() #ifdef TQT_THREAD_SUPPORT // protect manager creation TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &manager ) : 0); + tqt_global_mutexpool->get( &manager ) : nullptr); // we check the manager pointer again to make sure that another thread // has not created the manager before us. @@ -88,7 +88,7 @@ static void create_manager() TQTextCodec *TQTextCodecFactory::createForName(const TQString &name) { - TQTextCodec *codec = 0; + TQTextCodec *codec = nullptr; #ifndef TQT_NO_COMPONENT @@ -109,7 +109,7 @@ TQTextCodec *TQTextCodecFactory::createForName(const TQString &name) TQTextCodec *TQTextCodecFactory::createForMib(int mib) { - TQTextCodec *codec = 0; + TQTextCodec *codec = nullptr; #ifndef TQT_NO_COMPONENT diff --git a/src/codecs/tqtextcodecplugin.cpp b/src/codecs/tqtextcodecplugin.cpp index 046b009f7..1b6450983 100644 --- a/src/codecs/tqtextcodecplugin.cpp +++ b/src/codecs/tqtextcodecplugin.cpp @@ -129,7 +129,7 @@ TQTextCodecPluginPrivate::~TQTextCodecPluginPrivate() TQRESULT TQTextCodecPluginPrivate::queryInterface( const TQUuid &iid, TQUnknownInterface **iface ) { - *iface = 0; + *iface = nullptr; if ( iid == IID_QUnknown ) *iface = this; diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp index a80b63bc1..643568b27 100644 --- a/src/dialogs/tqcolordialog.cpp +++ b/src/dialogs/tqcolordialog.cpp @@ -78,7 +78,7 @@ class TQWellArray : public TQGridView TQ_PROPERTY( int selectedRow READ selectedRow ) public: - TQWellArray( TQWidget* parent=0, const char* name=0, bool popup = false ); + TQWellArray( TQWidget* parent=nullptr, const char* name=nullptr, bool popup = false ); ~TQWellArray() {} TQString cellContent( int row, int col ) const; @@ -149,7 +149,7 @@ TQWellArray::TQWellArray( TQWidget *parent, const char * name, bool popup ) : TQGridView( parent, name, (popup ? (WStyle_Customize|WStyle_Tool|WStyle_NoBorder) : 0 ) ) { - d = 0; + d = nullptr; setFocusPolicy( StrongFocus ); setVScrollBarMode(AlwaysOff); setHScrollBarMode(AlwaysOff); @@ -351,7 +351,7 @@ void TQWellArray::dimensionChange( int, int ) if ( d->brush ) delete[] d->brush; delete d; - d = 0; + d = nullptr; } } @@ -634,7 +634,7 @@ class TQColorPicker : public TQFrame { TQ_OBJECT public: - TQColorPicker(TQWidget* parent=0, const char* name=0); + TQColorPicker(TQWidget* parent=nullptr, const char* name=nullptr); ~TQColorPicker(); public slots: @@ -668,7 +668,7 @@ class TQColorLuminancePicker : public TQWidget { TQ_OBJECT public: - TQColorLuminancePicker(TQWidget* parent=0, const char* name=0); + TQColorLuminancePicker(TQWidget* parent=nullptr, const char* name=nullptr); ~TQColorLuminancePicker(); public slots: @@ -714,7 +714,7 @@ TQColorLuminancePicker::TQColorLuminancePicker(TQWidget* parent, :TQWidget( parent, name ) { hue = 100; val = 100; sat = 100; - pix = 0; + pix = nullptr; // setBackgroundMode( NoBackground ); } @@ -737,7 +737,7 @@ void TQColorLuminancePicker::setVal( int v ) if ( val == v ) return; val = TQMAX( 0, TQMIN(v,255)); - delete pix; pix=0; + delete pix; pix=nullptr; repaint( false ); //### emit newHsv( hue, sat, val ); } @@ -788,7 +788,7 @@ void TQColorLuminancePicker::setCol( int h, int s , int v ) val = v; hue = h; sat = s; - delete pix; pix=0; + delete pix; pix=nullptr; repaint( false );//#### } @@ -880,7 +880,7 @@ class TQColIntValidator: public TQIntValidator { public: TQColIntValidator( int bottom, int top, - TQWidget * parent, const char *name = 0 ) + TQWidget * parent, const char *name = nullptr ) :TQIntValidator( bottom, top, parent, name ) {} TQValidator::State validate( TQString &, int & ) const; @@ -909,7 +909,7 @@ TQValidator::State TQColIntValidator::validate( TQString &s, int &pos ) const class TQColNumLineEdit : public TQLineEdit { public: - TQColNumLineEdit( TQWidget *parent, const char* name=0 ) + TQColNumLineEdit( TQWidget *parent, const char* name=nullptr ) : TQLineEdit( parent, name ) { setMaxLength( 3 );} TQSize sizeHint() const { return TQSize( fontMetrics().width( "999" ) + 2 * ( margin() + frameWidth() ), @@ -930,7 +930,7 @@ class TQColorShower : public TQWidget { TQ_OBJECT public: - TQColorShower( TQWidget *parent, const char *name=0 ); + TQColorShower( TQWidget *parent, const char *name=nullptr ); //things that don't emit signals void setHsv( int h, int s, int v ); @@ -1312,7 +1312,7 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : if ( compact ) border = 6; TQHBoxLayout *topLay = new TQHBoxLayout( dialog, border, 6 ); - TQVBoxLayout *leftLay = 0; + TQVBoxLayout *leftLay = nullptr; if ( !compact ) leftLay = new TQVBoxLayout( topLay ); @@ -1352,8 +1352,8 @@ TQColorDialogPrivate::TQColorDialogPrivate( TQColorDialog *dialog ) : pWidth = 150; pHeight = 100; - custom = 0; - standard = 0; + custom = nullptr; + standard = nullptr; } TQVBoxLayout *rightLay = new TQVBoxLayout( topLay ); diff --git a/src/dialogs/tqcolordialog.h b/src/dialogs/tqcolordialog.h index 93b6daf19..a51f16455 100644 --- a/src/dialogs/tqcolordialog.h +++ b/src/dialogs/tqcolordialog.h @@ -54,9 +54,9 @@ class TQ_EXPORT TQColorDialog : public TQDialog TQ_OBJECT public: - static TQColor getColor( const TQColor& init = white, TQWidget* parent=0, const char* name=0 ); - static TQRgb getRgba( TQRgb, bool* ok = 0, - TQWidget* parent=0, const char* name=0 ); + static TQColor getColor( const TQColor& init = white, TQWidget* parent=nullptr, const char* name=nullptr ); + static TQRgb getRgba( TQRgb, bool* ok = nullptr, + TQWidget* parent=nullptr, const char* name=nullptr ); static int customCount(); static TQRgb customColor( int ); @@ -65,7 +65,7 @@ public: private: ~TQColorDialog(); - TQColorDialog( TQWidget* parent=0, const char* name=0, bool modal=false ); + TQColorDialog( TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false ); void setColor( const TQColor& ); TQColor color() const; diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp index c9d83006b..462bc6f67 100644 --- a/src/dialogs/tqdialog.cpp +++ b/src/dialogs/tqdialog.cpp @@ -214,9 +214,9 @@ class TQDialogPrivate : public TQt public: TQDialogPrivate() - : mainDef(0), orientation(Horizontal),extension(0), doShowExtension(false) + : mainDef(nullptr), orientation(Horizontal),extension(nullptr), doShowExtension(false) #ifndef TQT_NO_SIZEGRIP - ,resizer(0) + ,resizer(nullptr) #endif { } @@ -314,7 +314,7 @@ void TQDialog::setDefault( TQPushButton *pushButton ) void TQDialog::setMainDefault( TQPushButton *pushButton ) { #ifndef TQT_NO_PUSHBUTTON - d->mainDef = 0; + d->mainDef = nullptr; setDefault(pushButton); #endif } @@ -483,7 +483,7 @@ void TQDialog::done( int r ) widget = list->next(); } delete list; - if ( widget == 0 ) + if ( !widget ) emit tqApp->lastWindowClosed(); } if ( isMain ) @@ -540,7 +540,7 @@ void TQDialog::contextMenuEvent( TQContextMenuEvent *e ) w = w->parentWidget(true); } if ( !s.isEmpty() ) { - TQPopupMenu p(0,"qt_whats_this_menu"); + TQPopupMenu p(nullptr,"qt_whats_this_menu"); p.insertItem( tr("What's This?"), 42 ); if ( p.exec( e->globalPos() ) >= 42 ) TQWhatsThis::display( s, w->mapToGlobal( w->rect().center() ), w ); @@ -819,7 +819,7 @@ void TQDialog::adjustPositionInternal( TQWidget*w, bool useRelPos) TQWidgetList *list = TQApplication::topLevelWidgets(); TQWidgetListIt it( *list ); while ( (extraw == 0 || extrah == 0) && - it.current() != 0 ) { + it.current() ) { int framew, frameh; TQWidget * current = it.current(); ++it; @@ -1156,7 +1156,7 @@ void TQDialog::setSizeGripEnabled(bool enabled) d->resizer->show(); } else { delete d->resizer; - d->resizer = 0; + d->resizer = nullptr; } } #endif //TQT_NO_SIZEGRIP diff --git a/src/dialogs/tqdialog.h b/src/dialogs/tqdialog.h index 35bd0e40c..9e046d9f5 100644 --- a/src/dialogs/tqdialog.h +++ b/src/dialogs/tqdialog.h @@ -60,7 +60,7 @@ friend class TQPushButton; TQ_PROPERTY( bool modal READ isModal WRITE setModal ) public: - explicit TQDialog( TQWidget* parent=0, const char* name=0, bool modal=false, + explicit TQDialog( TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0 ); ~TQDialog(); diff --git a/src/dialogs/tqerrormessage.cpp b/src/dialogs/tqerrormessage.cpp index e8431a345..f40971bd6 100644 --- a/src/dialogs/tqerrormessage.cpp +++ b/src/dialogs/tqerrormessage.cpp @@ -107,13 +107,13 @@ after seeing each message. \sa TQMessageBox TQStatusBar::message() */ -static TQErrorMessage * qtMessageHandler = 0; +static TQErrorMessage * qtMessageHandler = nullptr; static void deleteStaticcTQErrorMessage() // post-routine { if ( qtMessageHandler ) { delete qtMessageHandler; - qtMessageHandler = 0; + qtMessageHandler = nullptr; } } @@ -188,8 +188,8 @@ the list of "do not show again" messages is deleted. */ TQErrorMessage::~TQErrorMessage() { if ( this == qtMessageHandler ) { - qtMessageHandler = 0; - TQtMsgHandler tmp = qInstallMsgHandler( 0 ); + qtMessageHandler = nullptr; + TQtMsgHandler tmp = qInstallMsgHandler( nullptr ); // in case someone else has later stuck in another... if ( tmp != jump ) qInstallMsgHandler( tmp ); @@ -223,7 +223,7 @@ isn't one already. TQErrorMessage * TQErrorMessage::qtHandler() { if ( !qtMessageHandler ) { - qtMessageHandler = new TQErrorMessage( 0, "automatic message handler" ); + qtMessageHandler = new TQErrorMessage( nullptr, "automatic message handler" ); tqAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up #ifndef TQT_NO_WIDGET_TOPEXTRA if ( tqApp->mainWidget() ) diff --git a/src/dialogs/tqerrormessage.h b/src/dialogs/tqerrormessage.h index 21e12a488..35002469f 100644 --- a/src/dialogs/tqerrormessage.h +++ b/src/dialogs/tqerrormessage.h @@ -57,7 +57,7 @@ template class TQDict; class TQ_EXPORT TQErrorMessage: public TQDialog { TQ_OBJECT public: - TQErrorMessage( TQWidget* parent, const char* name=0 ); + TQErrorMessage( TQWidget* parent, const char* name=nullptr ); ~TQErrorMessage(); static TQErrorMessage * qtHandler(); diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp index 1257640c5..61605920c 100644 --- a/src/dialogs/tqfiledialog.cpp +++ b/src/dialogs/tqfiledialog.cpp @@ -453,25 +453,25 @@ static const char * const back_xpm [] = { "....##.......", ".....#......."}; -static TQPixmap * openFolderIcon = 0; -static TQPixmap * closedFolderIcon = 0; -static TQPixmap * detailViewIcon = 0; -static TQPixmap * multiColumnListViewIcon = 0; -static TQPixmap * cdToParentIcon = 0; -static TQPixmap * newFolderIcon = 0; -static TQPixmap * fifteenTransparentPixels = 0; -static TQPixmap * symLinkDirIcon = 0; -static TQPixmap * symLinkFileIcon = 0; -static TQPixmap * fileIcon = 0; -static TQPixmap * startCopyIcon = 0; -static TQPixmap * endCopyIcon = 0; -static TQPixmap * previewContentsViewIcon = 0; -static TQPixmap * previewInfoViewIcon = 0; -static TQPixmap *goBackIcon = 0; -static TQFileIconProvider * fileIconProvider = 0; +static TQPixmap * openFolderIcon = nullptr; +static TQPixmap * closedFolderIcon = nullptr; +static TQPixmap * detailViewIcon = nullptr; +static TQPixmap * multiColumnListViewIcon = nullptr; +static TQPixmap * cdToParentIcon = nullptr; +static TQPixmap * newFolderIcon = nullptr; +static TQPixmap * fifteenTransparentPixels = nullptr; +static TQPixmap * symLinkDirIcon = nullptr; +static TQPixmap * symLinkFileIcon = nullptr; +static TQPixmap * fileIcon = nullptr; +static TQPixmap * startCopyIcon = nullptr; +static TQPixmap * endCopyIcon = nullptr; +static TQPixmap * previewContentsViewIcon = nullptr; +static TQPixmap * previewInfoViewIcon = nullptr; +static TQPixmap *goBackIcon = nullptr; +static TQFileIconProvider * fileIconProvider = nullptr; static int lastWidth = 0; static int lastHeight = 0; -static TQString * workingDirectory = 0; +static TQString * workingDirectory = nullptr; static bool bShowHiddenFiles = false; static int sortFilesBy = (int)TQDir::Name; @@ -558,7 +558,7 @@ static void resolveLibs() class TQWindowsIconProvider : public TQFileIconProvider { public: - TQWindowsIconProvider( TQObject *parent=0, const char *name=0 ); + TQWindowsIconProvider( TQObject *parent=nullptr, const char *name=nullptr ); ~TQWindowsIconProvider(); const TQPixmap * pixmap( const TQFileInfo &fi ); @@ -962,15 +962,15 @@ public: struct File: public TQListViewItem { File( TQFileDialogPrivate * dlgp, const TQUrlInfo * fi, TQListViewItem * parent ) - : TQListViewItem( parent, dlgp->last ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( false ) + : TQListViewItem( parent, dlgp->last ), info( *fi ), d(dlgp), i( nullptr ), hasMimePixmap( false ) { setup(); dlgp->last = this; } File( TQFileDialogPrivate * dlgp, const TQUrlInfo * fi, TQListView * parent ) - : TQListViewItem( parent, dlgp->last ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( false ) + : TQListViewItem( parent, dlgp->last ), info( *fi ), d(dlgp), i( nullptr ), hasMimePixmap( false ) { setup(); dlgp->last = this; } File( TQFileDialogPrivate * dlgp, const TQUrlInfo * fi, TQListView * parent, TQListViewItem * after ) - : TQListViewItem( parent, after ), info( *fi ), d(dlgp), i( 0 ), hasMimePixmap( false ) + : TQListViewItem( parent, after ), info( *fi ), d(dlgp), i( nullptr ), hasMimePixmap( false ) { setup(); if ( !nextSibling() ) dlgp->last = this; } ~File(); @@ -1179,7 +1179,7 @@ void TQRenameEdit::slotReturnPressed() TQFileListBox::TQFileListBox( TQWidget *parent, TQFileDialog *dlg ) : TQListBox( parent, "filelistbox" ), filedialog( dlg ), - renaming( false ), renameItem( 0 ), mousePressed( false ), + renaming( false ), renameItem( nullptr ), mousePressed( false ), firstMousePressEvent( true ) { changeDirTimer = new TQTimer( this ); @@ -1201,7 +1201,7 @@ TQFileListBox::TQFileListBox( TQWidget *parent, TQFileDialog *dlg ) connect( this, TQ_SIGNAL( contentsMoving(int,int) ), this, TQ_SLOT( contentsMoved(int,int) ) ); viewport()->setAcceptDrops( true ); - dragItem = 0; + dragItem = nullptr; } void TQFileListBox::show() @@ -1222,7 +1222,7 @@ void TQFileListBox::keyPressEvent( TQKeyEvent *e ) TQChar keyChar = keyPressed[0]; bool handled = false; if ( keyChar.isLetterOrNumber() ) { - TQListBoxItem * i = 0; + TQListBoxItem * i = nullptr; if ( currentItem() ) i = item( currentItem() ); else @@ -1296,7 +1296,7 @@ void TQFileListBox::viewportMousePressEvent( TQMouseEvent *e ) void TQFileListBox::viewportMouseReleaseEvent( TQMouseEvent *e ) { - dragItem = 0; + dragItem = nullptr; TQListBox::viewportMouseReleaseEvent( e ); mousePressed = false; } @@ -1315,7 +1315,7 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e ) #ifndef TQT_NO_DRAGANDDROP if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() && mousePressed ) { TQListBoxItem *item = dragItem; - dragItem = 0; + dragItem = nullptr; if ( item ) { if ( !itemRect( item ).contains( e->pos() ) ) return; @@ -1357,7 +1357,7 @@ void TQFileListBox::viewportDragEnterEvent( TQDragEnterEvent *e ) { startDragUrl = filedialog->d->url; startDragDir = filedialog->dirPath(); - currDropItem = 0; + currDropItem = nullptr; if ( !TQUriDrag::canDecode( e ) ) { e->ignore(); @@ -1454,7 +1454,7 @@ void TQFileListBox::viewportDropEvent( TQDropEvent *e ) // ##### what is supportAction for? e->acceptAction(); - currDropItem = 0; + currDropItem = nullptr; } bool TQFileListBox::acceptDrop( const TQPoint &pnt, TQWidget *source ) @@ -1477,13 +1477,13 @@ void TQFileListBox::setCurrentDropItem( const TQPoint &pnt ) { changeDirTimer->stop(); - TQListBoxItem *item = 0; + TQListBoxItem *item = nullptr; if ( pnt != TQPoint( -1, -1 ) ) item = itemAt( pnt ); if ( item && !TQUrlInfo( filedialog->d->url, item->text() ).isDir() ) - item = 0; + item = nullptr; if ( item && !itemRect( item ).contains( pnt ) ) - item = 0; + item = nullptr; currDropItem = item; if ( currDropItem ) @@ -1500,7 +1500,7 @@ void TQFileListBox::changeDirDuringDrag() changeDirTimer->stop(); TQUrl u( filedialog->d->url, TQFileDialogPrivate::encodeFileName(currDropItem->text()) ); filedialog->setDir( u ); - currDropItem = 0; + currDropItem = nullptr; #endif } @@ -1555,7 +1555,7 @@ void TQFileListBox::rename() void TQFileListBox::cancelRename() { - renameItem = 0; + renameItem = nullptr; lined->parentWidget()->hide(); viewport()->setFocusProxy( this ); renaming = false; @@ -1579,7 +1579,7 @@ void TQFileListBox::contentsMoved( int, int ) ************************************************************************/ TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *parent, TQFileDialog *dlg ) - : TQListView( parent, "qt_filedlg_listview" ), renaming( false ), renameItem( 0 ), + : TQListView( parent, "qt_filedlg_listview" ), renaming( false ), renameItem( nullptr ), filedialog( dlg ), mousePressed( false ), firstMousePressEvent( true ) { @@ -1610,7 +1610,7 @@ TQFileDialogTQFileListView::TQFileDialogTQFileListView( TQWidget *parent, TQFile viewport()->setAcceptDrops( true ); sortcolumn = 0; ascending = true; - dragItem = 0; + dragItem = nullptr; } void TQFileDialogTQFileListView::setSorting( int column, bool increasing ) @@ -1656,7 +1656,7 @@ void TQFileDialogTQFileListView::keyPressEvent( TQKeyEvent *e ) TQString keyPressed = e->text().lower(); TQChar keyChar = keyPressed[0]; if ( keyChar.isLetterOrNumber() ) { - TQListViewItem * i = 0; + TQListViewItem * i = nullptr; if ( currentItem() ) i = currentItem(); else @@ -1734,7 +1734,7 @@ void TQFileDialogTQFileListView::viewportMouseReleaseEvent( TQMouseEvent *e ) { TQListView::viewportMouseReleaseEvent( e ); mousePressed = false; - dragItem = 0; + dragItem = nullptr; } void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e ) @@ -1745,7 +1745,7 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e ) #ifndef TQT_NO_DRAGANDDROP if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() && mousePressed ) { TQListViewItem *item = dragItem; - dragItem = 0; + dragItem = nullptr; if ( item ) { TQUriDrag* drag = new TQUriDrag( viewport() ); TQStringList files; @@ -1781,7 +1781,7 @@ void TQFileDialogTQFileListView::viewportDragEnterEvent( TQDragEnterEvent *e ) { startDragUrl = filedialog->d->url; startDragDir = filedialog->dirPath(); - currDropItem = 0; + currDropItem = nullptr; if ( !TQUriDrag::canDecode( e ) ) { e->ignore(); @@ -1873,7 +1873,7 @@ void TQFileDialogTQFileListView::viewportDropEvent( TQDropEvent *e ) // ##### what is supportAction for? e->acceptAction(); - currDropItem = 0; + currDropItem = nullptr; } bool TQFileDialogTQFileListView::acceptDrop( const TQPoint &pnt, TQWidget *source ) @@ -1898,12 +1898,12 @@ void TQFileDialogTQFileListView::setCurrentDropItem( const TQPoint &pnt ) TQListViewItem *item = itemAt( pnt ); if ( pnt == TQPoint( -1, -1 ) ) - item = 0; + item = nullptr; if ( item && !TQUrlInfo( filedialog->d->url, item->text( 0 ) ).isDir() ) - item = 0; + item = nullptr; if ( item && !itemRect( item ).contains( pnt ) ) - item = 0; + item = nullptr; currDropItem = item; @@ -1922,7 +1922,7 @@ void TQFileDialogTQFileListView::changeDirDuringDrag() changeDirTimer->stop(); TQUrl u( filedialog->d->url, TQFileDialogPrivate::encodeFileName(currDropItem->text( 0 ) ) ); filedialog->setDir( u ); - currDropItem = 0; + currDropItem = nullptr; #endif // TQT_NO_DRAGANDDROP } @@ -1979,7 +1979,7 @@ void TQFileDialogTQFileListView::rename() void TQFileDialogTQFileListView::cancelRename() { - renameItem = 0; + renameItem = nullptr; lined->parentWidget()->hide(); viewport()->setFocusProxy( this ); renaming = false; @@ -2059,7 +2059,7 @@ TQString TQFileDialogPrivate::File::text( int column ) const const TQPixmap * TQFileDialogPrivate::File::pixmap( int column ) const { if ( column ) { - return 0; + return nullptr; } else if ( TQListViewItem::pixmap( column ) ) { return TQListViewItem::pixmap( column ); } else if ( info.isSymLink() ) { @@ -2466,14 +2466,14 @@ void TQFileDialog::init() setSizeGripEnabled( true ); d = new TQFileDialogPrivate(); d->mode = AnyFile; - d->last = 0; - d->lastEFSelected = 0; - d->moreFiles = 0; + d->last = nullptr; + d->lastEFSelected = nullptr; + d->moreFiles = nullptr; d->infoPreview = false; d->contentsPreview = false; d->hadDotDot = false; d->ignoreNextKeyPress = false; - d->progressDia = 0; + d->progressDia = nullptr; d->checkForFilter = false; d->ignoreNextRefresh = false; d->ignoreStop = false; @@ -2488,7 +2488,7 @@ void TQFileDialog::init() d->url = TQUrlOperator( ::toRootIfNotExists( TQDir::currentDirPath() ) ); d->oldUrl = d->url; - d->currListChildren = 0; + d->currListChildren = nullptr; connect( &d->url, TQ_SIGNAL( start(TQNetworkOperation*) ), this, TQ_SLOT( urlStart(TQNetworkOperation*) ) ); @@ -2574,7 +2574,7 @@ void TQFileDialog::init() TQFileInfo *fi; makeVariables(); - while ( (fi = it.current()) != 0 ) { + while ( (fi = it.current()) ) { ++it; d->paths->insertItem( *openFolderIcon, fi->absFilePath() ); } @@ -2633,7 +2633,7 @@ void TQFileDialog::init() connect( d->newFolder, TQ_SIGNAL(clicked()), this, TQ_SLOT(newFolderClicked()) ); - d->modeButtons = new TQButtonGroup( 0, "invisible group" ); + d->modeButtons = new TQButtonGroup( nullptr, "invisible group" ); connect( d->modeButtons, TQ_SIGNAL(destroyed()), this, TQ_SLOT(modeButtonsDestroyed()) ); d->modeButtons->setExclusive( true ); @@ -2720,7 +2720,7 @@ void TQFileDialog::init() d->infoPreviewWidget = new TQWidget( d->preview, "qt_preview_info" ); d->contentsPreviewWidget = new TQWidget( d->preview, "qt_preview_contents" ); - d->infoPreviewer = d->contentsPreviewer = 0; + d->infoPreviewer = d->contentsPreviewer = nullptr; h = new TQHBoxLayout( 0 ); d->buttonLayout = h; @@ -2926,7 +2926,7 @@ TQFileDialog::~TQFileDialog() #endif delete d; - d = 0; + d = nullptr; } @@ -3252,7 +3252,7 @@ const TQDir *TQFileDialog::dir() const if ( d->url.isLocalFile() ) return new TQDir( d->url.path() ); else - return 0; + return nullptr; } /*! @@ -3940,7 +3940,7 @@ r.setHeight( TQMAX(r.height(),t.height()) ) d->mcView->setFixedSize( r ); d->detailView->setFixedSize( r ); - TQButton *b = 0; + TQButton *b = nullptr; if ( !d->toolButtons.isEmpty() ) { for ( b = d->toolButtons.first(); b; b = d->toolButtons.next() ) b->setFixedSize( b->sizeHint().width(), r.height() ); @@ -4048,7 +4048,7 @@ void TQFileDialog::listBoxSelectionChanged() nameEdit->clear(); TQString str; TQListBoxItem * i = d->moreFiles->item( 0 ); - TQListBoxItem * j = 0; + TQListBoxItem * j = nullptr; int index = 0; files->blockSignals( true ); while( i ) { @@ -4075,7 +4075,7 @@ void TQFileDialog::listBoxSelectionChanged() if ( d->moreFiles->isSelected( i ) && !( (TQFileDialogPrivate::File*)(mcitem)->i )->info.isDir() ) { str += TQString( "\"%1\" " ).arg( i->text() ); - if ( j == 0 ) + if ( !j ) j = i; } i = d->moreFiles->item( ++index ); @@ -4273,7 +4273,7 @@ void TQFileDialog::popupContextMenu( const TQString &filename, bool, bool glob = filename.isEmpty(); - TQPopupMenu m( 0, "file dialog context menu" ); + TQPopupMenu m( nullptr, "file dialog context menu" ); m.setCheckable( true ); if ( !glob ) { @@ -4312,7 +4312,7 @@ void TQFileDialog::popupContextMenu( const TQString &filename, bool, } else { int reload = m.insertItem( tr( "R&eload" ) ); - TQPopupMenu m2( 0, "sort menu" ); + TQPopupMenu m2( nullptr, "sort menu" ); int sname = m2.insertItem( tr( "Sort by &Name" ) ); //int stype = m2.insertItem( tr( "Sort by &Type" ) ); @@ -4535,7 +4535,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, return winGetExistingDirectory( initialDir, parent, name, caption ); #endif #if defined(TQ_WS_MAC) - TQString *initialDir = 0; + TQString *initialDir = nullptr; if (!dir.isEmpty()) { TQUrlOperator u(dir); if (TQFileInfo(u.path()).isDir()) @@ -5600,7 +5600,7 @@ void TQFileDialog::addFilter( const TQString &filter ) void TQFileDialog::modeButtonsDestroyed() { if ( d ) - d->modeButtons = 0; + d->modeButtons = nullptr; } @@ -5834,7 +5834,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op ) d->paths->insertItem( *openFolderIcon, s, -1 ); d->paths->setCurrentItem( d->paths->count() - 1 ); } - d->last = 0; + d->last = nullptr; d->hadDotDot = false; if ( d->goBack && d->history.last() != d->url.toString() ) { @@ -5866,7 +5866,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op ) d->ignoreStop = true; d->progressDia->close(); delete d->progressDia; - d->progressDia = 0; + d->progressDia = nullptr; } int ecode = op->errorCode(); @@ -5900,7 +5900,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op ) ui.setSize( 0 ); TQValueList lst; lst << ui; - insertEntry( lst, 0 ); + insertEntry( lst, nullptr ); } } resortDir(); @@ -5912,7 +5912,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op ) d->progressDia->close(); } delete d->progressDia; - d->progressDia = 0; + d->progressDia = nullptr; } #if defined(TQ_WS_WIN) @@ -6011,8 +6011,8 @@ void TQFileDialog::insertEntry( const TQValueList &lst, TQNetworkOper } #endif if ( !d->url.isLocalFile() ) { - TQFileDialogPrivate::File * i = 0; - TQFileDialogPrivate::MCItem *i2 = 0; + TQFileDialogPrivate::File * i = nullptr; + TQFileDialogPrivate::MCItem *i2 = nullptr; i = new TQFileDialogPrivate::File( d, &inf, files ); i2 = new TQFileDialogPrivate::MCItem( d->moreFiles, i ); @@ -6034,7 +6034,7 @@ void TQFileDialog::removeEntry( TQNetworkOperation *op ) if ( !op ) return; - TQUrlInfo *i = 0; + TQUrlInfo *i = nullptr; TQListViewItemIterator it( files ); bool ok1 = false, ok2 = false; for ( i = d->sortedList.first(); it.current(); ++it, i = d->sortedList.next() ) { @@ -6061,7 +6061,7 @@ void TQFileDialog::itemChanged( TQNetworkOperation *op ) if ( !op ) return; - TQUrlInfo *i = 0; + TQUrlInfo *i = nullptr; TQListViewItemIterator it1( files ); bool ok1 = false, ok2 = false; // first check whether the new file replaces an existing file. @@ -6080,7 +6080,7 @@ void TQFileDialog::itemChanged( TQNetworkOperation *op ) break; } - i = 0; + i = nullptr; TQListViewItemIterator it( files ); ok1 = false; ok2 = false; @@ -6280,15 +6280,15 @@ void TQFileDialog::resortDir() d->mimeTypeTimer->stop(); d->pendingItems.clear(); - TQFileDialogPrivate::File *item = 0; - TQFileDialogPrivate::MCItem *item2 = 0; + TQFileDialogPrivate::File *item = nullptr; + TQFileDialogPrivate::MCItem *item2 = nullptr; d->sortedList.sort(); if ( files->childCount() > 0 || d->moreFiles->count() > 0 ) { d->moreFiles->clear(); files->clear(); - d->last = 0; + d->last = nullptr; files->setSorting( -1 ); } @@ -6340,7 +6340,7 @@ void TQFileDialog::removeProgressDia() { if ( d->progressDia ) delete d->progressDia; - d->progressDia = 0; + d->progressDia = nullptr; } /*! diff --git a/src/dialogs/tqfiledialog.h b/src/dialogs/tqfiledialog.h index 912c9a557..ad2eb6ae2 100644 --- a/src/dialogs/tqfiledialog.h +++ b/src/dialogs/tqfiledialog.h @@ -71,7 +71,7 @@ class TQ_EXPORT TQFileIconProvider : public TQObject { TQ_OBJECT public: - TQFileIconProvider( TQObject * parent = 0, const char* name = 0 ); + TQFileIconProvider( TQObject * parent = nullptr, const char* name = nullptr ); virtual const TQPixmap * pixmap( const TQFileInfo & ); private: // Disabled copy constructor and operator= @@ -108,36 +108,36 @@ class TQ_EXPORT TQFileDialog : public TQDialog public: TQFileDialog( const TQString& dirName, const TQString& filter = TQString::null, - TQWidget* parent=0, const char* name=0, bool modal = false ); - TQFileDialog( TQWidget* parent=0, const char* name=0, bool modal = false ); + TQWidget* parent=nullptr, const char* name=nullptr, bool modal = false ); + TQFileDialog( TQWidget* parent=nullptr, const char* name=nullptr, bool modal = false ); ~TQFileDialog(); // recommended static functions static TQString getOpenFileName( const TQString &initially = TQString::null, const TQString &filter = TQString::null, - TQWidget *parent = 0, const char* name = 0, + TQWidget *parent = nullptr, const char* name = nullptr, const TQString &caption = TQString::null, - TQString *selectedFilter = 0, + TQString *selectedFilter = nullptr, bool resolveSymlinks = true); static TQString getSaveFileName( const TQString &initially = TQString::null, const TQString &filter = TQString::null, - TQWidget *parent = 0, const char* name = 0, + TQWidget *parent = nullptr, const char* name = nullptr, const TQString &caption = TQString::null, - TQString *selectedFilter = 0, + TQString *selectedFilter = nullptr, bool resolveSymlinks = true); static TQString getExistingDirectory( const TQString &dir = TQString::null, - TQWidget *parent = 0, - const char* name = 0, + TQWidget *parent = nullptr, + const char* name = nullptr, const TQString &caption = TQString::null, bool dirOnly = true, bool resolveSymlinks = true); static TQStringList getOpenFileNames( const TQString &filter= TQString::null, const TQString &dir = TQString::null, - TQWidget *parent = 0, - const char* name = 0, + TQWidget *parent = nullptr, + const char* name = nullptr, const TQString &caption = TQString::null, - TQString *selectedFilter = 0, + TQString *selectedFilter = nullptr, bool resolveSymlinks = true); // other static functions @@ -301,26 +301,26 @@ private: static TQString winGetOpenFileName( const TQString &initialSelection, const TQString &filter, TQString* workingDirectory, - TQWidget *parent = 0, - const char* name = 0, + TQWidget *parent = nullptr, + const char* name = nullptr, const TQString& caption = TQString::null, - TQString* selectedFilter = 0 ); + TQString* selectedFilter = nullptr ); static TQString winGetSaveFileName( const TQString &initialSelection, const TQString &filter, TQString* workingDirectory, - TQWidget *parent = 0, - const char* name = 0, + TQWidget *parent = nullptr, + const char* name = nullptr, const TQString& caption = TQString::null, - TQString* selectedFilter = 0 ); + TQString* selectedFilter = nullptr ); static TQStringList winGetOpenFileNames( const TQString &filter, TQString* workingDirectory, - TQWidget *parent = 0, - const char* name = 0, + TQWidget *parent = nullptr, + const char* name = nullptr, const TQString& caption = TQString::null, - TQString* selectedFilter = 0 ); + TQString* selectedFilter = nullptr ); static TQString winGetExistingDirectory( const TQString &initialDirectory, - TQWidget* parent = 0, - const char* name = 0, + TQWidget* parent = nullptr, + const char* name = nullptr, const TQString& caption = TQString::null); static TQString resolveLinkFile( const TQString& linkfile ); #endif diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp index 37d9b75da..4a9ed42ff 100644 --- a/src/dialogs/tqfontdialog.cpp +++ b/src/dialogs/tqfontdialog.cpp @@ -316,7 +316,7 @@ TQFontDialog::TQFontDialog( TQWidget *parent, const char *name, TQFontDialog::~TQFontDialog() { delete d; - d = 0; + d = nullptr; } /*! @@ -388,7 +388,7 @@ TQFont TQFontDialog::getFont( bool *ok, const TQFont &initial, */ TQFont TQFontDialog::getFont( bool *ok, TQWidget *parent,const char* name) { - return getFont( ok, 0, parent, name ); + return getFont( ok, nullptr, parent, name ); } extern bool tqt_use_native_dialogs; diff --git a/src/dialogs/tqfontdialog.h b/src/dialogs/tqfontdialog.h index 178781ee7..4ce675158 100644 --- a/src/dialogs/tqfontdialog.h +++ b/src/dialogs/tqfontdialog.h @@ -68,14 +68,14 @@ class TQ_EXPORT TQFontDialog: public TQDialog public: static TQFont getFont( bool *ok, const TQFont &def, - TQWidget* parent=0, const char* name=0); - static TQFont getFont( bool *ok, TQWidget* parent=0, const char* name=0); + TQWidget* parent=nullptr, const char* name=nullptr); + static TQFont getFont( bool *ok, TQWidget* parent=nullptr, const char* name=nullptr); private: static TQFont getFont( bool *ok, const TQFont *def, - TQWidget* parent=0, const char* name=0); + TQWidget* parent=nullptr, const char* name=nullptr); - TQFontDialog( TQWidget* parent=0, const char* name=0, bool modal=false, + TQFontDialog( TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0 ); ~TQFontDialog(); diff --git a/src/dialogs/tqinputdialog.cpp b/src/dialogs/tqinputdialog.cpp index fb1d0823b..3b71067bd 100644 --- a/src/dialogs/tqinputdialog.cpp +++ b/src/dialogs/tqinputdialog.cpp @@ -129,9 +129,9 @@ TQInputDialog::TQInputDialog( const TQString &label, TQWidget* parent, : TQDialog( parent, name, modal ) { d = new TQInputDialogPrivate; - d->lineEdit = 0; - d->spinBox = 0; - d->comboBox = 0; + d->lineEdit = nullptr; + d->spinBox = nullptr; + d->comboBox = nullptr; TQVBoxLayout *vbox = new TQVBoxLayout( this, 6, 6 ); @@ -215,7 +215,7 @@ TQComboBox *TQInputDialog::editableComboBox() const void TQInputDialog::setType( Type t ) { - TQWidget *input = 0; + TQWidget *input = nullptr; switch ( t ) { case LineEdit: input = d->lineEdit; diff --git a/src/dialogs/tqinputdialog.h b/src/dialogs/tqinputdialog.h index 0347efee9..29be34c34 100644 --- a/src/dialogs/tqinputdialog.h +++ b/src/dialogs/tqinputdialog.h @@ -60,7 +60,7 @@ class TQ_EXPORT TQInputDialog : public TQDialog private: enum Type { LineEdit, SpinBox, ComboBox, EditableComboBox }; - TQInputDialog( const TQString &label, TQWidget* parent=0, const char* name=0, + TQInputDialog( const TQString &label, TQWidget* parent=nullptr, const char* name=nullptr, bool modal = true, Type type = LineEdit ); //### 4.0: widget flag! ~TQInputDialog(); @@ -75,16 +75,16 @@ private: public: //### 4.0: widget flag! static TQString getText( const TQString &caption, const TQString &label, TQLineEdit::EchoMode echo = TQLineEdit::Normal, - const TQString &text = TQString::null, bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); + const TQString &text = TQString::null, bool *ok = nullptr, TQWidget *parent = nullptr, const char *name = nullptr ); static int getInteger( const TQString &caption, const TQString &label, int value = 0, int minValue = -2147483647, int maxValue = 2147483647, - int step = 1, bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); + int step = 1, bool *ok = nullptr, TQWidget *parent = nullptr, const char *name = nullptr ); static double getDouble( const TQString &caption, const TQString &label, double value = 0, double minValue = -2147483647, double maxValue = 2147483647, - int decimals = 1, bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); + int decimals = 1, bool *ok = nullptr, TQWidget *parent = nullptr, const char *name = nullptr ); static TQString getItem( const TQString &caption, const TQString &label, const TQStringList &list, int current = 0, bool editable = true, - bool *ok = 0, TQWidget *parent = 0, const char *name = 0 ); + bool *ok = nullptr, TQWidget *parent = nullptr, const char *name = nullptr ); private slots: void textChanged( const TQString &s ); diff --git a/src/dialogs/tqmessagebox.cpp b/src/dialogs/tqmessagebox.cpp index 436194325..01d850cff 100644 --- a/src/dialogs/tqmessagebox.cpp +++ b/src/dialogs/tqmessagebox.cpp @@ -457,7 +457,7 @@ static const char * const mb_texts[] = { #else const char * mb_texts[] = { #endif - 0, + nullptr, TQT_TRANSLATE_NOOP("TQMessageBox","OK"), TQT_TRANSLATE_NOOP("TQMessageBox","Cancel"), TQT_TRANSLATE_NOOP("TQMessageBox","&Yes"), @@ -467,7 +467,7 @@ const char * mb_texts[] = { TQT_TRANSLATE_NOOP("TQMessageBox","&Ignore"), TQT_TRANSLATE_NOOP("TQMessageBox","Yes to &All"), TQT_TRANSLATE_NOOP("TQMessageBox","N&o to All"), - 0 + nullptr }; /*! @@ -579,7 +579,7 @@ TQMessageBox::~TQMessageBox() delete mbd; } -static TQString * translatedTextAboutTQt = 0; +static TQString * translatedTextAboutTQt = nullptr; void TQMessageBox::init( int button0, int button1, int button2 ) { @@ -666,7 +666,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) } for ( i=0; i<3; i++ ) { if ( i >= mbd->numButtons ) { - mbd->pb[i] = 0; + mbd->pb[i] = nullptr; } else { TQCString buttonName; buttonName.sprintf( "button%d", i+1 ); @@ -683,7 +683,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) } } resizeButtons(); - reserved1 = reserved2 = 0; + reserved1 = reserved2 = nullptr; } @@ -1306,15 +1306,15 @@ void TQMessageBox::about( TQWidget *parent, const TQString &caption, WDestructiveClose); TQ_CHECK_PTR( mb ); #ifndef TQT_NO_WIDGET_TOPEXTRA - const TQPixmap *pm = parent ? parent->icon() : 0; + const TQPixmap *pm = parent ? parent->icon() : nullptr; if ( pm && !pm->isNull() ) mb->setIconPixmap( *pm ); else { - pm = parent ? parent->topLevelWidget()->icon() : 0; + pm = parent ? parent->topLevelWidget()->icon() : nullptr; if ( pm && !pm->isNull() ) mb->setIconPixmap( *pm ); else { - pm = tqApp && tqApp->mainWidget() ? tqApp->mainWidget()->icon() : 0; + pm = tqApp && tqApp->mainWidget() ? tqApp->mainWidget()->icon() : nullptr; if ( pm && !pm->isNull() ) mb->setIconPixmap( *pm ); } diff --git a/src/dialogs/tqmessagebox.h b/src/dialogs/tqmessagebox.h index 86a96fc2d..875d69ff6 100644 --- a/src/dialogs/tqmessagebox.h +++ b/src/dialogs/tqmessagebox.h @@ -64,10 +64,10 @@ public: enum Icon { NoIcon = 0, Information = 1, Warning = 2, Critical = 3, Question = 4 }; - TQMessageBox( TQWidget* parent=0, const char* name=0 ); + TQMessageBox( TQWidget* parent=nullptr, const char* name=nullptr ); TQMessageBox( const TQString& caption, const TQString &text, Icon icon, int button0, int button1, int button2, - TQWidget* parent=0, const char* name=0, bool modal=true, + TQWidget* parent=nullptr, const char* name=nullptr, bool modal=true, WFlags f=WStyle_DialogBorder ); ~TQMessageBox(); @@ -129,7 +129,7 @@ public: static int message( const TQString &caption, const TQString& text, const TQString& buttonText=TQString::null, - TQWidget *parent=0, const char * =0 ) { + TQWidget *parent=nullptr, const char * =nullptr ) { return TQMessageBox::information( parent, caption, text, buttonText.isEmpty() ? tr("OK") : buttonText ) == 0; @@ -140,7 +140,7 @@ public: const TQString& text, const TQString& yesButtonText=TQString::null, const TQString& noButtonText=TQString::null, - TQWidget *parent=0, const char * = 0 ) { + TQWidget *parent=nullptr, const char * = nullptr ) { return TQMessageBox::information( parent, caption, text, yesButtonText.isEmpty() ? tr("OK") : yesButtonText, diff --git a/src/dialogs/tqprintdialog.cpp b/src/dialogs/tqprintdialog.cpp index 15272e8fa..03bc8920d 100644 --- a/src/dialogs/tqprintdialog.cpp +++ b/src/dialogs/tqprintdialog.cpp @@ -151,7 +151,7 @@ public: typedef void (*Q_PrintDialogHook)(TQListView *); -static Q_PrintDialogHook addPrinterHook = 0; +static Q_PrintDialogHook addPrinterHook = nullptr; void qt_set_printdialog_hook( Q_PrintDialogHook hook ) { @@ -290,7 +290,7 @@ static void parseEtcLpPrinters( TQListView * printers ) TQFileInfoListIterator it( *dirs ); TQFileInfo *printer; TQString tmp; - while ( (printer = it.current()) != 0 ) { + while ( (printer = it.current()) ) { ++it; if ( printer->isDir() ) { tmp.sprintf( "/etc/lp/printers/%s/configuration", @@ -351,13 +351,13 @@ static void parseEtcLpPrinters( TQListView * printers ) // solaris 2.6 -static char * parsePrintersConf( TQListView * printers, bool *found = 0 ) +static char * parsePrintersConf( TQListView * printers, bool *found = nullptr ) { TQFile pc( TQString::fromLatin1("/etc/printers.conf") ); if ( !pc.open( IO_ReadOnly ) ) { if ( found ) *found = false; - return 0; + return nullptr; } if ( found ) *found = true; @@ -368,7 +368,7 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 ) TQString printerDesc; int lineLength = 0; - char * defaultPrinter = 0; + char * defaultPrinter = nullptr; while ( !pc.atEnd() && (lineLength=pc.readLine( line, 1024 )) > 0 ) { @@ -518,18 +518,18 @@ static char *parseNsswitchPrintersEntry( TQListView * printers, char *line ) while ( isspace((uchar) line[k]) ) \ k++ - char *defaultPrinter = 0; + char *defaultPrinter = nullptr; bool stop = false; int lastStatus = NotFound; int k = 8; skipSpaces(); if ( line[k] != ':' ) - return 0; + return nullptr; k++; char *cp = strchr( line, '#' ); - if ( cp != 0 ) + if ( cp ) *cp = '\0'; while ( line[k] != '\0' ) { @@ -596,9 +596,9 @@ static char *parseNsswitchConf( TQListView * printers ) { TQFile nc( TQString::fromLatin1("/etc/nsswitch.conf") ); if ( !nc.open(IO_ReadOnly) ) - return 0; + return nullptr; - char *defaultPrinter = 0; + char *defaultPrinter = nullptr; char *line = new char[1025]; line[1024] = '\0'; @@ -630,7 +630,7 @@ static void parseEtcLpMember( TQListView * printers ) TQFileInfoListIterator it( *dirs ); TQFileInfo *printer; TQString tmp; - while ( (printer = it.current()) != 0 ) { + while ( (printer = it.current()) ) { ++it; // I haven't found any real documentation, so I'm guessing that // since lpstat uses /etc/lp/member rather than one of the @@ -655,7 +655,7 @@ static void parseSpoolInterface( TQListView * printers ) TQFileInfoListIterator it( *files ); TQFileInfo *printer; - while ( (printer = it.current()) != 0) { + while ( (printer = it.current())) { ++it; if ( !printer->isFile() ) @@ -790,7 +790,7 @@ static void parseQconfig( TQListView * printers ) static char * parseCupsOutput( TQListView * printers ) { - char * defaultPrinter = 0; + char * defaultPrinter = nullptr; int nd; cups_dest_t * d; TQLibrary lib( "cups" ); @@ -801,12 +801,12 @@ static char * parseCupsOutput( TQListView * printers ) if ( _cupsGetDests ) { nd = _cupsGetDests( &d ); if ( nd < 1 ) - return 0; + return nullptr; int n = 0; while ( n < nd ) { perhapsAddPrinter( printers, d[n].name, - TQPrintDialog::tr("Unknown Location"), 0 ); + TQPrintDialog::tr("Unknown Location"), nullptr ); if ( d[n].is_default && !defaultPrinter ) defaultPrinter = tqstrdup( d[n].instance ); n++; @@ -819,13 +819,13 @@ static char * parseCupsOutput( TQListView * printers ) } #endif -static TQPrintDialog * globalPrintDialog = 0; +static TQPrintDialog * globalPrintDialog = nullptr; static void qpd_cleanup_globaldialog() { - if ( globalPrintDialog != 0 ) + if ( globalPrintDialog ) delete globalPrintDialog; - globalPrintDialog = 0; + globalPrintDialog = nullptr; } /*! @@ -959,7 +959,7 @@ TQPrintDialog::TQPrintDialog( TQPrinter *prn, TQWidget *parent, const char *name TQPrintDialog::~TQPrintDialog() { if ( this == globalPrintDialog ) - globalPrintDialog = 0; + globalPrintDialog = nullptr; delete d; } @@ -1039,7 +1039,7 @@ TQGroupBox * TQPrintDialog::setupDestination() d->printers->addColumn( tr("Comment"), 150 ); #if defined(Q_OS_UNIX) - char * etcLpDefault = 0; + char * etcLpDefault = nullptr; #ifndef TQT_NO_CUPS etcLpDefault = parseCupsOutput( d->printers ); @@ -1074,7 +1074,7 @@ TQGroupBox * TQPrintDialog::setupDestination() } } - char * def = 0; + char * def = nullptr; f.setFile( TQString::fromLatin1("/etc/nsswitch.conf") ); if ( f.isFile() ) { def = parseNsswitchConf( d->printers ); @@ -1375,7 +1375,7 @@ TQGroupBox * TQPrintDialog::setupPaper() bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w ) { if ( !globalPrintDialog ) { - globalPrintDialog = new TQPrintDialog( 0, 0, "global print dialog" ); + globalPrintDialog = new TQPrintDialog( nullptr, nullptr, "global print dialog" ); #ifndef TQT_NO_WIDGET_TOPEXTRA globalPrintDialog->setCaption( TQPrintDialog::tr( "Setup Printer" ) ); #endif @@ -1392,15 +1392,15 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w ) if ( pm && !pm->isNull() ) globalPrintDialog->setIcon( *pm ); else { - w = w ? w->topLevelWidget() : 0; - pm = w ? w->icon() : 0; + w = w ? w->topLevelWidget() : nullptr; + pm = w ? w->icon() : nullptr; if ( pm && !pm->isNull() ) globalPrintDialog->setIcon( *pm ); } } #endif bool r = globalPrintDialog->exec() == TQDialog::Accepted; - globalPrintDialog->setPrinter( 0 ); + globalPrintDialog->setPrinter( nullptr ); return r; } diff --git a/src/dialogs/tqprintdialog.h b/src/dialogs/tqprintdialog.h index fa7ef36bb..bed42048b 100644 --- a/src/dialogs/tqprintdialog.h +++ b/src/dialogs/tqprintdialog.h @@ -55,10 +55,10 @@ class TQ_EXPORT TQPrintDialog : public TQDialog { TQ_OBJECT public: - TQPrintDialog( TQPrinter *, TQWidget* parent=0, const char* name=0 ); + TQPrintDialog( TQPrinter *, TQWidget* parent=nullptr, const char* name=nullptr ); ~TQPrintDialog(); - static bool getPrinterSetup( TQPrinter *, TQWidget* = 0 ); + static bool getPrinterSetup( TQPrinter *, TQWidget* = nullptr ); static void setGlobalPrintDialog( TQPrintDialog * ); void setPrinter( TQPrinter *, bool = false ); diff --git a/src/dialogs/tqprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp index 4f4319827..8fb1e48cc 100644 --- a/src/dialogs/tqprogressdialog.cpp +++ b/src/dialogs/tqprogressdialog.cpp @@ -73,7 +73,7 @@ public: int totalSteps ) : creator( parent ), label( new TQLabel(labelText,that,"label") ), - cancel( 0 ), + cancel( nullptr ), bar( new TQProgressBar(totalSteps,that,"bar") ), shown_once( false ), cancellation_flag( false ), @@ -437,7 +437,7 @@ void TQProgressDialog::setCancelButtonText( const TQString &cancelButtonText ) else setCancelButton(new TQPushButton(cancelButtonText, this, "cancel")); } else { - setCancelButton(0); + setCancelButton(nullptr); } int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); diff --git a/src/dialogs/tqprogressdialog.h b/src/dialogs/tqprogressdialog.h index 6f65a7425..be44a4ead 100644 --- a/src/dialogs/tqprogressdialog.h +++ b/src/dialogs/tqprogressdialog.h @@ -66,10 +66,10 @@ class TQ_EXPORT TQProgressDialog : public TQDialog TQ_PROPERTY( TQString labelText READ labelText WRITE setLabelText ) public: - TQProgressDialog( TQWidget* parent=0, const char* name=0, bool modal=false, + TQProgressDialog( TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0 ); TQProgressDialog( const TQString& labelText, const TQString &cancelButtonText, - int totalSteps, TQWidget* parent=0, const char* name=0, + int totalSteps, TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0 ); ~TQProgressDialog(); diff --git a/src/dialogs/tqtabdialog.cpp b/src/dialogs/tqtabdialog.cpp index c0ad02698..cf806f063 100644 --- a/src/dialogs/tqtabdialog.cpp +++ b/src/dialogs/tqtabdialog.cpp @@ -171,9 +171,9 @@ public: }; TQTabDialogPrivate::TQTabDialogPrivate() - : tw(0), - ok(0), cb(0), db(0), hb(0), ab(0), - tll(0) + : tw(nullptr), + ok(nullptr), cb(nullptr), db(nullptr), hb(nullptr), ab(nullptr), + tll(nullptr) { } /*! @@ -251,7 +251,7 @@ void TQTabDialog::setFont( const TQFont & font ) bool TQTabDialog::hasDefaultButton() const { - return d->db != 0; + return d->db; } @@ -265,7 +265,7 @@ bool TQTabDialog::hasDefaultButton() const bool TQTabDialog::hasHelpButton() const { - return d->hb != 0; + return d->hb; } @@ -293,7 +293,7 @@ bool TQTabDialog::hasHelpButton() const bool TQTabDialog::hasCancelButton() const { - return d->cb != 0; + return d->cb; } @@ -331,7 +331,7 @@ bool TQTabDialog::hasCancelButton() const bool TQTabDialog::hasApplyButton() const { - return d->ab != 0; + return d->ab; } @@ -345,7 +345,7 @@ bool TQTabDialog::hasApplyButton() const bool TQTabDialog::hasOkButton() const { - return d->ok != 0; + return d->ok; } @@ -681,7 +681,7 @@ void TQTabDialog::setApplyButton( const TQString &text ) { if ( !text && d->ab ) { delete d->ab; - d->ab = 0; + d->ab = nullptr; setSizes(); } else { if ( !d->ab ) { @@ -725,7 +725,7 @@ void TQTabDialog::setHelpButton( const TQString &text ) { if ( !text ) { delete d->hb; - d->hb = 0; + d->hb = nullptr; setSizes(); } else { if ( !d->hb ) { @@ -772,7 +772,7 @@ void TQTabDialog::setDefaultButton( const TQString &text ) { if ( !text ) { delete d->db; - d->db = 0; + d->db = nullptr; setSizes(); } else { if ( !d->db ) { @@ -821,7 +821,7 @@ void TQTabDialog::setCancelButton( const TQString &text ) { if ( !text ) { delete d->cb; - d->cb = 0; + d->cb = nullptr; setSizes(); } else { if ( !d->cb ) { @@ -1046,7 +1046,7 @@ void TQTabDialog::setOkButton( const TQString &text ) { if ( !text ) { delete d->ok; - d->ok = 0; + d->ok = nullptr; setSizes(); } else { if ( !d->ok ) { diff --git a/src/dialogs/tqtabdialog.h b/src/dialogs/tqtabdialog.h index de6d8bc2c..b08ba79da 100644 --- a/src/dialogs/tqtabdialog.h +++ b/src/dialogs/tqtabdialog.h @@ -56,7 +56,7 @@ class TQ_EXPORT TQTabDialog : public TQDialog { TQ_OBJECT public: - TQTabDialog( TQWidget* parent=0, const char* name=0, bool modal=false, + TQTabDialog( TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0 ); ~TQTabDialog(); diff --git a/src/dialogs/tqwizard.cpp b/src/dialogs/tqwizard.cpp index 5e2ebaff8..4a044d904 100644 --- a/src/dialogs/tqwizard.cpp +++ b/src/dialogs/tqwizard.cpp @@ -147,10 +147,10 @@ public: Page * page( const TQWidget * w ) { if ( !w ) - return 0; + return nullptr; int i = pages.count(); while( --i >= 0 && pages.at( i ) && pages.at( i )->w != w ) { } - return i >= 0 ? pages.at( i ) : 0; + return i >= 0 ? pages.at( i ) : nullptr; } }; @@ -166,7 +166,7 @@ TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal, : TQDialog( parent, name, modal, f ) { d = new TQWizardPrivate(); - d->current = 0; // not quite true, but... + d->current = nullptr; // not quite true, but... d->ws = new TQWidgetStack( this, "qt_widgetstack" ); d->pages.setAutoDelete( true ); d->title = new TQLabel( this, "title label" ); @@ -180,9 +180,9 @@ TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal, d->ws->installEventFilter( this ); - d->v = 0; - d->hbar1 = 0; - d->hbar2 = 0; + d->v = nullptr; + d->hbar1 = nullptr; + d->hbar2 = nullptr; d->cancelButton->setText( tr( "&Cancel" ) ); d->backButton->setText( tr( "< &Back" ) ); @@ -235,7 +235,7 @@ void TQWizard::show() if ( pageCount() > 0 ) showPage( d->pages.at( 0 )->w ); else - showPage( 0 ); + showPage( nullptr ); } TQDialog::show(); @@ -909,7 +909,7 @@ void TQWizard::removePage( TQWidget * page ) TQWidget* TQWizard::page( int index ) const { if ( index >= pageCount() || index < 0 ) - return 0; + return nullptr; return d->pages.at( index )->w; } diff --git a/src/dialogs/tqwizard.h b/src/dialogs/tqwizard.h index b9bb060f1..00ae16026 100644 --- a/src/dialogs/tqwizard.h +++ b/src/dialogs/tqwizard.h @@ -57,7 +57,7 @@ class TQ_EXPORT TQWizard : public TQDialog TQ_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont ) public: - TQWizard( TQWidget* parent=0, const char* name=0, bool modal=false, + TQWizard( TQWidget* parent=nullptr, const char* name=nullptr, bool modal=false, WFlags f=0 ); ~TQWizard(); diff --git a/src/inputmethod/tqinputcontextfactory.cpp b/src/inputmethod/tqinputcontextfactory.cpp index ec723bc92..898aedb8e 100644 --- a/src/inputmethod/tqinputcontextfactory.cpp +++ b/src/inputmethod/tqinputcontextfactory.cpp @@ -54,7 +54,7 @@ #ifndef TQT_NO_COMPONENT -static TQPluginManager *manager = 0; +static TQPluginManager *manager = nullptr; static TQSingleCleanupHandler< TQPluginManager > cleanup_manager; static void create_manager() @@ -65,7 +65,7 @@ static void create_manager() #ifdef TQT_THREAD_SUPPORT // protect manager creation TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &manager ) : 0); + tqt_global_mutexpool->get( &manager ) : nullptr); // we check the manager pointer again to make sure that another thread // has not created the manager before us. @@ -90,7 +90,7 @@ static void create_manager() */ TQInputContext *TQInputContextFactory::create( const TQString& key, TQWidget *widget ) { - TQInputContext *ret = 0; + TQInputContext *ret = nullptr; TQString inputcontext = key; #ifndef TQT_NO_COMPONENT // make sure the manager is created diff --git a/src/inputmethod/tqinputcontextplugin.cpp b/src/inputmethod/tqinputcontextplugin.cpp index 7acdc9300..f80b858a8 100644 --- a/src/inputmethod/tqinputcontextplugin.cpp +++ b/src/inputmethod/tqinputcontextplugin.cpp @@ -161,7 +161,7 @@ private: TQRESULT TQInputContextPluginPrivate::queryInterface( const TQUuid &iid, TQUnknownInterface **iface ) { - *iface = 0; + *iface = nullptr; if ( iid == IID_QUnknown ) *iface = this; diff --git a/src/kernel/tqabstractlayout.cpp b/src/kernel/tqabstractlayout.cpp index 094c21fa0..bd098f0da 100644 --- a/src/kernel/tqabstractlayout.cpp +++ b/src/kernel/tqabstractlayout.cpp @@ -223,7 +223,7 @@ void TQLayoutItem::invalidate() */ TQLayout * TQLayoutItem::layout() { - return 0; + return nullptr; } /*! @@ -232,7 +232,7 @@ TQLayout * TQLayoutItem::layout() */ TQSpacerItem * TQLayoutItem::spacerItem() { - return 0; + return nullptr; } /*! @@ -257,7 +257,7 @@ TQSpacerItem * TQSpacerItem::spacerItem() */ TQWidget * TQLayoutItem::widget() { - return 0; + return nullptr; } /*! @@ -291,7 +291,7 @@ bool TQLayoutItem::hasHeightForWidth() const */ TQLayoutIterator TQLayoutItem::iterator() { - return TQLayoutIterator( 0 ); + return TQLayoutIterator( nullptr ); } /*! @@ -635,9 +635,9 @@ void TQLayout::init() marginImpl = false; autoMinimum = false; autoResizeMode = true; - extraData = 0; + extraData = nullptr; #ifndef TQT_NO_MENUBAR - menubar = 0; + menubar = nullptr; #endif } @@ -667,7 +667,7 @@ TQLayout::TQLayout( TQLayout *parentLayout, int spacing, const char *name ) management will work. */ TQLayout::TQLayout( int spacing, const char *name ) - : TQObject( 0, name ) + : TQObject( nullptr, name ) { init(); insideSpacing = spacing; @@ -775,7 +775,7 @@ TQWidget *TQLayout::mainWidget() Q_ASSERT(parentLayout); return parentLayout->mainWidget(); } else { - return 0; + return nullptr; } } else { Q_ASSERT(parent() && parent()->isWidgetType()); @@ -824,7 +824,7 @@ static bool removeWidgetRecursively( TQLayoutItem *lay, TQWidget *w ) bool didSomething = false; TQLayoutIterator it = lay->iterator(); TQLayoutItem *child; - while ( (child = it.current()) != 0 ) { + while ( (child = it.current()) ) { if ( child->widget() == w ) { it.deleteCurrent(); lay->invalidate(); // maybe redundant @@ -875,7 +875,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e ) TQWidget *w = (TQWidget *)c->child(); #ifndef TQT_NO_MENUBAR if ( w == menubar ) - menubar = 0; + menubar = nullptr; #endif if ( removeWidgetRecursively( this, w ) ) { TQEvent *lh = new TQEvent( TQEvent::LayoutHint ); @@ -1041,7 +1041,7 @@ TQLayout::~TQLayout() */ if ( isTopLevel() && parent() && parent()->isWidgetType() && ((TQWidget*)parent())->layout() == this ) - setWidgetLayout( (TQWidget*)parent(), 0 ); + setWidgetLayout( (TQWidget*)parent(), nullptr ); } /*! @@ -1163,7 +1163,7 @@ static void invalidateRecursive( TQLayoutItem *lay ) lay->invalidate(); TQLayoutIterator it = lay->iterator(); TQLayoutItem *child; - while ( (child = it.current()) != 0 ) { + while ( (child = it.current()) ) { invalidateRecursive( child ); ++it; } @@ -1866,7 +1866,7 @@ void TQLayout::remove( TQWidget *widget ) { TQLayoutIterator it = iterator(); TQLayoutItem *child; - while ( (child = it.current()) != 0 ) { + while ( (child = it.current()) ) { if ( child->widget() == widget ) { it.deleteCurrent(); invalidate(); // maybe redundant @@ -1891,7 +1891,7 @@ void TQLayout::removeItem( TQLayoutItem *item ) { TQLayoutIterator it = iterator(); TQLayoutItem *child; - while ( (child = it.current()) != 0 ) { + while ( (child = it.current()) ) { if ( child == item ) { it.takeCurrent(); invalidate(); // maybe redundant diff --git a/src/kernel/tqaccel.cpp b/src/kernel/tqaccel.cpp index 34b15a5bf..7d768c95e 100644 --- a/src/kernel/tqaccel.cpp +++ b/src/kernel/tqaccel.cpp @@ -142,7 +142,7 @@ struct TQAccelItem { // internal accelerator item TQAccelItem( const TQKeySequence &k, int i ) - { key=k; id=i; enabled=true; signal=0; } + { key=k; id=i; enabled=true; signal=nullptr; } ~TQAccelItem() { delete signal; } int id; TQKeySequence key; @@ -179,7 +179,7 @@ public: private: TQAccelManager():currentState(TQt::NoMatch), clash(-1) { self_ptr = this; } - ~TQAccelManager() { self_ptr = 0; } + ~TQAccelManager() { self_ptr = nullptr; } bool correctSubWindow( TQWidget *w, TQAccelPrivate* d ); SequenceMatch match( TQKeyEvent* e, TQAccelItem* item, TQKeySequence& temp ); @@ -191,7 +191,7 @@ private: TQKeySequence intermediate; int clash; }; -TQAccelManager* TQAccelManager::self_ptr = 0; +TQAccelManager* TQAccelManager::self_ptr = nullptr; bool TQ_EXPORT tqt_tryAccelEvent( TQWidget* w, TQKeyEvent* e){ return TQAccelManager::self()->tryAccelEvent( w, e ); @@ -393,7 +393,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) { #ifndef TQT_NO_STATUSBAR // Needs to be declared and used here because of "goto doclash" - TQStatusBar* mainStatusBar = 0; + TQStatusBar* mainStatusBar = nullptr; #endif // Modifiers can NOT be accelerators... @@ -403,12 +403,12 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) SequenceMatch result = TQt::NoMatch; TQKeySequence tocheck, partial; - TQAccelPrivate* accel = 0; - TQAccelItem* item = 0; - TQAccelPrivate* firstaccel = 0; - TQAccelItem* firstitem = 0; - TQAccelPrivate* lastaccel = 0; - TQAccelItem* lastitem = 0; + TQAccelPrivate* accel = nullptr; + TQAccelItem* item = nullptr; + TQAccelPrivate* firstaccel = nullptr; + TQAccelItem* firstitem = nullptr; + TQAccelPrivate* lastaccel = nullptr; + TQAccelItem* lastitem = nullptr; TQKeyEvent pe = *e; int n = -1; @@ -460,7 +460,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) } while ( hasShift-- && !matchFound && !identicalDisabled ); #ifndef TQT_NO_STATUSBAR - mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( 0, "TQStatusBar" ); + mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( nullptr, "TQStatusBar" ); #endif if ( n < 0 ) { // no match found currentState = partial.count() ? PartialMatch : NoMatch; @@ -503,7 +503,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) doclash: // found more than one match #ifndef TQT_NO_STATUSBAR if ( !mainStatusBar ) // if "goto doclash", we need to get statusbar again. - mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( 0, "TQStatusBar" ); + mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( nullptr, "TQStatusBar" ); #endif TQString message = TQAccel::tr( "Ambiguous \"%1\" not handled" ).arg( (TQString)tocheck ); diff --git a/src/kernel/tqaccel.h b/src/kernel/tqaccel.h index c883ba2ff..d333b6a1c 100644 --- a/src/kernel/tqaccel.h +++ b/src/kernel/tqaccel.h @@ -54,8 +54,8 @@ class TQ_EXPORT TQAccel : public TQObject // accelerator class { TQ_OBJECT public: - TQAccel( TQWidget *parent, const char *name=0 ); - TQAccel( TQWidget* watch, TQObject *parent, const char *name=0 ); + TQAccel( TQWidget *parent, const char *name=nullptr ); + TQAccel( TQWidget* watch, TQObject *parent, const char *name=nullptr ); ~TQAccel(); bool isEnabled() const; diff --git a/src/kernel/tqaccessible.cpp b/src/kernel/tqaccessible.cpp index 02833d7e3..0183e3fec 100644 --- a/src/kernel/tqaccessible.cpp +++ b/src/kernel/tqaccessible.cpp @@ -290,7 +290,7 @@ avoid unnecessary performance penalties if no client is listening. */ -static TQPluginManager *qAccessibleManager = 0; +static TQPluginManager *qAccessibleManager = nullptr; class AccessibleCache : public TQObject, public TQPtrDict { @@ -313,7 +313,7 @@ public slots: #include "tqaccessible.moc" -static AccessibleCache *qAccessibleInterface = 0; +static AccessibleCache *qAccessibleInterface = nullptr; static bool cleanupAdded = false; static void qAccessibleCleanup() @@ -322,9 +322,9 @@ static void qAccessibleCleanup() qAccessibleManager->setAutoUnload( false ); delete qAccessibleInterface; - qAccessibleInterface = 0; + qAccessibleInterface = nullptr; delete qAccessibleManager; - qAccessibleManager = 0; + qAccessibleManager = nullptr; } #ifdef TQ_WS_MAC @@ -348,7 +348,7 @@ void AccessibleCache::removeObject(TQObject *object) remove(object); if (!count()) { delete this; - qAccessibleInterface = 0; + qAccessibleInterface = nullptr; } } @@ -390,7 +390,7 @@ TQRESULT TQAccessible::queryAccessibleInterface( TQObject *object, TQAccessibleI } } - TQInterfacePtr factory = 0; + TQInterfacePtr factory = nullptr; TQMetaObject *mo = object->metaObject(); while ( mo ) { qAccessibleManager->queryInterface( mo->className(), &factory ); @@ -418,7 +418,7 @@ TQRESULT TQAccessible::queryAccessibleInterface( TQObject *object, TQAccessibleI */ bool TQAccessible::isActive() { - return qAccessibleManager != 0; + return qAccessibleManager; } /*! @@ -672,7 +672,7 @@ TQAccessibleObject::~TQAccessibleObject() qAccessibleInterface->removeObject(object_); if ( !qAccessibleInterface->count() ) { delete qAccessibleInterface; - qAccessibleInterface = 0; + qAccessibleInterface = nullptr; } } } diff --git a/src/kernel/tqapplication.cpp b/src/kernel/tqapplication.cpp index d708eac95..d5471f2f7 100644 --- a/src/kernel/tqapplication.cpp +++ b/src/kernel/tqapplication.cpp @@ -323,27 +323,27 @@ void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE ); #endif TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ); -TQApplication *tqApp = 0; // global application object +TQApplication *tqApp = nullptr; // global application object -TQStyle *TQApplication::app_style = 0; // default application style +TQStyle *TQApplication::app_style = nullptr; // default application style bool tqt_explicit_app_style = false; // style explicitly set by programmer int TQApplication::app_cspec = TQApplication::NormalColor; #ifndef TQT_NO_PALETTE -TQPalette *TQApplication::app_pal = 0; // default application palette +TQPalette *TQApplication::app_pal = nullptr; // default application palette #endif -TQFont *TQApplication::app_font = 0; // default application font +TQFont *TQApplication::app_font = nullptr; // default application font bool tqt_app_has_font = false; #ifndef TQT_NO_CURSOR -TQCursor *TQApplication::app_cursor = 0; // default application cursor +TQCursor *TQApplication::app_cursor = nullptr; // default application cursor #endif int TQApplication::app_tracking = 0; // global mouse tracking bool TQApplication::is_app_running = false; // app starting up if false bool TQApplication::is_app_closing = false; // app closing down if true int TQApplication::loop_level = 0; // event loop level -TQWidget *TQApplication::main_widget = 0; // main application widget -TQWidget *TQApplication::focus_widget = 0; // has keyboard input focus -TQWidget *TQApplication::active_window = 0; // toplevel with keyboard focus +TQWidget *TQApplication::main_widget = nullptr; // main application widget +TQWidget *TQApplication::focus_widget = nullptr; // has keyboard input focus +TQWidget *TQApplication::active_window = nullptr; // toplevel with keyboard focus bool TQApplication::obey_desktop_settings = true; // use winsys resources int TQApplication::cursor_flash_time = 1000; // text caret flash time int TQApplication::mouse_double_click_time = 400; // mouse dbl click limit @@ -368,18 +368,18 @@ bool TQApplication::animate_toolbox = false; bool TQApplication::widgetCount = false; TQApplication::Type tqt_appType=TQApplication::Tty; #ifndef TQT_NO_COMPONENT -TQStringList *TQApplication::app_libpaths = 0; +TQStringList *TQApplication::app_libpaths = nullptr; #endif bool TQApplication::metaComposeUnicode = false; int TQApplication::composedUnicode = 0; #ifdef TQT_THREAD_SUPPORT -TQMutex *TQApplication::tqt_mutex = 0; -TQMutex *tqt_sharedStringMutex = 0; -TQ_EXPORT TQMutex * tqt_sharedMetaObjectMutex = 0; +TQMutex *TQApplication::tqt_mutex = nullptr; +TQMutex *tqt_sharedStringMutex = nullptr; +TQ_EXPORT TQMutex * tqt_sharedMetaObjectMutex = nullptr; #ifdef QT_USE_GLIBMAINLOOP -TQMutex *tqt_timerListMutex = 0; +TQMutex *tqt_timerListMutex = nullptr; #endif // QT_USE_GLIBMAINLOOP static TQt::HANDLE tqt_application_thread_id = 0; @@ -437,7 +437,7 @@ void tqt_setMaxWindowRect(const TQRect& r) typedef void (*VFPTR)(); typedef TQValueList TQVFuncList; -static TQVFuncList *postRList = 0; // list of post routines +static TQVFuncList *postRList = nullptr; // list of post routines /*! \relates TQApplication @@ -524,19 +524,19 @@ TQ_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction p ) } // Default application palettes and fonts (per widget type) -TQAsciiDict *TQApplication::app_palettes = 0; -TQAsciiDict *TQApplication::app_fonts = 0; +TQAsciiDict *TQApplication::app_palettes = nullptr; +TQAsciiDict *TQApplication::app_fonts = nullptr; #ifndef TQT_NO_SESSIONMANAGER -TQString *TQApplication::session_key = 0; // ## session key. Should be a member in 4.0 +TQString *TQApplication::session_key = nullptr; // ## session key. Should be a member in 4.0 #endif -TQWidgetList *TQApplication::popupWidgets = 0; // has keyboard input focus +TQWidgetList *TQApplication::popupWidgets = nullptr; // has keyboard input focus -TQDesktopWidget *tqt_desktopWidget = 0; // root window widgets +TQDesktopWidget *tqt_desktopWidget = nullptr; // root window widgets #ifndef TQT_NO_CLIPBOARD -TQClipboard *tqt_clipboard = 0; // global clipboard object +TQClipboard *tqt_clipboard = nullptr; // global clipboard object #endif -TQWidgetList * tqt_modal_stack=0; // stack of modal widgets +TQWidgetList * tqt_modal_stack=nullptr; // stack of modal widgets #ifdef TQT_THREAD_SUPPORT @@ -665,7 +665,7 @@ uint qGlobalPostedEventsCount() } #ifndef TQT_NO_PALETTE -TQPalette *tqt_std_pal = 0; +TQPalette *tqt_std_pal = nullptr; void tqt_create_std_palette() { @@ -756,7 +756,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) static char* empty = "\0"; argv[j] = empty; #else - argv[j] = 0; + argv[j] = nullptr; #endif *argcptr = j; } @@ -961,7 +961,7 @@ void TQApplication::construct( int &argc, char **argv, Type type, bool enable_sm tqt_is_gui_used = (type != Tty); init_precmdline(); static const char *empty = ""; - if ( argc == 0 || argv == 0 ) { + if ( argc == 0 || !argv ) { argc = 0; argv = (char **)∅ // ouch! careful with TQApplication::argv()! } @@ -1004,7 +1004,7 @@ TQApplication::TQApplication( Display* dpy, HANDLE visual, HANDLE colormap ) // ### a string literal is a cont char* // ### using it as a char* is wrong and could lead to segfaults // ### if aargv is modified someday - static char *aargv[] = { (char*)"unknown", 0 }; + static char *aargv[] = { (char*)"unknown", nullptr }; app_argc = aargc; app_argv = aargv; @@ -1094,7 +1094,7 @@ bool TQApplication::isCoreThread() { void TQApplication::init_precmdline() { - translators = 0; + translators = nullptr; is_app_closing = false; #ifndef TQT_NO_SESSIONMANAGER is_session_restored = false; @@ -1140,7 +1140,7 @@ void TQApplication::initialize( int argc, char **argv, bool enable_sm ) session_manager = new TQSessionManager( tqApp, session_id, *session_key ); } else { - session_manager = 0; + session_manager = nullptr; } #endif @@ -1169,7 +1169,7 @@ void TQApplication::initialize( int argc, char **argv, bool enable_sm ) TQWidget *TQApplication::activePopupWidget() { - return popupWidgets ? popupWidgets->getLast() : 0; + return popupWidgets ? popupWidgets->getLast() : nullptr; } @@ -1189,7 +1189,7 @@ TQWidget *TQApplication::activePopupWidget() TQWidget *TQApplication::activeModalWidget() { - return tqt_modal_stack ? tqt_modal_stack->getFirst() : 0; + return tqt_modal_stack ? tqt_modal_stack->getFirst() : nullptr; } /*! @@ -1217,14 +1217,14 @@ TQApplication::~TQApplication() it = postRList->begin(); } delete postRList; - postRList = 0; + postRList = nullptr; } TQObject *tipmanager = child( "toolTipManager", "TQTipManager", false ); delete tipmanager; delete tqt_desktopWidget; - tqt_desktopWidget = 0; + tqt_desktopWidget = nullptr; is_app_closing = true; // Due to hacks to speed up TQStyle engine (see git hash 523c1fd99) TQObjects now contain a @@ -1235,28 +1235,28 @@ TQApplication::~TQApplication() #ifndef TQT_NO_CLIPBOARD delete tqt_clipboard; - tqt_clipboard = 0; + tqt_clipboard = nullptr; #endif TQWidget::destroyMapper(); #ifndef TQT_NO_PALETTE delete tqt_std_pal; - tqt_std_pal = 0; + tqt_std_pal = nullptr; delete app_pal; - app_pal = 0; + app_pal = nullptr; delete app_palettes; - app_palettes = 0; + app_palettes = nullptr; #endif delete app_font; - app_font = 0; + app_font = nullptr; delete app_fonts; - app_fonts = 0; + app_fonts = nullptr; #ifndef TQT_NO_STYLE delete app_style; - app_style = 0; + app_style = nullptr; #endif #ifndef TQT_NO_CURSOR delete app_cursor; - app_cursor = 0; + app_cursor = nullptr; #endif #ifndef TQT_NO_TRANSLATION delete translators; @@ -1271,18 +1271,18 @@ TQApplication::~TQApplication() #ifndef TQT_NO_COMPONENT delete app_libpaths; - app_libpaths = 0; + app_libpaths = nullptr; #endif #ifdef TQT_THREAD_SUPPORT delete tqt_mutex; - tqt_mutex = 0; + tqt_mutex = nullptr; #endif // TQT_THREAD_SUPPORT if( tqApp == this ) { if ( postedEvents ) removePostedEvents( this ); - tqApp = 0; + tqApp = nullptr; } is_app_running = false; @@ -1293,18 +1293,18 @@ TQApplication::~TQApplication() if ( session_manager ) { delete session_manager; } - session_manager = 0; + session_manager = nullptr; if ( session_key ) { delete session_key; } - session_key = 0; + session_key = nullptr; #endif //TQT_NO_SESSIONMANAGER #ifdef TQT_THREAD_SUPPORT delete tqt_sharedMetaObjectMutex; - tqt_sharedMetaObjectMutex = 0; + tqt_sharedMetaObjectMutex = nullptr; delete tqt_sharedStringMutex; - tqt_sharedStringMutex = 0; + tqt_sharedStringMutex = nullptr; #ifdef QT_USE_GLIBMAINLOOP delete tqt_timerListMutex; tqt_timerListMutex = 0; @@ -1397,7 +1397,7 @@ TQApplication::~TQApplication() #ifndef TQT_NO_STYLE -static TQString *tqt_style_override = 0; +static TQString *tqt_style_override = nullptr; /*! Returns the application's style object. @@ -1423,7 +1423,7 @@ TQStyle& TQApplication::style() if ( tqt_style_override ) { style = *tqt_style_override; delete tqt_style_override; - tqt_style_override = 0; + tqt_style_override = nullptr; } else { # if defined(TQ_WS_WIN) && defined(Q_OS_TEMP) style = "PocketPC"; @@ -1581,11 +1581,11 @@ TQStyle* TQApplication::setStyle( const TQString& style ) *tqt_style_override = style; else tqt_style_override = new TQString(style); - return 0; + return nullptr; } TQStyle *s = TQStyleFactory::create( style ); if ( !s ) - return 0; + return nullptr; setStyle( s ); return s; @@ -2030,7 +2030,7 @@ TQPalette TQApplication::palette(const TQWidget* w) return *wp; TQAsciiDictIterator it( *app_palettes ); const char* name; - while ( (name=it.currentKey()) != 0 ) { + while ( (name=it.currentKey()) ) { if ( w->inherits( name ) ) return *it.current(); ++it; @@ -2060,7 +2060,7 @@ TQPalette TQApplication::palette(TQStringList objectTypeList) } TQAsciiDictIterator it( *app_palettes ); const char* name; - while ( (name=it.currentKey()) != 0 ) { + while ( (name=it.currentKey()) ) { if ( objectTypeList.contains(name) ) { return *it.current(); } @@ -2092,7 +2092,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, const char* className ) { TQPalette pal = palette; - TQPalette *oldpal = 0; + TQPalette *oldpal = nullptr; #ifndef TQT_NO_STYLE if ( !startingUp() ) // on startup this has been done already tqApp->style().polish( pal ); // NB: non-const reference @@ -2105,9 +2105,9 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, } else { *app_pal = pal; } - all = app_palettes != 0; + all = app_palettes; delete app_palettes; - app_palettes = 0; + app_palettes = nullptr; tqt_fix_tooltips(); } else { if ( !app_palettes ) { @@ -2149,7 +2149,7 @@ TQFont TQApplication::font( const TQWidget *w ) return *wf; TQAsciiDictIterator it( *app_fonts ); const char* name; - while ( (name=it.currentKey()) != 0 ) { + while ( (name=it.currentKey()) ) { if ( w->inherits( name ) ) return *it.current(); ++it; @@ -2196,9 +2196,9 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets, app_font->detach(); app_font->d->mask = TQFontPrivate::Complete; - all = app_fonts != 0; + all = app_fonts; delete app_fonts; - app_fonts = 0; + app_fonts = nullptr; } else { if (!app_fonts){ app_fonts = new TQAsciiDict; @@ -2551,7 +2551,7 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e ) return false; } - if ( receiver == 0 ) { // serious error + if ( !receiver ) { // serious error #if defined(QT_CHECK_NULL) tqWarning( "TQApplication::notify: Unexpected null receiver" ); #endif @@ -2578,13 +2578,13 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e ) TQObject * c = ((TQChildEvent*)e)->child(); TQPostEvent * pe; l->first(); - while( ( pe = l->current()) != 0 ) { + while( ( pe = l->current()) ) { if ( pe->event && pe->receiver == receiver && pe->event->type() == TQEvent::ChildInserted && ((TQChildEvent*)pe->event)->child() == c ) { pe->event->posted = false; delete pe->event; - pe->event = 0; + pe->event = nullptr; l->remove(); continue; } @@ -2821,7 +2821,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e) if ( eventFilters ) { TQObjectListIt it( *eventFilters ); TQObject *obj; - while ( (obj=it.current()) != 0 ) { // send to all filters + while ( (obj=it.current()) ) { // send to all filters ++it; // until one returns true if ( obj->eventFilter(receiver,e) ) return true; @@ -3258,7 +3258,7 @@ void TQApplication::installTranslator( TQTranslator * mf ) TQWidgetList *list = topLevelWidgets(); TQWidgetListIt it( *list ); TQWidget *w; - while ( ( w=it.current() ) != 0 ) { + while ( ( w=it.current() ) ) { ++it; if (!w->isDesktop()) postEvent( w, new TQEvent( TQEvent::LanguageChange ) ); @@ -3285,7 +3285,7 @@ void TQApplication::removeTranslator( TQTranslator * mf ) TQWidgetList *list = topLevelWidgets(); TQWidgetListIt it( *list ); TQWidget *w; - while ( ( w=it.current() ) != 0 ) { + while ( ( w=it.current() ) ) { ++it; postEvent( w, new TQEvent( TQEvent::LanguageChange ) ); } @@ -3380,7 +3380,7 @@ TQString TQApplication::translate( const char * context, const char * sourceText #ifndef TQT_NO_TEXTCODEC if ( encoding == UnicodeUTF8 ) return TQString::fromUtf8( sourceText ); - else if ( TQTextCodec::codecForTr() != 0 ) + else if ( TQTextCodec::codecForTr() ) return TQTextCodec::codecForTr()->toUnicode( sourceText ); else #endif @@ -3412,7 +3412,7 @@ TQString TQApplication::translate( const char * context, const char * sourceText void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) { - if ( receiver == 0 ) { + if ( !receiver ) { #if defined(QT_CHECK_NULL) tqWarning( "TQApplication::postEvent: Unexpected null receiver" ); #endif @@ -3436,14 +3436,14 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) event->type() == TQEvent::Move || event->type() == TQEvent::LanguageChange ) { l->first(); - TQPostEvent * cur = 0; + TQPostEvent * cur = nullptr; for ( ;; ) { - while ( (cur=l->current()) != 0 && + while ( (cur=l->current()) && ( cur->receiver != receiver || - cur->event == 0 || + !cur->event || cur->event->type() != event->type() ) ) l->next(); - if ( l->current() != 0 ) { + if ( l->current() ) { if ( cur->event->type() == TQEvent::Paint ) { TQPaintEvent * p = (TQPaintEvent*)(cur->event); if ( p->erase != ((TQPaintEvent*)event)->erase ) { @@ -3478,15 +3478,15 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) // if this is one of the compressible IM events, do compression else if ( event->type() == TQEvent::IMCompose ) { l->last(); - TQPostEvent * cur = 0; + TQPostEvent * cur = nullptr; for ( ;; ) { - while ( (cur=l->current()) != 0 && + while ( (cur=l->current()) && ( cur->receiver != receiver || - cur->event == 0 || + !cur->event || cur->event->type() != event->type() || cur->event->type() != TQEvent::IMStart ) ) l->prev(); - if ( l->current() != 0 ) { + if ( l->current() ) { // IMCompose must not be compressed with another one // beyond its IMStart boundary if ( cur->event->type() == TQEvent::IMStart ) { @@ -3537,7 +3537,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) */ void TQApplication::sendPostedEvents() { - sendPostedEvents( 0, 0 ); + sendPostedEvents( nullptr, 0 ); } @@ -3558,8 +3558,8 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type ) { // Make sure the object hierarchy is stable before processing events // to avoid endless loops - if ( receiver == 0 && event_type == 0 ) { - sendPostedEvents( 0, TQEvent::ChildInserted ); + if ( !receiver && event_type == 0 ) { + sendPostedEvents( nullptr, TQEvent::ChildInserted ); } #ifdef TQT_THREAD_SUPPORT @@ -3582,11 +3582,11 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type ) // this, it looks the way it does for good reasons. TQPostEventListIt it( *l ); TQPostEvent *pe; - while ( (pe=it.current()) != 0 ) { + while ( (pe=it.current()) ) { ++it; Q_ASSERT(pe->receiver); if ( pe->event // hasn't been sent yet - && ( receiver == 0 // we send to all receivers + && ( !receiver // we send to all receivers || receiver == pe->receiver ) // we send to THAT receiver && ( event_type == 0 // we send all types || event_type == pe->event->type() ) // we send THAT type @@ -3601,7 +3601,7 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type ) pe->event->posted = false; TQEvent * e = pe->event; TQObject * r = pe->receiver; - pe->event = 0; + pe->event = nullptr; // next, update the data structure so that we're ready // for the next event. @@ -3617,7 +3617,7 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type ) // somewhere else if it isn't being used. if ( r->postedEvents->isEmpty() ) { delete r->postedEvents; - r->postedEvents = 0; + r->postedEvents = nullptr; } } @@ -3650,7 +3650,7 @@ void TQApplication::sendPostedEvents( TQObject *receiver, int event_type ) // delivered. if ( l == GlobalPostedEvents() ) { GlobalPostedEvents()->first(); - while( (pe=GlobalPostedEvents()->current()) != 0 ) { + while( (pe=GlobalPostedEvents()->current()) ) { if ( pe->event ) { GlobalPostedEvents()->next(); } @@ -3714,12 +3714,12 @@ void TQApplication::removePostedEvents( TQObject *receiver, int event_type ) TQPostEventList * l = receiver->postedEvents; l->first(); TQPostEvent * pe; - while( (pe=l->current()) != 0 ) { + while( (pe=l->current()) ) { if ( !event_type || pe->event->type() == event_type ) { if ( pe->event ) { pe->event->posted = false; delete pe->event; - pe->event = 0; + pe->event = nullptr; } l->remove(); } else { @@ -3727,7 +3727,7 @@ void TQApplication::removePostedEvents( TQObject *receiver, int event_type ) } } if ( !event_type || !l->count() ) { - receiver->postedEvents = 0; + receiver->postedEvents = nullptr; delete l; } } @@ -3755,7 +3755,7 @@ void TQApplication::removePostedEvent( TQEvent * event ) TQPostEventListIt it( *GlobalPostedEvents() ); TQPostEvent * pe; - while( (pe = it.current()) != 0 ) { + while( (pe = it.current()) ) { ++it; if ( pe->event == event ) { #if defined(QT_DEBUG) @@ -3832,7 +3832,7 @@ void TQApplication::removePostedEvent( TQEvent * event ) #endif event->posted = false; delete pe->event; - pe->event = 0; + pe->event = nullptr; return; } } @@ -3894,7 +3894,7 @@ void TQApplication::threadTerminationHandler( TQThread *originThread ) { */ void TQApplication::setActiveWindow( TQWidget* act ) { - TQWidget* window = act?act->topLevelWidget():0; + TQWidget* window = act?act->topLevelWidget():nullptr; if ( active_window == window ) return; @@ -3915,7 +3915,7 @@ void TQApplication::setActiveWindow( TQWidget* act ) } else #endif deacts.append(active_window); - active_window = 0; + active_window = nullptr; TQEvent e( TQEvent::WindowDeactivate ); for(TQWidget *w = deacts.first(); w; w = deacts.next()) TQApplication::sendSpontaneousEvent( w, &e ); @@ -3947,7 +3947,7 @@ void TQApplication::setActiveWindow( TQWidget* act ) if ( !active_window && focus_widget ) { TQFocusEvent out( TQEvent::FocusOut ); TQWidget *tmp = focus_widget; - focus_widget = 0; + focus_widget = nullptr; #ifdef TQ_WS_WIN TQInputContext::accept( tmp ); #elif defined(TQ_WS_X11) @@ -4040,12 +4040,12 @@ TQ_EXPORT void tqt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) { TQEvent leaveEvent( TQEvent::Leave ); for ( w = leaveList.first(); w; w = leaveList.next() ) { - if ( !tqApp->activeModalWidget() || tqt_tryModalHelper( w, 0 )) + if ( !tqApp->activeModalWidget() || tqt_tryModalHelper( w, nullptr )) TQApplication::sendEvent( w, &leaveEvent ); } TQEvent enterEvent( TQEvent::Enter ); for ( w = enterList.first(); w; w = enterList.next() ) { - if ( !tqApp->activeModalWidget() || tqt_tryModalHelper( w, 0 )) + if ( !tqApp->activeModalWidget() || tqt_tryModalHelper( w, nullptr )) TQApplication::sendEvent( w, &enterEvent ); } } @@ -4062,7 +4062,7 @@ extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //tqapplication_mac.cp if the widget should accept the event. */ TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { - TQWidget *modal=0, *top=TQApplication::activeModalWidget(); + TQWidget *modal=nullptr, *top=TQApplication::activeModalWidget(); if ( rettop ) *rettop = top; if ( tqApp->activePopupWidget() ) @@ -4142,7 +4142,7 @@ TQDesktopWidget *TQApplication::desktop() */ TQClipboard *TQApplication::clipboard() { - if ( tqt_clipboard == 0 ) { + if ( !tqt_clipboard ) { tqt_clipboard = new TQClipboard; TQ_CHECK_PTR( tqt_clipboard ); } @@ -4475,7 +4475,7 @@ void TQApplication::setReverseLayout( bool b ) TQWidgetList *list = topLevelWidgets(); TQWidgetListIt it( *list ); TQWidget *w; - while ( ( w=it.current() ) != 0 ) { + while ( ( w=it.current() ) ) { ++it; postEvent( w, new TQEvent( TQEvent::LayoutDirectionChange ) ); } @@ -4860,7 +4860,7 @@ public: TQSessionManager::RestartHint restartHint; }; -TQSessionManager* tqt_session_manager_self = 0; +TQSessionManager* tqt_session_manager_self = nullptr; TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString &key ) : TQObject( app, "tqt_sessionmanager" ) { diff --git a/src/kernel/tqapplication.h b/src/kernel/tqapplication.h index ef1050774..ae83abd50 100644 --- a/src/kernel/tqapplication.h +++ b/src/kernel/tqapplication.h @@ -117,14 +117,14 @@ public: static bool hasGlobalMouseTracking(); static void setGlobalMouseTracking( bool enable ); #ifndef TQT_NO_PALETTE - static TQPalette palette( const TQWidget* = 0 ); + static TQPalette palette( const TQWidget* = nullptr ); static TQPalette palette( TQStringList ); static void setPalette( const TQPalette &, bool informWidgets=false, - const char* className = 0 ); + const char* className = nullptr ); #endif - static TQFont font( const TQWidget* = 0 ); + static TQFont font( const TQWidget* = nullptr ); static void setFont( const TQFont &, bool informWidgets=false, - const char* className = 0 ); + const char* className = nullptr ); static TQFontMetrics fontMetrics(); TQWidget *mainWidget() const; @@ -188,7 +188,7 @@ public: enum Encoding { DefaultCodec, UnicodeUTF8 }; TQString translate( const char * context, const char * key, - const char * comment = 0, + const char * comment = nullptr, Encoding encoding = DefaultCodec ) const; #ifndef TQT_NO_DIR TQString applicationDirPath(); @@ -485,7 +485,7 @@ inline TQWidget *TQApplication::widgetAt( const TQPoint &p, bool child ) inline bool TQApplication::inPopupMode() const { - return popupWidgets != 0; + return popupWidgets; } #ifndef TQT_NO_SESSIONMANAGER inline bool TQApplication::isSessionRestored() const diff --git a/src/kernel/tqapplication_p.h b/src/kernel/tqapplication_p.h index 3ba8b0846..2c28899d2 100644 --- a/src/kernel/tqapplication_p.h +++ b/src/kernel/tqapplication_p.h @@ -90,6 +90,6 @@ extern int tqt_ncols_option; extern void tqt_dispatchEnterLeave( TQWidget*, TQWidget* ); -extern bool tqt_tryModalHelper( TQWidget *, TQWidget ** = 0 ); +extern bool tqt_tryModalHelper( TQWidget *, TQWidget ** = nullptr ); #endif diff --git a/src/kernel/tqapplication_x11.cpp b/src/kernel/tqapplication_x11.cpp index 08603d96c..918cfbac1 100644 --- a/src/kernel/tqapplication_x11.cpp +++ b/src/kernel/tqapplication_x11.cpp @@ -185,18 +185,18 @@ const int XKeyRelease = KeyRelease; *****************************************************************************/ static const char *appName; // application name static const char *appClass; // application class -static const char *appFont = 0; // application font -static const char *appBGCol = 0; // application bg color -static const char *appFGCol = 0; // application fg color -static const char *appBTNCol = 0; // application btn color -static const char *mwGeometry = 0; // main widget geometry -static const char *mwTitle = 0; // main widget title +static const char *appFont = nullptr; // application font +static const char *appBGCol = nullptr; // application bg color +static const char *appFGCol = nullptr; // application fg color +static const char *appBTNCol = nullptr; // application btn color +static const char *mwGeometry = nullptr; // main widget geometry +static const char *mwTitle = nullptr; // main widget title //Ming-Che 10/10 -TQ_EXPORT char *tqt_ximServer = 0; // XIM Server will connect to +TQ_EXPORT char *tqt_ximServer = nullptr; // XIM Server will connect to static bool mwIconic = false; // main widget iconified //Ming-Che 10/10 -static Display *appDpy = 0; // X11 application display -static char *appDpyName = 0; // X11 display name +static Display *appDpy = nullptr; // X11 application display +static char *appDpyName = nullptr; // X11 display name static bool appForeignDpy = false; // we didn't create display static bool appSync = false; // X11 synchronization #if defined(QT_DEBUG) @@ -209,10 +209,10 @@ static bool app_save_rootinfo = false; // save root info static bool app_do_modal = false; // modal mode static Window curWin = 0; // current window -static GC* app_gc_ro = 0; // read-only GC -static GC* app_gc_tmp = 0; // temporary GC -static GC* app_gc_ro_m = 0; // read-only GC (monochrome) -static GC* app_gc_tmp_m = 0; // temporary GC (monochrome) +static GC* app_gc_ro = nullptr; // read-only GC +static GC* app_gc_tmp = nullptr; // temporary GC +static GC* app_gc_ro_m = nullptr; // read-only GC (monochrome) +static GC* app_gc_tmp_m = nullptr; // temporary GC (monochrome) // symbols needed by extern TQXEmbed class TQ_EXPORT Atom tqt_wm_protocols = 0; // window manager protocols TQ_EXPORT Atom tqt_wm_delete_window = 0; // delete window protocol @@ -296,9 +296,9 @@ Atom tqt_net_wm_full_placement = 0; // KDE extension Atom tqt_enlightenment_desktop = 0; // window managers list of supported "stuff" -Atom *tqt_net_supported_list = 0; +Atom *tqt_net_supported_list = nullptr; // list of virtual root windows -Window *tqt_net_virtual_root_list = 0; +Window *tqt_net_virtual_root_list = nullptr; // X11 SYNC support @@ -361,8 +361,8 @@ static bool ignoreNextMouseReleaseEvent = false; // ignore the next mouse re // event if return from a modal // widget -static TQWidget *popupButtonFocus = 0; -static TQWidget *popupOfPopupButtonFocus = 0; +static TQWidget *popupButtonFocus = nullptr; +static TQWidget *popupOfPopupButtonFocus = nullptr; static bool popupCloseDownMode = false; static bool popupGrabOk; @@ -405,7 +405,7 @@ static uint appliedstamp = 0; typedef int (*QX11EventFilter) (XEvent*); QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter); -static QX11EventFilter tqt_x11_event_filter = 0; +static QX11EventFilter tqt_x11_event_filter = nullptr; TQ_EXPORT QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter) { QX11EventFilter old_filter = tqt_x11_event_filter; @@ -431,7 +431,7 @@ static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing; #endif TQ_EXPORT int tqt_ximComposingKeycode=0; -TQ_EXPORT TQTextCodec * tqt_input_mapper = 0; +TQ_EXPORT TQTextCodec * tqt_input_mapper = nullptr; TQ_EXPORT Time tqt_x_time = CurrentTime; TQ_EXPORT Time tqt_x_user_time = CurrentTime; @@ -465,7 +465,7 @@ bool tqt_try_modal( TQWidget *, XEvent * ); int tqt_ncols_option = 216; // used in tqcolor_x11.cpp int tqt_visual_option = -1; bool tqt_cmap_option = false; -TQWidget *tqt_button_down = 0; // widget got last button-down +TQWidget *tqt_button_down = nullptr; // widget got last button-down extern bool tqt_tryAccelEvent( TQWidget*, TQKeyEvent* ); // def in tqaccel.cpp @@ -478,7 +478,7 @@ struct TQScrollInProgress { int dx, dy; }; long TQScrollInProgress::serial=0; -static TQPtrList *sip_list = 0; +static TQPtrList *sip_list = nullptr; // stuff in tqdnd_x11.cpp @@ -528,11 +528,11 @@ extern void tqt_create_std_palette(); void tqt_x11_intern_atom( const char *, Atom * ); -static TQPtrList* deferred_map_list = 0; +static TQPtrList* deferred_map_list = nullptr; static void tqt_deferred_map_cleanup() { delete deferred_map_list; - deferred_map_list = 0; + deferred_map_list = nullptr; } void tqt_deferred_map_add( TQWidget* w) { @@ -729,7 +729,7 @@ void TQApplication::create_xim() TQWidgetList *list= tqApp->topLevelWidgets(); TQWidgetListIt it(*list); TQWidget * w; - while( (w=it.current()) != 0 ) { + while( (w=it.current()) ) { ++it; w->createTLSysExtra(); } @@ -825,7 +825,7 @@ static int tqt_x_errhandler( Display *dpy, XErrorEvent *err ) static int tqt_xio_errhandler( Display * ) { tqWarning( "%s: Fatal IO error: client killed", appName ); - tqApp = 0; + tqApp = nullptr; exit( 1 ); //### give the application a chance for a proper shutdown instead, //### exit(1) doesn't help. @@ -839,7 +839,7 @@ static int tqt_xio_errhandler( Display * ) // Memory leak: if the app exits before tqt_init_internal(), this dict // isn't released correctly. -static TQAsciiDict *atoms_to_be_created = 0; +static TQAsciiDict *atoms_to_be_created = nullptr; static bool create_atoms_now = 0; /***************************************************************************** @@ -909,7 +909,7 @@ static void tqt_x11_process_intern_atoms() } #endif delete atoms_to_be_created; - atoms_to_be_created = 0; + atoms_to_be_created = nullptr; create_atoms_now = true; } } @@ -927,7 +927,7 @@ bool TQApplication::x11_apply_settings() int format; long offset = 0; unsigned long nitems, after = 1; - unsigned char *data = 0; + unsigned char *data = nullptr; TQDateTime timestamp, settingsstamp; bool update_timestamp = false; @@ -1218,8 +1218,8 @@ static void tqt_set_input_encoding() // set font, foreground and background from x11 resources. The // arguments may override the resource settings. -static void tqt_set_x11_resources( const char* font = 0, const char* fg = 0, - const char* bg = 0, const char* button = 0 ) +static void tqt_set_x11_resources( const char* font = nullptr, const char* fg = nullptr, + const char* bg = nullptr, const char* button = nullptr ) { if ( !tqt_std_pal ) tqt_create_std_palette(); @@ -1425,7 +1425,7 @@ static void tqt_detect_broken_window_manager() Atom type; int format; ulong nitems, after; - uchar *data = 0; + uchar *data = nullptr; // look for SGI's 4Dwm int e = XGetWindowProperty(appDpy, TQPaintDevice::x11AppRootWindow(), @@ -1448,7 +1448,7 @@ void tqt_get_net_supported() int format; long offset = 0; unsigned long nitems, after; - unsigned char *data = 0; + unsigned char *data = nullptr; int e = XGetWindowProperty(appDpy, TQPaintDevice::x11AppRootWindow(), tqt_net_supported, 0, 0, @@ -1458,7 +1458,7 @@ void tqt_get_net_supported() if (tqt_net_supported_list) delete [] tqt_net_supported_list; - tqt_net_supported_list = 0; + tqt_net_supported_list = nullptr; if (e == Success && type == XA_ATOM && format == 32) { TQBuffer ts; @@ -1514,7 +1514,7 @@ void tqt_get_net_virtual_roots() { if (tqt_net_virtual_root_list) delete [] tqt_net_virtual_root_list; - tqt_net_virtual_root_list = 0; + tqt_net_virtual_root_list = nullptr; if (! tqt_net_supports(tqt_net_virtual_roots)) return; @@ -1693,7 +1693,7 @@ void tqt_init_internal( int *argcptr, char **argv, // Set application name and class appName = tqstrdup( "TQt-subapplication" ); - char *app_class = 0; + char *app_class = nullptr; if (argv) { const char* p = strrchr( argv[0], '/' ); app_class = tqstrdup(p ? p + 1 : argv[0]); @@ -1716,7 +1716,7 @@ void tqt_init_internal( int *argcptr, char **argv, original_xio_errhandler = XSetIOErrorHandler( tqt_xio_errhandler ); // Set application name and class - char *app_class = 0; + char *app_class = nullptr; if (argv) { const char *p = strrchr( argv[0], '/' ); appName = p ? p + 1 : argv[0]; @@ -1846,10 +1846,10 @@ void tqt_init_internal( int *argcptr, char **argv, // Connect to X server if( tqt_is_gui_used ) { - if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { + if ( !( appDpy = XOpenDisplay(appDpyName) ) ) { tqWarning( "%s: cannot connect to X server %s", appName, XDisplayName(appDpyName) ); - tqApp = 0; + tqApp = nullptr; exit( 1 ); } @@ -1896,7 +1896,7 @@ void tqt_init_internal( int *argcptr, char **argv, TQPaintDevice::x_approotwindow_arr[ screen ] = RootWindow(appDpy, screen); // setup the visual and colormap for each screen - Visual *vis = 0; + Visual *vis = nullptr; if ( visual && screen == appScreen ) { // use the provided visual on the default screen only vis = (Visual *) visual; @@ -1915,7 +1915,7 @@ void tqt_init_internal( int *argcptr, char **argv, XFree(vi); } else { // couldn't get info about the visual, use the default instead - vis = 0; + vis = nullptr; } } @@ -2107,7 +2107,7 @@ void tqt_init_internal( int *argcptr, char **argv, XRenderPictFormat *format = XRenderFindVisualFormat(appDpy, (Visual *) TQPaintDevice::x_appvisual); - tqt_use_xrender = (format != 0) && (TQPaintDevice::x_appdepth != 8); + tqt_use_xrender = (format) && (TQPaintDevice::x_appdepth != 8); } #endif // TQT_NO_XRENDER @@ -2130,13 +2130,13 @@ void tqt_init_internal( int *argcptr, char **argv, #if !defined(TQT_NO_XFTFREETYPE) // defined in tqfont_x11.cpp extern bool tqt_has_xft; - tqt_has_xft = XftInit(0) && XftInitFtLibrary(); + tqt_has_xft = XftInit(nullptr) && XftInitFtLibrary(); if (tqt_has_xft) { char *dpi_str = XGetDefault(appDpy, "Xft", "dpi"); if (dpi_str) { // use a custom DPI - char *end = 0; + char *end = nullptr; int dpi = strtol(dpi_str, &end, 0); if (dpi_str != end) { for (int s = 0; s < ScreenCount(appDpy); ++s) { @@ -2416,7 +2416,7 @@ void TQApplication::x11_initialize_style() if ( data ) XFree( (char *)data ); // twin is there. check if KDE's styles are available, // otherwise use windows style - if ( (app_style = TQStyleFactory::create("highcolor") ) == 0 ) + if ( !(app_style = TQStyleFactory::create("highcolor") ) ) app_style = TQStyleFactory::create("windows"); } if ( !app_style && @@ -2449,12 +2449,12 @@ void TQApplication::x11_initialize_style() void tqt_init( int *argcptr, char **argv, TQApplication::Type ) { - tqt_init_internal( argcptr, argv, 0, 0, 0 ); + tqt_init_internal( argcptr, argv, nullptr, 0, 0 ); } void tqt_init( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap ) { - tqt_init_internal( 0, 0, display, visual, colormap ); + tqt_init_internal( nullptr, nullptr, display, visual, colormap ); } void tqt_init( int *argcptr, char **argv, Display *display, TQt::HANDLE visual, TQt::HANDLE colormap ) @@ -2510,7 +2510,7 @@ void tqt_cleanup() } } -#define QT_CLEANUP_GC(g) if (g) { for (int i=0;ix11Display(), main_widget->winId(), - 0, 0, app_argv, app_argc, 0, 0, 0 ); + nullptr, nullptr, app_argv, app_argc, nullptr, nullptr, nullptr ); if ( mwTitle ) XStoreName( main_widget->x11Display(), main_widget->winId(), (char*)mwTitle ); if ( mwGeometry ) { // parse geometry @@ -2818,7 +2818,7 @@ extern void tqt_x11_enforce_cursor( TQWidget * w ); typedef TQPtrList TQCursorList; -static TQCursorList *cursorStack = 0; +static TQCursorList *cursorStack = nullptr; /*! \fn TQCursor *TQApplication::overrideCursor() @@ -2903,7 +2903,7 @@ void TQApplication::restoreOverrideCursor() return; cursorStack->removeLast(); app_cursor = cursorStack->last(); - if ( TQWidget::mapper != 0 && !closingDown() ) { + if ( TQWidget::mapper && !closingDown() ) { TQWidgetIntDictIt it( *((TQWidgetIntDict*)TQWidget::mapper) ); TQWidget *w; while ( (w=it.current()) ) { // set back to original cursors @@ -2915,7 +2915,7 @@ void TQApplication::restoreOverrideCursor() } if ( !app_cursor ) { delete cursorStack; - cursorStack = 0; + cursorStack = nullptr; } } @@ -2998,7 +2998,7 @@ Window tqt_x11_findClientWindow( Window win, Atom property, bool leaf ) int format, i; ulong nitems, after; uchar *data; - Window root, parent, target=0, *children=0; + Window root, parent, target=0, *children=nullptr; uint nchildren; if ( XGetWindowProperty( appDpy, win, property, 0, 0, false, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) { @@ -3043,10 +3043,10 @@ TQWidget *TQApplication::widgetAt( int x, int y, bool child ) TQPaintDevice::x11AppRootWindow(screen), TQPaintDevice::x11AppRootWindow(screen), x, y, &lx, &ly, &target) ) { - return 0; + return nullptr; } if ( !target || target == TQPaintDevice::x11AppRootWindow(screen) ) - return 0; + return nullptr; TQWidget *w, *c; w = TQWidget::find( (WId)target ); @@ -3054,7 +3054,7 @@ TQWidget *TQApplication::widgetAt( int x, int y, bool child ) tqt_ignore_badwindow(); target = tqt_x11_findClientWindow( target, tqt_wm_state, true ); if (tqt_badwindow() ) - return 0; + return nullptr; w = TQWidget::find( (WId)target ); #if 0 if ( !w ) { @@ -3164,7 +3164,7 @@ void TQApplication::beep() Special lookup functions for windows that have been reparented recently *****************************************************************************/ -static TQWidgetIntDict *wPRmapper = 0; // alternative widget mapper +static TQWidgetIntDict *wPRmapper = nullptr; // alternative widget mapper void qPRCreate( const TQWidget *widget, Window oldwin ) { // TQWidget::reparent mechanism @@ -3192,7 +3192,7 @@ void qPRCleanup( TQWidget *widget ) wPRmapper->remove( key );// old window no longer needed if ( wPRmapper->count() == 0 ) { // became empty delete wPRmapper; // then reset alt mapper - wPRmapper = 0; + wPRmapper = nullptr; return; } } @@ -3201,7 +3201,7 @@ void qPRCleanup( TQWidget *widget ) static TQETWidget *qPRFindWidget( Window oldwin ) { - return wPRmapper ? (TQETWidget*)wPRmapper->find((long)oldwin) : 0; + return wPRmapper ? (TQETWidget*)wPRmapper->find((long)oldwin) : nullptr; } /*! @@ -3324,7 +3324,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) TQETWidget *widget = (TQETWidget*)TQWidget::find( (WId)event->xany.window ); if ( wPRmapper ) { // just did a widget reparent? - if ( widget == 0 ) { // not in std widget mapper + if ( !widget ) { // not in std widget mapper switch ( event->type ) { // only for mouse/key events case ButtonPress: case ButtonRelease: @@ -3339,7 +3339,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) qPRCleanup( widget ); // remove from alt mapper } - TQETWidget *keywidget=0; + TQETWidget *keywidget=nullptr; bool grabbed=false; if ( event->type==XKeyPress || event->type==XKeyRelease ) { keywidget = (TQETWidget*)TQWidget::keyboardGrabber(); @@ -3627,7 +3627,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) event->xfocus.detail != NotifyNonlinear ) break; if ( !inPopupMode() && widget == active_window ) - setActiveWindow( 0 ); + setActiveWindow( nullptr ); break; case EnterNotify: { // enter window @@ -3662,7 +3662,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) if ( !widget->isDesktop() ) widget->translateMouseEvent( event ); //we don't get MotionNotify, emulate it - TQWidget* enter = 0; + TQWidget* enter = nullptr; XEvent ev; while ( XCheckMaskEvent( widget->x11Display(), EnterWindowMask | LeaveWindowMask , &ev ) && !tqt_x11EventFilter( &ev )) { @@ -3693,11 +3693,11 @@ int TQApplication::x11ProcessEvent( XEvent* event ) event->xcrossing.focus && widget == active_window && tqt_focus_model == FocusModel_PointerRoot // PointerRoot mode ) { - setActiveWindow( 0 ); + setActiveWindow( nullptr ); } if ( !curWin ) - tqt_dispatchEnterLeave( widget, 0 ); + tqt_dispatchEnterLeave( widget, nullptr ); tqt_dispatchEnterLeave( enter, widget ); curWin = enter ? enter->winId() : 0; @@ -3861,7 +3861,7 @@ void tqt_enter_modal( TQWidget *widget ) TQApplication::sendEvent(widget->parentWidget(), &e); } - tqt_dispatchEnterLeave( 0, TQWidget::find((WId)curWin) ); + tqt_dispatchEnterLeave( nullptr, TQWidget::find((WId)curWin) ); tqt_modal_stack->insert( 0, widget ); app_do_modal = true; curWin = 0; @@ -3874,14 +3874,14 @@ void tqt_leave_modal( TQWidget *widget ) if ( tqt_modal_stack && tqt_modal_stack->removeRef(widget) ) { if ( tqt_modal_stack->isEmpty() ) { delete tqt_modal_stack; - tqt_modal_stack = 0; + tqt_modal_stack = nullptr; TQPoint p( TQCursor::pos() ); TQWidget* w = TQApplication::widgetAt( p.x(), p.y(), true ); tqt_dispatchEnterLeave( w, TQWidget::find( curWin ) ); // send synthetic enter event curWin = w? w->winId() : 0; } } - app_do_modal = tqt_modal_stack != 0; + app_do_modal = tqt_modal_stack; ignoreNextMouseReleaseEvent = true; if (widget->parentWidget()) { @@ -3990,13 +3990,13 @@ void TQApplication::closePopup( TQWidget *popup ) return; popupWidgets->removeRef( popup ); if (popup == popupOfPopupButtonFocus) { - popupButtonFocus = 0; - popupOfPopupButtonFocus = 0; + popupButtonFocus = nullptr; + popupOfPopupButtonFocus = nullptr; } if ( popupWidgets->count() == 0 ) { // this was the last popup popupCloseDownMode = true; // control mouse events delete popupWidgets; - popupWidgets = 0; + popupWidgets = nullptr; if ( !tqt_nograb() && popupGrabOk ) { // grabbing not disabled if ( mouseButtonState != 0 || popup->geometry(). contains(TQPoint(mouseGlobalXPos, mouseGlobalYPos) ) ) @@ -4133,7 +4133,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) if ( tqt_button_down && (state & (LeftButton | MidButton | RightButton ) ) == 0 ) - tqt_button_down = 0; + tqt_button_down = nullptr; // throw away mouse move events that are sent multiple times to the same // position @@ -4157,7 +4157,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) if ( tqt_button_down && (state & (LeftButton | MidButton | RightButton ) ) == 0 ) - tqt_button_down = 0; + tqt_button_down = nullptr; if ( !tqt_button_down ) state = state & ~(LeftButton | MidButton | RightButton ); } else { // button press or release @@ -4265,8 +4265,8 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) TQWidget *popupTarget = popupChild ? popupChild : popup; if (popup != popupOfPopupButtonFocus){ - popupButtonFocus = 0; - popupOfPopupButtonFocus = 0; + popupButtonFocus = nullptr; + popupOfPopupButtonFocus = nullptr; } if ( !popupTarget->isEnabled() ) { @@ -4297,8 +4297,8 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) globalPos, button, state ); TQApplication::sendSpontaneousEvent( popupButtonFocus, &e ); if ( releaseAfter ) { - popupButtonFocus = 0; - popupOfPopupButtonFocus = 0; + popupButtonFocus = nullptr; + popupOfPopupButtonFocus = nullptr; } } else if ( popupChild ) { TQMouseEvent e( type, popupChild->mapFromGlobal(globalPos), @@ -4320,7 +4320,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) } if ( releaseAfter ) - tqt_button_down = 0; + tqt_button_down = nullptr; if ( tqApp->inPopupMode() ) { // still in popup mode if ( popupGrabOk ) @@ -4358,7 +4358,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) (state & (~button) & ( LeftButton | MidButton | RightButton)) == 0 ) { - tqt_button_down = 0; + tqt_button_down = nullptr; } int oldOpenPopupCount = openPopupCount; @@ -4422,8 +4422,8 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev ) TQPair tId; XEvent xinputMotionEvent; XEvent mouseMotionEvent; - const XDeviceMotionEvent *motion = 0; - XDeviceButtonEvent *button = 0; + const XDeviceMotionEvent *motion = nullptr; + XDeviceButtonEvent *button = nullptr; TQEvent::Type t; if ( ev->type == xinput_motion ) { @@ -4528,7 +4528,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event) Atom ret; int format, e; - unsigned char *data = 0; + unsigned char *data = nullptr; unsigned long nitems, after; if (event->xproperty.atom == tqt_net_wm_frame_strut) { @@ -4933,17 +4933,17 @@ static const KeySym KeyTbl[] = { // keyboard mapping table }; -static TQIntDict *keyDict = 0; -static TQIntDict *textDict = 0; +static TQIntDict *keyDict = nullptr; +static TQIntDict *textDict = nullptr; static void deleteKeyDicts() { if ( keyDict ) delete keyDict; - keyDict = 0; + keyDict = nullptr; if ( textDict ) delete textDict; - textDict = 0; + textDict = nullptr; } #if !defined(TQT_NO_XIM) @@ -5163,7 +5163,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, #endif if ( !mb ) { count = XLookupString( &xkeyevent, - chars.data(), chars.size(), &key, 0 ); + chars.data(), chars.size(), &key, nullptr ); } if ( count && !keycode ) { keycode = tqt_ximComposingKeycode; @@ -5197,13 +5197,13 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, case 11: // APL case 14: // Korean, no mapping mib = -1; // manual conversion - mapper = 0; + mapper = nullptr; converted = keysymToUnicode( byte3, key & 0xff ); case 0x20: // currency symbols if ( key >= 0x20a0 && key <= 0x20ac ) { mib = -1; // manual conversion - mapper = 0; + mapper = nullptr; converted = (uint)key; } break; @@ -5217,7 +5217,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, } } else if ( key >= 0x1000000 && key <= 0x100ffff ) { converted = (ushort) (key - 0x1000000); - mapper = 0; + mapper = nullptr; } if ( count < (int)chars.size()-1 ) chars[count] = '\0'; @@ -6158,7 +6158,7 @@ class TQSmSocketReceiver : public TQObject TQ_OBJECT public: TQSmSocketReceiver( int socket ) - : TQObject(0,0) + : TQObject(nullptr,nullptr) { TQSocketNotifier* sn = new TQSocketNotifier( socket, TQSocketNotifier::Read, this ); connect( sn, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( socketActivated(int) ) ); @@ -6169,7 +6169,7 @@ public slots: }; -static SmcConn smcConnection = 0; +static SmcConn smcConnection = nullptr; static bool sm_interactionActive; static bool sm_smActive; static int sm_interactStyle; @@ -6182,7 +6182,7 @@ static bool sm_isshutdown; static bool sm_phase2; static bool sm_in_phase2; -static TQSmSocketReceiver* sm_receiver = 0; +static TQSmSocketReceiver* sm_receiver = nullptr; static void resetSmState(); static void sm_setProperty( const char* name, const char* type, @@ -6294,7 +6294,7 @@ static void sm_performSaveYourself( TQSessionManagerData* smd ) // generate a new session key timeval tv; - gettimeofday( &tv, 0 ); + gettimeofday( &tv, nullptr ); smd->sessionKey = TQString::number( tv.tv_sec ) + "_" + TQString::number(tv.tv_usec); // tell the session manager about our program in best POSIX style @@ -6408,7 +6408,7 @@ static void sm_saveYourselfPhase2Callback( SmcConn smcConn, SmPointer clientData void TQSmSocketReceiver::socketActivated(int) { - IceProcessMessages( SmcGetIceConnection( smcConnection ), 0, 0); + IceProcessMessages( SmcGetIceConnection( smcConnection ), nullptr, nullptr); } @@ -6423,7 +6423,7 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString& resetSmState(); char cerror[256]; - char* myId = 0; + char* myId = nullptr; char* prevId = (char*)id.latin1(); // we know what we are doing SmcCallbacks cb; @@ -6441,7 +6441,7 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString& if ( !session_manager || !session_manager[0] ) return; - smcConnection = SmcOpenConnection( 0, 0, 1, 0, + smcConnection = SmcOpenConnection( nullptr, nullptr, 1, 0, SmcSaveYourselfProcMask | SmcDieProcMask | SmcSaveCompleteProcMask | @@ -6466,8 +6466,8 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString& TQSessionManager::~TQSessionManager() { if ( smcConnection ) - SmcCloseConnection( smcConnection, 0, 0 ); - smcConnection = 0; + SmcCloseConnection( smcConnection, 0, nullptr ); + smcConnection = nullptr; delete sm_receiver; delete d; } diff --git a/src/kernel/tqasyncimageio.cpp b/src/kernel/tqasyncimageio.cpp index 42697d495..86adbb037 100644 --- a/src/kernel/tqasyncimageio.cpp +++ b/src/kernel/tqasyncimageio.cpp @@ -319,7 +319,7 @@ public: int count; }; -TQPtrList * TQImageDecoderPrivate::factories = 0; +TQPtrList * TQImageDecoderPrivate::factories = nullptr; // See tqgif.h for important information regarding this option #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1 TQGIFFormatType * TQImageDecoderPrivate::gif_decoder_factory = 0; @@ -329,7 +329,7 @@ TQGIFFormatType * TQImageDecoderPrivate::gif_decoder_factory = 0; void TQImageDecoderPrivate::cleanup() { delete factories; - factories = 0; + factories = nullptr; // See tqgif.h for important information regarding this option #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1 delete gif_decoder_factory; @@ -348,7 +348,7 @@ TQImageDecoder::TQImageDecoder(TQImageConsumer* c) d = new TQImageDecoderPrivate; TQ_CHECK_PTR(d); consumer = c; - actual_decoder = 0; + actual_decoder = nullptr; } /*! @@ -441,7 +441,7 @@ TQImageFormatType* TQImageDecoder::format( const char* name ) if ( tqstricmp(name,f->formatName())==0 ) return f; } - return 0; + return nullptr; } /*! @@ -455,7 +455,7 @@ const char* TQImageDecoder::formatName(const uchar* buffer, int length) { TQImageDecoderPrivate::ensureFactories(); - const char* name = 0; + const char* name = nullptr; for (TQImageFormatType* f = TQImageDecoderPrivate::factories->first(); f && !name; f = TQImageDecoderPrivate::factories->next()) diff --git a/src/kernel/tqasyncio.cpp b/src/kernel/tqasyncio.cpp index aa3fff18a..8be01f268 100644 --- a/src/kernel/tqasyncio.cpp +++ b/src/kernel/tqasyncio.cpp @@ -70,7 +70,7 @@ TQAsyncIO::~TQAsyncIO() */ void TQAsyncIO::connect(TQObject* obj, const char *member) { - signal.disconnect(0, 0); + signal.disconnect(nullptr, nullptr); signal.connect(obj, member); } diff --git a/src/kernel/tqbitmap.h b/src/kernel/tqbitmap.h index 6d862bfaf..8dadf7ff8 100644 --- a/src/kernel/tqbitmap.h +++ b/src/kernel/tqbitmap.h @@ -58,7 +58,7 @@ public: TQBitmap( const TQSize &, const uchar *bits, bool isXbitmap=false ); TQBitmap( const TQBitmap & ); #ifndef TQT_NO_IMAGEIO - TQBitmap( const TQString &fileName, const char *format=0 ); + TQBitmap( const TQString &fileName, const char *format=nullptr ); #endif TQBitmap &operator=( const TQBitmap & ); TQBitmap &operator=( const TQPixmap & ); diff --git a/src/kernel/tqclipboard.h b/src/kernel/tqclipboard.h index 32d715bb3..b4a05a43f 100644 --- a/src/kernel/tqclipboard.h +++ b/src/kernel/tqclipboard.h @@ -54,7 +54,7 @@ class TQ_EXPORT TQClipboard : public TQObject { TQ_OBJECT private: - TQClipboard( TQObject *parent=0, const char *name=0 ); + TQClipboard( TQObject *parent=nullptr, const char *name=nullptr ); ~TQClipboard(); public: diff --git a/src/kernel/tqclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp index 87ea4041a..8c97c9432 100644 --- a/src/kernel/tqclipboard_x11.cpp +++ b/src/kernel/tqclipboard_x11.cpp @@ -102,8 +102,8 @@ extern const char* tqt_xdnd_atom_to_str( Atom ); static int clipboard_timeout = 5000; // 5s timeout on clipboard operations -static TQWidget * owner = 0; -static TQWidget *requestor = 0; +static TQWidget * owner = nullptr; +static TQWidget *requestor = nullptr; static bool inSelectionMode_obsolete = false; // ### remove 4.0 static bool timer_event_clear = false; static int timer_id = 0; @@ -122,15 +122,15 @@ static int capture_event_type = -1; static XEvent captured_event; class TQClipboardWatcher; // forward decl -static TQClipboardWatcher *selection_watcher = 0; -static TQClipboardWatcher *clipboard_watcher = 0; +static TQClipboardWatcher *selection_watcher = nullptr; +static TQClipboardWatcher *clipboard_watcher = nullptr; static void cleanup() { delete owner; delete requestor; - owner = 0; - requestor = 0; + owner = nullptr; + requestor = nullptr; } static @@ -138,8 +138,8 @@ void setupOwner() { if ( owner ) return; - owner = new TQWidget( 0, "internal clipboard owner" ); - requestor = new TQWidget(0, "internal clipboard requestor"); + owner = new TQWidget( nullptr, "internal clipboard owner" ); + requestor = new TQWidget(nullptr, "internal clipboard requestor"); tqAddPostRoutine( cleanup ); } @@ -208,7 +208,7 @@ public: TQClipboardData::TQClipboardData() { - src = 0; + src = nullptr; timestamp = CurrentTime; tindex=0; } @@ -220,23 +220,23 @@ void TQClipboardData::clear(bool destruct) { if(destruct) delete src; - src = 0; + src = nullptr; timestamp = CurrentTime; } -static TQClipboardData *internalCbData = 0; -static TQClipboardData *internalSelData = 0; +static TQClipboardData *internalCbData = nullptr; +static TQClipboardData *internalSelData = nullptr; static void cleanupClipboardData() { delete internalCbData; - internalCbData = 0; + internalCbData = nullptr; } static TQClipboardData *clipboardData() { - if ( internalCbData == 0 ) { + if ( !internalCbData ) { internalCbData = new TQClipboardData; TQ_CHECK_PTR( internalCbData ); tqAddPostRoutine( cleanupClipboardData ); @@ -253,12 +253,12 @@ void tqt_clipboard_cleanup_mime_source(TQMimeSource *src) static void cleanupSelectionData() { delete internalSelData; - internalSelData = 0; + internalSelData = nullptr; } static TQClipboardData *selectionData() { - if (internalSelData == 0) { + if (!internalSelData) { internalSelData = new TQClipboardData; TQ_CHECK_PTR(internalSelData); tqAddPostRoutine(cleanupSelectionData); @@ -283,8 +283,8 @@ public: }; typedef TQMap TransactionMap; -static TransactionMap *transactions = 0; -static QX11EventFilter prev_x11_event_filter = 0; +static TransactionMap *transactions = nullptr; +static QX11EventFilter prev_x11_event_filter = nullptr; static int incr_timer_id = 0; static int tqt_xclb_transation_event_handler(XEvent *event) @@ -340,7 +340,7 @@ TQClipboardINCRTransaction::~TQClipboardINCRTransaction(void) if (transactions->isEmpty()) { VTQDEBUG("TQClipboard: no more INCR transations"); delete transactions; - transactions = 0; + transactions = nullptr; (void)tqt_set_x11_event_filter(prev_x11_event_filter); if (incr_timer_id != 0) { @@ -387,7 +387,7 @@ int TQClipboardINCRTransaction::x11Event(XEvent *event) void TQClipboard::clear( Mode mode ) -{ setData(0, mode); } +{ setData(nullptr, mode); } /*! @@ -536,7 +536,7 @@ bool tqt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, // process other clipboard events, since someone is probably requesting data from us XEvent e; - if (XCheckIfEvent(dpy, &e, checkForClipboardEvents, 0)) + if (XCheckIfEvent(dpy, &e, checkForClipboardEvents, nullptr)) tqApp->x11ProcessEvent(&e); now = TQTime::currentTime(); @@ -552,7 +552,7 @@ bool tqt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, struct timeval usleep_tv; usleep_tv.tv_sec = 0; usleep_tv.tv_usec = 50000; - select(0, 0, 0, 0, &usleep_tv); + select(0, nullptr, nullptr, nullptr, &usleep_tv); } while ( started.msecsTo(now) < timeout ); return false; @@ -657,7 +657,7 @@ bool tqt_xclb_read_property( Display *dpy, Window win, Atom property, textprop.nitems = length; textprop.value = (unsigned char *) buffer->data(); - char **list_ret = 0; + char **list_ret = nullptr; int count; if ( XmbTextPropertyToTextList( dpy, &textprop, &list_ret, &count ) == Success && @@ -718,7 +718,7 @@ TQByteArray tqt_xclb_read_incremental_property( Display *dpy, Window win, event.xproperty.state != PropertyNewValue ) continue; if ( tqt_xclb_read_property(dpy, win, property, true, &tmp_buf, - &length,0, 0, false) ) { + &length,nullptr, nullptr, false) ) { if ( length == 0 ) { // no more data, we're done if ( nullterm ) { buf.resize( offset+1 ); @@ -746,7 +746,7 @@ TQByteArray tqt_xclb_read_incremental_property( Display *dpy, Window win, // timed out ... create a new requestor window, otherwise the requestor // could consider next request to be still part of this timed out request delete requestor; - requestor = new TQWidget( 0, "internal clipboard requestor" ); + requestor = new TQWidget( nullptr, "internal clipboard requestor" ); return TQByteArray(); } @@ -848,7 +848,7 @@ static Atom send_string_selection(TQClipboardData *d, Atom target, Window window } Atom xtarget = None; - const char *fmt = 0; + const char *fmt = nullptr; if (target == XA_STRING || (target == xa_text && TQTextCodec::codecForLocale()->mibEnum() == 4)) { // the ICCCM states that STRING is latin1 plus newline and tab @@ -1142,7 +1142,7 @@ bool TQClipboard::event( TQEvent *e ) static Atom xa_multiple = *tqt_xdnd_str_to_atom("MULTIPLE"); static Atom xa_timestamp = *tqt_xdnd_str_to_atom("TIMESTAMP"); - struct AtomPair { Atom target; Atom property; } *multi = 0; + struct AtomPair { Atom target; Atom property; } *multi = nullptr; Atom multi_type = None; int multi_format = 0; int nmulti = 0; @@ -1153,7 +1153,7 @@ bool TQClipboard::event( TQEvent *e ) TQByteArray multi_data; if (req->property == None || !tqt_xclb_read_property(dpy, req->requestor, req->property, - false, &multi_data, 0, &multi_type, &multi_format, 0) + false, &multi_data, nullptr, &multi_type, &multi_format, 0) || multi_format != 32) { // MULTIPLE property not formatted correctly XSendEvent(dpy, req->requestor, False, NoEventMask, &event); @@ -1273,9 +1273,9 @@ TQClipboardWatcher::TQClipboardWatcher( TQClipboard::Mode mode ) TQClipboardWatcher::~TQClipboardWatcher() { if( selection_watcher == this ) - selection_watcher = 0; + selection_watcher = nullptr; if( clipboard_watcher == this ) - clipboard_watcher = 0; + clipboard_watcher = nullptr; } bool TQClipboardWatcher::empty() const @@ -1296,7 +1296,7 @@ bool TQClipboardWatcher::empty() const const char* TQClipboardWatcher::format( int n ) const { if ( empty() ) - return 0; + return nullptr; if (! formatList.count()) { // get the list of targets from the current clipboard owner - we do this @@ -1358,7 +1358,7 @@ const char* TQClipboardWatcher::format( int n ) const return formatList[n]; if (n == 0) return "text/plain"; - return 0; + return nullptr; } TQByteArray TQClipboardWatcher::encodedData( const char* fmt ) const @@ -1391,7 +1391,7 @@ TQByteArray TQClipboardWatcher::encodedData( const char* fmt ) const return TQByteArray( 0 ); XGetGeometry(dpy,xpm, &r,&x,&y,&w,&h,&bw,&d); TQImageIO iio; - GC gc = XCreateGC( dpy, xpm, 0, 0 ); + GC gc = XCreateGC( dpy, xpm, 0, nullptr ); if ( d == 1 ) { TQBitmap qbm(w,h); XCopyArea(dpy,xpm,qbm.handle(),gc,0,0,w,h,0,0); @@ -1449,7 +1449,7 @@ TQByteArray TQClipboardWatcher::getDataInFormat(Atom fmtatom) const XSelectInput(dpy, win, PropertyChangeMask); if ( tqt_xclb_read_property(dpy,win,tqt_selection_property,true, - &buf,0,&type,0,false) ) { + &buf,nullptr,&type,nullptr,false) ) { if ( type == tqt_x_incr ) { int nbytes = buf.size() >= 4 ? *((int*)buf.data()) : 0; buf = tqt_xclb_read_incremental_property( dpy, win, @@ -1477,7 +1477,7 @@ TQMimeSource* TQClipboard::data( Mode mode ) const #ifdef QT_CHECK_RANGE tqWarning( "TQClipboard::data: invalid mode '%d'", mode ); #endif // QT_CHECK_RANGE - return 0; + return nullptr; } if ( ! d->source() && ! timer_event_clear ) { diff --git a/src/kernel/tqcolor.h b/src/kernel/tqcolor.h index 96bb758bd..67aea5f16 100644 --- a/src/kernel/tqcolor.h +++ b/src/kernel/tqcolor.h @@ -131,7 +131,7 @@ public: static void destroyAllocContext( int ); #if defined(TQ_WS_WIN) - static const TQRgb* palette( int* numEntries = 0 ); + static const TQRgb* palette( int* numEntries = nullptr ); static int setPaletteEntries( const TQRgb* entries, int numEntries, int base = -1 ); static HPALETTE hPal() { return hpal; } diff --git a/src/kernel/tqcolor_x11.cpp b/src/kernel/tqcolor_x11.cpp index 8ffd8205c..8328dd276 100644 --- a/src/kernel/tqcolor_x11.cpp +++ b/src/kernel/tqcolor_x11.cpp @@ -75,13 +75,13 @@ class TQColorScreenData { public: TQColorScreenData() { - colorDict = 0; + colorDict = nullptr; colors_avail = true; - g_vis = 0; - g_carr = 0; + g_vis = nullptr; + g_carr = nullptr; g_carr_fetch = true; g_cells = 0; - g_our_alloc = 0; + g_our_alloc = nullptr; color_reduce = false; } @@ -102,7 +102,7 @@ public: }; static int screencount = 0; -static TQColorScreenData **screendata = 0; // array of screendata pointers +static TQColorScreenData **screendata = nullptr; // array of screendata pointers /* @@ -358,23 +358,23 @@ void TQColor::cleanup() for ( scr = 0; scr < screencount; scr++ ) { if ( screendata[scr]->g_carr ) { delete [] screendata[scr]->g_carr; - screendata[scr]->g_carr = 0; + screendata[scr]->g_carr = nullptr; } if ( screendata[scr]->g_our_alloc ) { delete [] screendata[scr]->g_our_alloc; - screendata[scr]->g_our_alloc = 0; + screendata[scr]->g_our_alloc = nullptr; } if ( screendata[scr]->colorDict ) { screendata[scr]->colorDict->setAutoDelete( true ); screendata[scr]->colorDict->clear(); delete screendata[scr]->colorDict; - screendata[scr]->colorDict = 0; + screendata[scr]->colorDict = nullptr; } delete screendata[scr]; - screendata[scr] = 0; + screendata[scr] = nullptr; } delete [] screendata; - screendata = 0; + screendata = nullptr; screencount = 0; } diff --git a/src/kernel/tqconnection.cpp b/src/kernel/tqconnection.cpp index 14c7ca41c..498c5515a 100644 --- a/src/kernel/tqconnection.cpp +++ b/src/kernel/tqconnection.cpp @@ -59,7 +59,7 @@ TQConnection::TQConnection( const TQObject *object, int member, mbr_name = memberName; mbr_type = memberType; nargs = 0; - if ( strstr(memberName,"()") == 0 ) { + if ( !strstr(memberName,"()") ) { const char *p = memberName; nargs++; while ( *p ) { diff --git a/src/kernel/tqconnection.h b/src/kernel/tqconnection.h index 6b769484f..37a9837bb 100644 --- a/src/kernel/tqconnection.h +++ b/src/kernel/tqconnection.h @@ -51,7 +51,7 @@ public: TQConnection( const TQObject *, int, const char *memberName, int memberType ); ~TQConnection() {} - bool isConnected() const { return obj != 0; } + bool isConnected() const { return obj; } TQObject *object() const { return obj; } // get object/member pointer int member() const { return mbr; } diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp index d299bdd63..5a7d88216 100644 --- a/src/kernel/tqcursor_x11.cpp +++ b/src/kernel/tqcursor_x11.cpp @@ -74,7 +74,7 @@ TQCursorData::TQCursorData( int s ) { cshape = s; hcurs = 0; - bm = bmm = 0; + bm = bmm = nullptr; hx = hy = 0; pm = pmm = 0; } @@ -126,7 +126,7 @@ const TQCursor & TQt::busyCursor = cursorTable[16]; TQCursor *TQCursor::find_cur( int shape ) // find predefined cursor { - return (uint)shape <= LastCursor ? &cursorTable[shape] : 0; + return (uint)shape <= LastCursor ? &cursorTable[shape] : nullptr; } @@ -147,7 +147,7 @@ void TQCursor::cleanup() for( shape = 0; shape <= LastCursor; shape++ ) { if ( cursorTable[shape].data && cursorTable[shape].data->deref() ) delete cursorTable[shape].data; - cursorTable[shape].data = 0; + cursorTable[shape].data = nullptr; } initialized = false; } @@ -177,7 +177,7 @@ TQCursor::TQCursor() { if ( !initialized ) { if ( tqApp->startingUp() ) { - data = 0; + data = nullptr; return; } initialize(); @@ -584,7 +584,7 @@ void TQCursor::update() const static const uchar *cursor_bits16[] = { cur_ver_bits, mcur_ver_bits, cur_hor_bits, mcur_hor_bits, cur_bdiag_bits, mcur_bdiag_bits, cur_fdiag_bits, mcur_fdiag_bits, - 0, 0, cur_blank_bits, cur_blank_bits }; + nullptr, nullptr, cur_blank_bits, cur_blank_bits }; static const uchar vsplit_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -685,7 +685,7 @@ void TQCursor::update() const static const uchar * const cursor_bits32[] = { vsplit_bits, vsplitm_bits, hsplit_bits, hsplitm_bits, - 0, 0, 0, 0, whatsthis_bits, whatsthism_bits, busy_bits, busym_bits + nullptr, nullptr, nullptr, nullptr, whatsthis_bits, whatsthism_bits, busy_bits, busym_bits }; static const uchar forbidden_bits[] = { diff --git a/src/kernel/tqdesktopwidget.h b/src/kernel/tqdesktopwidget.h index 4126e3c65..285cd1244 100644 --- a/src/kernel/tqdesktopwidget.h +++ b/src/kernel/tqdesktopwidget.h @@ -58,7 +58,7 @@ public: int numScreens() const; int primaryScreen() const; - int screenNumber( TQWidget *widget = 0 ) const; // ### 4.0: const TQWidget* + int screenNumber( TQWidget *widget = nullptr ) const; // ### 4.0: const TQWidget* int screenNumber( const TQPoint & ) const; TQWidget *screen( int screen = -1 ); diff --git a/src/kernel/tqdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp index 1e84d9112..5929aa60d 100644 --- a/src/kernel/tqdesktopwidget_x11.cpp +++ b/src/kernel/tqdesktopwidget_x11.cpp @@ -65,7 +65,7 @@ public: }; TQSingleDesktopWidget::TQSingleDesktopWidget() - : TQWidget( 0, "desktop", WType_Desktop ) + : TQWidget( nullptr, "desktop", WType_Desktop ) { } @@ -95,7 +95,7 @@ public: TQDesktopWidgetPrivate::TQDesktopWidgetPrivate() : use_xinerama(false), defaultScreen(0), screenCount(0), - screens( 0 ), rects( 0 ), workareas( 0 ) + screens( nullptr ), rects( nullptr ), workareas( nullptr ) { } @@ -105,7 +105,7 @@ TQDesktopWidgetPrivate::~TQDesktopWidgetPrivate() for ( int i = 0; i < screenCount; ++i ) { if (i == defaultScreen) continue; delete screens[i]; - screens[i] = 0; + screens[i] = nullptr; } free(screens); @@ -121,7 +121,7 @@ void TQDesktopWidgetPrivate::init() int newScreenCount = ScreenCount(TQPaintDevice::x11AppDisplay()); #ifndef TQT_NO_XINERAMA - XineramaScreenInfo *xinerama_screeninfo = 0; + XineramaScreenInfo *xinerama_screeninfo = nullptr; // we ignore the Xinerama extension when the display is using // traditional multi-screen (with multiple root windows) @@ -203,7 +203,7 @@ void TQDesktopWidgetPrivate::init() // the TQDesktopWidget itself will be created on the default screen // as tqt_x11_create_desktop_on_screen defaults to -1 TQDesktopWidget::TQDesktopWidget() - : TQWidget( 0, "desktop", WType_Desktop ) + : TQWidget( nullptr, "desktop", WType_Desktop ) { d = new TQDesktopWidgetPrivate(); @@ -281,7 +281,7 @@ const TQRect& TQDesktopWidget::availableGeometry( int screen ) const DefaultScreen(TQPaintDevice::x11AppDisplay()) : screen; Atom ret; int format, e; - unsigned char *data = 0; + unsigned char *data = nullptr; unsigned long nitems, after; e = XGetWindowProperty( TQPaintDevice::x11AppDisplay(), diff --git a/src/kernel/tqdnd_x11.cpp b/src/kernel/tqdnd_x11.cpp index a538c02f3..93d5fcba4 100644 --- a/src/kernel/tqdnd_x11.cpp +++ b/src/kernel/tqdnd_x11.cpp @@ -181,8 +181,8 @@ static Atom tqt_xdnd_dragsource_xid = 0; const int tqt_xdnd_max_type = 100; static Atom tqt_xdnd_types[tqt_xdnd_max_type]; -static TQIntDict * tqt_xdnd_drag_types = 0; -static TQDict * tqt_xdnd_atom_numbers = 0; +static TQIntDict * tqt_xdnd_drag_types = nullptr; +static TQDict * tqt_xdnd_atom_numbers = nullptr; // timer used when target wants "continuous" move messages (eg. scroll) static int heartbeat = -1; @@ -209,10 +209,10 @@ bool tqt_xdnd_dragging = false; static bool need_modifiers_check = false; // dict of payload data, sorted by type atom -static TQIntDict * tqt_xdnd_target_data = 0; +static TQIntDict * tqt_xdnd_target_data = nullptr; // first drag object, or 0 -static TQDragObject * tqt_xdnd_source_object = 0; +static TQDragObject * tqt_xdnd_source_object = nullptr; // Motif dnd extern void tqt_motifdnd_enable( TQWidget *, bool ); @@ -228,16 +228,16 @@ static TQDropEvent::Action global_requested_action = TQDropEvent::Copy; static TQDropEvent::Action global_accepted_action = TQDropEvent::Copy; // for embedding only -static TQWidget* current_embedding_widget = 0; +static TQWidget* current_embedding_widget = nullptr; static XEvent last_enter_event; // cursors -static TQCursor *noDropCursor = 0; -static TQCursor *moveCursor = 0; -static TQCursor *copyCursor = 0; -static TQCursor *linkCursor = 0; +static TQCursor *noDropCursor = nullptr; +static TQCursor *moveCursor = nullptr; +static TQCursor *copyCursor = nullptr; +static TQCursor *linkCursor = nullptr; -static TQPixmap *defaultPm = 0; +static TQPixmap *defaultPm = nullptr; static const int default_pm_hotx = -2; static const int default_pm_hoty = -16; @@ -262,7 +262,7 @@ class TQShapedPixmapWidget : public TQWidget { public: TQShapedPixmapWidget(int screen = -1) : TQWidget(TQApplication::desktop()->screen( screen ), - 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 ) + nullptr, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 ) { x11SetWindowType( X11WindowTypeDND ); } @@ -306,9 +306,9 @@ private: TQPoint oldhot; }; -static TQShapedPixmapWidget * tqt_xdnd_deco = 0; +static TQShapedPixmapWidget * tqt_xdnd_deco = nullptr; -static TQWidget* desktop_proxy = 0; +static TQWidget* desktop_proxy = nullptr; class TQExtraWidget : public TQWidget { @@ -321,7 +321,7 @@ public: static bool tqt_xdnd_enable( TQWidget* w, bool on ) { if ( on ) { - TQWidget * xdnd_widget = 0; + TQWidget * xdnd_widget = nullptr; if ( w->isDesktop() ) { if ( desktop_proxy ) // *WE* already have one. return false; @@ -339,7 +339,7 @@ static bool tqt_xdnd_enable( TQWidget* w, bool on ) if ( type == XA_WINDOW && proxy_id_ptr ) { proxy_id = *proxy_id_ptr; XFree(proxy_id_ptr); - proxy_id_ptr = 0; + proxy_id_ptr = nullptr; // Already exists. Real? tqt_ignore_badwindow(); XGetWindowProperty( w->x11Display(), proxy_id, @@ -384,7 +384,7 @@ static bool tqt_xdnd_enable( TQWidget* w, bool on ) XDeleteProperty( w->x11Display(), w->winId(), tqt_xdnd_proxy ); delete desktop_proxy; - desktop_proxy = 0; + desktop_proxy = nullptr; } return true; } @@ -392,7 +392,7 @@ static bool tqt_xdnd_enable( TQWidget* w, bool on ) const char* tqt_xdnd_atom_to_str( Atom a ) { - if ( !a ) return 0; + if ( !a ) return nullptr; if ( a == XA_STRING ) return "text/plain"; // some Xdnd clients are dumb @@ -405,7 +405,7 @@ const char* tqt_xdnd_atom_to_str( Atom a ) if ( !(result=tqt_xdnd_drag_types->find( a )) ) { const char* mimeType = XGetAtomName( TQPaintDevice::x11AppDisplay(), a ); if ( !mimeType ) - return 0; // only happens on protocol error + return nullptr; // only happens on protocol error result = new TQCString( mimeType ); tqt_xdnd_drag_types->insert( (long)a, result ); XFree((void*)mimeType); @@ -416,7 +416,7 @@ const char* tqt_xdnd_atom_to_str( Atom a ) Atom* tqt_xdnd_str_to_atom( const char *mimeType ) { if ( !mimeType || !*mimeType ) - return 0; + return nullptr; if ( !tqt_xdnd_atom_numbers ) { tqt_xdnd_atom_numbers = new TQDict( 17 ); tqt_xdnd_atom_numbers->setAutoDelete( true ); @@ -467,23 +467,23 @@ void tqt_xdnd_setup() { void tqt_xdnd_cleanup() { delete tqt_xdnd_drag_types; - tqt_xdnd_drag_types = 0; + tqt_xdnd_drag_types = nullptr; delete tqt_xdnd_atom_numbers; - tqt_xdnd_atom_numbers = 0; + tqt_xdnd_atom_numbers = nullptr; delete tqt_xdnd_target_data; - tqt_xdnd_target_data = 0; + tqt_xdnd_target_data = nullptr; delete noDropCursor; - noDropCursor = 0; + noDropCursor = nullptr; delete copyCursor; - copyCursor = 0; + copyCursor = nullptr; delete moveCursor; - moveCursor = 0; + moveCursor = nullptr; delete linkCursor; - linkCursor = 0; + linkCursor = nullptr; delete defaultPm; - defaultPm = 0; + defaultPm = nullptr; delete desktop_proxy; - desktop_proxy = 0; + desktop_proxy = nullptr; } @@ -525,13 +525,13 @@ static bool checkEmbedded(TQWidget* w, const XEvent* xe) if (!w) return false; - if (current_embedding_widget != 0 && current_embedding_widget != w) { + if (current_embedding_widget && current_embedding_widget != w) { tqt_xdnd_current_target = ((TQExtraWidget*)current_embedding_widget)->extraData()->xDndProxy; tqt_xdnd_current_proxy_target = tqt_xdnd_current_target; tqt_xdnd_send_leave(); tqt_xdnd_current_target = 0; tqt_xdnd_current_proxy_target = 0; - current_embedding_widget = 0; + current_embedding_widget = nullptr; } TQWExtra* extra = ((TQExtraWidget*)w)->extraData(); @@ -551,7 +551,7 @@ static bool checkEmbedded(TQWidget* w, const XEvent* xe) tqt_xdnd_current_widget = w; return true; } - current_embedding_widget = 0; + current_embedding_widget = nullptr; return false; } @@ -680,7 +680,7 @@ void tqt_handle_xdnd_position( TQWidget *w, const XEvent * xe, bool passive ) } if ( !c->acceptDrops() ) { - tqt_xdnd_current_widget = 0; + tqt_xdnd_current_widget = nullptr; answerRect = TQRect( p, TQSize( 1, 1 ) ); } else if ( xdndaction_to_qtaction(l[4]) < TQDropEvent::Private ) { tqt_xdnd_current_widget = c; @@ -728,7 +728,7 @@ void tqt_handle_xdnd_position( TQWidget *w, const XEvent * xe, bool passive ) TQWidget * source = TQWidget::find( tqt_xdnd_dragsource_xid ); if ( source && source->isDesktop() && !source->acceptDrops() ) - source = 0; + source = nullptr; if ( source ) tqt_handle_xdnd_status( source, (const XEvent *)&response, passive ); @@ -768,8 +768,8 @@ void tqt_handle_xdnd_leave( TQWidget *w, const XEvent * xe, bool /*passive*/ ) } if (checkEmbedded(current_embedding_widget, xe)) { - current_embedding_widget = 0; - tqt_xdnd_current_widget = 0; + current_embedding_widget = nullptr; + tqt_xdnd_current_widget = nullptr; return; } @@ -782,13 +782,13 @@ void tqt_handle_xdnd_leave( TQWidget *w, const XEvent * xe, bool /*passive*/ ) // This often happens - leave other-process window quickly //tqDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", //l[0], tqt_xdnd_dragsource_xid ); - tqt_xdnd_current_widget = 0; + tqt_xdnd_current_widget = nullptr; return; } tqt_xdnd_dragsource_xid = 0; tqt_xdnd_types[0] = 0; - tqt_xdnd_current_widget = 0; + tqt_xdnd_current_widget = nullptr; } @@ -811,7 +811,7 @@ void tqt_xdnd_send_leave() TQWidget * w = TQWidget::find( tqt_xdnd_current_proxy_target ); if ( w && w->isDesktop() && !w->acceptDrops() ) - w = 0; + w = nullptr; if ( w ) tqt_handle_xdnd_leave( w, (const XEvent *)&leave, false ); @@ -832,9 +832,9 @@ void tqt_handle_xdnd_drop( TQWidget *, const XEvent * xe, bool passive ) } if (!passive && checkEmbedded(tqt_xdnd_current_widget, xe)){ - current_embedding_widget = 0; + current_embedding_widget = nullptr; tqt_xdnd_dragsource_xid = 0; - tqt_xdnd_current_widget = 0; + tqt_xdnd_current_widget = nullptr; return; } const unsigned long *l = (const unsigned long *)xe->xclient.data.l; @@ -878,7 +878,7 @@ void tqt_handle_xdnd_drop( TQWidget *, const XEvent * xe, bool passive ) TQApplication::sendEvent( tqt_xdnd_current_widget, &e ); } tqt_xdnd_dragsource_xid = 0; - tqt_xdnd_current_widget = 0; + tqt_xdnd_current_widget = nullptr; // reset tqt_xdnd_target_current_time = CurrentTime; @@ -894,11 +894,11 @@ void tqt_handle_xdnd_finished( TQWidget *, const XEvent * xe, bool passive ) // if ( !passive ) (void ) checkEmbedded( tqt_xdnd_current_widget, xe); - current_embedding_widget = 0; + current_embedding_widget = nullptr; tqt_xdnd_current_target = 0; tqt_xdnd_current_proxy_target = 0; delete tqt_xdnd_source_object; - tqt_xdnd_source_object = 0; + tqt_xdnd_source_object = nullptr; } } @@ -966,8 +966,8 @@ bool TQDragManager::eventFilter( TQObject * o, TQEvent * e) if ( e->type() == TQEvent::KeyRelease && ((TQKeyEvent*)e)->key() == Key_Escape ) { tqApp->removeEventFilter( this ); - object = 0; - dragSource = 0; + object = nullptr; + dragSource = nullptr; beingCancelled = false; tqApp->exit_loop(); return true; // block the key release @@ -975,7 +975,7 @@ bool TQDragManager::eventFilter( TQObject * o, TQEvent * e) return false; } - Q_ASSERT( object != 0 ); + Q_ASSERT( object ); if ( !o->isWidgetType() ) return false; @@ -994,8 +994,8 @@ bool TQDragManager::eventFilter( TQObject * o, TQEvent * e) drop(); else cancel(); - object = 0; - dragSource = 0; + object = nullptr; + dragSource = nullptr; beingCancelled = false; tqApp->exit_loop(); return true; @@ -1020,8 +1020,8 @@ bool TQDragManager::eventFilter( TQObject * o, TQEvent * e) if ( ke->key() == Key_Escape && e->type() == TQEvent::KeyPress ) { cancel(); tqApp->removeEventFilter( this ); - object = 0; - dragSource = 0; + object = nullptr; + dragSource = nullptr; beingCancelled = false; tqApp->exit_loop(); } else { @@ -1064,7 +1064,7 @@ bool TQDragManager::updateMode( ButtonState newstate ) if ( (newstate & both) == both ) { global_requested_action = TQDropEvent::Link; } else { - bool local = tqt_xdnd_source_object != 0; + bool local = tqt_xdnd_source_object; if ( drag_mode == TQDragObject::DragMove ) global_requested_action = TQDropEvent::Move; else if ( drag_mode == TQDragObject::DragCopy ) @@ -1136,7 +1136,7 @@ void TQDragManager::cancel( bool deleteSource ) heartbeat = -1; if ( object ) { beingCancelled = true; - object = 0; + object = nullptr; } if ( tqt_xdnd_current_target ) { @@ -1152,9 +1152,9 @@ void TQDragManager::cancel( bool deleteSource ) if ( deleteSource ) delete tqt_xdnd_source_object; - tqt_xdnd_source_object = 0; + tqt_xdnd_source_object = nullptr; delete tqt_xdnd_deco; - tqt_xdnd_deco = 0; + tqt_xdnd_deco = nullptr; dndCancelled = true; } @@ -1270,7 +1270,7 @@ void TQDragManager::move( const TQPoint & globalPos ) Atom type = None; int f; unsigned long n, a; - unsigned char *data = 0; + unsigned char *data = nullptr; XGetWindowProperty(TQPaintDevice::x11AppDisplay(), target, tqt_xdnd_aware, 0, 0, False, AnyPropertyType, &type, &f,&n,&a,&data); if (data) @@ -1294,9 +1294,9 @@ void TQDragManager::move( const TQPoint & globalPos ) if ( target ) { w = TQWidget::find( (WId)target ); if ( w && w->isDesktop() && !w->acceptDrops() ) - w = 0; + w = nullptr; } else { - w = 0; + w = nullptr; target = rootwin; } @@ -1316,7 +1316,7 @@ void TQDragManager::move( const TQPoint & globalPos ) } else if ( type == XA_WINDOW && proxy_id ) { proxy_target = *proxy_id; XFree(proxy_id); - proxy_id = 0; + proxy_id = nullptr; r = XGetWindowProperty( tqt_xdisplay(), proxy_target, tqt_xdnd_proxy, 0, 1, False, XA_WINDOW, &type, &f,&n,&a,(uchar**)&proxy_id ); if ( ( r != Success ) || tqt_badwindow() || !type || !proxy_id || *proxy_id != proxy_target ) { @@ -1425,7 +1425,7 @@ void TQDragManager::drop() return; delete tqt_xdnd_deco; - tqt_xdnd_deco = 0; + tqt_xdnd_deco = nullptr; XClientMessageEvent drop; drop.type = ClientMessage; @@ -1441,7 +1441,7 @@ void TQDragManager::drop() TQWidget * w = TQWidget::find( tqt_xdnd_current_proxy_target ); if ( w && w->isDesktop() && !w->acceptDrops() ) - w = 0; + w = nullptr; if ( w ) tqt_handle_xdnd_drop( w, (const XEvent *)&drop, false ); @@ -1465,9 +1465,9 @@ bool tqt_xdnd_handle_badwindow() tqt_xdnd_current_target = 0; tqt_xdnd_current_proxy_target = 0; delete tqt_xdnd_source_object; - tqt_xdnd_source_object = 0; + tqt_xdnd_source_object = nullptr; delete tqt_xdnd_deco; - tqt_xdnd_deco = 0; + tqt_xdnd_deco = nullptr; return true; } if ( tqt_xdnd_dragsource_xid ) { @@ -1475,7 +1475,7 @@ bool tqt_xdnd_handle_badwindow() if ( tqt_xdnd_current_widget ) { TQDragLeaveEvent e; TQApplication::sendEvent( tqt_xdnd_current_widget, &e ); - tqt_xdnd_current_widget = 0; + tqt_xdnd_current_widget = nullptr; } return true; } @@ -1609,7 +1609,7 @@ static TQByteArray tqt_xdnd_obtain_data( const char *format ) if ( tqt_xclb_read_property( TQPaintDevice::x11AppDisplay(), tw->winId(), tqt_xdnd_selection, true, - &result, 0, &type, 0, false ) ) { + &result, nullptr, &type, nullptr, false ) ) { if ( type == tqt_incr_atom ) { int nbytes = result.size() >= 4 ? *((int*)result.data()) : 0; result = tqt_xclb_read_incremental_property( TQPaintDevice::x11AppDisplay(), @@ -1722,11 +1722,11 @@ const char* TQDropEvent::format( int n ) const while( isetTarget( 0 ); + tqt_xdnd_source_object->setTarget( nullptr ); tqt_xdnd_deco = new TQShapedPixmapWidget(); willDrop = false; @@ -1813,7 +1813,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode ) #endif delete tqt_xdnd_deco; - tqt_xdnd_deco = 0; + tqt_xdnd_deco = nullptr; killTimer( heartbeat ); heartbeat = -1; tqt_xdnd_current_screen = -1; diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp index 73816323d..36e1b77a8 100644 --- a/src/kernel/tqdragobject.cpp +++ b/src/kernel/tqdragobject.cpp @@ -260,7 +260,7 @@ static const char * const link_xpm[] = { #ifndef TQT_NO_DRAGANDDROP // the universe's only drag manager -TQDragManager * tqt_dnd_manager = 0; +TQDragManager * tqt_dnd_manager = nullptr; TQDragManager::TQDragManager() @@ -274,9 +274,9 @@ TQDragManager::TQDragManager() #if defined(TQ_WS_X11) createCursors(); // Xcursors cache can hold only 8 bitmaps (4 cursors) #endif - object = 0; - dragSource = 0; - dropWidget = 0; + object = nullptr; + dragSource = nullptr; + dropWidget = nullptr; if ( !tqt_dnd_manager ) tqt_dnd_manager = this; beingCancelled = false; @@ -291,7 +291,7 @@ TQDragManager::~TQDragManager() if ( restoreCursor ) TQApplication::restoreOverrideCursor(); #endif - tqt_dnd_manager = 0; + tqt_dnd_manager = nullptr; delete [] pm_cursor; } @@ -310,7 +310,7 @@ TQDragObject::TQDragObject( TQWidget * dragSource, const char * name ) : TQObject( dragSource, name ) { d = new TQDragObjectData(); - d->pm_cursor = 0; + d->pm_cursor = nullptr; #ifndef TQT_NO_DRAGANDDROP if ( !tqt_dnd_manager && tqApp ) (void)new TQDragManager(); @@ -564,7 +564,7 @@ TQWidget * TQDragObject::source() if ( parent() && parent()->isWidgetType() ) return (TQWidget *)parent(); else - return 0; + return nullptr; } @@ -628,7 +628,7 @@ const char * staticCharset(int i) } return localcharset; } - return 0; + return nullptr; } @@ -745,7 +745,7 @@ void TQTextDrag::setText( const TQString &text ) const char * TQTextDrag::format(int i) const { if ( i >= d->nfmt ) - return 0; + return nullptr; return d->fmt[i]; } @@ -774,7 +774,7 @@ static TQTextCodec *codecForHTML(const TQCString &ba) // determine charset int mib = 0; int pos; - TQTextCodec *c = 0; + TQTextCodec *c = nullptr; if (ba.size() > 1 && (((uchar)ba[0] == 0xfe && (uchar)ba[1] == 0xff) || ((uchar)ba[0] == 0xff && (uchar)ba[1] == 0xfe))) { @@ -810,7 +810,7 @@ static TQTextCodec *codecForHTML(const TQCString &ba) static TQTextCodec* findcodec(const TQMimeSource* e) { - TQTextCodec* r = 0; + TQTextCodec* r = nullptr; const char* f; int i; for ( i=0; (f=e->format(i)); i++ ) { @@ -822,7 +822,7 @@ TQTextCodec* findcodec(const TQMimeSource* e) if (r) return r; } - return 0; + return nullptr; } @@ -873,7 +873,7 @@ bool TQTextDrag::canDecode( const TQMimeSource* e ) const char* f; for (int i=0; (f=e->format(i)); i++) { if ( 0==tqstrnicmp(f,"text/",5) ) { - return findcodec(e) != 0; + return findcodec(e); } } return 0; @@ -921,7 +921,7 @@ bool TQTextDrag::decode( const TQMimeSource* e, TQString& str, TQCString& subtyp TQCString foundst = m.mid(5,semi-5); if ( subtype.isNull() || foundst == subtype ) { bool html = !tqstrnicmp(mime, "text/html", 9); - TQTextCodec* codec = 0; + TQTextCodec* codec = nullptr; if (html) { TQByteArray bytes = e->encodedData(mime); // search for the charset tag in the HTML @@ -1012,7 +1012,7 @@ public: TQImageDrag::TQImageDrag( TQImage image, TQWidget * dragSource, const char * name ) : TQDragObject( dragSource, name ), - d(0) + d(nullptr) { setImage( image ); } @@ -1024,7 +1024,7 @@ TQImageDrag::TQImageDrag( TQImage image, TQImageDrag::TQImageDrag( TQWidget * dragSource, const char * name ) : TQDragObject( dragSource, name ), - d(0) + d(nullptr) { } @@ -1061,7 +1061,7 @@ void TQImageDrag::setImage( TQImage image ) if(cacheType == TQMimeSource::NoCache) { //cache it cacheType = TQMimeSource::Graphics; cache.gfx.img = new TQImage( img ); - cache.gfx.pix = 0; + cache.gfx.pix = nullptr; } } @@ -1078,7 +1078,7 @@ const char * TQImageDrag::format(int i) const str = "image/ppm"; return str; } else { - return 0; + return nullptr; } } @@ -1166,7 +1166,7 @@ bool TQImageDrag::decode( const TQMimeSource* e, TQImage& img ) m->clearCache(); m->cacheType = TQMimeSource::Graphics; m->cache.gfx.img = new TQImage( img ); - m->cache.gfx.pix = 0; + m->cache.gfx.pix = nullptr; return true; } @@ -1253,7 +1253,7 @@ const char * TQStoredDrag::format(int i) const if ( i==0 ) return d->fmt; else - return 0; + return nullptr; } @@ -1698,7 +1698,7 @@ bool TQUriDrag::decodeToUnicodeUris( const TQMimeSource* e, TQStringList& l ) */ TQWidget* TQDropEvent::source() const { - return tqt_dnd_manager ? tqt_dnd_manager->dragSource : 0; + return tqt_dnd_manager ? tqt_dnd_manager->dragSource : nullptr; } #endif diff --git a/src/kernel/tqdragobject.h b/src/kernel/tqdragobject.h index a06e5ca2c..eb28067dc 100644 --- a/src/kernel/tqdragobject.h +++ b/src/kernel/tqdragobject.h @@ -57,7 +57,7 @@ class TQImageDragData; class TQ_EXPORT TQDragObject: public TQObject, public TQMimeSource { TQ_OBJECT public: - TQDragObject( TQWidget * dragSource = 0, const char * name = 0 ); + TQDragObject( TQWidget * dragSource = nullptr, const char * name = nullptr ); virtual ~TQDragObject(); #ifndef TQT_NO_DRAGANDDROP @@ -98,7 +98,7 @@ class TQ_EXPORT TQStoredDrag: public TQDragObject { public: TQStoredDrag( const char * mimeType, - TQWidget * dragSource = 0, const char * name = 0 ); + TQWidget * dragSource = nullptr, const char * name = nullptr ); ~TQStoredDrag(); virtual void setEncodedData( const TQByteArray & ); @@ -118,8 +118,8 @@ class TQ_EXPORT TQTextDrag: public TQDragObject { TQTextDragPrivate* d; public: TQTextDrag( const TQString &, - TQWidget * dragSource = 0, const char * name = 0 ); - TQTextDrag( TQWidget * dragSource = 0, const char * name = 0 ); + TQWidget * dragSource = nullptr, const char * name = nullptr ); + TQTextDrag( TQWidget * dragSource = nullptr, const char * name = nullptr ); ~TQTextDrag(); virtual void setText( const TQString &); @@ -146,8 +146,8 @@ class TQ_EXPORT TQImageDrag: public TQDragObject { TQImageDragData* d; public: - TQImageDrag( TQImage image, TQWidget * dragSource = 0, const char * name = 0 ); - TQImageDrag( TQWidget * dragSource = 0, const char * name = 0 ); + TQImageDrag( TQImage image, TQWidget * dragSource = nullptr, const char * name = nullptr ); + TQImageDrag( TQWidget * dragSource = nullptr, const char * name = nullptr ); ~TQImageDrag(); virtual void setImage( TQImage image ); @@ -171,8 +171,8 @@ class TQ_EXPORT TQUriDrag: public TQStoredDrag { TQ_OBJECT public: - TQUriDrag( TQStrList uris, TQWidget * dragSource = 0, const char * name = 0 ); - TQUriDrag( TQWidget * dragSource = 0, const char * name = 0 ); + TQUriDrag( TQStrList uris, TQWidget * dragSource = nullptr, const char * name = nullptr ); + TQUriDrag( TQWidget * dragSource = nullptr, const char * name = nullptr ); ~TQUriDrag(); void setFilenames( const TQStringList & fnames ) { setFileNames( fnames ); } @@ -202,8 +202,8 @@ class TQ_EXPORT TQColorDrag : public TQStoredDrag TQColor color; public: - TQColorDrag( const TQColor &col, TQWidget *dragsource = 0, const char *name = 0 ); - TQColorDrag( TQWidget * dragSource = 0, const char * name = 0 ); + TQColorDrag( const TQColor &col, TQWidget *dragsource = nullptr, const char *name = nullptr ); + TQColorDrag( TQWidget * dragSource = nullptr, const char * name = nullptr ); void setColor( const TQColor &col ); static bool canDecode( TQMimeSource * ); diff --git a/src/kernel/tqdrawutil.cpp b/src/kernel/tqdrawutil.cpp index a05908895..f95fe2391 100644 --- a/src/kernel/tqdrawutil.cpp +++ b/src/kernel/tqdrawutil.cpp @@ -887,7 +887,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, } TQColor *cols[5]; - cols[0] = 0; + cols[0] = nullptr; cols[1] = (TQColor *)&g.button(); cols[2] = (TQColor *)&g.mid(); cols[3] = (TQColor *)&g.light(); diff --git a/src/kernel/tqdrawutil.h b/src/kernel/tqdrawutil.h index 78ffc0ac8..159070c20 100644 --- a/src/kernel/tqdrawutil.h +++ b/src/kernel/tqdrawutil.h @@ -69,42 +69,42 @@ TQ_EXPORT void qDrawShadeLine( TQPainter *p, const TQPoint &p1, const TQPoint &p TQ_EXPORT void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &, bool sunken=false, int lineWidth = 1, int midLineWidth = 0, - const TQBrush *fill = 0 ); + const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawShadeRect( TQPainter *p, const TQRect &r, const TQColorGroup &, bool sunken=false, int lineWidth = 1, int midLineWidth = 0, - const TQBrush *fill = 0 ); + const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawShadePanel( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &, bool sunken=false, - int lineWidth = 1, const TQBrush *fill = 0 ); + int lineWidth = 1, const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawShadePanel( TQPainter *p, const TQRect &r, const TQColorGroup &, bool sunken=false, - int lineWidth = 1, const TQBrush *fill = 0 ); + int lineWidth = 1, const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawWinButton( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, bool sunken = false, - const TQBrush *fill = 0 ); + const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawWinButton( TQPainter *p, const TQRect &r, const TQColorGroup &g, bool sunken = false, - const TQBrush *fill = 0 ); + const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawWinPanel( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &, bool sunken=false, - const TQBrush *fill = 0 ); + const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawWinPanel( TQPainter *p, const TQRect &r, const TQColorGroup &, bool sunken=false, - const TQBrush *fill = 0 ); + const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawPlainRect( TQPainter *p, int x, int y, int w, int h, const TQColor &, - int lineWidth = 1, const TQBrush *fill = 0 ); + int lineWidth = 1, const TQBrush *fill = nullptr ); TQ_EXPORT void qDrawPlainRect( TQPainter *p, const TQRect &r, const TQColor &, - int lineWidth = 1, const TQBrush *fill = 0 ); + int lineWidth = 1, const TQBrush *fill = nullptr ); // @@ -118,7 +118,7 @@ TQ_EXPORT TQRect qItemRect( TQPainter *p, TQt::GUIStyle gs, int x, int y, int w, TQ_EXPORT void qDrawItem( TQPainter *p, TQt::GUIStyle gs, int x, int y, int w, int h, int flags, const TQColorGroup &g, bool enabled, const TQPixmap *pixmap, const TQString& text, - int len=-1, const TQColor* penColor = 0 ); + int len=-1, const TQColor* penColor = nullptr ); TQ_EXPORT void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool down, int x, int y, int w, int h, diff --git a/src/kernel/tqevent.cpp b/src/kernel/tqevent.cpp index 053c00223..0deb5b381 100644 --- a/src/kernel/tqevent.cpp +++ b/src/kernel/tqevent.cpp @@ -2270,7 +2270,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP */ TQCustomEvent::TQCustomEvent( int type ) - : TQEvent( (TQEvent::Type)type ), d( 0 ) + : TQEvent( (TQEvent::Type)type ), d( nullptr ) { } diff --git a/src/kernel/tqevent.h b/src/kernel/tqevent.h index 96205c0a7..017107abb 100644 --- a/src/kernel/tqevent.h +++ b/src/kernel/tqevent.h @@ -512,7 +512,7 @@ public: TQDropEvent( const TQPoint& pos, Type typ=Drop ) : TQEvent(typ), p(pos), act(0), accpt(0), accptact(0), resv(0), - d(0) + d(nullptr) {} const TQPoint &pos() const { return p; } bool isAccepted() const { return accpt || accptact; } diff --git a/src/kernel/tqeventloop.cpp b/src/kernel/tqeventloop.cpp index 9b3d3cb2b..dc77c1ad5 100644 --- a/src/kernel/tqeventloop.cpp +++ b/src/kernel/tqeventloop.cpp @@ -140,7 +140,7 @@ TQEventLoop::~TQEventLoop() TQThread* thread = TQThread::currentThreadObject(); if (thread) { if (thread->d) { - thread->d->eventLoop = 0; + thread->d->eventLoop = nullptr; } } #else @@ -241,7 +241,7 @@ int TQEventLoop::enterLoop() emit tqApp->aboutToQuit(); // send deferred deletes - TQApplication::sendPostedEvents( 0, TQEvent::DeferredDelete ); + TQApplication::sendPostedEvents( nullptr, TQEvent::DeferredDelete ); } return d->looplevel; diff --git a/src/kernel/tqeventloop.h b/src/kernel/tqeventloop.h index 8ae467f2b..b7d45dce5 100644 --- a/src/kernel/tqeventloop.h +++ b/src/kernel/tqeventloop.h @@ -69,7 +69,7 @@ class TQ_EXPORT TQEventLoop : public TQObject TQ_OBJECT public: - TQEventLoop( TQObject *parent = 0, const char *name = 0 ); + TQEventLoop( TQObject *parent = nullptr, const char *name = nullptr ); ~TQEventLoop(); enum ProcessEvents { diff --git a/src/kernel/tqeventloop_unix.cpp b/src/kernel/tqeventloop_unix.cpp index 9c2c2fb43..56d37c5dc 100644 --- a/src/kernel/tqeventloop_unix.cpp +++ b/src/kernel/tqeventloop_unix.cpp @@ -91,13 +91,13 @@ struct TimerInfo { // internal timer info typedef TQPtrList TimerList; // list of TimerInfo structs static TQBitArray *timerBitVec; // timer bit vector -static TimerList *timerList = 0; // timer list +static TimerList *timerList = nullptr; // timer list static void initTimers(); void cleanupTimers(); static timeval watchtime; // watch if time is turned back timeval *tqt_wait_timer(); -timeval *tqt_wait_timer_max = 0; +timeval *tqt_wait_timer_max = nullptr; // // Internal operator functions for timevals @@ -192,7 +192,7 @@ static void insertTimer( const TimerInfo *ti ) // insert timer info into list static inline void getTime( timeval &t ) // get time of day { - gettimeofday( &t, 0 ); + gettimeofday( &t, nullptr ); while ( t.tv_usec >= 1000000 ) { // NTP-related fix t.tv_usec -= 1000000; t.tv_sec++; @@ -257,7 +257,7 @@ timeval *tqt_wait_timer() tm = *tqt_wait_timer_max; return &tm; } - return 0; // no timers + return nullptr; // no timers } // Timer initialization @@ -271,16 +271,16 @@ static void initTimers() // initialize timers timerList = new TimerList; TQ_CHECK_PTR( timerList ); timerList->setAutoDelete( true ); - gettimeofday( &watchtime, 0 ); + gettimeofday( &watchtime, nullptr ); } // Timer cleanup void cleanupTimers() { delete timerList; - timerList = 0; + timerList = nullptr; delete timerBitVec; - timerBitVec = 0; + timerBitVec = nullptr; } // Main timer functions for starting and killing timers @@ -345,7 +345,7 @@ bool qKillTimer( TQObject *obj ) Socket notifier type *****************************************************************************/ TQSockNotType::TQSockNotType() - : list( 0 ) + : list( nullptr ) { FD_ZERO( &select_fds ); FD_ZERO( &enabled_fds ); @@ -356,7 +356,7 @@ TQSockNotType::~TQSockNotType() { if ( list ) delete list; - list = 0; + list = nullptr; } /***************************************************************************** @@ -366,7 +366,7 @@ void TQEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) { int sockfd = notifier->socket(); int type = notifier->type(); - if ( sockfd < 0 || sockfd >= FD_SETSIZE || type < 0 || type > 2 || notifier == 0 ) { + if ( sockfd < 0 || sockfd >= FD_SETSIZE || type < 0 || type > 2 || !notifier ) { #if defined(QT_CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif @@ -418,7 +418,7 @@ void TQEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier ) { int sockfd = notifier->socket(); int type = notifier->type(); - if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { + if ( sockfd < 0 || type < 0 || type > 2 || !notifier ) { #if defined(QT_CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif @@ -455,7 +455,7 @@ void TQEventLoop::setSocketNotifierPending( TQSocketNotifier *notifier ) { int sockfd = notifier->socket(); int type = notifier->type(); - if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { + if ( sockfd < 0 || type < 0 || type > 2 || !notifier ) { #if defined(QT_CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif @@ -529,7 +529,7 @@ int TQEventLoop::activateTimers() bool first = true; timeval currentTime; int n_act = 0, maxCount = timerList->count(); - TimerInfo *begin = 0; + TimerInfo *begin = nullptr; TimerInfo *t; for ( ;; ) { @@ -565,7 +565,7 @@ int TQEventLoop::activateTimers() if ( !timerList ) // sendEvent allows other threads to execute, therefore we must check for list existence when it returns! return 0; if ( timerList->findRef( begin ) == -1 ) - begin = 0; + begin = nullptr; } return n_act; } diff --git a/src/kernel/tqeventloop_unix_glib.cpp b/src/kernel/tqeventloop_unix_glib.cpp index 405723ad5..2e916afcf 100644 --- a/src/kernel/tqeventloop_unix_glib.cpp +++ b/src/kernel/tqeventloop_unix_glib.cpp @@ -103,13 +103,13 @@ struct TimerInfo { // internal timer info typedef TQPtrList TimerList; // list of TimerInfo structs static TQBitArray *timerBitVec; // timer bit vector -static TimerList *timerList = 0; // timer list +static TimerList *timerList = nullptr; // timer list static void initTimers(); void cleanupTimers(); static timeval watchtime; // watch if time is turned back timeval *tqt_wait_timer(); -timeval *tqt_wait_timer_max = 0; +timeval *tqt_wait_timer_max = nullptr; // // Internal operator functions for timevals @@ -324,9 +324,9 @@ static void initTimers() // initialize timers void cleanupTimers() { delete timerList; - timerList = 0; + timerList = nullptr; delete timerBitVec; - timerBitVec = 0; + timerBitVec = nullptr; } // Main timer functions for starting and killing timers @@ -467,7 +467,7 @@ void TQEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) { int sockfd = notifier->socket(); int type = notifier->type(); - if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { + if ( sockfd < 0 || type < 0 || type > 2 || !notifier ) { #if defined(QT_CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif @@ -522,7 +522,7 @@ void TQEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier ) { int sockfd = notifier->socket(); int type = notifier->type(); - if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { + if ( sockfd < 0 || type < 0 || type > 2 || !notifier ) { #if defined(QT_CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif @@ -558,7 +558,7 @@ void TQEventLoop::setSocketNotifierPending( TQSocketNotifier *notifier ) { int sockfd = notifier->socket(); int type = notifier->type(); - if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { + if ( sockfd < 0 || type < 0 || type > 2 || !notifier ) { #if defined(QT_CHECK_RANGE) tqWarning( "TQSocketNotifier: Internal error" ); #endif @@ -642,7 +642,7 @@ int TQEventLoop::activateTimers() bool first = true; timeval currentTime; int n_act = 0, maxCount = timerList->count(); - TimerInfo *begin = 0; + TimerInfo *begin = nullptr; TimerInfo *t; for ( ;; ) { @@ -701,7 +701,7 @@ int TQEventLoop::activateTimers() if (tqt_timerListMutex) tqt_timerListMutex->lock(); #endif if ( timerList->findRef( begin ) == -1 ) { - begin = 0; + begin = nullptr; } } #if defined(TQT_THREAD_SUPPORT) diff --git a/src/kernel/tqeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp index ae6d636d9..0e4c23bbe 100644 --- a/src/kernel/tqeventloop_x11.cpp +++ b/src/kernel/tqeventloop_x11.cpp @@ -71,10 +71,10 @@ typedef void (*VFPTR)(); typedef TQValueList TQVFuncList; void tqt_install_preselect_handler( VFPTR ); void tqt_remove_preselect_handler( VFPTR ); -static TQVFuncList *tqt_preselect_handler = 0; +static TQVFuncList *tqt_preselect_handler = nullptr; void tqt_install_postselect_handler( VFPTR ); void tqt_remove_postselect_handler( VFPTR ); -static TQVFuncList *tqt_postselect_handler = 0; +static TQVFuncList *tqt_postselect_handler = nullptr; void tqt_install_preselect_handler( VFPTR handler ) { @@ -218,7 +218,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) // return the maximum time we can wait for an event. static timeval zerotm; - timeval *tm = 0; + timeval *tm = nullptr; if ( ! ( flags & ExcludeTimers ) ) { if (TQApplication::isCoreThread()) { tm = tqt_wait_timer(); // wait for TQt timers @@ -330,13 +330,13 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) do { switch (type) { case 0: // read - ret = select(sn->fd + 1, &fdset, 0, 0, &zerotm); + ret = select(sn->fd + 1, &fdset, nullptr, nullptr, &zerotm); break; case 1: // write - ret = select(sn->fd + 1, 0, &fdset, 0, &zerotm); + ret = select(sn->fd + 1, nullptr, &fdset, nullptr, &zerotm); break; case 2: // except - ret = select(sn->fd + 1, 0, 0, &fdset, &zerotm); + ret = select(sn->fd + 1, nullptr, nullptr, &fdset, &zerotm); break; } } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); diff --git a/src/kernel/tqeventloop_x11_glib.cpp b/src/kernel/tqeventloop_x11_glib.cpp index d8331c6bb..e1429cd52 100644 --- a/src/kernel/tqeventloop_x11_glib.cpp +++ b/src/kernel/tqeventloop_x11_glib.cpp @@ -152,10 +152,10 @@ typedef void (*VFPTR)(); typedef TQValueList TQVFuncList; void tqt_install_preselect_handler( VFPTR ); void tqt_remove_preselect_handler( VFPTR ); -static TQVFuncList *tqt_preselect_handler = 0; +static TQVFuncList *tqt_preselect_handler = nullptr; void tqt_install_postselect_handler( VFPTR ); void tqt_remove_postselect_handler( VFPTR ); -static TQVFuncList *tqt_postselect_handler = 0; +static TQVFuncList *tqt_postselect_handler = nullptr; void tqt_install_preselect_handler( VFPTR handler ) { @@ -405,7 +405,7 @@ bool TQEventLoop::gsourcePrepare(GSource *gs, int * timeout) // return the maximum time we can wait for an event. static timeval zerotm; - timeval *tm = 0; + timeval *tm = nullptr; if ( ! ( flags & ExcludeTimers ) ) { if (TQApplication::isCoreThread()) { tm = tqt_wait_timer(); // wait for TQt timers diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp index fe4d16c57..dc31d1381 100644 --- a/src/kernel/tqfont.cpp +++ b/src/kernel/tqfont.cpp @@ -131,7 +131,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const TQFontPrivate::TQFontPrivate() - : engineData( 0 ), paintdevice( 0 ), + : engineData( nullptr ), paintdevice( nullptr ), rawMode( false ), underline( false ), overline( false ), strikeOut( false ), mask( 0 ) { @@ -143,7 +143,7 @@ TQFontPrivate::TQFontPrivate() } TQFontPrivate::TQFontPrivate( const TQFontPrivate &other ) - : TQShared(), request( other.request ), engineData( 0 ), + : TQShared(), request( other.request ), engineData( nullptr ), paintdevice( other.paintdevice ), screen( other.screen ), rawMode( other.rawMode ), underline( other.underline ), overline( other.overline ), strikeOut( other.strikeOut ), mask( other.mask ) @@ -154,13 +154,13 @@ TQFontPrivate::~TQFontPrivate() { if ( engineData ) engineData->deref(); - engineData = 0; + engineData = nullptr; } void TQFontPrivate::resolve( const TQFontPrivate *other ) { #ifdef QT_CHECK_STATE - Q_ASSERT( other != 0 ); + Q_ASSERT( other ); #endif if ( ( mask & Complete ) == Complete ) return; @@ -224,7 +224,7 @@ TQFontEngineData::~TQFontEngineData() for ( int i = 0; i < TQFont::LastPrivateScript; i++ ) { if ( engines[i] ) engines[i]->deref(); - engines[i] = 0; + engines[i] = nullptr; } #else if ( engine ) @@ -550,7 +550,7 @@ void TQFont::detach() if (d->count == 1) { if ( d->engineData ) d->engineData->deref(); - d->engineData = 0; + d->engineData = nullptr; return; } @@ -643,7 +643,7 @@ TQFont::~TQFont() { if ( d->deref() ) delete d; - d = 0; + d = nullptr; } /*! @@ -1255,7 +1255,7 @@ bool TQFont::exactMatch() const { TQFontEngine *engine = d->engineForScript( TQFont::NoScript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return d->rawMode ? engine->type() != TQFontEngine::Box @@ -1376,7 +1376,7 @@ void TQFont::setDefaultFont( const TQFont &f ) *****************************************************************************/ typedef TQDict TQFontSubst; -static TQFontSubst *fontSubst = 0; +static TQFontSubst *fontSubst = nullptr; static TQSingleCleanupHandler tqfont_cleanup_fontsubst; @@ -1396,7 +1396,7 @@ static void initFontSubst() "helvetica", "Arial", #endif - 0, 0 + nullptr, nullptr }; if (fontSubst) @@ -1407,7 +1407,7 @@ static void initFontSubst() fontSubst->setAutoDelete( true ); tqfont_cleanup_fontsubst.set(&fontSubst); - for ( int i=0; initTbl[i] != 0; i += 2 ) + for ( int i=0; initTbl[i]; i += 2 ) TQFont::insertSubstitution(TQString::fromLatin1(initTbl[i]), TQString::fromLatin1(initTbl[i+1])); } @@ -1550,7 +1550,7 @@ TQStringList TQFont::substitutions() static TQ_UINT8 get_font_bits( const TQFontPrivate *f ) { #ifdef QT_CHECK_STATE - Q_ASSERT( f != 0 ); + Q_ASSERT( f ); #endif TQ_UINT8 bits = 0; @@ -1581,7 +1581,7 @@ static TQ_UINT8 get_font_bits( const TQFontPrivate *f ) static void set_font_bits( TQ_UINT8 bits, TQFontPrivate *f ) { #ifdef QT_CHECK_STATE - Q_ASSERT( f != 0 ); + Q_ASSERT( f ); #endif f->request.italic = (bits & 0x01) != 0; @@ -1887,7 +1887,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font ) that is not screen-compatible. */ TQFontMetrics::TQFontMetrics( const TQFont &font ) - : d( font.d ), painter( 0 ), fscript( TQFont::NoScript ) + : d( font.d ), painter( nullptr ), fscript( TQFont::NoScript ) { d->ref(); } @@ -1899,7 +1899,7 @@ TQFontMetrics::TQFontMetrics( const TQFont &font ) script. */ TQFontMetrics::TQFontMetrics( const TQFont &font, TQFont::Script script ) - : d( font.d ), painter( 0 ), fscript( script ) + : d( font.d ), painter( nullptr ), fscript( script ) { d->ref(); } @@ -1938,7 +1938,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p ) Constructs a copy of \a fm. */ TQFontMetrics::TQFontMetrics( const TQFontMetrics &fm ) - : d( fm.d ), painter( 0 ), fscript( fm.fscript ) + : d( fm.d ), painter( nullptr ), fscript( fm.fscript ) { d->ref(); } @@ -1985,8 +1985,8 @@ int TQFontMetrics::ascent() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return TQMAX(engine->ascent(), latin_engine->ascent()); @@ -2009,8 +2009,8 @@ int TQFontMetrics::descent() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return TQMAX(engine->descent(), latin_engine->descent()); @@ -2029,8 +2029,8 @@ int TQFontMetrics::height() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return (TQMAX(engine->ascent(), latin_engine->ascent()) + @@ -2049,8 +2049,8 @@ int TQFontMetrics::leading() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return TQMAX(engine->leading(), latin_engine->leading()); @@ -2068,8 +2068,8 @@ int TQFontMetrics::lineSpacing() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return (TQMAX(engine->leading(), latin_engine->leading()) + @@ -2092,8 +2092,8 @@ int TQFontMetrics::minLeftBearing() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return TQMIN(engine->minLeftBearing(), latin_engine->minLeftBearing()); @@ -2114,8 +2114,8 @@ int TQFontMetrics::minRightBearing() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *latin_engine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( latin_engine ); #endif // QT_CHECK_STATE return TQMIN(engine->minRightBearing(), latin_engine->minRightBearing()); @@ -2129,8 +2129,8 @@ int TQFontMetrics::maxWidth() const TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); TQFontEngine *lengine = d->engineForScript( TQFont::Latin ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( lengine != 0 ); + Q_ASSERT( engine ); + Q_ASSERT( lengine ); #endif // QT_CHECK_STATE return TQMAX(engine->maxCharWidth(), lengine->maxCharWidth()); @@ -2147,7 +2147,7 @@ bool TQFontMetrics::inFont(TQChar ch) const TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE if ( engine->type() == TQFontEngine::Box ) return false; @@ -2174,14 +2174,14 @@ int TQFontMetrics::leftBearing(TQChar ch) const TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE if ( engine->type() == TQFontEngine::Box ) return 0; glyph_t glyphs[10]; int nglyphs = 9; - engine->stringToCMap( &ch, 1, glyphs, 0, &nglyphs, false ); + engine->stringToCMap( &ch, 1, glyphs, nullptr, &nglyphs, false ); // ### can nglyphs != 1 happen at all? Not currently I think glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); return gi.x; @@ -2208,14 +2208,14 @@ int TQFontMetrics::rightBearing(TQChar ch) const TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE if ( engine->type() == TQFontEngine::Box ) return 0; glyph_t glyphs[10]; int nglyphs = 9; - engine->stringToCMap( &ch, 1, glyphs, 0, &nglyphs, false ); + engine->stringToCMap( &ch, 1, glyphs, nullptr, &nglyphs, false ); // ### can nglyphs != 1 happen at all? Not currently I think glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); return gi.xoff - gi.x - gi.width; @@ -2260,7 +2260,7 @@ int TQFontMetrics::width( const TQString &str, int len ) const if ( ::category( *ch ) != TQChar::Mark_NonSpacing && !qIsZeroWidthChar(ch->unicode())) { TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE glyph_t glyphs[8]; @@ -2390,12 +2390,12 @@ TQRect TQFontMetrics::boundingRect( TQChar ch ) const TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE glyph_t glyphs[10]; int nglyphs = 9; - engine->stringToCMap( &ch, 1, glyphs, 0, &nglyphs, false ); + engine->stringToCMap( &ch, 1, glyphs, nullptr, &nglyphs, false ); glyph_metrics_t gi = engine->boundingBox( glyphs[0] ); return TQRect( gi.x, gi.y, gi.width, gi.height ); } @@ -2478,7 +2478,7 @@ TQRect TQFontMetrics::boundingRect( int x, int y, int w, int h, int flgs, TQRect rb; TQRect r(x, y, w, h); tqt_format_text( TQFont( d, d->paintdevice ), r, flgs|TQt::DontPrint, str, len, &rb, - tabstops, tabarray, tabarraylen, intern, 0 ); + tabstops, tabarray, tabarraylen, intern, nullptr ); return rb; } @@ -2529,7 +2529,7 @@ int TQFontMetrics::underlinePos() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return engine->underlinePosition(); @@ -2569,7 +2569,7 @@ int TQFontMetrics::lineWidth() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return engine->lineThickness(); @@ -2642,7 +2642,7 @@ int TQFontMetrics::lineWidth() const that is not screen-compatible. */ TQFontInfo::TQFontInfo( const TQFont &font ) - : d( font.d ), painter( 0 ), fscript( TQFont::NoScript ) + : d( font.d ), painter( nullptr ), fscript( TQFont::NoScript ) { d->ref(); } @@ -2652,7 +2652,7 @@ TQFontInfo::TQFontInfo( const TQFont &font ) script. */ TQFontInfo::TQFontInfo( const TQFont &font, TQFont::Script script ) - : d( font.d ), painter( 0 ), fscript( script ) + : d( font.d ), painter( nullptr ), fscript( script ) { d->ref(); } @@ -2662,7 +2662,7 @@ TQFontInfo::TQFontInfo( const TQFont &font, TQFont::Script script ) Constructs a font info object from the painter's font \a p. */ TQFontInfo::TQFontInfo( const TQPainter *p ) - : painter( 0 ), fscript( TQFont::NoScript ) + : painter( nullptr ), fscript( TQFont::NoScript ) { TQPainter *painter = (TQPainter *) p; @@ -2686,7 +2686,7 @@ TQFontInfo::TQFontInfo( const TQPainter *p ) Constructs a copy of \a fi. */ TQFontInfo::TQFontInfo( const TQFontInfo &fi ) - : d(fi.d), painter(0), fscript( fi.fscript ) + : d(fi.d), painter(nullptr), fscript( fi.fscript ) { d->ref(); } @@ -2711,7 +2711,7 @@ TQFontInfo &TQFontInfo::operator=( const TQFontInfo &fi ) d = fi.d; d->ref(); } - painter = 0; + painter = nullptr; fscript = fi.fscript; return *this; } @@ -2725,7 +2725,7 @@ TQString TQFontInfo::family() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return engine->fontDef.family; } @@ -2739,7 +2739,7 @@ int TQFontInfo::pointSize() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return ( engine->fontDef.pointSize + 5 ) / 10; } @@ -2753,7 +2753,7 @@ int TQFontInfo::pixelSize() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return engine->fontDef.pixelSize; } @@ -2767,7 +2767,7 @@ bool TQFontInfo::italic() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return engine->fontDef.italic; } @@ -2781,7 +2781,7 @@ int TQFontInfo::weight() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return engine->fontDef.weight; @@ -2848,7 +2848,7 @@ bool TQFontInfo::fixedPitch() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE #ifdef Q_OS_MAC if (!engine->fontDef.fixedPitchComputed) { @@ -2875,7 +2875,7 @@ TQFont::StyleHint TQFontInfo::styleHint() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return (TQFont::StyleHint) engine->fontDef.styleHint; } @@ -2905,7 +2905,7 @@ bool TQFontInfo::exactMatch() const { TQFontEngine *engine = d->engineForScript( (TQFont::Script) fscript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return d->rawMode ? engine->type() != TQFontEngine::Box @@ -2928,7 +2928,7 @@ static const int fast_timeout = 10000; // 10s static const int slow_timeout = 300000; // 5m #endif // TQFONTCACHE_DEBUG -TQFontCache *TQFontCache::instance = 0; +TQFontCache *TQFontCache::instance = nullptr; const uint TQFontCache::min_cost = 4*1024; // 4mb static TQSingleCleanupHandler cleanup_fontcache; @@ -2938,7 +2938,7 @@ TQFontCache::TQFontCache() : TQObject( tqApp, "global font cache" ), total_cost( 0 ), max_cost( min_cost ), current_timestamp( 0 ), fast( false ), timer_id( -1 ) { - Q_ASSERT( instance == 0 ); + Q_ASSERT( !instance ); instance = this; cleanup_fontcache.set( &instance ); } @@ -2975,14 +2975,14 @@ TQFontCache::~TQFontCache() } ++it; } - instance = 0; + instance = nullptr; } TQFontEngineData *TQFontCache::findEngineData( const Key &key ) const { EngineDataCache::ConstIterator it = engineDataCache.find( key ), end = engineDataCache.end(); - if ( it == end ) return 0; + if ( it == end ) return nullptr; // found return it.data(); @@ -3000,7 +3000,7 @@ TQFontEngine *TQFontCache::findEngine( const Key &key ) { EngineCache::Iterator it = engineCache.find( key ), end = engineCache.end(); - if ( it == end ) return 0; + if ( it == end ) return nullptr; // found... update the hitcount and timestamp it.data().hits++; diff --git a/src/kernel/tqfont_x11.cpp b/src/kernel/tqfont_x11.cpp index 86d3507bf..41bd6429a 100644 --- a/src/kernel/tqfont_x11.cpp +++ b/src/kernel/tqfont_x11.cpp @@ -143,7 +143,7 @@ static TQCString tqt_fixXLFD( const TQCString &xlfd ) } typedef TQMap FallbackMap; -static FallbackMap *fallbackMap = 0; +static FallbackMap *fallbackMap = nullptr; static TQSingleCleanupHandler tqt_fallback_font_family_cleanup; static void ensure_fallback_map() @@ -260,11 +260,11 @@ void TQFont::initialize() // get some sample text based on the users locale. we use this to determine the // default script for the font system - TQCString oldlctime = setlocale(LC_TIME, 0); + TQCString oldlctime = setlocale(LC_TIME, nullptr); TQCString lctime = setlocale(LC_TIME, ""); - time_t ttmp = time(0); - struct tm *tt = 0; + time_t ttmp = time(nullptr); + struct tm *tt = nullptr; char samp[64]; TQString sample; @@ -277,7 +277,7 @@ void TQFont::initialize() tt = localtime( &ttmp ); #endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS - if ( tt != 0 && strftime( samp, 64, "%A%B", tt ) > 0 ) + if ( tt && strftime( samp, 64, "%A%B", tt ) > 0 ) if ( codec ) sample = codec->toUnicode( samp ); } @@ -312,7 +312,7 @@ void TQFont::cleanup() { // delete the global font cache delete TQFontCache::instance; - TQFontCache::instance = 0; + TQFontCache::instance = nullptr; } /*! @@ -378,7 +378,7 @@ void TQFontPrivate::load( TQFont::Script script ) if ( engineData->engines[script] ) return; // load the font - TQFontEngine *engine = 0; + TQFontEngine *engine = nullptr; // double scale = 1.0; // ### TODO: fix the scale calculations // list of families to try @@ -408,7 +408,7 @@ void TQFontPrivate::load( TQFont::Script script ) break; if ( ! req.family.isEmpty() ) - engine = 0; + engine = nullptr; continue; } @@ -424,7 +424,7 @@ void TQFontPrivate::load( TQFont::Script script ) */ bool TQFont::dirty() const { - return d->engineData == 0; + return !d->engineData; } /*! @@ -435,7 +435,7 @@ TQt::HANDLE TQFont::handle() const { TQFontEngine *engine = d->engineForScript( TQFontPrivate::defaultScript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE switch ( engine->type() ) { @@ -468,7 +468,7 @@ TQString TQFont::rawName() const { TQFontEngine *engine = d->engineForScript( TQFontPrivate::defaultScript ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE return TQString::fromLatin1( engine->name() ); @@ -578,7 +578,7 @@ static const char * const tryFonts[] = { "8x13", "9x15", "fixed", - 0 + nullptr }; // Returns true if the font exists, false otherwise @@ -660,7 +660,7 @@ int TQFontMetrics::width( TQChar ch ) const TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE glyph_t glyphs[8]; @@ -714,7 +714,7 @@ int TQFontMetrics::charWidth( const TQString &str, int pos ) const } else { TQFontEngine *engine = d->engineForScript( script ); #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); + Q_ASSERT( engine ); #endif // QT_CHECK_STATE glyph_t glyphs[8]; diff --git a/src/kernel/tqfontdata_p.h b/src/kernel/tqfontdata_p.h index 89efd70d4..907f7fadd 100644 --- a/src/kernel/tqfontdata_p.h +++ b/src/kernel/tqfontdata_p.h @@ -242,7 +242,7 @@ public: // TQFontEngine cache struct Engine { - Engine() : data( 0 ), timestamp( 0 ), hits( 0 ) { } + Engine() : data( nullptr ), timestamp( 0 ), hits( 0 ) { } Engine( TQFontEngine *d ) : data( d ), timestamp( 0 ), hits( 0 ) { } TQFontEngine *data; diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp index 502d150b1..26c52f9b5 100644 --- a/src/kernel/tqfontdatabase.cpp +++ b/src/kernel/tqfontdatabase.cpp @@ -79,9 +79,9 @@ static int ucstricmp( const TQString &as, const TQString &bs ) const TQChar *b = bs.unicode(); if ( a == b ) return 0; - if ( a == 0 ) + if ( !a ) return 1; - if ( b == 0 ) + if ( !b ) return -1; int l=TQMIN(as.length(),bs.length()); while ( l-- && ::lower( *a ) == ::lower( *b ) ) @@ -159,7 +159,7 @@ TQtFontEncoding *TQtFontSize::encodingID( int id, uint xpoint, uint xres, return encodings + i; } - if ( !add ) return 0; + if ( !add ) return nullptr; if ( !(count % 4) ) encodings = ( TQtFontEncoding * ) @@ -206,10 +206,10 @@ struct TQtFontStyle TQtFontStyle( const Key &k ) : key( k ), bitmapScalable( false ), smoothScalable( false ), - fakeOblique( false ), count( 0 ), pixelSizes( 0 ) + fakeOblique( false ), count( 0 ), pixelSizes( nullptr ) { #if defined(TQ_WS_X11) - weightName = setwidthName = 0; + weightName = setwidthName = nullptr; #endif // TQ_WS_X11 } @@ -256,7 +256,7 @@ TQtFontSize *TQtFontStyle::pixelSize( unsigned short size, bool add ) return pixelSizes + i; } if ( !add ) - return 0; + return nullptr; if ( !(count % 8) ) pixelSizes = (TQtFontSize *) @@ -265,14 +265,14 @@ TQtFontSize *TQtFontStyle::pixelSize( unsigned short size, bool add ) pixelSizes[count].pixelSize = size; #ifdef TQ_WS_X11 pixelSizes[count].count = 0; - pixelSizes[count].encodings = 0; + pixelSizes[count].encodings = nullptr; #endif return pixelSizes + (count++); } struct TQtFontFoundry { - TQtFontFoundry( const TQString &n ) : name( n ), count( 0 ), styles( 0 ) {} + TQtFontFoundry( const TQString &n ) : name( n ), count( 0 ), styles( nullptr ) {} ~TQtFontFoundry() { while ( count-- ) delete styles[count]; @@ -305,7 +305,7 @@ TQtFontStyle *TQtFontFoundry::style( const TQtFontStyle::Key &key, bool create ) pos = low; } if ( !create ) - return 0; + return nullptr; // tqDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d", key.weight, key.italic, key.oblique, key.stretch, pos ); if ( !(count % 8) ) @@ -338,7 +338,7 @@ struct TQtFontFamily fixedPitchComputed(false), #endif fullyLoaded( false ), - name( n ), count( 0 ), foundries( 0 ) { + name( n ), count( 0 ), foundries( nullptr ) { memset( scripts, 0, sizeof( scripts ) ); } ~TQtFontFamily() { @@ -391,7 +391,7 @@ TQtFontFoundry *TQtFontFamily::foundry( const TQString &f, bool create ) return foundries[i]; } if ( !create ) - return 0; + return nullptr; if ( !(count % 8) ) foundries = (TQtFontFoundry **) @@ -404,7 +404,7 @@ TQtFontFoundry *TQtFontFamily::foundry( const TQString &f, bool create ) class TQFontDatabasePrivate { public: - TQFontDatabasePrivate() : count( 0 ), families( 0 ) { } + TQFontDatabasePrivate() : count( 0 ), families( nullptr ) { } ~TQFontDatabasePrivate() { while ( count-- ) delete families[count]; @@ -434,7 +434,7 @@ TQtFontFamily *TQFontDatabasePrivate::family( const TQString &f, bool create ) return families[pos]; } if ( !create ) - return 0; + return nullptr; if ( res < 0 ) pos++; @@ -645,7 +645,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script ) static TQSingleCleanupHandler tqfontdatabase_cleanup; -static TQFontDatabasePrivate *db=0; +static TQFontDatabasePrivate *db=nullptr; #define SMOOTH_SCALABLE 0xffff #if defined( TQ_WS_X11 ) @@ -698,7 +698,7 @@ static TQtFontStyle *bestStyle(TQtFontFoundry *foundry, const TQtFontStyle::Key static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, TQtFontSize *size, int force_encoding_id) { - TQtFontEncoding *encoding = 0; + TQtFontEncoding *encoding = nullptr; if (force_encoding_id >= 0) { encoding = size->encodingID(force_encoding_id); @@ -719,7 +719,7 @@ static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, if (!encoding || !scripts_for_xlfd_encoding[encoding->encoding][script]) { // find the first encoding that supports the requested script - encoding = 0; + encoding = nullptr; for (int x = 0; !encoding && x < size->count; ++x) { const int enc = size->encodings[x].encoding; if (scripts_for_xlfd_encoding[enc][script]) { @@ -768,7 +768,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt } int px = -1; - TQtFontSize *size = 0; + TQtFontSize *size = nullptr; // 1. see if we have an exact matching size if (! (styleStrategy & TQFont::ForceOutline)) { @@ -798,7 +798,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt } #ifdef TQ_WS_X11 - TQtFontEncoding *encoding = 0; + TQtFontEncoding *encoding = nullptr; #endif // 4. find closest size match @@ -842,7 +842,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt #ifdef TQ_WS_X11 if (size) { encoding = findEncoding(script, styleStrategy, size, force_encoding_id); - if (!encoding) size = 0; + if (!encoding) size = nullptr; } if ( ! encoding ) { FM_DEBUG( " foundry doesn't support the script we want" ); @@ -919,12 +919,12 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if ( !db ) initializeDb(); - TQFontEngine *fe = 0; + TQFontEngine *fe = nullptr; if ( fp ) { if ( fp->rawMode ) { - fe = loadEngine( script, fp, request, 0, 0, 0 + fe = loadEngine( script, fp, request, nullptr, nullptr, nullptr #ifdef TQ_WS_X11 - , 0, 0, false + , nullptr, nullptr, false #endif ); @@ -1001,16 +1001,16 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, || family_name == "Serif" || family_name == "Monospace") { fe = loadFontConfigFont(fp, request, script); - usesFontConfig = (fe != 0); + usesFontConfig = (fe); } if (!fe) { - TQtFontFamily *best_family = 0; - TQtFontFoundry *best_foundry = 0; - TQtFontStyle *best_style = 0; - TQtFontSize *best_size = 0; + TQtFontFamily *best_family = nullptr; + TQtFontFoundry *best_foundry = nullptr; + TQtFontStyle *best_style = nullptr; + TQtFontSize *best_size = nullptr; #ifdef TQ_WS_X11 - TQtFontEncoding *best_encoding = 0; + TQtFontEncoding *best_encoding = nullptr; #endif // TQ_WS_X11 unsigned int score = ~0; @@ -1072,11 +1072,11 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, } } - TQtFontFoundry *try_foundry = 0; - TQtFontStyle *try_style = 0; - TQtFontSize *try_size = 0; + TQtFontFoundry *try_foundry = nullptr; + TQtFontStyle *try_style = nullptr; + TQtFontSize *try_size = nullptr; #ifdef TQ_WS_X11 - TQtFontEncoding *try_encoding = 0; + TQtFontEncoding *try_encoding = nullptr; #endif // TQ_WS_X11 // as we know the script is supported, we can be sure @@ -1089,7 +1089,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, , &try_encoding, force_encoding_id #endif ); - if ( try_foundry == 0 ) { + if ( !try_foundry ) { // the specific foundry was not found, so look for // any foundry matching our requirements newscore = bestFoundry( override_script, score, request.styleStrategy, try_family, @@ -1116,9 +1116,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, break; } - if ( best_family != 0 && best_foundry != 0 && best_style != 0 + if ( best_family && best_foundry && best_style #ifdef TQ_WS_X11 - && best_size != 0 && best_encoding != 0 + && best_size && best_encoding #endif ) { FM_DEBUG( " BEST:\n" @@ -1177,7 +1177,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, FM_DEBUG( " WARN: font loaded cannot render a sample char" ); delete fe; - fe = 0; + fe = nullptr; } else if ( fp ) { TQFontDef def = request; if (def.family.isEmpty()) { @@ -1209,7 +1209,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, if (!fe) { if ( !request.family.isEmpty() ) - return 0; + return nullptr; FM_DEBUG( "returning box engine" ); @@ -1720,7 +1720,7 @@ TQValueList TQFontDatabase::pointSizes( const TQString &family, if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) { #ifdef TQ_WS_X11 - const uint pointSize = tqRound(tqt_pointSize(size->pixelSize, 0, -1)); + const uint pointSize = tqRound(tqt_pointSize(size->pixelSize, nullptr, -1)); #else const uint pointSize = size->pixelSize; // embedded uses 72dpi #endif @@ -1821,7 +1821,7 @@ TQValueList TQFontDatabase::smoothSizes( const TQString &family, if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) { #ifdef TQ_WS_X11 - const uint pointSize = tqRound(tqt_pointSize(size->pixelSize, 0, -1)); + const uint pointSize = tqRound(tqt_pointSize(size->pixelSize, nullptr, -1)); #else const uint pointSize = size->pixelSize; // embedded uses 72dpi #endif @@ -1965,7 +1965,7 @@ int TQFontDatabase::weight( const TQString &family, */ TQString TQFontDatabase::scriptName(TQFont::Script script) { - const char *name = 0; + const char *name = nullptr; switch (script) { case TQFont::Latin: diff --git a/src/kernel/tqfontdatabase_x11.cpp b/src/kernel/tqfontdatabase_x11.cpp index d84e5c495..3377befc5 100644 --- a/src/kernel/tqfontdatabase_x11.cpp +++ b/src/kernel/tqfontdatabase_x11.cpp @@ -134,7 +134,7 @@ static const XlfdEncoding xlfd_encoding[] = { { "*-symbol", 34, 0, 0, make_tag('m','b','o','l') }, { "*-fontspecific", 35, 0, 0, make_tag('i','f','i','c') }, { "fontspecific-*", 36, 0, make_tag('f','o','n','t'), 0 }, - { 0, 0, 0, 0, 0 } + { nullptr, 0, 0, 0, 0 } }; static const char scripts_for_xlfd_encoding[37][61] = { @@ -534,7 +534,7 @@ enum XLFDFieldNames { static bool parseXFontName( char *fontName, char **tokens ) { if ( ! fontName || fontName[0] == '0' || fontName[0] != '-' ) { - tokens[0] = 0; + tokens[0] = nullptr; return false; } @@ -546,7 +546,7 @@ static bool parseXFontName( char *fontName, char **tokens ) if ( *fontName == '-' ) break; if ( ! *fontName ) { - fontName = 0; + fontName = nullptr; break; } } @@ -556,7 +556,7 @@ static bool parseXFontName( char *fontName, char **tokens ) if ( i < NFontFields ) { for ( int j = i ; j < NFontFields; ++j ) - tokens[j] = 0; + tokens[j] = nullptr; return false; } @@ -632,10 +632,10 @@ bool tqt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) if ( r && fd->pixelSize && TQPaintDevice::x11AppDpiY( screen ) && r != TQPaintDevice::x11AppDpiY( screen ) ) { // calculate actual pointsize for display DPI - fd->pointSize = tqRound(tqt_pointSize(fd->pixelSize, 0, screen) * 10.); + fd->pointSize = tqRound(tqt_pointSize(fd->pixelSize, nullptr, screen) * 10.); } else if ( fd->pixelSize == 0 && fd->pointSize ) { // calculate pixel size from pointsize/dpi - fd->pixelSize = tqRound(tqt_pixelSize(fd->pointSize / 10., 0, screen)); + fd->pixelSize = tqRound(tqt_pixelSize(fd->pointSize / 10., nullptr, screen)); } return true; @@ -707,7 +707,7 @@ static unsigned char encodingLoaded[numEncodings]; static void loadXlfds( const char *reqFamily, int encoding_id ) { - TQtFontFamily *fontFamily = reqFamily ? db->family( reqFamily ) : 0; + TQtFontFamily *fontFamily = reqFamily ? db->family( reqFamily ) : nullptr; // make sure we don't load twice if ( (encoding_id == -1 && xlfdsFullyLoaded) || (encoding_id != -1 && encodingLoaded[encoding_id]) ) @@ -850,7 +850,7 @@ static void loadXft() { "Serif", "serif", false }, { "Sans Serif", "sans-serif", false }, { "Monospace", "monospace", true }, - { 0, 0, false } + { nullptr, nullptr, false } }; const XftDefaultFont *f = defaults; while (f->qtname) { @@ -934,7 +934,7 @@ static bool loadXftFont( FcPattern* font ) int spacing_value; char *file_value; int index_value; - char *foundry_value = 0; + char *foundry_value = nullptr; FcBool scalable = FcTrue; if (XftPatternGetString( font, @@ -948,7 +948,7 @@ static bool loadXftFont( FcPattern* font ) slant_value = XFT_SLANT_ROMAN; weight_value = XFT_WEIGHT_MEDIUM; spacing_value = XFT_PROPORTIONAL; - file_value = 0; + file_value = nullptr; index_value = 0; XftPatternGetInteger (font, XFT_SLANT, 0, &slant_value); XftPatternGetInteger (font, XFT_WEIGHT, 0, &weight_value); @@ -956,13 +956,13 @@ static bool loadXftFont( FcPattern* font ) XftPatternGetString (font, XFT_FILE, 0, &file_value); XftPatternGetInteger (font, XFT_INDEX, 0, &index_value); FcPatternGetBool(font, FC_SCALABLE, 0, &scalable); - foundry_value = 0; + foundry_value = nullptr; XftPatternGetString(font, FC_FOUNDRY, 0, &foundry_value); TQtFontFamily *family = db->family( familyName, true ); family->rawName = rawName; family->hasXft = true; - FcCharSet *charset = 0; + FcCharSet *charset = nullptr; FcResult res = FcPatternGetCharSet(font, FC_CHARSET, 0, &charset); if (res == FcResultMatch && FcCharSetCount(charset) > 1) { for (int i = 0; i < TQFont::LastPrivateScript; ++i) { @@ -1063,11 +1063,11 @@ static void load( const TQString &family = TQString::null, int script = -1 ) return; #endif // TQT_NO_XFTFREETYPE if ( script == -1 ) - loadXlfds( 0, -1 ); + loadXlfds( nullptr, -1 ); else { for ( int i = 0; i < numEncodings; i++ ) { if ( scripts_for_xlfd_encoding[i][script] ) - loadXlfds( 0, i ); + loadXlfds( nullptr, i ); } } } else { @@ -1303,7 +1303,7 @@ TQFontEngine *loadEngine( TQFont::Script script, XFontStruct *xfs; if (! (xfs = XLoadQueryFont(TQPaintDevice::x11AppDisplay(), xlfd.data() ) ) ) - return 0; + return nullptr; TQFontEngine *fe = new TQFontEngineXLFD( xfs, xlfd.data(), 0 ); if ( ! tqt_fillFontDef( xfs, &fe->fontDef, TQPaintDevice::x11AppScreen() ) && @@ -1319,7 +1319,7 @@ TQFontEngine *loadEngine( TQFont::Script script, FM_DEBUG( " using Xft" ); XftPattern *pattern = XftPatternCreate(); - if ( !pattern ) return 0; + if ( !pattern ) return nullptr; bool symbol = (family->scripts[TQFont::UnknownScript] == TQtFontFamily::Supported); if (!symbol && script != TQFont::Unicode) { @@ -1370,7 +1370,7 @@ TQFontEngine *loadEngine( TQFont::Script script, } XftPatternDestroy(pattern); if (!result) - return 0; + return nullptr; // somehow this gets lost in the XftMatch call, reset the anitaliasing property correctly. if (request.styleStrategy & (TQFont::PreferAntialias|TQFont::NoAntialias)) { @@ -1385,7 +1385,7 @@ TQFontEngine *loadEngine( TQFont::Script script, XftFont *xftfs = XftFontOpenPattern( TQPaintDevice::x11AppDisplay(), dup ); if ( ! xftfs ) // Xft couldn't find a font? - return 0; + return nullptr; TQFontEngine *fe = new TQFontEngineXft( xftfs, result, symbol ? 1 : 0 ); if (fp->paintdevice @@ -1450,9 +1450,9 @@ TQFontEngine *loadEngine( TQFont::Script script, XFontStruct *xfs; if (! (xfs = XLoadQueryFont(TQPaintDevice::x11AppDisplay(), xlfd.data() ) ) ) - return 0; + return nullptr; - TQFontEngine *fe = 0; + TQFontEngine *fe = nullptr; const int mib = xlfd_encoding[ encoding->encoding ].mib; if (script == TQFont::Latin && encoding->encoding <= LAST_LATIN_ENCODING && !forced_encoding) { fe = new TQFontEngineLatinXLFD( xfs, xlfd.data(), mib ); @@ -1488,7 +1488,7 @@ static void parseFontName(const TQString &name, TQString &foundry, TQString &fam static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef &request, TQFont::Script script) { if (!tqt_has_xft) - return 0; + return nullptr; TQStringList family_list; if (request.family.isEmpty()) { @@ -1539,7 +1539,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef // XftFontMatch calls the right ConfigSubstitute variants, but as we use // FcFontMatch/Sort here we have to do it manually. - FcConfigSubstitute(0, pattern, FcMatchPattern); + FcConfigSubstitute(nullptr, pattern, FcMatchPattern); XftDefaultSubstitute(TQPaintDevice::x11AppDisplay(), TQPaintDevice::x11AppScreen(), pattern); // tqDebug("1: pattern contains:"); @@ -1593,25 +1593,25 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef FcPatternPrint(pattern); #endif - TQFontEngine *fe = 0; + TQFontEngine *fe = nullptr; for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { bool use_fontsort = ( jj == 1 ); FcResult result; - FcFontSet *fs = 0; - FcPattern *fsp = 0; + FcFontSet *fs = nullptr; + FcPattern *fsp = nullptr; // Properly conform to fontconfig API. We need to call FcDefaultSubstitute() // before FcFontSort()/FcFontMatch(). FcDefaultSubstitute(pattern); if( use_fontsort ) { - fs = FcFontSort(0, pattern, FcFalse, 0, &result); + fs = FcFontSort(nullptr, pattern, FcFalse, nullptr, &result); if (!fs) continue; } else { - fsp = FcFontMatch(0, pattern, &result); + fsp = FcFontMatch(nullptr, pattern, &result); if (!fsp) continue; } @@ -1694,7 +1694,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef if ( script != TQFont::Unicode && !canRender(fe, script) ) { FM_DEBUG( " WARN: font loaded cannot render samples" ); delete fe; - fe = 0; + fe = nullptr; }else FM_DEBUG( " USE: %s", fe->fontDef.family.latin1() ); } diff --git a/src/kernel/tqfontengine_p.h b/src/kernel/tqfontengine_p.h index b05b3386d..1a314752f 100644 --- a/src/kernel/tqfontengine_p.h +++ b/src/kernel/tqfontengine_p.h @@ -87,7 +87,7 @@ public: TQFontEngine() { count = 0; cache_count = 0; #ifdef TQ_WS_X11 - transformed_fonts = 0; + transformed_fonts = nullptr; #endif } virtual ~TQFontEngine(); @@ -98,7 +98,7 @@ public: #ifdef TQ_WS_X11 virtual int cmap() const { return -1; } - virtual TQOpenType *openType() const { return 0; } + virtual TQOpenType *openType() const { return nullptr; } #endif virtual void draw( TQPainter *p, int x, int y, const TQTextEngine *engine, const TQScriptItem *si, int textFlags ) = 0; @@ -431,9 +431,9 @@ public: Q_ASSERT(script < TQFont::NScripts); return supported_scripts[script]; } - void selectScript(unsigned int script, const Features *features = 0); + void selectScript(unsigned int script, const Features *features = nullptr); - bool shape(TQShaperItem *item, const unsigned int *properties = 0); + bool shape(TQShaperItem *item, const unsigned int *properties = nullptr); bool positionAndAdd(TQShaperItem *item, int availableGlyphs, bool doLogClusters = true); OTL_GlyphItem glyphs() const { return otl_buffer->in_string; } diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp index 3d264742d..4d8b615a1 100644 --- a/src/kernel/tqfontengine_x11.cpp +++ b/src/kernel/tqfontengine_x11.cpp @@ -90,7 +90,7 @@ inline static void qSafeXDestroyImage( XImage *x ) { if ( x->data ) { free( x->data ); - x->data = 0; + x->data = nullptr; } XDestroyImage( x ); } @@ -400,7 +400,7 @@ TQFontEngine::Type TQFontEngineBox::type() const static inline XCharStruct *charStruct( XFontStruct *xfs, uint ch ) { - XCharStruct *xcs = 0; + XCharStruct *xcs = nullptr; unsigned char r = ch>>8; unsigned char c = ch&0xff; if ( r >= xfs->min_byte1 && @@ -415,14 +415,14 @@ static inline XCharStruct *charStruct( XFontStruct *xfs, uint ch ) xfs->min_char_or_byte2 + 1)) + (c - xfs->min_char_or_byte2); if (xcs->width == 0 && xcs->ascent == 0 && xcs->descent == 0) - xcs = 0; + xcs = nullptr; } } return xcs; } TQFontEngineXLFD::TQFontEngineXLFD( XFontStruct *fs, const char *name, int mib ) - : _fs( fs ), _name( name ), _codec( 0 ), _scale( 1. ), _cmap( mib ) + : _fs( fs ), _name( name ), _codec( nullptr ), _scale( 1. ), _cmap( mib ) { if ( _cmap ) _codec = TQTextCodec::codecForMib( _cmap ); @@ -456,7 +456,7 @@ TQFontEngineXLFD::TQFontEngineXLFD( XFontStruct *fs, const char *name, int mib ) TQFontEngineXLFD::~TQFontEngineXLFD() { XFreeFont( TQPaintDevice::x11AppDisplay(), _fs ); - _fs = 0; + _fs = nullptr; TransformedFont *trf = transformed_fonts; while ( trf ) { XUnloadFont( TQPaintDevice::x11AppDisplay(), trf->xlfd_font ); @@ -527,7 +527,7 @@ TQFontEngine::Error TQFontEngineXLFD::stringToCMap( const TQChar *str, int len, while ( g-- != glyphs ) { unsigned int gl = *g; xcs = (gl >= _fs->min_char_or_byte2 && gl <= _fs->max_char_or_byte2) ? - base + gl : 0; + base + gl : nullptr; *(--a) = (!xcs || (!xcs->width && !xcs->ascent && !xcs->descent)) ? _fs->ascent : xcs->width; } } @@ -602,7 +602,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng // check if we have it cached TransformedFont *trf = transformed_fonts; - TransformedFont *prev = 0; + TransformedFont *prev = nullptr; int i = 0; while ( trf ) { if ( trf->xx == mat[0] && @@ -942,9 +942,9 @@ bool TQFontEngineXLFD::canRender( const TQChar *string, int len ) glyph_t glyphs[256]; int nglyphs = 255; glyph_t *g = glyphs; - if ( stringToCMap( string, len, g, 0, &nglyphs, false ) == OutOfMemory ) { + if ( stringToCMap( string, len, g, nullptr, &nglyphs, false ) == OutOfMemory ) { g = (glyph_t *)malloc( nglyphs*sizeof(glyph_t) ); - stringToCMap( string, len, g, 0, &nglyphs, false ); + stringToCMap( string, len, g, nullptr, &nglyphs, false ); } bool allExist = true; @@ -999,10 +999,10 @@ TQFontEngineLatinXLFD::~TQFontEngineLatinXLFD() { for ( int i = 0; i < _count; ++i ) { delete _engines[i]; - _engines[i] = 0; + _engines[i] = nullptr; } delete [] _engines; - _engines = 0; + _engines = nullptr; } void TQFontEngineLatinXLFD::findEngine( const TQChar &ch ) @@ -1024,7 +1024,7 @@ void TQFontEngineLatinXLFD::findEngine( const TQChar &ch ) static const int mib_count = sizeof( alternate_encodings ) / sizeof( const char * ); // see if one of the above mibs can map the char we want - TQTextCodec *codec = 0; + TQTextCodec *codec = nullptr; int which = -1; int i; for ( i = 0; i < mib_count; ++i ) { @@ -1050,10 +1050,10 @@ void TQFontEngineLatinXLFD::findEngine( const TQChar &ch ) const int enc_id = tqt_xlfd_encoding_id( alternate_encodings[which] ); TQFontDef req = fontDef; - TQFontEngine *engine = TQFontDatabase::findFont( TQFont::Latin, 0, req, enc_id ); + TQFontEngine *engine = TQFontDatabase::findFont( TQFont::Latin, nullptr, req, enc_id ); if ( ! engine ) { req.family = TQString::null; - engine = TQFontDatabase::findFont( TQFont::Latin, 0, req, enc_id ); + engine = TQFontDatabase::findFont( TQFont::Latin, nullptr, req, enc_id ); if ( ! engine ) return; } engine->setScale( scale() ); @@ -1469,7 +1469,7 @@ static inline void unlockFTFace( XftFont *font ) } TQFontEngineXft::TQFontEngineXft( XftFont *font, XftPattern *pattern, int cmap ) - : _font( font ), _pattern( pattern ), _openType( 0 ), _cmap( cmap ) + : _font( font ), _pattern( pattern ), _openType( nullptr ), _cmap( cmap ) { _face = lockFTFace( _font ); @@ -1511,8 +1511,8 @@ TQFontEngineXft::~TQFontEngineXft() XftFontClose( TQPaintDevice::x11AppDisplay(),_font ); XftPatternDestroy( _pattern ); - _font = 0; - _pattern = 0; + _font = nullptr; + _pattern = nullptr; TransformedFont *trf = transformed_fonts; while ( trf ) { XftFontClose( TQPaintDevice::x11AppDisplay(), trf->xft_font ); @@ -1558,8 +1558,8 @@ TQFontEngine::Error TQFontEngineXft::stringToCMap( const TQChar *str, int len, g glyphs[glyph_pos] = uc < cmapCacheSize ? cmapCache[uc] : 0; if ( !glyphs[glyph_pos] ) { glyph_t glyph = 0; - if (XftCharExists(0, _font, uc)) { - glyph = XftCharIndex(0, _font, uc); + if (XftCharExists(nullptr, _font, uc)) { + glyph = XftCharIndex(nullptr, _font, uc); } if ( !glyph && _cmap != -1 ) { glyph = getAdobeCharIndex(_font, _cmap, uc); @@ -1631,7 +1631,7 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi return; } - XftMatrix *mat = 0; + XftMatrix *mat = nullptr; XftPatternGetMatrix( _pattern, XFT_MATRIX, 0, &mat ); XftMatrix m2; m2.xx = p->m11()*_scale; @@ -1641,7 +1641,7 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi // check if we have it cached TransformedFont *trf = transformed_fonts; - TransformedFont *prev = 0; + TransformedFont *prev = nullptr; int i = 0; while ( trf ) { if ( trf->xx == (float)m2.xx && @@ -1948,7 +1948,7 @@ int TQFontEngineXft::minRightBearing() const TQChar *ch = (TQChar *)char_table; glyph_t glyphs[char_table_entries]; int ng = char_table_entries; - stringToCMap(ch, char_table_entries, glyphs, 0, &ng, false); + stringToCMap(ch, char_table_entries, glyphs, nullptr, &ng, false); while (--ng) { if (glyphs[ng]) { glyph_metrics_t gi = that->boundingBox( glyphs[ng] ); @@ -1985,7 +1985,7 @@ bool TQFontEngineXft::canRender( const TQChar *string, int len ) if (_cmap != -1) { for ( int i = 0; i < len; i++ ) { uint uc = getCodepoint(string, i, len); - if (!XftCharExists(0, _font, uc) + if (!XftCharExists(nullptr, _font, uc) && getAdobeCharIndex(_font, _cmap, uc) == 0) { allExist = false; break; @@ -1994,7 +1994,7 @@ bool TQFontEngineXft::canRender( const TQChar *string, int len ) } else { for ( int i = 0; i < len; i++ ) { uint uc = getCodepoint(string, i, len); - if (!XftCharExists(0, _font, uc)) { + if (!XftCharExists(nullptr, _font, uc)) { allExist = false; break; } @@ -2011,7 +2011,7 @@ TQOpenType *TQFontEngineXft::openType() const return _openType; if ( !_face || ! FT_IS_SFNT( _face ) ) - return 0; + return nullptr; TQFontEngineXft *that = (TQFontEngineXft *)this; that->_openType = new TQOpenType(that); @@ -2194,23 +2194,23 @@ static const OTScripts ot_scripts [] = { }; TQOpenType::TQOpenType(TQFontEngineXft *fe) - : fontEngine(fe), gdef(0), gsub(0), gpos(0), current_script(0) + : fontEngine(fe), gdef(nullptr), gsub(nullptr), gpos(nullptr), current_script(0) { face = fe->face(); otl_buffer_new(face->memory, &otl_buffer); - tmpAttributes = 0; - tmpLogClusters = 0; + tmpAttributes = nullptr; + tmpLogClusters = nullptr; FT_Error error; if ((error = TT_Load_GDEF_Table(face, &gdef))) { #ifdef OT_DEBUG tqDebug("error loading gdef table: %d", error); #endif - gdef = 0; + gdef = nullptr; } if ((error = TT_Load_GSUB_Table(face, &gsub, gdef))) { - gsub = 0; + gsub = nullptr; #ifdef OT_DEBUG if (error != FT_Err_Table_Missing) { tqDebug("error loading gsub table: %d", error); @@ -2221,7 +2221,7 @@ TQOpenType::TQOpenType(TQFontEngineXft *fe) } if ((error = TT_Load_GPOS_Table(face, &gpos, gdef))) { - gpos = 0; + gpos = nullptr; #ifdef OT_DEBUG tqDebug("error loading gpos table: %d", error); #endif diff --git a/src/kernel/tqfontmetrics.h b/src/kernel/tqfontmetrics.h index 35d09f5e8..4d8b20c4d 100644 --- a/src/kernel/tqfontmetrics.h +++ b/src/kernel/tqfontmetrics.h @@ -84,10 +84,10 @@ public: TQRect boundingRect( TQChar ) const; TQRect boundingRect( int x, int y, int w, int h, int flags, const TQString& str, int len=-1, int tabstops=0, - int *tabarray=0, TQTextParag **intern=0 ) const; + int *tabarray=nullptr, TQTextParag **intern=nullptr ) const; TQSize size( int flags, const TQString& str, int len=-1, int tabstops=0, - int *tabarray=0, TQTextParag **intern=0 ) const; + int *tabarray=nullptr, TQTextParag **intern=nullptr ) const; int underlinePos() const; int overlinePos() const; diff --git a/src/kernel/tqgplugin.cpp b/src/kernel/tqgplugin.cpp index 606e856fb..a316ca1f3 100644 --- a/src/kernel/tqgplugin.cpp +++ b/src/kernel/tqgplugin.cpp @@ -43,7 +43,7 @@ #include TQGPlugin::TQGPlugin() - : _iface( 0 ) + : _iface( nullptr ) { } diff --git a/src/kernel/tqguardedptr.cpp b/src/kernel/tqguardedptr.cpp index ab18f5ed2..762ecf85a 100644 --- a/src/kernel/tqguardedptr.cpp +++ b/src/kernel/tqguardedptr.cpp @@ -196,7 +196,7 @@ TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o) - : TQObject(0, "_ptrpriv" ), obj( o ) + : TQObject(nullptr, "_ptrpriv" ), obj( o ) { if ( obj ) connect( obj, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); @@ -222,5 +222,5 @@ void TQGuardedPtrPrivate::reconnect( TQObject *o ) void TQGuardedPtrPrivate::objectDestroyed() { - obj = 0; + obj = nullptr; } diff --git a/src/kernel/tqguardedptr.h b/src/kernel/tqguardedptr.h index e31d6f0c2..576fe077e 100644 --- a/src/kernel/tqguardedptr.h +++ b/src/kernel/tqguardedptr.h @@ -71,7 +71,7 @@ template class TQGuardedPtr { public: - TQGuardedPtr() : priv( new TQGuardedPtrPrivate( 0 ) ) {} + TQGuardedPtr() : priv( new TQGuardedPtrPrivate( nullptr ) ) {} TQGuardedPtr( T* o) { priv = new TQGuardedPtrPrivate( (TQObject*)o ); @@ -113,11 +113,11 @@ public: bool isNull() const { return !priv || !priv->object(); } - T* operator->() const { return (T*)(priv?priv->object():0); } + T* operator->() const { return (T*)(priv?priv->object():nullptr); } - T& operator*() const { return *((T*)(priv?priv->object():0)); } + T& operator*() const { return *((T*)(priv?priv->object():nullptr)); } - operator T*() const { return (T*)(priv?priv->object():0); } + operator T*() const { return (T*)(priv?priv->object():nullptr); } private: diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp index 71b71ffee..efd4b1a29 100644 --- a/src/kernel/tqiconset.cpp +++ b/src/kernel/tqiconset.cpp @@ -50,7 +50,7 @@ enum { NumSizes = 2, NumModes = 3, NumStates = 2 }; -static TQIconFactory *defaultFac = 0; +static TQIconFactory *defaultFac = nullptr; static TQSingleCleanupHandler q_cleanup_icon_factory; static short widths[2] = { 22, 32 }; @@ -71,10 +71,10 @@ struct TQIconSetIcon TQPixmap *pixmap; }; - TQIconSetIcon() : origin( Generated ) { pixmap = 0; } + TQIconSetIcon() : origin( Generated ) { pixmap = nullptr; } TQIconSetIcon( const TQIconSetIcon& other ) : origin( Generated ) { - pixmap = 0; + pixmap = nullptr; operator=( other ); } ~TQIconSetIcon() { @@ -91,15 +91,15 @@ struct TQIconSetIcon if ( pixmap && (origin == Manufactured || origin == Generated) ) { origin = Generated; delete pixmap; - pixmap = 0; + pixmap = nullptr; } } }; TQIconSetIcon& TQIconSetIcon::operator=( const TQIconSetIcon& other ) { - TQPixmap *oldPixmap = 0; - TQString *oldFileName = 0; + TQPixmap *oldPixmap = nullptr; + TQString *oldFileName = nullptr; if ( origin == SuppliedFileName ) { oldFileName = fileName; } else { @@ -113,7 +113,7 @@ TQIconSetIcon& TQIconSetIcon::operator=( const TQIconSetIcon& other ) if ( other.pixmap ) { pixmap = new TQPixmap( *other.pixmap ); } else { - pixmap = 0; + pixmap = nullptr; } } delete oldPixmap; @@ -128,7 +128,7 @@ public: TQPixmap defaultPix; TQIconFactory *factory; - TQIconSetPrivate() : factory( 0 ) { } + TQIconSetPrivate() : factory( nullptr ) { } TQIconSetPrivate( const TQIconSetPrivate& other ) : TQShared() { count = 1; for ( int i = 0; i < NumSizes; i++ ) { @@ -144,7 +144,7 @@ public: factory->ref(); } ~TQIconSetPrivate() { - setFactory( 0 ); + setFactory( nullptr ); } TQIconSetIcon *icon( const TQIconSet *iconSet, TQIconSet::Size size, @@ -172,7 +172,7 @@ TQIconSetIcon *TQIconSetPrivate::icon( const TQIconSet *iconSet, if ( newPixmap->isNull() ) { delete newPixmap; ik->origin = Generated; - ik->pixmap = 0; + ik->pixmap = nullptr; } else { ik->origin = SuppliedPixmap; ik->pixmap = newPixmap; @@ -361,7 +361,7 @@ TQIconSetIcon *TQIconSetPrivate::icon( const TQIconSet *iconSet, \sa setPixmap(), reset() */ TQIconSet::TQIconSet() - : d( 0 ) + : d( nullptr ) { } @@ -378,7 +378,7 @@ TQIconSet::TQIconSet() \sa setIconSize() reset() */ TQIconSet::TQIconSet( const TQPixmap& pixmap, Size size ) - : d( 0 ) + : d( nullptr ) { reset( pixmap, size ); } @@ -388,7 +388,7 @@ TQIconSet::TQIconSet( const TQPixmap& pixmap, Size size ) large icon. */ TQIconSet::TQIconSet( const TQPixmap& smallPix, const TQPixmap& largePix ) - : d( 0 ) + : d( nullptr ) { reset( smallPix, Small ); reset( largePix, Large ); @@ -431,7 +431,7 @@ void TQIconSet::reset( const TQPixmap& pixmap, Size size ) normalize( size, pixmap.size() ); setPixmap( pixmap, size, Normal ); d->defaultPix = pixmap; - d->setFactory( 0 ); + d->setFactory( nullptr ); } /*! @@ -462,13 +462,13 @@ void TQIconSet::setPixmap( const TQPixmap& pixmap, Size size, Mode mode, detach(); clearGenerated(); - TQIconSetIcon *icon = d->icon( 0, size, mode, state ); + TQIconSetIcon *icon = d->icon( nullptr, size, mode, state ); if ( icon->origin == SuppliedFileName ) { delete icon->fileName; - icon->pixmap = 0; + icon->pixmap = nullptr; } icon->origin = SuppliedPixmap; - if ( icon->pixmap == 0 ) { + if ( !icon->pixmap ) { icon->pixmap = new TQPixmap( pixmap ); } else { *icon->pixmap = pixmap; @@ -489,7 +489,7 @@ void TQIconSet::setPixmap( const TQString& fileName, Size size, Mode mode, detach(); clearGenerated(); - TQIconSetIcon *icon = d->icon( 0, size, mode, state ); + TQIconSetIcon *icon = d->icon( nullptr, size, mode, state ); if ( icon->origin == SuppliedFileName ) { *icon->fileName = fileName; } else { @@ -780,7 +780,7 @@ void TQIconSet::normalize( Size& which, const TQSize& pixSize ) TQPixmap *TQIconSet::createScaled( Size size, const TQPixmap *suppliedPix ) const { if ( !suppliedPix || suppliedPix->isNull() ) - return 0; + return nullptr; TQImage img = suppliedPix->convertToImage(); TQSize imgSize = iconSize( size ); @@ -809,10 +809,10 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const { TQPixmap normalPix = pixmap( size, Normal, state ); if ( normalPix.isNull() ) - return 0; + return nullptr; TQImage img; - TQPixmap *pixmap = 0; + TQPixmap *pixmap = nullptr; TQBitmap normalMask; if ( normalPix.mask() ) { normalMask = *normalPix.mask(); @@ -891,7 +891,7 @@ TQPixmap *TQIconFactory::createPixmap( const TQIconSet& /* iconSet */, TQIconSet::Mode /* mode */, TQIconSet::State /* state */ ) { - return 0; + return nullptr; } /*! diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp index 9435b6909..ccfc13959 100644 --- a/src/kernel/tqimage.cpp +++ b/src/kernel/tqimage.cpp @@ -417,7 +417,7 @@ TQImage::TQImage( const char * const xpm[] ) { init(); #ifndef TQT_NO_IMAGEIO_XPM - read_xpm_image_or_array( 0, xpm, *this ); + read_xpm_image_or_array( nullptr, xpm, *this ); #else // We use a tqFatal rather than disabling the whole function, as this // constructor may be ambiguous. @@ -603,7 +603,7 @@ TQImage TQImage::copy() const { if ( isNull() ) { // maintain the fields of invalid TQImages when copied - return TQImage( 0, width(), height(), depth(), colorTable(), numColors(), bitOrder() ); + return TQImage( nullptr, width(), height(), depth(), colorTable(), numColors(), bitOrder() ); } else { TQImage image; image.create( width(), height(), depth(), numColors(), bitOrder() ); @@ -1086,7 +1086,7 @@ void TQImage::setNumColors( int numColors ) free( data->ctbl ); else data->ctbl_mine = true; - data->ctbl = 0; + data->ctbl = nullptr; } data->ncols = 0; return; @@ -1101,7 +1101,7 @@ void TQImage::setNumColors( int numColors ) TQ_CHECK_PTR(data->ctbl); data->ctbl_mine = true; } - data->ncols = data->ctbl == 0 ? 0 : numColors; + data->ncols = !data->ctbl ? 0 : numColors; } @@ -1268,12 +1268,12 @@ void TQImage::reinit() { data->w = data->h = data->d = data->ncols = 0; data->nbytes = 0; - data->ctbl = 0; - data->bits = 0; + data->ctbl = nullptr; + data->bits = nullptr; data->bitordr = TQImage::IgnoreEndian; data->alpha = false; #ifndef TQT_NO_IMAGE_TEXT - data->misc = 0; + data->misc = nullptr; #endif data->dpmx = 0; data->dpmy = 0; @@ -1289,7 +1289,7 @@ void TQImage::freeBits() { if ( data->bits ) { // dealloc image bits free( data->bits ); - data->bits = 0; + data->bits = nullptr; } } @@ -1314,7 +1314,7 @@ struct TQRgbMap { TQRgb rgb; }; -static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_flags, TQRgb* palette=0, int palette_count=0 ) +static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_flags, TQRgb* palette=nullptr, int palette_count=0 ) { TQRgb *p; uchar *b; @@ -2376,8 +2376,8 @@ bool TQImage::isGrayscale() const static void pnmscale(const TQImage& src, TQImage& dst) { - TQRgb* xelrow = 0; - TQRgb* tempxelrow = 0; + TQRgb* xelrow = nullptr; + TQRgb* tempxelrow = nullptr; TQRgb* xP; TQRgb* nxP; int rows, cols, rowsread, newrows, newcols; @@ -2433,7 +2433,7 @@ void pnmscale(const TQImage& src, TQImage& dst) for ( col = 0; col < cols; ++col ) as[col] = HALFSCALE; } else { - as = 0; + as = nullptr; } rs = new long[cols]; gs = new long[cols]; @@ -3061,11 +3061,11 @@ TQImage TQImage::createHeuristicMask( bool clipTight ) const while( !done ) { done = true; ypn = m.scanLine(0); - ypc = 0; + ypc = nullptr; for ( y = 0; y < h; y++ ) { ypp = ypc; ypc = ypn; - ypn = (y == h-1) ? 0 : m.scanLine(y+1); + ypn = (y == h-1) ? nullptr : m.scanLine(y+1); TQRgb *p = (TQRgb *)scanLine(y); for ( x = 0; x < w; x++ ) { // slowness here - it's possible to do six of these tests @@ -3087,11 +3087,11 @@ TQImage TQImage::createHeuristicMask( bool clipTight ) const if ( !clipTight ) { ypn = m.scanLine(0); - ypc = 0; + ypc = nullptr; for ( y = 0; y < h; y++ ) { ypp = ypc; ypc = ypn; - ypn = (y == h-1) ? 0 : m.scanLine(y+1); + ypn = (y == h-1) ? nullptr : m.scanLine(y+1); TQRgb *p = (TQRgb *)scanLine(y); for ( x = 0; x < w; x++ ) { if ( (*p & 0x00ffffff) != background ) { @@ -3551,7 +3551,7 @@ TQDataStream &operator>>( TQDataStream &s, TQImage &image ) return s; } } - TQImageIO io( s.device(), 0 ); + TQImageIO io( s.device(), nullptr ); if ( io.read() ) image = io.image(); return s; @@ -3726,11 +3726,11 @@ TQImageIO::TQImageIO( const TQString &fileName, const char* format ) void TQImageIO::init() { d = new TQImageIOData(); - d->parameters = 0; + d->parameters = nullptr; d->quality = -1; // default quality of the current format d->gamma=0.0f; iostat = 0; - iodev = 0; + iodev = nullptr; } /*! @@ -3777,11 +3777,11 @@ TQImageHandler::TQImageHandler( const char *f, const char *h, const TQCString& f } typedef TQPtrList TQIHList;// list of image handlers -static TQIHList *imageHandlers = 0; +static TQIHList *imageHandlers = nullptr; #ifndef TQT_NO_COMPONENT -static TQPluginManager *plugin_manager = 0; +static TQPluginManager *plugin_manager = nullptr; #else -static void *plugin_manager = 0; +static void *plugin_manager = nullptr; #endif void tqt_init_image_plugins() @@ -3809,10 +3809,10 @@ static void cleanup() { // make sure that image handlers are delete before plugin manager delete imageHandlers; - imageHandlers = 0; + imageHandlers = nullptr; #ifndef TQT_NO_COMPONENT delete plugin_manager; - plugin_manager = 0; + plugin_manager = nullptr; #endif } @@ -3824,7 +3824,7 @@ void tqt_init_image_handlers() // initialize image handlers imageHandlers->setAutoDelete( true ); tqAddPostRoutine( cleanup ); #ifndef TQT_NO_IMAGEIO_BMP - TQImageIO::defineIOHandler( "BMP", "^BM", 0, + TQImageIO::defineIOHandler( "BMP", "^BM", nullptr, read_bmp_image, write_bmp_image ); #endif #ifndef TQT_NO_IMAGEIO_PPM @@ -3871,7 +3871,7 @@ static TQImageHandler *get_image_handler( const char *format ) return p; p = imageHandlers->next(); } - return 0; // no such handler + return nullptr; // no such handler } @@ -4175,7 +4175,7 @@ const char* TQImageIO::imageFormat( const TQString &fileName ) { TQFile file( fileName ); if ( !file.open(IO_ReadOnly) ) - return 0; + return nullptr; const char* format = imageFormat( &file ); file.close(); return format; @@ -4207,11 +4207,11 @@ const char *TQImageIO::imageFormat( TQIODevice *d ) int rdlen = d->readBlock( buf, buflen ); // read a few bytes if ( rdlen != buflen ) - return 0; + return nullptr; memcpy( buf2, buf, buflen ); - const char* format = 0; + const char* format = nullptr; for ( int n = 0; n < rdlen; n++ ) if ( buf[n] == '\0' ) buf[n] = '\001'; @@ -4350,7 +4350,7 @@ bool TQImageIO::read() if ( !image_format ) { if ( file.isOpen() ) { // unknown format file.close(); - iodev = 0; + iodev = nullptr; } return false; } @@ -4383,7 +4383,7 @@ bool TQImageIO::read() if ( file.isOpen() ) { // image was read using file file.close(); - iodev = 0; + iodev = nullptr; } return iostat == 0; // image successfully read? } @@ -4443,7 +4443,7 @@ bool TQImageIO::write() (*h->write_image)( this ); if ( file.isOpen() ) { // image was written using file file.close(); - iodev = 0; + iodev = nullptr; } return iostat == 0; // image successfully written? } @@ -5381,7 +5381,7 @@ static void read_async_image( TQImageIO *iio ) } } - consumer->decoder = 0; + consumer->decoder = nullptr; delete decoder; delete consumer; } @@ -5456,7 +5456,7 @@ static void read_xbm_image( TQImageIO *iio ) return; } buf[readBytes] = '\0'; - if ( strstr(buf,"0x") != 0 ) // does line contain data? + if ( strstr(buf,"0x") ) // does line contain data? break; } @@ -5643,14 +5643,14 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc TQImage & image) { TQCString buf; - TQIODevice *d = 0; + TQIODevice *d = nullptr; buf.resize( 200 ); int i, cpp, ncols, w, h, index = 0; if ( iio ) { iio->setStatus( 1 ); - d = iio ? iio->ioDevice() : 0; + d = iio ? iio->ioDevice() : nullptr; d->readLine( buf.data(), buf.size() ); // "/* XPM */" TQRegExp r( TQString::fromLatin1("/\\*.XPM.\\*/") ); if ( buf.find(r) == -1 ) @@ -5783,7 +5783,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc static void read_xpm_image( TQImageIO * iio ) { TQImage i; - (void)read_xpm_image_or_array( iio, 0, i ); + (void)read_xpm_image_or_array( iio, nullptr, i ); return; } diff --git a/src/kernel/tqimage.h b/src/kernel/tqimage.h index 41e8b717c..ede2f67cf 100644 --- a/src/kernel/tqimage.h +++ b/src/kernel/tqimage.h @@ -76,7 +76,7 @@ public: TQImage( const TQSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian ); #ifndef TQT_NO_IMAGEIO - TQImage( const TQString &fileName, const char* format=0 ); + TQImage( const TQString &fileName, const char* format=nullptr ); TQImage( const char * const xpm[] ); TQImage( const TQByteArray &data ); #endif @@ -97,7 +97,7 @@ public: #ifndef TQT_NO_MIME static TQImage fromMimeSource( const TQString& abs_name ); #endif - bool isNull() const { return data->bits == 0; } + bool isNull() const { return !data->bits; } int width() const { return data->w; } int height() const { return data->h; } @@ -180,10 +180,10 @@ public: static TQStringList inputFormatList(); static TQStringList outputFormatList(); #endif - bool load( const TQString &fileName, const char* format=0 ); + bool load( const TQString &fileName, const char* format=nullptr ); bool loadFromData( const uchar *buf, uint len, - const char *format=0 ); - bool loadFromData( TQByteArray data, const char* format=0 ); + const char *format=nullptr ); + bool loadFromData( TQByteArray data, const char* format=nullptr ); bool save( const TQString &fileName, const char* format, int quality=-1 ) const; bool save( TQIODevice * device, const char* format, @@ -206,7 +206,7 @@ public: TQValueList textList() const; TQStringList textLanguages() const; TQStringList textKeys() const; - TQString text(const char* key, const char* lang=0) const; + TQString text(const char* key, const char* lang=nullptr) const; TQString text(const TQImageTextKeyLang&) const; void setText(const char* key, const char* lang, const TQString&); #endif @@ -341,7 +341,7 @@ inline bool TQImage::hasAlphaBuffer() const inline uchar *TQImage::bits() const { - return data->bits ? data->bits[0] : 0; + return data->bits ? data->bits[0] : nullptr; } inline uchar **TQImage::jumpTable() const @@ -394,7 +394,7 @@ inline uchar *TQImage::scanLine( int i ) const if ( i >= data->h ) warningIndexRange( "scanLine", i ); #endif - return data->bits ? data->bits[i] : 0; + return data->bits ? data->bits[i] : nullptr; } inline int TQImage::dotsPerMeterX() const diff --git a/src/kernel/tqimageformatplugin.cpp b/src/kernel/tqimageformatplugin.cpp index c7da8581d..9f7862c84 100644 --- a/src/kernel/tqimageformatplugin.cpp +++ b/src/kernel/tqimageformatplugin.cpp @@ -106,7 +106,7 @@ TQImageFormatPluginPrivate::~TQImageFormatPluginPrivate() TQRESULT TQImageFormatPluginPrivate::queryInterface( const TQUuid &iid, TQUnknownInterface **iface ) { - *iface = 0; + *iface = nullptr; if ( iid == IID_QUnknown ) *iface = this; diff --git a/src/kernel/tqinputcontext.cpp b/src/kernel/tqinputcontext.cpp index 913b0da5f..9e6564d45 100644 --- a/src/kernel/tqinputcontext.cpp +++ b/src/kernel/tqinputcontext.cpp @@ -52,7 +52,7 @@ class TQInputContextPrivate { public: TQInputContextPrivate() - : holderWidget( 0 ), composingWidget( 0 ), hasFocus( false ), + : holderWidget( nullptr ), composingWidget( nullptr ), hasFocus( false ), isComposing( false ) #if !defined(TQT_NO_IM_PREEDIT_RELOCATION) , preeditString( TQString::null ), @@ -356,7 +356,7 @@ void TQInputContext::setHolderWidget( TQWidget *w ) */ TQWidget *TQInputContext::focusWidget() const { - return d->hasFocus ? d->composingWidget : 0; + return d->hasFocus ? d->composingWidget : nullptr; } @@ -412,7 +412,7 @@ void TQInputContext::setFocusWidget( TQWidget *w ) void TQInputContext::releaseComposingWidget( TQWidget *w ) { if ( d->composingWidget == w ) { - d->composingWidget = 0; + d->composingWidget = nullptr; d->hasFocus = false; } } @@ -515,8 +515,8 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type, const TQString &text, int cursorPosition, int selLength ) { - TQObject *receiver = 0; - TQIMEvent *event = 0; + TQObject *receiver = nullptr; + TQIMEvent *event = nullptr; #if defined(TQ_WS_X11) receiver = d->composingWidget; @@ -810,7 +810,7 @@ TQString TQInputContext::language() */ TQPtrList *TQInputContext::menus() { - return 0; + return nullptr; } /*! diff --git a/src/kernel/tqinputcontext.h b/src/kernel/tqinputcontext.h index 06f72f206..90c78ad14 100644 --- a/src/kernel/tqinputcontext.h +++ b/src/kernel/tqinputcontext.h @@ -66,7 +66,7 @@ class TQ_EXPORT TQInputContext : public TQObject { TQ_OBJECT public: - TQInputContext( TQObject *parent = 0 ); + TQInputContext( TQObject *parent = nullptr ); virtual ~TQInputContext(); virtual TQString identifierName(); @@ -80,7 +80,7 @@ public: virtual void setFocus(); virtual void unsetFocus(); - virtual void setMicroFocus( int x, int y, int w, int h, TQFont *f = 0 ); + virtual void setMicroFocus( int x, int y, int w, int h, TQFont *f = nullptr ); virtual void mouseHandler( int x, TQEvent::Type type, TQt::ButtonState button, TQt::ButtonState state ); virtual TQFont font() const; diff --git a/src/kernel/tqinputcontext_p.h b/src/kernel/tqinputcontext_p.h index 9261ae909..7ff82a51a 100644 --- a/src/kernel/tqinputcontext_p.h +++ b/src/kernel/tqinputcontext_p.h @@ -104,10 +104,10 @@ public: static void setFont( const TQWidget *w, const TQFont & ); static void setFocusHint( int x, int y, int w, int h, const TQWidget *widget ); static bool startComposition(); - static bool endComposition( TQWidget *fw = 0 ); + static bool endComposition( TQWidget *fw = nullptr ); static bool composition( LPARAM lparam ); - static void accept( TQWidget *fw = 0 ); + static void accept( TQWidget *fw = nullptr ); static void enable( TQWidget *w, bool b ); #endif }; diff --git a/src/kernel/tqinternal.cpp b/src/kernel/tqinternal.cpp index 98524dfdd..6af17c485 100644 --- a/src/kernel/tqinternal.cpp +++ b/src/kernel/tqinternal.cpp @@ -49,9 +49,9 @@ // Prevent drawing artifacts on such screens #define USE_HUGE_QT_SHARED_DOUBLE_BUFFERS 1 -static TQPixmap* qdb_shared_pixmap = 0; -static TQPixmap *qdb_force_pixmap = 0; -static TQSharedDoubleBuffer* qdb_owner = 0; +static TQPixmap* qdb_shared_pixmap = nullptr; +static TQPixmap *qdb_force_pixmap = nullptr; +static TQSharedDoubleBuffer* qdb_owner = nullptr; TQCleanupHandler qdb_pixmap_cleanup; @@ -134,7 +134,7 @@ private: started when creating the object. */ TQSharedDoubleBufferCleaner::TQSharedDoubleBufferCleaner( void ) - : TQObject( 0, "internal shared double buffer cleanup object" ), + : TQObject( nullptr, "internal shared double buffer cleanup object" ), timer_id( -1 ) { } @@ -164,7 +164,7 @@ void TQSharedDoubleBufferCleaner::doCleanup( void ) { qdb_pixmap_cleanup.remove( &qdb_force_pixmap ); delete qdb_force_pixmap; - qdb_force_pixmap = 0; + qdb_force_pixmap = nullptr; } /* \internal @@ -192,7 +192,7 @@ bool TQSharedDoubleBufferCleaner::event( TQEvent *e ) } // static instance -static TQSharedDoubleBufferCleaner *static_cleaner = 0; +static TQSharedDoubleBufferCleaner *static_cleaner = nullptr; TQSingleCleanupHandler cleanup_static_cleaner; inline static TQSharedDoubleBufferCleaner *staticCleaner() @@ -249,8 +249,8 @@ inline static TQSharedDoubleBufferCleaner *staticCleaner() \sa DoubleBufferFlags */ TQSharedDoubleBuffer::TQSharedDoubleBuffer( DBFlags f ) - : wid( 0 ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), - p( 0 ), external_p( 0 ), pix( 0 ) + : wid( nullptr ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), + p( nullptr ), external_p( nullptr ), pix( nullptr ) { } @@ -263,8 +263,8 @@ TQSharedDoubleBuffer::TQSharedDoubleBuffer( DBFlags f ) TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQWidget* widget, int x, int y, int w, int h, DBFlags f ) - : wid( 0 ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), - p( 0 ), external_p( 0 ), pix( 0 ) + : wid( nullptr ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), + p( nullptr ), external_p( nullptr ), pix( nullptr ) { begin( widget, x, y, w, h ); } @@ -278,8 +278,8 @@ TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQWidget* widget, TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQPainter* painter, int x, int y, int w, int h, DBFlags f) - : wid( 0 ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), - p( 0 ), external_p( 0 ), pix( 0 ) + : wid( nullptr ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), + p( nullptr ), external_p( nullptr ), pix( nullptr ) { begin( painter, x, y, w, h ); } @@ -291,8 +291,8 @@ TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQPainter* painter, \sa DoubleBufferFlags begin() */ TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQWidget *widget, const TQRect &r, DBFlags f ) - : wid( 0 ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), - p( 0 ), external_p( 0 ), pix( 0 ) + : wid( nullptr ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), + p( nullptr ), external_p( nullptr ), pix( nullptr ) { begin( widget, r ); } @@ -304,8 +304,8 @@ TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQWidget *widget, const TQRect &r, D \sa DoubleBufferFlags begin() */ TQSharedDoubleBuffer::TQSharedDoubleBuffer( TQPainter *painter, const TQRect &r, DBFlags f ) - : wid( 0 ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), - p( 0 ), external_p( 0 ), pix( 0 ) + : wid( nullptr ), rx( 0 ), ry( 0 ), rw( 0 ), rh( 0 ), flags( f ), state( 0 ), + p( nullptr ), external_p( nullptr ), pix( nullptr ) { begin( painter, r ); } @@ -464,13 +464,13 @@ bool TQSharedDoubleBuffer::end() releasePixmap(); } - wid = 0; + wid = nullptr; rx = ry = rw = rh = 0; // do not reset flags! state = 0; - p = external_p = 0; - pix = 0; + p = external_p = nullptr; + pix = nullptr; return true; } @@ -521,19 +521,19 @@ TQPixmap *TQSharedDoubleBuffer::getPixmap() { if ( isDisabled() ) { // double buffering disabled globally - return 0; + return nullptr; } if ( qdb_owner ) { // shared pixmap already in use - return 0; + return nullptr; } if ( rw <= 0 || rh <= 0 || ( hardLimitWidth > 0 && rw >= hardLimitWidth ) || ( hardLimitHeight > 0 && rh >= hardLimitHeight ) ) { // invalid size, or hard limit reached - return 0; + return nullptr; } if ( rw >= sharedLimitWidth || rh >= sharedLimitHeight ) { @@ -559,7 +559,7 @@ TQPixmap *TQSharedDoubleBuffer::getPixmap() } // size is outside shared limit - return 0; + return nullptr; } if ( ! qdb_shared_pixmap ) { @@ -592,7 +592,7 @@ void TQSharedDoubleBuffer::releasePixmap() return; } - qdb_owner = 0; + qdb_owner = nullptr; } /* \internal @@ -619,9 +619,9 @@ void TQSharedDoubleBuffer::cleanup() qdb_pixmap_cleanup.remove( &qdb_force_pixmap ); delete qdb_shared_pixmap; delete qdb_force_pixmap; - qdb_shared_pixmap = 0; - qdb_force_pixmap = 0; - qdb_owner = 0; + qdb_shared_pixmap = nullptr; + qdb_force_pixmap = nullptr; + qdb_owner = nullptr; } /* \internal @@ -721,7 +721,7 @@ bool TQMembuf::scanNewline( TQByteArray *store ) if ( _size == 0 ) return false; int i = 0; // index into 'store' - TQByteArray *a = 0; + TQByteArray *a = nullptr; char *p; int n; for ( ;; ) { diff --git a/src/kernel/tqinternal_p.h b/src/kernel/tqinternal_p.h index d8c29cc67..4cc7bddf7 100644 --- a/src/kernel/tqinternal_p.h +++ b/src/kernel/tqinternal_p.h @@ -160,7 +160,7 @@ template T* qAutoDeleterData( TQAutoDeleter* ad ) { if ( !ad ) - return 0; + return nullptr; return ad->data(); } @@ -205,7 +205,7 @@ inline TQByteArray TQMembuf::readAll() { TQByteArray ba(_size); consumeBytes(_size,ba.data()); return ba; } inline bool TQMembuf::canReadLine() const -{ return ((TQMembuf*)this)->scanNewline( 0 ); } +{ return ((TQMembuf*)this)->scanNewline( nullptr ); } inline TQIODevice::Offset TQMembuf::size() const { return _size; } diff --git a/src/kernel/tqjpegio.cpp b/src/kernel/tqjpegio.cpp index c16f0f68f..e17a740ea 100644 --- a/src/kernel/tqjpegio.cpp +++ b/src/kernel/tqjpegio.cpp @@ -445,7 +445,7 @@ void write_jpeg_image(TQImageIO* iio) struct jpeg_compress_struct cinfo; JSAMPROW row_pointer[1]; - row_pointer[0] = 0; + row_pointer[0] = nullptr; struct my_jpeg_destination_mgr *iod_dest = new my_jpeg_destination_mgr(iio); struct my_error_mgr jerr; @@ -462,7 +462,7 @@ void write_jpeg_image(TQImageIO* iio) cinfo.image_width = image.width(); cinfo.image_height = image.height(); - TQRgb* cmap=0; + TQRgb* cmap=nullptr; bool gray=false; switch ( image.depth() ) { case 1: @@ -589,7 +589,7 @@ void qInitJpegIO() { // Not much to go on - just 3 bytes: 0xFF, M_SOI, 0xFF // Even the third is not strictly specified as required. - TQImageIO::defineIOHandler("JPEG", "^\377\330\377", 0, read_jpeg_image, write_jpeg_image); + TQImageIO::defineIOHandler("JPEG", "^\377\330\377", nullptr, read_jpeg_image, write_jpeg_image); } #endif diff --git a/src/kernel/tqkeysequence.cpp b/src/kernel/tqkeysequence.cpp index 2dead6397..0597a0231 100644 --- a/src/kernel/tqkeysequence.cpp +++ b/src/kernel/tqkeysequence.cpp @@ -180,7 +180,7 @@ static struct { { TQt::Key_Escape, TQT_TRANSLATE_NOOP( "TQAccel", "Escape" ) }, { TQt::Key_SysReq, TQT_TRANSLATE_NOOP( "TQAccel", "System Request" ) }, - { 0, 0 } + { 0, nullptr } }; diff --git a/src/kernel/tqlayout.cpp b/src/kernel/tqlayout.cpp index 02e35d49c..ab09e2c7c 100644 --- a/src/kernel/tqlayout.cpp +++ b/src/kernel/tqlayout.cpp @@ -80,7 +80,7 @@ public: void setGeometry( const TQRect &r ) { item_->setGeometry( r ); } int alignment() const { return item_->alignment(); } TQLayoutItem *item() { return item_; } - TQLayoutItem *takeItem() { TQLayoutItem *i = item_; item_ = 0; return i; } + TQLayoutItem *takeItem() { TQLayoutItem *i = item_; item_ = nullptr; return i; } int hStretch() { return item_->widget() ? item_->widget()->sizePolicy().horStretch() : 0; } @@ -232,10 +232,10 @@ void TQGridLayoutData::init() { addVertical = false; setDirty(); - multi = 0; + multi = nullptr; rr = cc = 0; nextR = nextC = 0; - hfwData = 0; + hfwData = nullptr; things.setAutoDelete( true ); hReversed = false; vReversed = false; @@ -303,7 +303,7 @@ bool TQGridLayoutData::findWidget( TQWidget* w, int *row, int *col ) { TQPtrListIterator it( things ); TQGridBox * box; - while ( (box = it.current()) != 0 ) { + while ( (box = it.current()) ) { ++it; if ( box->item()->widget() == w ) { if ( row ) @@ -316,7 +316,7 @@ bool TQGridLayoutData::findWidget( TQWidget* w, int *row, int *col ) if ( multi ) { TQPtrListIterator it( *multi ); TQGridMultiBox * mbox; - while ( (mbox = it.current()) != 0 ) { + while ( (mbox = it.current()) ) { ++it; box = mbox->box(); if ( box->item()->widget() == w ) { @@ -423,7 +423,7 @@ void TQGridLayoutData::setSize( int r, int c ) if ( hfwData && (int)hfwData->size() < r ) { delete hfwData; - hfwData = 0; + hfwData = nullptr; hfw_width = -1; } rr = r; @@ -525,7 +525,7 @@ void TQGridLayoutData::addData( TQGridBox *box, bool r, bool c ) box->expanding() & TQSizePolicy::Vertically ); } if ( box->isEmpty() ) { - if ( box->item()->widget() != 0 ) { + if ( box->item()->widget() ) { /* Hidden widgets should behave exactly the same as if there were no widgets at all in the cell. We could have @@ -626,7 +626,7 @@ void TQGridLayoutData::setupLayoutData( int spacing ) TQPtrListIterator it( things ); TQGridBox * box; - while ( (box = it.current()) != 0 ) { + while ( (box = it.current()) ) { ++it; addData( box ); has_hfw = has_hfw || box->item()->hasHeightForWidth(); @@ -635,7 +635,7 @@ void TQGridLayoutData::setupLayoutData( int spacing ) if ( multi ) { TQPtrListIterator it( *multi ); TQGridMultiBox * mbox; - while ( (mbox = it.current()) != 0 ) { + while ( (mbox = it.current()) ) { ++it; TQGridBox *box = mbox->box(); int r1 = box->row; @@ -708,14 +708,14 @@ void TQGridLayoutData::setupHfwLayoutData( int spacing ) } TQPtrListIterator it( things ); TQGridBox * box; - while ( (box=it.current()) != 0 ) { + while ( (box=it.current()) ) { ++it; addHfwData( box, colData[box->col].size ); } if ( multi ) { TQPtrListIterator it( *multi ); TQGridMultiBox * mbox; - while ( (mbox=it.current()) != 0 ) { + while ( (mbox=it.current()) ) { ++it; TQGridBox *box = mbox->box(); int r1 = box->row; @@ -771,7 +771,7 @@ void TQGridLayoutData::distribute( TQRect r, int spacing ) TQPtrListIterator it( things ); TQGridBox * box; - while ( (box=it.current()) != 0 ) { + while ( (box=it.current()) ) { ++it; int x = colData[box->col].pos; int y = rData[box->row].pos; @@ -786,7 +786,7 @@ void TQGridLayoutData::distribute( TQRect r, int spacing ) if ( multi ) { TQPtrListIterator it( *multi ); TQGridMultiBox * mbox; - while ( (mbox=it.current()) != 0 ) { + while ( (mbox=it.current()) ) { ++it; TQGridBox *box = mbox->box(); int r2 = mbox->torow; @@ -834,11 +834,11 @@ public: TQLayoutItem *current() { if ( multi ) { if ( !data->multi || idx >= (int)data->multi->count() ) - return 0; + return nullptr; return data->multi->at( idx )->box()->item(); } else { if ( idx >= (int)data->things.count() ) - return 0; + return nullptr; return data->things.at( idx )->item(); } } @@ -855,16 +855,16 @@ public: return current(); } TQLayoutItem *takeCurrent() { - TQLayoutItem *item = 0; + TQLayoutItem *item = nullptr; if ( multi ) { if ( !data->multi || idx >= (int)data->multi->count() ) - return 0; + return nullptr; TQGridMultiBox *b = data->multi->take( idx ); item = b->takeItem(); delete b; } else { if ( idx >= (int)data->things.count() ) - return 0; + return nullptr; TQGridBox *b = data->things.take( idx ); item = b->takeItem(); delete b; @@ -1556,13 +1556,13 @@ struct TQBoxLayoutItem class TQBoxLayoutData { public: - TQBoxLayoutData() : geomArray( 0 ), hfwWidth( -1 ), dirty( true ) + TQBoxLayoutData() : geomArray( nullptr ), hfwWidth( -1 ), dirty( true ) { list.setAutoDelete( true ); } ~TQBoxLayoutData() { delete geomArray; } void setDirty() { delete geomArray; - geomArray = 0; + geomArray = nullptr; hfwWidth = -1; hfwHeight = -1; dirty = true; @@ -1587,7 +1587,7 @@ public: TQBoxLayoutIterator( TQBoxLayoutData *d ) : data( d ), idx( 0 ) {} TQLayoutItem *current() { if ( idx >= int(data->list.count()) ) - return 0; + return nullptr; return data->list.at(idx)->item; } TQLayoutItem *next() { @@ -1595,12 +1595,12 @@ public: return current(); } TQLayoutItem *takeCurrent() { - TQLayoutItem *item = 0; + TQLayoutItem *item = nullptr; TQBoxLayoutItem *b = data->list.take( idx ); if ( b ) { item = b->item; - b->item = 0; + b->item = nullptr; delete b; } data->setDirty(); @@ -2209,7 +2209,7 @@ bool TQBoxLayout::setStretchFactor( TQWidget *w, int stretch ) { TQPtrListIterator it( data->list ); TQBoxLayoutItem *box; - while ( (box=it.current()) != 0 ) { + while ( (box=it.current()) ) { ++it; if ( box->item->widget() == w ) { box->stretch = stretch; @@ -2231,7 +2231,7 @@ bool TQBoxLayout::setStretchFactor( TQLayout *l, int stretch ) { TQPtrListIterator it( data->list ); TQBoxLayoutItem *box; - while ( (box=it.current()) != 0 ) { + while ( (box=it.current()) ) { ++it; if ( box->item->layout() == l ) { box->stretch = stretch; @@ -2256,7 +2256,7 @@ void TQBoxLayout::setDirection( Direction direction ) //#### or even a TQSpacerItem::flip() TQPtrListIterator it( data->list ); TQBoxLayoutItem *box; - while ( (box=it.current()) != 0 ) { + while ( (box=it.current()) ) { ++it; if ( box->magic ) { TQSpacerItem *sp = box->item->spacerItem(); @@ -2404,7 +2404,7 @@ void TQBoxLayout::calcHfw( int w ) TQPtrListIterator it( data->list ); TQBoxLayoutItem *box; bool first = true; - while ( (box = it.current()) != 0 ) { + while ( (box = it.current()) ) { ++it; bool empty = box->item->isEmpty(); h += box->hfw( w ); diff --git a/src/kernel/tqlayout.h b/src/kernel/tqlayout.h index c900c352d..4849a35c9 100644 --- a/src/kernel/tqlayout.h +++ b/src/kernel/tqlayout.h @@ -92,9 +92,9 @@ public: it = i.it; return *this; } - TQLayoutItem *operator++() { return it ? it->next() : 0; } - TQLayoutItem *current() { return it ? it->current() : 0; } - TQLayoutItem *takeCurrent() { return it ? it->takeCurrent() : 0; } + TQLayoutItem *operator++() { return it ? it->next() : nullptr; } + TQLayoutItem *current() { return it ? it->current() : nullptr; } + TQLayoutItem *takeCurrent() { return it ? it->takeCurrent() : nullptr; } void deleteCurrent(); private: @@ -189,9 +189,9 @@ public: enum ResizeMode { FreeResize, Minimum, Fixed, Auto }; TQLayout( TQWidget *parent, int margin = 0, int spacing = -1, - const char *name = 0 ); - TQLayout( TQLayout *parentLayout, int spacing = -1, const char *name = 0 ); - TQLayout( int spacing = -1, const char *name = 0 ); + const char *name = nullptr ); + TQLayout( TQLayout *parentLayout, int spacing = -1, const char *name = nullptr ); + TQLayout( int spacing = -1, const char *name = nullptr ); ~TQLayout(); int margin() const { return outsideBorder; } @@ -293,11 +293,11 @@ class TQ_EXPORT TQGridLayout : public TQLayout TQ_OBJECT public: TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0, - int spacing = -1, const char *name = 0 ); + int spacing = -1, const char *name = nullptr ); TQGridLayout( int nRows = 1, int nCols = 1, int spacing = -1, - const char *name = 0 ); + const char *name = nullptr ); TQGridLayout( TQLayout *parentLayout, int nRows = 1, int nCols = 1, - int spacing = -1, const char *name = 0 ); + int spacing = -1, const char *name = nullptr ); ~TQGridLayout(); TQSize sizeHint() const; @@ -373,10 +373,10 @@ public: Down = TopToBottom, Up = BottomToTop }; TQBoxLayout( TQWidget *parent, Direction, int border = 0, int spacing = -1, - const char *name = 0 ); + const char *name = nullptr ); TQBoxLayout( TQLayout *parentLayout, Direction, int spacing = -1, - const char *name = 0 ); - TQBoxLayout( Direction, int spacing = -1, const char *name = 0 ); + const char *name = nullptr ); + TQBoxLayout( Direction, int spacing = -1, const char *name = nullptr ); ~TQBoxLayout(); void addItem( TQLayoutItem * ); @@ -436,10 +436,10 @@ class TQ_EXPORT TQHBoxLayout : public TQBoxLayout TQ_OBJECT public: TQHBoxLayout( TQWidget *parent, int border = 0, - int spacing = -1, const char *name = 0 ); + int spacing = -1, const char *name = nullptr ); TQHBoxLayout( TQLayout *parentLayout, - int spacing = -1, const char *name = 0 ); - TQHBoxLayout( int spacing = -1, const char *name = 0 ); + int spacing = -1, const char *name = nullptr ); + TQHBoxLayout( int spacing = -1, const char *name = nullptr ); ~TQHBoxLayout(); @@ -455,10 +455,10 @@ class TQ_EXPORT TQVBoxLayout : public TQBoxLayout TQ_OBJECT public: TQVBoxLayout( TQWidget *parent, int border = 0, - int spacing = -1, const char *name = 0 ); + int spacing = -1, const char *name = nullptr ); TQVBoxLayout( TQLayout *parentLayout, - int spacing = -1, const char *name = 0 ); - TQVBoxLayout( int spacing = -1, const char *name = 0 ); + int spacing = -1, const char *name = nullptr ); + TQVBoxLayout( int spacing = -1, const char *name = nullptr ); ~TQVBoxLayout(); diff --git a/src/kernel/tqlocalfs.cpp b/src/kernel/tqlocalfs.cpp index d4d14065a..c77666e0d 100644 --- a/src/kernel/tqlocalfs.cpp +++ b/src/kernel/tqlocalfs.cpp @@ -153,7 +153,7 @@ void TQLocalFs::operationListChildren( TQNetworkOperation *op ) TQFileInfoListIterator it( *filist ); TQFileInfo *fi; TQValueList infos; - while ( ( fi = it.current() ) != 0 ) { + while ( ( fi = it.current() ) ) { ++it; infos << TQUrlInfo( fi->fileName(), convertPermissions(fi), fi->owner(), fi->group(), fi->size(), fi->lastModified(), fi->lastRead(), fi->isDir(), fi->isFile(), diff --git a/src/kernel/tqmetaobject.cpp b/src/kernel/tqmetaobject.cpp index 80c415b6e..956f68566 100644 --- a/src/kernel/tqmetaobject.cpp +++ b/src/kernel/tqmetaobject.cpp @@ -135,7 +135,7 @@ enum Flags { StoredOverride = 0x00020000 }; -static TQAsciiDict *tqt_metaobjects = 0; +static TQAsciiDict *tqt_metaobjects = nullptr; static int tqt_metaobjects_count = 0; class TQMetaObjectPrivate @@ -143,11 +143,11 @@ class TQMetaObjectPrivate public: TQMetaObjectPrivate() : #ifndef TQT_NO_PROPERTIES - enumData(0), numEnumData(0), - propData(0),numPropData(0), - tqt_static_property(0), + enumData(nullptr), numEnumData(0), + propData(nullptr),numPropData(0), + tqt_static_property(nullptr), #endif - classInfo(0), numClassInfo(0) {} + classInfo(nullptr), numClassInfo(0) {} #ifndef TQT_NO_PROPERTIES const TQMetaEnum *enumData; int numEnumData; @@ -214,12 +214,12 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl { classname = class_name; // set meta data superclass = super_class; - superclassname = superclass ? superclass->className() : 0; + superclassname = superclass ? superclass->className() : nullptr; slotDict = init( slotData = slot_data, n_slots ); signalDict = init( signalData = signal_data, n_signals ); d = new TQMetaObjectPrivate; - reserved = 0; + reserved = nullptr; #ifndef TQT_NO_PROPERTIES d->propData = prop_data; @@ -250,12 +250,12 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl { classname = class_name; // set meta data superclass = super_class; - superclassname = superclass ? superclass->className() : 0; + superclassname = superclass ? superclass->className() : nullptr; slotDict = init( slotData = slot_data, n_slots ); signalDict = init( signalData = signal_data, n_signals ); d = new TQMetaObjectPrivate; - reserved = 0; + reserved = nullptr; d->propData = prop_data; d->numPropData = n_props; @@ -280,13 +280,13 @@ TQMetaObject::~TQMetaObject() delete d; #ifdef TQT_THREAD_SUPPORT TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : nullptr ); #endif // TQT_THREAD_SUPPORT if ( tqt_metaobjects ) { tqt_metaobjects->remove( classname ); if ( tqt_metaobjects->isEmpty() ) { delete tqt_metaobjects; - tqt_metaobjects = 0; + tqt_metaobjects = nullptr; } } @@ -363,7 +363,7 @@ const TQMetaData* TQMetaObject::slot( int index, bool super ) const return slotData + idx; } if ( !super || !superclass ) - return 0; + return nullptr; return superclass->slot( index, super ); } @@ -381,7 +381,7 @@ const TQMetaData* TQMetaObject::signal( int index, bool super ) const return signalData + idx; } if ( !super || !superclass ) - return 0; + return nullptr; return superclass->signal( index, super ); } @@ -415,7 +415,7 @@ int TQMetaObject::findSignal( const char* n, bool super ) const int offset = -1; do { - const TQMetaData *md = mo->signalDict ? mo->signalDict->find( n ) : 0; + const TQMetaData *md = mo->signalDict ? mo->signalDict->find( n ) : nullptr; if ( md ) { #if defined(QT_CHECK_RANGE) if ( offset != -1 ) { @@ -450,7 +450,7 @@ int TQMetaObject::findSignal( const char* n, bool super ) const */ int TQMetaObject::findSlot( const char* n, bool super ) const { - const TQMetaData *md = slotDict ? slotDict->find( n ) : 0; + const TQMetaData *md = slotDict ? slotDict->find( n ) : nullptr; if ( md ) return slotOffset() + ( md - slotData ); if ( !super || !superclass) @@ -505,7 +505,7 @@ TQMetaObject *TQMetaObject::new_metaobject( const char *classname, TQMemberDict *TQMetaObject::init( const TQMetaData * data, int n ) { if ( n == 0 ) // nothing, then make no dict - return 0; + return nullptr; TQMemberDict *dict = new TQMemberDict( optDictSize(n), true, false ); TQ_CHECK_PTR( dict ); while ( n-- ) { // put all members into dict @@ -535,11 +535,11 @@ int TQMetaObject::numClassInfo( bool super ) const const TQClassInfo* TQMetaObject::classInfo( int index, bool super ) const { if ( index < 0 ) - return 0; + return nullptr; if ( index < d->numClassInfo ) return &(d->classInfo[ index ]); if ( !super || !superclass ) - return 0; + return nullptr; return superclass->classInfo( index - d->numClassInfo, super ); } @@ -557,7 +557,7 @@ const char* TQMetaObject::classInfo( const char* name, bool super ) const return d->classInfo[i].value; } if ( !super || !superclass ) - return 0; + return nullptr; return superclass->classInfo( name, super ); } @@ -592,7 +592,7 @@ const TQMetaProperty* TQMetaObject::property( int index, bool super ) const if ( d->propData && idx >= 0 && idx < (int)d->numPropData ) return d->propData + idx; if ( !super || !superclass ) - return 0; + return nullptr; return superclass->property( index, super ); } @@ -648,7 +648,7 @@ int TQMetaObject::indexOfProperty( const TQMetaProperty* prop, bool super ) cons const TQMetaProperty* TQMetaObject::resolveProperty( const TQMetaProperty* p ) const { if ( !superclass ) - return 0; + return nullptr; return superclass->property( superclass->findProperty( p->n, true ), true ); } @@ -765,7 +765,7 @@ const TQMetaEnum* TQMetaObject::enumerator( const char* name, bool super ) const if ( qstrcmp( d->enumData[i].name, name ) == 0 ) return &(d->enumData[i]); if ( !super || !superclass ) - return 0; + return nullptr; return superclass->enumerator( name, super ); } @@ -794,15 +794,15 @@ bool TQMetaObject::inherits( const char* clname ) const TQMetaObject *TQMetaObject::metaObject( const char *class_name ) { if ( !tqt_metaobjects ) - return 0; + return nullptr; #ifdef TQT_THREAD_SUPPORT TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : nullptr ); #endif // TQT_THREAD_SUPPORT TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)tqt_metaobjects->find( class_name ); if ( func ) return func(); - return 0; + return nullptr; } /*! \internal */ @@ -812,7 +812,7 @@ bool TQMetaObject::hasMetaObject( const char *class_name ) return false; #ifdef TQT_THREAD_SUPPORT TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : nullptr ); #endif // TQT_THREAD_SUPPORT return !!tqt_metaobjects->find( class_name ); } @@ -879,7 +879,7 @@ TQStrList TQMetaProperty::enumKeys() const ed = (*meta)->enumerator( t, true ); if ( !ed ) return l; - if ( ed != 0 ) { + if ( ed ) { for( uint i = 0; i < ed->count; ++i ) { uint j = 0; while ( j < i && @@ -926,12 +926,12 @@ const char* TQMetaProperty::valueToKey( int value ) const if ( !enumData && meta ) ed = (*meta)->enumerator( t, true ); if ( !ed ) - return 0; + return nullptr; for ( uint i = 0; i < ed->count; ++i ) { if ( value == ed->items[i].value ) return ed->items[i].key ; } - return 0; + return nullptr; } /*! @@ -1018,9 +1018,9 @@ int TQMetaProperty::id() const */ void TQMetaProperty::clear() { - t = n = 0; - meta = 0; - enumData = 0; + t = n = nullptr; + meta = nullptr; + enumData = nullptr; _id = -1; flags = 0; } @@ -1043,7 +1043,7 @@ bool TQMetaProperty::isSetType() const const TQMetaEnum* ed = enumData; if ( !enumData && meta ) ed = (*meta)->enumerator( t, true ); - return ( ed != 0 && ed->set ); + return ( ed && ed->set ); } bool TQMetaProperty::isEnumType() const @@ -1112,7 +1112,7 @@ bool TQMetaProperty::designable( TQObject* o ) const return false; if ( o ) { int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, true ); - return idx >= 0 && o->tqt_property( idx, 3, 0 ); + return idx >= 0 && o->tqt_property( idx, 3, nullptr ); } if ( testFlags( DesignableOverride ) ) { const TQMetaObject* mo = (*meta); @@ -1133,7 +1133,7 @@ bool TQMetaProperty::scriptable( TQObject* o ) const { if ( o ) { int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, true ); - return idx >= 0 && o->tqt_property( idx, 4, 0 ); + return idx >= 0 && o->tqt_property( idx, 4, nullptr ); } if ( testFlags( ScriptableOverride ) ) { const TQMetaObject* mo = (*meta); @@ -1156,7 +1156,7 @@ bool TQMetaProperty::stored( TQObject* o ) const return false; if ( o ) { int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, true ); - return idx >= 0 && o->tqt_property( idx, 5, 0 ); + return idx >= 0 && o->tqt_property( idx, 5, nullptr ); } if ( testFlags( StoredOverride ) ) { const TQMetaObject* mo = (*meta); @@ -1181,7 +1181,7 @@ bool TQMetaProperty::reset( TQObject* o ) const int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, true ); if ( idx < 0 ) return 0; - return o->tqt_property( idx, 2, 0 ); + return o->tqt_property( idx, 2, nullptr ); } @@ -1198,11 +1198,11 @@ bool TQMetaProperty::reset( TQObject* o ) const * TQObject reference to the metaObj to NULL when it is destroyed. */ TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObjectFunction func ) - : metaObject( 0 ) + : metaObject( nullptr ) { #ifdef TQT_THREAD_SUPPORT TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : nullptr ); #endif // TQT_THREAD_SUPPORT if ( !tqt_metaobjects ) tqt_metaobjects = new TQAsciiDict( 257 ); @@ -1212,7 +1212,7 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObje } TQMetaObjectCleanUp::TQMetaObjectCleanUp() - : metaObject( 0 ) + : metaObject( nullptr ) { } @@ -1224,16 +1224,16 @@ TQMetaObjectCleanUp::~TQMetaObjectCleanUp() { #ifdef TQT_THREAD_SUPPORT TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( &tqt_metaobjects ) : 0 ); + tqt_global_mutexpool->get( &tqt_metaobjects ) : nullptr ); #endif // TQT_THREAD_SUPPORT if ( !--tqt_metaobjects_count ) { delete tqt_metaobjects; - tqt_metaobjects = 0; + tqt_metaobjects = nullptr; } if ( metaObject ) { delete *metaObject; - *metaObject = 0; - metaObject = 0; + *metaObject = nullptr; + metaObject = nullptr; } } diff --git a/src/kernel/tqmetaobject.h b/src/kernel/tqmetaobject.h index 4bdeedab8..c2a1a951d 100644 --- a/src/kernel/tqmetaobject.h +++ b/src/kernel/tqmetaobject.h @@ -97,9 +97,9 @@ public: int keysToValue( const TQStrList& keys ) const; TQStrList valueToKeys( int value ) const; - bool designable( TQObject* = 0 ) const; - bool scriptable( TQObject* = 0 ) const; - bool stored( TQObject* = 0 ) const; + bool designable( TQObject* = nullptr ) const; + bool scriptable( TQObject* = nullptr ) const; + bool stored( TQObject* = nullptr ) const; bool reset( TQObject* ) const; diff --git a/src/kernel/tqmime.cpp b/src/kernel/tqmime.cpp index fab43440f..c893f54ec 100644 --- a/src/kernel/tqmime.cpp +++ b/src/kernel/tqmime.cpp @@ -65,7 +65,7 @@ */ static int tqt_mime_serial_number = 0; -static TQMimeSourceFactory* defaultfactory = 0; +static TQMimeSourceFactory* defaultfactory = nullptr; static TQSingleCleanupHandler tqmime_cleanup_factory; /*! @@ -93,13 +93,13 @@ void TQMimeSource::clearCache() if ( cacheType == Text ) { delete cache.txt.str; delete cache.txt.subtype; - cache.txt.str = 0; - cache.txt.subtype = 0; + cache.txt.str = nullptr; + cache.txt.subtype = nullptr; } else if ( cacheType == Graphics ) { delete cache.gfx.img; delete cache.gfx.pix; - cache.gfx.img = 0; - cache.gfx.pix = 0; + cache.gfx.img = nullptr; + cache.gfx.pix = nullptr; } cacheType = NoCache; } @@ -158,7 +158,7 @@ bool TQMimeSource::provides(const char* mimeType) const class TQMimeSourceFactoryData { public: TQMimeSourceFactoryData() : - last(0) + last(nullptr) { } @@ -266,13 +266,13 @@ TQMimeSourceFactory::TQMimeSourceFactory() : TQMimeSourceFactory::~TQMimeSourceFactory() { if ( defaultFactory() == this ) - defaultfactory = 0; + defaultfactory = nullptr; delete d; } TQMimeSource* TQMimeSourceFactory::dataInternal(const TQString& abs_name, const TQMap &extensions ) const { - TQMimeSource* r = 0; + TQMimeSource* r = nullptr; TQFileInfo fi(abs_name); if ( fi.isReadable() ) { @@ -360,7 +360,7 @@ const TQMimeSource* TQMimeSourceFactory::data(const TQString& abs_name) const if ( d->stored.contains(abs_name) ) return d->stored[abs_name]; - TQMimeSource* r = 0; + TQMimeSource* r = nullptr; TQStringList::Iterator it; if ( abs_name[0] == '/' #ifdef TQ_WS_WIN @@ -586,7 +586,7 @@ void TQMimeSourceFactory::setDefaultFactory( TQMimeSourceFactory* factory) TQMimeSourceFactory* TQMimeSourceFactory::takeDefaultFactory() { TQMimeSourceFactory *f = defaultfactory; - defaultfactory = 0; + defaultfactory = nullptr; return f; } diff --git a/src/kernel/tqmngio.cpp b/src/kernel/tqmngio.cpp index 7b309326e..66e8c47b9 100644 --- a/src/kernel/tqmngio.cpp +++ b/src/kernel/tqmngio.cpp @@ -245,7 +245,7 @@ TODO: decide on this point. gIFg gives disposal types, so it can be done. TQImageFormat* TQMNGFormatType::decoderFor( const uchar* buffer, int length ) { - if (length < 8) return 0; + if (length < 8) return nullptr; if ((buffer[0]==138 // MNG signature && buffer[1]=='M' @@ -275,7 +275,7 @@ TQImageFormat* TQMNGFormatType::decoderFor( const uchar* buffer, int length ) #endif ) return new TQMNGFormat; - return 0; + return nullptr; } const char* TQMNGFormatType::formatName() const @@ -290,10 +290,10 @@ const char* TQMNGFormatType::formatName() const TQMNGFormat::TQMNGFormat() { state = MovieStart; - handle = 0; + handle = nullptr; nbuffer = 0; maxbuffer = 0; - buffer = 0; + buffer = nullptr; losttime = 0; } @@ -304,7 +304,7 @@ TQMNGFormat::~TQMNGFormat() { // We're setting the consumer to 0 since it may have been // deleted by read_async_image in tqimage.cpp - consumer = 0; + consumer = nullptr; if (handle) mng_cleanup(&handle); } @@ -386,7 +386,7 @@ int TQMNGFormat::decode( TQImage& img, TQImageConsumer* cons, ubuffer = 0; if ( state == MovieStart ) { - handle = mng_initialize( (mng_ptr)this, ::memalloc, ::memfree, 0 ); + handle = mng_initialize( (mng_ptr)this, ::memalloc, ::memfree, nullptr ); mng_set_suspensionmode( handle, MNG_TRUE ); mng_setcb_openstream( handle, ::openstream ); mng_setcb_closestream( handle, ::closestream ); @@ -407,7 +407,7 @@ int TQMNGFormat::decode( TQImage& img, TQImageConsumer* cons, mng_display_resume(handle); losingtimer.start(); - image = 0; + image = nullptr; nbuffer -= ubuffer; if ( nbuffer ) { @@ -424,7 +424,7 @@ int TQMNGFormat::decode( TQImage& img, TQImageConsumer* cons, return length; } -static TQMNGFormatType* globalMngFormatTypeObject = 0; +static TQMNGFormatType* globalMngFormatTypeObject = nullptr; #endif // TQT_NO_ASYNC_IMAGE_IO @@ -433,7 +433,7 @@ void qCleanupMngIO() { if ( globalMngFormatTypeObject ) { delete globalMngFormatTypeObject; - globalMngFormatTypeObject = 0; + globalMngFormatTypeObject = nullptr; } } #endif diff --git a/src/kernel/tqmotifdnd_x11.cpp b/src/kernel/tqmotifdnd_x11.cpp index 15bae236f..f562b3b2c 100644 --- a/src/kernel/tqmotifdnd_x11.cpp +++ b/src/kernel/tqmotifdnd_x11.cpp @@ -83,7 +83,7 @@ static Atom atom_motif_window, atom_target_list ; static bool in_drop_site = false; static Window cur_window = 0; -static TQWidget *drop_widget = 0L; +static TQWidget *drop_widget = nullptr; static Atom Dnd_transfer_success, Dnd_transfer_failure; @@ -356,7 +356,7 @@ static void DndReadSourceProperty(Display * dpy, Window window, Atom dnd_selection, Atom ** targets, unsigned short * num_targets) { - DndSrcProp * src_prop = 0; + DndSrcProp * src_prop = nullptr; Atom type ; int format ; unsigned long bytesafter, lengthRtn; @@ -536,7 +536,7 @@ static Window MotifWindow(Display *display ) int format; unsigned long size; unsigned long bytes_after; - Window *property = 0; + Window *property = nullptr; Window motif_window ; /* this version does no caching, so it's slow: round trip each time */ @@ -598,7 +598,7 @@ static DndTargetsTable TargetsTable(Display *display) (unsigned char **) &target_prop) != Success) || type == None) { tqWarning("TQMotifDND: cannot get property on motif window"); - return 0; + return nullptr; } if (target_prop->protocol_version != DND_PROTOCOL_VERSION) { @@ -691,7 +691,7 @@ static int _DndIndexToTargets(Display * display, const char *tqt_motifdnd_format( int n ) { if ( ! tqt_motifdnd_active ) - return 0; // should not happen + return nullptr; // should not happen if ( n == 0 ) return "text/plain"; @@ -700,7 +700,7 @@ const char *tqt_motifdnd_format( int n ) n -= 2; if ( n >= num_src_targets ) - return 0; + return nullptr; Atom target = src_targets[n]; @@ -776,7 +776,7 @@ TQByteArray tqt_motifdnd_obtain_data( const char *mimeType ) if ( tqt_xclb_read_property( tqt_xdisplay(), tw->winId(), Dnd_selection, true, - &result, 0, &type, 0, true ) ) { + &result, nullptr, &type, nullptr, true ) ) { } } @@ -839,9 +839,9 @@ void tqt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pa TQDropEvent::Action accepted_action = TQDropEvent::Copy; me.setAction(accepted_action); - if ( c != 0L && c->acceptDrops() ) { + if ( c && c->acceptDrops() ) { - if ( drop_widget != 0L && drop_widget->acceptDrops() && + if ( drop_widget && drop_widget->acceptDrops() && drop_widget != c ) { TQDragLeaveEvent e; TQApplication::sendEvent( drop_widget, &e ); @@ -942,7 +942,7 @@ void tqt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pa dnd_data.property, cur_window, dnd_data.time); TQDragLeaveEvent e; TQApplication::sendEvent( drop_widget, &e ); - drop_widget = 0; + drop_widget = nullptr; return; } @@ -969,7 +969,7 @@ void tqt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pa if (in_drop_site) in_drop_site = False ; - drop_widget = 0; + drop_widget = nullptr; cur_window = 0; break; } // end of switch ( dnd_data.reason ) diff --git a/src/kernel/tqmovie.cpp b/src/kernel/tqmovie.cpp index 76e676144..03e7be3db 100644 --- a/src/kernel/tqmovie.cpp +++ b/src/kernel/tqmovie.cpp @@ -214,11 +214,11 @@ public: TQMoviePrivate::TQMoviePrivate() { dirty_cache = false; - buffer = 0; - pump = 0; - source = 0; - decoder = 0; - display_widget=0; + buffer = nullptr; + pump = nullptr; + source = nullptr; + decoder = nullptr; + display_widget=nullptr; buf_size = 0; init(false); } @@ -229,14 +229,14 @@ TQMoviePrivate::TQMoviePrivate(TQDataSource* src, TQMovie* movie, int bufsize) : buf_size(bufsize) { frametimer = new TQTimer(this); - pump = src ? new TQDataPump(src, this) : 0; + pump = src ? new TQDataPump(src, this) : nullptr; TQObject::connect(frametimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refresh())); dirty_cache = false; source = src; - buffer = 0; - decoder = 0; + buffer = nullptr; + decoder = nullptr; speed = 100; - display_widget=0; + display_widget=nullptr; init(true); } @@ -270,12 +270,12 @@ void TQMoviePrivate::init(bool fully) buf_usage = buf_r = buf_w = 0; if ( buffer ) // Avoid purify complaint delete [] buffer; - buffer = fully ? new uchar[buf_size] : 0; + buffer = fully ? new uchar[buf_size] : nullptr; if ( buffer ) memset( buffer, 0, buf_size ); delete decoder; - decoder = fully ? new TQImageDecoder(this) : 0; + decoder = fully ? new TQImageDecoder(this) : nullptr; #ifdef AVOID_OPEN_FDS if ( source && !source->isOpen() ) @@ -557,10 +557,10 @@ void TQMoviePrivate::eof() movie_ended = false; } else { delete decoder; - decoder = 0; + decoder = nullptr; if ( buffer ) // Avoid purify complaint delete [] buffer; - buffer = 0; + buffer = nullptr; emit dataStatus(TQMovie::EndOfMovie); #ifdef AVOID_OPEN_FDS if ( source ) @@ -629,7 +629,7 @@ TQMovie::TQMovie() */ TQMovie::TQMovie(int bufsize) { - d = new TQMoviePrivate(0, this, bufsize); + d = new TQMoviePrivate(nullptr, this, bufsize); } /*! diff --git a/src/kernel/tqmovie.h b/src/kernel/tqmovie.h index c340590e8..2955a4df9 100644 --- a/src/kernel/tqmovie.h +++ b/src/kernel/tqmovie.h @@ -91,10 +91,10 @@ public: void setSpeed(int); void connectResize(TQObject* receiver, const char *member); - void disconnectResize(TQObject* receiver, const char *member=0); + void disconnectResize(TQObject* receiver, const char *member=nullptr); void connectUpdate(TQObject* receiver, const char *member); - void disconnectUpdate(TQObject* receiver, const char *member=0); + void disconnectUpdate(TQObject* receiver, const char *member=nullptr); enum Status { SourceEmpty=-2, UnrecognizedFormat=-1, @@ -104,7 +104,7 @@ public: EndOfMovie=4, SpeedChanged=5 }; void connectStatus(TQObject* receiver, const char *member); - void disconnectStatus(TQObject* receiver, const char *member=0); + void disconnectStatus(TQObject* receiver, const char *member=nullptr); private: TQMoviePrivate *d; diff --git a/src/kernel/tqnetworkprotocol.cpp b/src/kernel/tqnetworkprotocol.cpp index b562d7dd4..6f66e0b02 100644 --- a/src/kernel/tqnetworkprotocol.cpp +++ b/src/kernel/tqnetworkprotocol.cpp @@ -53,15 +53,15 @@ extern TQ_EXPORT TQNetworkProtocolDict *tqNetworkProtocolRegister; -TQNetworkProtocolDict *tqNetworkProtocolRegister = 0; +TQNetworkProtocolDict *tqNetworkProtocolRegister = nullptr; class TQNetworkProtocolPrivate { public: TQNetworkProtocolPrivate( TQNetworkProtocol *p ) { - url = 0; - opInProgress = 0; + url = nullptr; + opInProgress = nullptr; opStartTimer = new TQTimer( p ); removeTimer = new TQTimer( p ); operationQueue.setAutoDelete( false ); @@ -610,13 +610,13 @@ TQNetworkProtocol *TQNetworkProtocol::getNetworkProtocol( const TQString &protoc } if ( protocol.isNull() ) - return 0; + return nullptr; TQNetworkProtocolFactoryBase *factory = tqNetworkProtocolRegister->find( protocol ); if ( factory ) return factory->createObject(); - return 0; + return nullptr; } /*! @@ -647,7 +647,7 @@ void TQNetworkProtocol::startOps() #ifdef TQNETWORKPROTOCOL_DEBUG tqDebug( "TQNetworkOperation: start processing operations" ); #endif - processNextOperation( 0 ); + processNextOperation( nullptr ); } /*! @@ -844,7 +844,7 @@ void TQNetworkProtocol::processNextOperation( TQNetworkOperation *old ) d->oldOps.append( d->opInProgress ); if ( d->operationQueue.isEmpty() ) { - d->opInProgress = 0; + d->opInProgress = nullptr; if ( d->autoDelete ) d->removeTimer->start( d->removeInterval, true ); return; @@ -914,7 +914,7 @@ void TQNetworkProtocol::stop() op->setState( StStopped ); op->setProtocolDetail( tr( "Operation stopped by the user" ) ); emit finished( op ); - setUrl( 0 ); + setUrl( nullptr ); op->free(); } } diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp index 8d3e248ef..8bbf684a2 100644 --- a/src/kernel/tqobject.cpp +++ b/src/kernel/tqobject.cpp @@ -136,9 +136,9 @@ TQStyleControlElementDataPrivate* TQObject::controlElementDataPrivateObject() { void TQObject::cleanupControlElementData() { delete d->controlElementData; - d->controlElementData = 0; + d->controlElementData = nullptr; delete d->controlElementDataPrivate; - d->controlElementDataPrivate = 0; + d->controlElementDataPrivate = nullptr; } #if defined(TQT_THREAD_SUPPORT) @@ -266,7 +266,7 @@ class TQSenderObjectList : public TQObjectList, public TQShared #endif }; -TQSenderObjectList::TQSenderObjectList() : currentSender( 0 ) { +TQSenderObjectList::TQSenderObjectList() : currentSender( nullptr ) { #ifdef TQT_THREAD_SUPPORT listMutex = new TQMutex( true ); #endif @@ -496,7 +496,7 @@ void *tqt_find_obj_child( TQObject *parent, const char *type, const char *name ) return obj; } } - return 0; + return nullptr; } #ifdef TQT_THREAD_SUPPORT @@ -519,8 +519,8 @@ TQThread* TQObject::contextThreadObject() const /* Preliminary signal spy */ -TQ_EXPORT TQObject* tqt_preliminary_signal_spy = 0; -static TQObject* tqt_spy_signal_sender = 0; +TQ_EXPORT TQObject* tqt_preliminary_signal_spy = nullptr; +static TQObject* tqt_spy_signal_sender = nullptr; static void tqt_spy_signal( TQObject* sender, int signal, TQUObject* o ) { @@ -542,7 +542,7 @@ static void tqt_spy_signal( TQObject* sender, int signal, TQUObject* o ) // protect access to tqt_spy_signal_sender void * const address = &tqt_spy_signal_sender; TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( address ) : 0 ); + tqt_global_mutexpool->get( address ) : nullptr ); #endif // TQT_THREAD_SUPPORT TQObject* old_sender = tqt_spy_signal_sender; @@ -560,19 +560,19 @@ static void tqt_spy_signal( TQObject* sender, int signal, TQUObject* o ) */ #endif // TQT_NO_PRELIMINARY_SIGNAL_SPY -static TQObjectList* object_trees = 0; +static TQObjectList* object_trees = nullptr; #ifdef TQT_THREAD_SUPPORT -static TQMutex *obj_trees_mutex = 0; +static TQMutex *obj_trees_mutex = nullptr; #endif static void cleanup_object_trees() { delete object_trees; - object_trees = 0; + object_trees = nullptr; #ifdef TQT_THREAD_SUPPORT delete obj_trees_mutex; - obj_trees_mutex = 0; + obj_trees_mutex = nullptr; #endif } @@ -662,14 +662,14 @@ TQObject::TQObject( TQObject *parent, const char *name ) blockSig( false ), // not blocking signals wasDeleted( false ), // double-delete catcher isTree( false ), // no tree yet - objname( name ? tqstrdup(name) : 0 ), // set object name - parentObj( 0 ), // no parent yet. It is set by insertChild() - childObjects( 0 ), // no children yet - connections( 0 ), // no connections yet - senderObjects( 0 ), // no signals connected yet - eventFilters( 0 ), // no filters installed - postedEvents( 0 ), // no events posted - d( 0 ) + objname( name ? tqstrdup(name) : nullptr ), // set object name + parentObj( nullptr ), // no parent yet. It is set by insertChild() + childObjects( nullptr ), // no children yet + connections( nullptr ), // no connections yet + senderObjects( nullptr ), // no signals connected yet + eventFilters( nullptr ), // no filters installed + postedEvents( nullptr ), // no events posted + d( nullptr ) { if ( !d ) { d = new TQObjectPrivate(0); @@ -734,7 +734,7 @@ TQObject::~TQObject() if ( objname ) { delete [] (char*)objname; } - objname = 0; + objname = nullptr; if ( pendTimer ) { // might be pending timers qKillTimer( this ); } @@ -751,7 +751,7 @@ TQObject::~TQObject() TQObject *obj; if ( senderObjects ) { // disconnect from senders TQSenderObjectList *tmp = senderObjects; - senderObjects = 0; + senderObjects = nullptr; obj = tmp->first(); while ( obj ) { // for all senders... obj->disconnect( this ); @@ -775,17 +775,17 @@ TQObject::~TQObject() } } delete connections; - connections = 0; + connections = nullptr; } if ( eventFilters ) { delete eventFilters; - eventFilters = 0; + eventFilters = nullptr; } if ( childObjects ) { // delete children objects TQObjectListIt it(*childObjects); while ( (obj=it.current()) ) { ++it; - obj->parentObj = 0; + obj->parentObj = nullptr; childObjects->removeRef( obj ); delete obj; } @@ -890,14 +890,14 @@ bool TQObject::inherits( const char *clname ) const void *tqt_inheritedBy( TQMetaObject *superClass, const TQObject *object ) { if (!object) - return 0; + return nullptr; TQMetaObject *mo = object->metaObject(); while (mo) { if (mo == superClass) return (void*)object; mo = mo->superClass(); } - return 0; + return nullptr; } /*! @@ -939,7 +939,7 @@ void TQObject::setName( const char *name ) { if ( objname ) delete [] (char*) objname; - objname = name ? tqstrdup(name) : 0; + objname = name ? tqstrdup(name) : nullptr; } /*! @@ -973,7 +973,7 @@ TQObject* TQObject::child( const char *objName, const char *inheritsClass, { const TQObjectList *list = children(); if ( !list ) - return 0; + return nullptr; bool onlyWidgets = ( inheritsClass && qstrcmp( inheritsClass, "TQWidget" ) == 0 ); TQObjectListIt it( *list ); @@ -1056,7 +1056,7 @@ void destroyDeepCopiedTQUObjectArray(TQUObject* uArray) bool TQObject::event( TQEvent *e ) { #if defined(QT_CHECK_NULL) - if ( e == 0 ) { + if ( !e ) { tqWarning( "TQObject::event: Null events are not permitted" ); } #endif @@ -1578,12 +1578,12 @@ TQObjectList *TQObject::queryList( const char *inheritsClass, if ( regexpMatch && objName ) { // regexp matching TQRegExp rx(TQString::fromLatin1(objName)); objSearch( list, (TQObjectList *)children(), inheritsClass, onlyWidgets, - 0, &rx, recursiveSearch ); + nullptr, &rx, recursiveSearch ); } else #endif { objSearch( list, (TQObjectList *)children(), inheritsClass, onlyWidgets, - objName, 0, recursiveSearch ); + objName, nullptr, recursiveSearch ); } return list; } @@ -1604,7 +1604,7 @@ TQConnectionList *TQObject::receivers( const char* signal ) const return receivers( metaObject()->findSignal(signal, true ) ); } } - return 0; + return nullptr; } /*! \internal @@ -1632,7 +1632,7 @@ TQConnectionList *TQObject::receivers( int signal ) const #endif if ( connections && signal >= 0 ) return connections->at( signal ); - return 0; + return nullptr; } @@ -1700,14 +1700,14 @@ void TQObject::removeChild( TQObject *obj ) #endif // TQT_THREAD_SUPPORT if ( childObjects && childObjects->removeRef(obj) ) { - obj->parentObj = 0; + obj->parentObj = nullptr; if ( !obj->wasDeleted ) { insert_tree( obj ); // it's a root object now obj->isTree = true; } if ( childObjects->isEmpty() ) { delete childObjects; // last child removed - childObjects = 0; // reset children list + childObjects = nullptr; // reset children list } // remove events must be sent, not posted!!! @@ -1815,7 +1815,7 @@ void TQObject::removeEventFilter( const TQObject *obj ) if ( eventFilters && eventFilters->removeRef(obj) ) { if ( eventFilters->isEmpty() ) { // last event filter removed delete eventFilters; - eventFilters = 0; // reset event filter list + eventFilters = nullptr; // reset event filter list } disconnect( obj, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(cleanupEventFilter(TQObject*)) ); @@ -1859,12 +1859,12 @@ static bool check_member_code( int code, const TQObject *object, static void err_member_notfound( int code, const TQObject *object, const char *member, const char *func ) { - const char *type = 0; + const char *type = nullptr; switch ( code ) { case TQ_SLOT_CODE: type = "slot"; break; case TQ_SIGNAL_CODE: type = "signal"; break; } - if ( strchr(member,')') == 0 ) // common typing mistake + if ( !strchr(member,')') ) // common typing mistake tqWarning( "TQObject::%s: Parentheses expected, %s %s::%s", func, type, object->className(), member ); else @@ -1896,7 +1896,7 @@ static void err_info_about_candidates( int code, while ( (p=newname.find("const char*")) >= 0 ) { newname.replace(p, 11, "const TQString&"); } - const TQMetaData *rm = 0; + const TQMetaData *rm = nullptr; switch ( code ) { case TQ_SLOT_CODE: rm = mo->slot( mo->findSlot( newname, true ), true ); @@ -1939,7 +1939,7 @@ const TQObject *TQObject::sender() // protect access to tqt_spy_signal_sender void * const address = &tqt_spy_signal_sender; TQMutexLocker locker( tqt_global_mutexpool ? - tqt_global_mutexpool->get( address ) : 0 ); + tqt_global_mutexpool->get( address ) : nullptr ); # endif // TQT_THREAD_SUPPORT return tqt_spy_signal_sender; } @@ -1955,7 +1955,7 @@ const TQObject *TQObject::sender() senderObjects->findRef( senderObjects->currentSender ) != -1 ) return senderObjects->currentSender; - return 0; + return nullptr; } @@ -2129,7 +2129,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, const TQObject *receiver, const char *member ) { #if defined(QT_CHECK_NULL) - if ( sender == 0 || receiver == 0 || signal == 0 || member == 0 ) { + if ( !sender || !receiver || !signal || !member ) { tqWarning( "TQObject::connect: Cannot connect %s::%s to %s::%s", sender ? sender->className() : "(null)", signal ? signal+1 : "(null)", @@ -2269,7 +2269,7 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const } TQMetaObject *rmeta = r->metaObject(); - const TQMetaData *rm = 0; + const TQMetaData *rm = nullptr; switch ( membcode ) { // get receiver member case TQ_SLOT_CODE: @@ -2386,7 +2386,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, const TQObject *receiver, const char *member ) { #if defined(QT_CHECK_NULL) - if ( sender == 0 || (receiver == 0 && member != 0) ) { + if ( !sender || (!receiver && member) ) { tqWarning( "TQObject::disconnect: Unexpected null parameter" ); return false; } @@ -2435,9 +2435,9 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, } } - if ( signal == 0 ) { // any/all signals + if ( !signal ) { // any/all signals if ( disconnectInternal( s, -1, r, membcode, member_index ) ) - s->disconnectNotify( 0 ); + s->disconnectNotify( nullptr ); else return false; } else { // specific signal @@ -2506,7 +2506,7 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index, continue; c = clist->first(); while ( c ) { // for all receivers... - if ( r == 0 ) { // remove all receivers + if ( !r ) { // remove all receivers #ifdef TQT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); #endif // TQT_THREAD_SUPPORT @@ -2533,8 +2533,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index, c = clist->next(); } } - if ( r == 0 ) // disconnect all receivers - s->connections->insert( i, 0 ); + if ( !r ) // disconnect all receivers + s->connections->insert( i, nullptr ); } } else { clist = s->connections->at( signal_index ); @@ -2543,7 +2543,7 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index, c = clist->first(); while ( c ) { // for all receivers... - if ( r == 0 ) { // remove all receivers + if ( !r ) { // remove all receivers #ifdef TQT_THREAD_SUPPORT if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock(); #endif // TQT_THREAD_SUPPORT @@ -2570,8 +2570,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index, c = clist->next(); } } - if ( r == 0 ) { // disconnect all receivers - s->connections->insert( signal_index, 0 ); + if ( !r ) { // disconnect all receivers + s->connections->insert( signal_index, nullptr ); } } return success; @@ -2667,7 +2667,7 @@ static TQMetaObjectCleanUp cleanUp_TQt = TQMetaObjectCleanUp( "TQObject", &TQObj TQMetaObject* TQObject::staticTQtMetaObject() { - static TQMetaObject* qtMetaObject = 0; + static TQMetaObject* qtMetaObject = nullptr; if ( qtMetaObject ) return qtMetaObject; @@ -2733,14 +2733,14 @@ TQMetaObject* TQObject::staticTQtMetaObject() }; #endif - qtMetaObject = new TQMetaObject( "TQt", 0, - 0, 0, - 0, 0, + qtMetaObject = new TQMetaObject( "TQt", nullptr, + nullptr, 0, + nullptr, 0, #ifndef TQT_NO_PROPERTIES - 0, 0, + nullptr, 0, enum_tbl, 5, #endif - 0, 0 ); + nullptr, 0 ); cleanUp_TQt.setMetaObject( qtMetaObject ); return qtMetaObject; @@ -2800,7 +2800,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) TQObject *object; TQSenderObjectList* sol; - TQObject* oldSender = 0; + TQObject* oldSender = nullptr; TQConnection *c; if ( clist->count() == 1 ) { // save iterator c = clist->first(); @@ -2872,7 +2872,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) if (sol) sol->listMutex->unlock(); #endif // TQT_THREAD_SUPPORT } else { - TQConnection *cd = 0; + TQConnection *cd = nullptr; TQConnectionListIt it(*clist); while ( (c=it.current()) ) { ++it; @@ -3249,7 +3249,7 @@ TQObjectUserData* TQObject::userData( uint id ) const { if ( d && id < d->size() ) return d->at( id ); - return 0; + return nullptr; } #endif // TQT_NO_USERDATA diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h index 44eb188c3..e168eab5c 100644 --- a/src/kernel/tqobject.h +++ b/src/kernel/tqobject.h @@ -77,7 +77,7 @@ class TQ_EXPORT TQObject: public TQt TQ_PROPERTY( TQCString name READ name WRITE setName ) public: - TQObject( TQObject *parent=0, const char *name=0 ); + TQObject( TQObject *parent=nullptr, const char *name=nullptr ); virtual ~TQObject(); #ifdef Q_QDOC @@ -107,7 +107,7 @@ public: void killTimer( int id ); void killTimers(); - TQObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = true ); //### const in 4.0 + TQObject *child( const char *objName, const char *inheritsClass = nullptr, bool recursiveSearch = true ); //### const in 4.0 const TQObjectList *children() const { return childObjects; } TQObjectList childrenListObject(); const TQObjectList childrenListObject() const; @@ -115,8 +115,8 @@ public: static const TQObjectList *objectTrees(); static const TQObjectList objectTreesListObject(); - TQObjectList *queryList( const char *inheritsClass = 0, - const char *objName = 0, + TQObjectList *queryList( const char *inheritsClass = nullptr, + const char *objName = nullptr, bool regexpMatch = true, bool recursiveSearch = true ) const; @@ -132,9 +132,9 @@ public: const char *member ) const; static bool disconnect( const TQObject *sender, const char *signal, const TQObject *receiver, const char *member ); - bool disconnect( const char *signal=0, - const TQObject *receiver=0, const char *member=0 ); - bool disconnect( const TQObject *receiver, const char *member=0 ); + bool disconnect( const char *signal=nullptr, + const TQObject *receiver=nullptr, const char *member=nullptr ); + bool disconnect( const TQObject *receiver, const char *member=nullptr ); static void connectInternal( const TQObject *sender, int signal_index, const TQObject *receiver, int membcode, int member_index ); static bool disconnectInternal( const TQObject *sender, int signal_index, @@ -269,7 +269,7 @@ inline bool TQObject::disconnect( const char *signal, inline bool TQObject::disconnect( const TQObject *receiver, const char *member ) { - return disconnect( this, 0, receiver, member ); + return disconnect( this, nullptr, receiver, member ); } diff --git a/src/kernel/tqobjectcleanuphandler.cpp b/src/kernel/tqobjectcleanuphandler.cpp index 452e4cad9..bec30975d 100644 --- a/src/kernel/tqobjectcleanuphandler.cpp +++ b/src/kernel/tqobjectcleanuphandler.cpp @@ -96,7 +96,7 @@ Constructs an empty TQObjectCleanupHandler. */ TQObjectCleanupHandler::TQObjectCleanupHandler() -: TQObject(), cleanupObjects( 0 ) +: TQObject(), cleanupObjects( nullptr ) { } @@ -116,7 +116,7 @@ TQObjectCleanupHandler::~TQObjectCleanupHandler() TQObject* TQObjectCleanupHandler::add( TQObject* object ) { if ( !object ) - return 0; + return nullptr; if ( !cleanupObjects ) { cleanupObjects = new TQObjectList; @@ -157,7 +157,7 @@ bool TQObjectCleanupHandler::isEmpty() const void TQObjectCleanupHandler::clear() { delete cleanupObjects; - cleanupObjects = 0; + cleanupObjects = nullptr; } void TQObjectCleanupHandler::objectDestroyed( TQObject*object ) diff --git a/src/kernel/tqobjectdefs.h b/src/kernel/tqobjectdefs.h index 871ba47a3..de7299687 100644 --- a/src/kernel/tqobjectdefs.h +++ b/src/kernel/tqobjectdefs.h @@ -50,8 +50,8 @@ # ifndef TQT_NO_TEXTCODEC // full set of tr functions # define TQT_TR_FUNCTIONS \ - static TQString tr( const char *, const char * = 0 ); \ - static TQString trUtf8( const char *, const char * = 0 ); + static TQString tr( const char *, const char * = nullptr ); \ + static TQString trUtf8( const char *, const char * = nullptr ); # else // no TQTextCodec, no utf8 # define TQT_TR_FUNCTIONS \ diff --git a/src/kernel/tqpaintdevice.h b/src/kernel/tqpaintdevice.h index ebb0c6a5a..2665ffbcc 100644 --- a/src/kernel/tqpaintdevice.h +++ b/src/kernel/tqpaintdevice.h @@ -220,7 +220,7 @@ protected: virtual bool cmd( int, TQPainter *, TQPDevCmdParam * ); virtual int metric( int ) const; - virtual int fontMet( TQFont *, int, const char * = 0, int = 0 ) const; + virtual int fontMet( TQFont *, int, const char * = nullptr, int = 0 ) const; virtual int fontInf( TQFont *, int ) const; ushort devFlags; // device flags diff --git a/src/kernel/tqpaintdevice_x11.cpp b/src/kernel/tqpaintdevice_x11.cpp index dd6251e2a..9df9489e7 100644 --- a/src/kernel/tqpaintdevice_x11.cpp +++ b/src/kernel/tqpaintdevice_x11.cpp @@ -99,7 +99,7 @@ // Some global variables - these are initialized by TQColor::initialize() // -Display *TQPaintDevice::x_appdisplay = 0; +Display *TQPaintDevice::x_appdisplay = nullptr; int TQPaintDevice::x_appscreen; int TQPaintDevice::x_appdepth; @@ -142,7 +142,7 @@ TQPaintDevice::TQPaintDevice( uint devflags ) painters = 0; hd = 0; rendhd = 0; - x11Data = 0; + x11Data = nullptr; } /*! @@ -158,7 +158,7 @@ TQPaintDevice::~TQPaintDevice() #endif if ( x11Data && x11Data->deref() ) { delete x11Data; - x11Data = 0; + x11Data = nullptr; } } @@ -171,7 +171,7 @@ TQPaintDevice::~TQPaintDevice() void TQPaintDevice::copyX11Data( const TQPaintDevice *fromDevice ) { - setX11Data( fromDevice ? fromDevice->x11Data : 0 ); + setX11Data( fromDevice ? fromDevice->x11Data : nullptr ); } /* @@ -188,7 +188,7 @@ void TQPaintDevice::cloneX11Data( const TQPaintDevice *fromDevice ) d->count = 0; setX11Data( d ); } else { - setX11Data( 0 ); + setX11Data( nullptr ); } } @@ -222,7 +222,7 @@ void TQPaintDevice::setX11Data( const TQPaintDeviceX11Data* d ) TQPaintDeviceX11Data* TQPaintDevice::getX11Data( bool def ) const { - TQPaintDeviceX11Data* res = 0; + TQPaintDeviceX11Data* res = nullptr; if ( def ) { res = new TQPaintDeviceX11Data; res->x_display = x11AppDisplay(); @@ -513,7 +513,7 @@ TQt::HANDLE TQPaintDevice::x11RenderHandle() const (X11 only). Using this function is not portable. */ -static int *dpisX=0, *dpisY=0; +static int *dpisX=nullptr, *dpisY=nullptr; static void create_dpis() { if ( dpisX ) @@ -785,12 +785,12 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap mask ) init_mask_gc = true; tqAddPostRoutine( cleanup_mask_gc ); for ( int i=0; igc || p->mask_no != mask_no ) { // not a perfect match if ( !p->gc ) { // no GC - p->gc = XCreateGC( dpy, hd, 0, 0 ); + p->gc = XCreateGC( dpy, hd, 0, nullptr ); XSetGraphicsExposures( dpy, p->gc, False ); } XSetClipMask( dpy, p->gc, mask ); @@ -836,8 +836,8 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, { if ( !src || !dst ) { #if defined(QT_CHECK_NULL) - Q_ASSERT( src != 0 ); - Q_ASSERT( dst != 0 ); + Q_ASSERT( src ); + Q_ASSERT( dst ); #endif return; } @@ -898,7 +898,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, TQRect r(dx, dy, pm->width(), pm->height()); param[0].rect = &r; param[1].pixmap = pm; - dst->cmd( TQPaintDevice::PdcDrawPixmap, 0, param ); + dst->cmd( TQPaintDevice::PdcDrawPixmap, nullptr, param ); if ( tmp_pm ) delete pm; return; @@ -959,11 +959,11 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, if ( src_pm->x11Screen() != dst->x11Screen() ) src_pm->x11SetScreen( dst->x11Screen() ); mono_src = src_pm->depth() == 1; - mask = ignoreMask ? 0 : src_pm->data->mask; + mask = ignoreMask ? nullptr : src_pm->data->mask; } else { - src_pm = 0; + src_pm = nullptr; mono_src = false; - mask = 0; + mask = nullptr; include_inferiors = ((TQWidget*)src)->testWFlags(TQt::WPaintUnclipped); graphics_exposure = td == TQInternal::Widget; } @@ -1033,7 +1033,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, // Create a new mask GC. If BestOptim, we store the mask GC // with the mask (not at the pixmap). This way, many pixmaps // which have a common mask will be optimized at no extra cost. - gc = XCreateGC( dpy, dst->handle(), 0, 0 ); + gc = XCreateGC( dpy, dst->handle(), 0, nullptr ); XSetGraphicsExposures( dpy, gc, False ); XSetClipMask( dpy, gc, mask->handle() ); if ( src_pm->optimization() == TQPixmap::BestOptim ) { diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp index d60225a5c..4a74bf915 100644 --- a/src/kernel/tqpainter.cpp +++ b/src/kernel/tqpainter.cpp @@ -590,7 +590,7 @@ TQPainter::~TQPainter() bool TQPainter::begin( const TQPaintDevice *pd, const TQWidget *copyAttributes, bool unclipped ) { - if ( copyAttributes == 0 ) { + if ( !copyAttributes ) { #if defined(QT_CHECK_NULL) tqWarning( "TQPainter::begin: The widget to copy attributes from cannot " "be null" ); @@ -679,7 +679,7 @@ void TQPainter::killPStack() "end() was called" ); #endif delete (TQPStateStack *)ps_stack; - ps_stack = 0; + ps_stack = nullptr; } /*! @@ -699,10 +699,10 @@ void TQPainter::save() updatePen(); if ( testf(DirtyBrush) ) updateBrush(); - pdev->cmd( TQPaintDevice::PdcSave, this, 0 ); + pdev->cmd( TQPaintDevice::PdcSave, this, nullptr ); } TQPStateStack *pss = (TQPStateStack *)ps_stack; - if ( pss == 0 ) { + if ( !pss ) { pss = new TQPtrStack; TQ_CHECK_PTR( pss ); pss->setAutoDelete( true ); @@ -733,7 +733,7 @@ void TQPainter::save() ps->ts = tabstops; ps->ta = tabarray; ps->wm_stack = wm_stack; - wm_stack = 0; + wm_stack = nullptr; pss->push( ps ); } @@ -747,12 +747,12 @@ void TQPainter::save() void TQPainter::restore() { if ( testf(ExtDev) ) { - pdev->cmd( TQPaintDevice::PdcRestore, this, 0 ); + pdev->cmd( TQPaintDevice::PdcRestore, this, nullptr ); if ( pdev->devType() == TQInternal::Picture ) block_ext = true; } TQPStateStack *pss = (TQPStateStack *)ps_stack; - if ( pss == 0 || pss->isEmpty() ) { + if ( !pss || pss->isEmpty() ) { #if defined(QT_CHECK_STATE) tqWarning( "TQPainter::restore: Empty stack error" ); #endif @@ -812,7 +812,7 @@ void TQPainter::restore() } typedef TQPtrDict TQPaintDeviceDict; -static TQPaintDeviceDict *pdev_dict = 0; +static TQPaintDeviceDict *pdev_dict = nullptr; /*! Redirects all paint commands for a paint device, \a pdev, to @@ -825,14 +825,14 @@ static TQPaintDeviceDict *pdev_dict = 0; void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ) { - if ( pdev_dict == 0 ) { - if ( replacement == 0 ) + if ( !pdev_dict ) { + if ( !replacement ) return; pdev_dict = new TQPaintDeviceDict; TQ_CHECK_PTR( pdev_dict ); } #if defined(QT_CHECK_NULL) - if ( pdev == 0 ) + if ( !pdev ) tqWarning( "TQPainter::redirect: The pdev argument cannot be 0" ); #endif if ( replacement ) { @@ -841,7 +841,7 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ) pdev_dict->remove( pdev ); if ( pdev_dict->count() == 0 ) { delete pdev_dict; - pdev_dict = 0; + pdev_dict = nullptr; } } } @@ -852,7 +852,7 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ) */ TQPaintDevice *TQPainter::redirect( TQPaintDevice *pdev ) { - return pdev_dict ? pdev_dict->find( pdev ) : 0; + return pdev_dict ? pdev_dict->find( pdev ) : nullptr; } /*! @@ -1031,7 +1031,7 @@ void TQPainter::setBrush( BrushStyle style ) d->color = TQt::black; if ( d->pixmap ) { delete d->pixmap; - d->pixmap = 0; + d->pixmap = nullptr; } updateBrush(); } @@ -1062,7 +1062,7 @@ void TQPainter::setBrush( const TQColor &color ) d->color = color; if ( d->pixmap ) { delete d->pixmap; - d->pixmap = 0; + d->pixmap = nullptr; } updateBrush(); } @@ -1171,7 +1171,7 @@ void TQPainter::setTabArray( int *ta ) tabarray = new int[tabarraylen]; // duplicate ta memcpy( tabarray, ta, sizeof(int)*tabarraylen ); } else { - tabarray = 0; + tabarray = nullptr; } } if ( isActive() && testf(ExtDev) ) { // tell extended device @@ -1464,7 +1464,7 @@ void TQPainter::setWorldMatrix( const TQWMatrix &m, bool combine ) void TQPainter::saveWorldMatrix() { TQWMatrixStack *stack = (TQWMatrixStack *)wm_stack; - if ( stack == 0 ) { + if ( !stack ) { stack = new TQPtrStack; TQ_CHECK_PTR( stack ); stack->setAutoDelete( true ); @@ -1482,7 +1482,7 @@ void TQPainter::saveWorldMatrix() void TQPainter::restoreWorldMatrix() { TQWMatrixStack *stack = (TQWMatrixStack *)wm_stack; - if ( stack == 0 || stack->isEmpty() ) { + if ( !stack || stack->isEmpty() ) { #if defined(QT_CHECK_STATE) tqWarning( "TQPainter::restoreWorldMatrix: Empty stack error" ); #endif @@ -3566,7 +3566,7 @@ void TQBrush::init( const TQColor &color, BrushStyle style ) TQ_CHECK_PTR( data ); data->style = style; data->color = color; - data->pixmap = 0; + data->pixmap = nullptr; } /*! @@ -3576,13 +3576,13 @@ void TQBrush::init( const TQColor &color, BrushStyle style ) TQBrush::TQBrush() { - static TQBrushData* defBrushData = 0; + static TQBrushData* defBrushData = nullptr; if ( !defBrushData ) { static TQSharedCleanupHandler defBrushCleanup; defBrushData = new TQBrushData; defBrushData->style = NoBrush; defBrushData->color = TQt::black; - defBrushData->pixmap = 0; + defBrushData->pixmap = nullptr; defBrushCleanup.set( &defBrushData ); } data = defBrushData; @@ -3803,7 +3803,7 @@ void TQBrush::setPixmap( const TQPixmap &pixmap ) delete data->pixmap; if ( pixmap.isNull() ) { data->style = NoBrush; - data->pixmap = 0; + data->pixmap = nullptr; } else { data->style = CustomPattern; data->pixmap = new TQPixmap( pixmap ); diff --git a/src/kernel/tqpainter.h b/src/kernel/tqpainter.h index b7ad045bf..9db836fa6 100644 --- a/src/kernel/tqpainter.h +++ b/src/kernel/tqpainter.h @@ -253,19 +253,19 @@ public: void drawText( const TQPoint &p, const TQString &, int pos, int len, TextDirection dir = Auto ); void drawText( int x, int y, int w, int h, int flags, - const TQString&, int len = -1, TQRect *br=0, - TQTextParag **intern=0 ); + const TQString&, int len = -1, TQRect *br=nullptr, + TQTextParag **intern=nullptr ); void drawText( const TQRect &, int flags, - const TQString&, int len = -1, TQRect *br=0, - TQTextParag **intern=0 ); + const TQString&, int len = -1, TQRect *br=nullptr, + TQTextParag **intern=nullptr ); void drawTextItem( int x, int y, const TQTextItem &ti, int textflags = 0 ); void drawTextItem( const TQPoint& p, const TQTextItem &ti, int textflags = 0 ); TQRect boundingRect( int x, int y, int w, int h, int flags, - const TQString&, int len = -1, TQTextParag **intern=0 ); + const TQString&, int len = -1, TQTextParag **intern=nullptr ); TQRect boundingRect( const TQRect &, int flags, - const TQString&, int len = -1, TQTextParag **intern=0 ); + const TQString&, int len = -1, TQTextParag **intern=nullptr ); int tabStops() const; void setTabStops( int ); diff --git a/src/kernel/tqpainter_x11.cpp b/src/kernel/tqpainter_x11.cpp index 3ff19ff70..0801d02df 100644 --- a/src/kernel/tqpainter_x11.cpp +++ b/src/kernel/tqpainter_x11.cpp @@ -58,8 +58,8 @@ #include // paintevent magic to provide Windows semantics on X11 -static TQRegion* paintEventClipRegion = 0; -static TQPaintDevice* paintEventDevice = 0; +static TQRegion* paintEventClipRegion = nullptr; +static TQPaintDevice* paintEventDevice = nullptr; void tqt_set_paintevent_clipping( TQPaintDevice* dev, const TQRegion& region) { @@ -73,8 +73,8 @@ void tqt_set_paintevent_clipping( TQPaintDevice* dev, const TQRegion& region) void tqt_clear_paintevent_clipping() { delete paintEventClipRegion; - paintEventClipRegion = 0; - paintEventDevice = 0; + paintEventClipRegion = nullptr; + paintEventDevice = nullptr; } class TQWFlagWidget : public TQWidget @@ -170,7 +170,7 @@ static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE d #ifndef TQT_NO_XFTFREETYPE if (draw) { - XftDrawSetClip((XftDraw *) draw, None); + XftDrawSetClip((XftDraw *) draw, nullptr); } #else Q_UNUSED(draw); @@ -316,7 +316,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=false, privateGC = true; // will be slower #endif if ( privateGC ) { - GC gc = XCreateGC( dpy, hd, 0, 0 ); + GC gc = XCreateGC( dpy, hd, 0, nullptr ); XSetGraphicsExposures( dpy, gc, False ); return gc; } @@ -326,7 +326,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=false, init_gc_array(); while ( i-- ) { if ( !p->gc ) { // create GC (once) - p->gc = XCreateGC( dpy, hd, 0, 0 ); + p->gc = XCreateGC( dpy, hd, 0, nullptr ); p->scrn = scrn; XSetGraphicsExposures( dpy, p->gc, False ); p->in_use = false; @@ -341,7 +341,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=false, #if defined(QT_CHECK_NULL) tqWarning( "TQPainter: Internal error; no available GC" ); #endif - GC gc = XCreateGC( dpy, hd, 0, 0 ); + GC gc = XCreateGC( dpy, hd, 0, nullptr ); XSetGraphicsExposures( dpy, gc, False ); return gc; } @@ -352,7 +352,7 @@ static void free_gc( Display *dpy, GC gc, bool privateGC = false ) privateGC = true; // will be slower #endif if ( privateGC ) { - Q_ASSERT( dpy != 0 ); + Q_ASSERT( dpy ); XFreeGC( dpy, gc ); return; } @@ -473,7 +473,7 @@ static bool obtain_gc( void **ref, GC *gc, uint pix, Display *dpy, int scrn, int k = (pix % gc_cache_size) * 4; TQGCC *g = gc_cache[k]; - TQGCC *prev = 0; + TQGCC *prev = nullptr; #define NOMATCH (g->gc && (g->pix != pix || g->scrn != scrn || \ (g->clip_serial > 0 && g->clip_serial != painter_clip_serial))) @@ -504,7 +504,7 @@ static bool obtain_gc( void **ref, GC *gc, uint pix, Display *dpy, int scrn, #if defined(GC_CACHE_STAT) g_numfaults++; #endif - *ref = 0; + *ref = nullptr; return false; } } @@ -590,23 +590,23 @@ void TQPainter::destroy() void TQPainter::init() { - d = 0; + d = nullptr; flags = IsStartingUp; bg_col = white; // default background color bg_mode = TransparentMode; // default background mode rop = CopyROP; // default ROP tabstops = 0; // default tabbing - tabarray = 0; + tabarray = nullptr; tabarraylen = 0; - ps_stack = 0; - wm_stack = 0; - gc = gc_brush = 0; - pdev = 0; - dpy = 0; + ps_stack = nullptr; + wm_stack = nullptr; + gc = gc_brush = nullptr; + pdev = nullptr; + dpy = nullptr; txop = txinv = 0; - penRef = brushRef = 0; + penRef = brushRef = nullptr; clip_serial = 0; - pfont = 0; + pfont = nullptr; block_ext = false; } @@ -698,7 +698,7 @@ void TQPainter::updatePen() if ( gc ) { if ( penRef ) { release_gc( penRef ); - penRef = 0; + penRef = nullptr; gc = alloc_gc( dpy, scrn, hd, testf(MonoDev) ); } else { internclipok = true; @@ -711,13 +711,13 @@ void TQPainter::updatePen() if ( !internclipok ) { if ( pdev == paintEventDevice && paintEventClipRegion ) { if ( penRef &&((TQGCC*)penRef)->clip_serial < gc_cache_clip_serial ) { - x11SetClipRegion( dpy, gc, 0, rendhd, *paintEventClipRegion ); + x11SetClipRegion( dpy, gc, nullptr, rendhd, *paintEventClipRegion ); ((TQGCC*)penRef)->clip_serial = gc_cache_clip_serial; } else if ( !penRef ) { - x11SetClipRegion( dpy, gc, 0, rendhd, *paintEventClipRegion ); + x11SetClipRegion( dpy, gc, nullptr, rendhd, *paintEventClipRegion ); } } else if (penRef && ((TQGCC*)penRef)->clip_serial ) { - x11ClearClipRegion(dpy, gc, 0, rendhd); + x11ClearClipRegion(dpy, gc, nullptr, rendhd); ((TQGCC*)penRef)->clip_serial = 0; } } @@ -905,7 +905,7 @@ void TQPainter::updateBrush() if ( gc_brush ) { if ( brushRef ) { release_gc( brushRef ); - brushRef = 0; + brushRef = nullptr; gc_brush = alloc_gc( dpy, scrn, hd, testf(MonoDev) ); } else { internclipok = true; @@ -918,13 +918,13 @@ void TQPainter::updateBrush() if ( !internclipok ) { if ( pdev == paintEventDevice && paintEventClipRegion ) { if ( brushRef &&((TQGCC*)brushRef)->clip_serial < gc_cache_clip_serial ) { - x11SetClipRegion( dpy, gc_brush, 0, rendhd, *paintEventClipRegion ); + x11SetClipRegion( dpy, gc_brush, nullptr, rendhd, *paintEventClipRegion ); ((TQGCC*)brushRef)->clip_serial = gc_cache_clip_serial; } else if ( !brushRef ){ - x11SetClipRegion( dpy, gc_brush, 0, rendhd, *paintEventClipRegion ); + x11SetClipRegion( dpy, gc_brush, nullptr, rendhd, *paintEventClipRegion ); } } else if (brushRef && ((TQGCC*)brushRef)->clip_serial ) { - x11ClearClipRegion(dpy, gc_brush, 0, rendhd); + x11ClearClipRegion(dpy, gc_brush, nullptr, rendhd); ((TQGCC*)brushRef)->clip_serial = 0; } } @@ -932,7 +932,7 @@ void TQPainter::updateBrush() if ( obtained ) return; - const uchar *pat = 0; // pattern + const uchar *pat = nullptr; // pattern int d = 0; // defalt pattern size: d*d int s = FillSolid; if ( bs >= Dense1Pattern && bs <= DiagCrossPattern ) { @@ -1017,7 +1017,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) #endif return false; } - if ( pd == 0 ) { + if ( !pd ) { #if defined(QT_CHECK_NULL) tqWarning( "TQPainter::begin: Paint device cannot be null" ); #endif @@ -1026,7 +1026,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) TQPixmap::x11SetDefaultScreen( pd->x11Screen() ); - const TQWidget *copyFrom = 0; + const TQWidget *copyFrom = nullptr; pdev = redirect( (TQPaintDevice*)pd ); if ( pdev ) { // redirected paint device? if ( pd->devType() == TQInternal::Widget ) @@ -1060,13 +1060,13 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) rendhd = pdev->rendhd; if ( testf(ExtDev) ) { // external device - if ( !pdev->cmd( TQPaintDevice::PdcBegin, this, 0 ) ) { + if ( !pdev->cmd( TQPaintDevice::PdcBegin, this, nullptr ) ) { // could not begin painting if ( reinit ) clearf( IsActive | DirtyFont ); else flags = IsStartingUp; - pdev = 0; + pdev = nullptr; return false; } if ( tabstops ) // update tabstops for device @@ -1206,43 +1206,43 @@ bool TQPainter::end() // end painting if ( gc_brush ) { // restore brush gc if ( brushRef ) { release_gc( brushRef ); - brushRef = 0; + brushRef = nullptr; } else { free_gc( dpy, gc_brush, testf(UsePrivateCx) ); } - gc_brush = 0; + gc_brush = nullptr; } if ( gc ) { // restore pen gc if ( penRef ) { release_gc( penRef ); - penRef = 0; + penRef = nullptr; } else { free_gc( dpy, gc, testf(UsePrivateCx) ); } - gc = 0; + gc = nullptr; } if ( testf(ExtDev) ) - pdev->cmd( TQPaintDevice::PdcEnd, this, 0 ); + pdev->cmd( TQPaintDevice::PdcEnd, this, nullptr ); #ifndef TQT_NO_XFTFREETYPE if (rendhd) { // reset clipping/subwindow mode on our render picture - XftDrawSetClip((XftDraw *) rendhd, None); + XftDrawSetClip((XftDraw *) rendhd, nullptr); XftDrawSetSubwindowMode((XftDraw *) rendhd, ClipByChildren); } #endif // TQT_NO_XFTFREETYPE if ( pfont ) { delete pfont; - pfont = 0; + pfont = nullptr; } flags = 0; pdev->painters--; - pdev = 0; - dpy = 0; + pdev = nullptr; + dpy = nullptr; return true; } @@ -1279,7 +1279,7 @@ void TQPainter::flush(const TQRegion &rgn, CoordinateMode m) void TQPainter::flush() { if ( testf(ExtDev) ) { - pdev->cmd( TQPaintDevice::PdcFlush, this, 0 ); + pdev->cmd( TQPaintDevice::PdcFlush, this, nullptr ); return; } @@ -2680,9 +2680,9 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, XSetFillStyle( dpy, gc, FillSolid ); if ( !selfmask ) { if ( pdev == paintEventDevice && paintEventClipRegion ) { - x11SetClipRegion( dpy, gc, 0, rendhd, *paintEventClipRegion ); + x11SetClipRegion( dpy, gc, nullptr, rendhd, *paintEventClipRegion ); } else { - x11ClearClipRegion(dpy, gc, 0, rendhd); + x11ClearClipRegion(dpy, gc, nullptr, rendhd); } } } else { @@ -2846,7 +2846,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, */ TQBitmap *mask = (TQBitmap *)pixmap.mask(); if ( !testf(ExtDev) && txop <= TxTranslate && pixmap.depth() > 1 && - mask == 0 ) { + !mask ) { if ( txop == TxTranslate ) map( x, y, &x, &y ); @@ -3121,7 +3121,7 @@ void TQPainter::drawText( int x, int y, const TQString &str, int pos, int len, T drawTextItem( x, y - ascent, ti, textFlags ); } - layout.d = 0; + layout.d = nullptr; } @@ -3155,7 +3155,7 @@ void TQPainter::drawTextItem( int x, int y, const TQTextItem &ti, int textFlags engine->shape( ti.item ); TQFontEngine *fe = si->fontEngine; - assert( fe != 0 ); + assert( fe ); x += si->x; y += si->y; diff --git a/src/kernel/tqpalette.cpp b/src/kernel/tqpalette.cpp index 1e4dfab89..9797c4621 100644 --- a/src/kernel/tqpalette.cpp +++ b/src/kernel/tqpalette.cpp @@ -193,7 +193,7 @@ public: TQColorGroup::TQColorGroup() { - static TQColorGroupPrivate* defColorGroupData = 0; + static TQColorGroupPrivate* defColorGroupData = nullptr; if ( !defColorGroupData ) { static TQSharedCleanupHandler defColorGroupCleanup; defColorGroupData = new TQColorGroupPrivate; @@ -577,7 +577,7 @@ static int palette_count = 1; TQPalette::TQPalette() { - static TQPalData *defPalData = 0; + static TQPalData *defPalData = nullptr; if ( !defPalData ) { // create common palette data defPalData = new TQPalData; // for the default palette static TQSharedCleanupHandler defPalCleanup; diff --git a/src/kernel/tqpicture.cpp b/src/kernel/tqpicture.cpp index 692e9087a..a2d66a62f 100644 --- a/src/kernel/tqpicture.cpp +++ b/src/kernel/tqpicture.cpp @@ -609,7 +609,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords ) case PdcSetTabArray: s >> i_16; if ( i_16 == 0 ) { - painter->setTabArray( 0 ); + painter->setTabArray( nullptr ); } else { int *ta = new int[i_16]; TQ_CHECK_PTR( ta ); diff --git a/src/kernel/tqpicture.h b/src/kernel/tqpicture.h index 28512b61f..20582fbd8 100644 --- a/src/kernel/tqpicture.h +++ b/src/kernel/tqpicture.h @@ -63,10 +63,10 @@ public: bool play( TQPainter * ); - bool load( TQIODevice *dev, const char *format = 0 ); - bool load( const TQString &fileName, const char *format = 0 ); - bool save( TQIODevice *dev, const char *format = 0 ); - bool save( const TQString &fileName, const char *format = 0 ); + bool load( TQIODevice *dev, const char *format = nullptr ); + bool load( const TQString &fileName, const char *format = nullptr ); + bool save( TQIODevice *dev, const char *format = nullptr ); + bool save( const TQString &fileName, const char *format = nullptr ); TQRect boundingRect() const; void setBoundingRect( const TQRect &r ); diff --git a/src/kernel/tqpixmap.cpp b/src/kernel/tqpixmap.cpp index 4bb55b98d..49b24ceb0 100644 --- a/src/kernel/tqpixmap.cpp +++ b/src/kernel/tqpixmap.cpp @@ -361,7 +361,7 @@ TQPixmap::TQPixmap( const TQPixmap &pixmap ) : TQPaintDevice( TQInternal::Pixmap ) { if ( pixmap.paintingActive() ) { // make a deep copy - data = 0; + data = nullptr; operator=( pixmap.copy() ); } else { data = pixmap.data; @@ -736,7 +736,7 @@ void TQPixmap::setMask( const TQBitmap &newmask ) data->selfmask = false; delete data->mask; - data->mask = 0; + data->mask = nullptr; } return; } @@ -754,7 +754,7 @@ void TQPixmap::setMask( const TQBitmap &newmask ) #if defined(TQ_WS_MAC) || (defined(TQ_WS_X11) && !defined(TQT_NO_XFTFREETYPE)) // when setting the mask, we get rid of the alpha channel completely delete data->alphapm; - data->alphapm = 0; + data->alphapm = nullptr; #endif // TQ_WS_X11 && !TQT_NO_XFTFREETYPE delete data->mask; @@ -1127,7 +1127,7 @@ static TQPixmap grabChildWidgets( TQWidget * w ) TQPainter p( &res ); TQObjectListIt it( *children ); TQObject * child; - while( (child=it.current()) != 0 ) { + while( (child=it.current()) ) { ++it; if ( child->isWidgetType() && !((TQWidget *)child)->isHidden() && diff --git a/src/kernel/tqpixmap.h b/src/kernel/tqpixmap.h index 8370f8edb..152df67cd 100644 --- a/src/kernel/tqpixmap.h +++ b/src/kernel/tqpixmap.h @@ -68,7 +68,7 @@ public: TQPixmap( int w, int h, int depth = -1, Optimization = DefaultOptim ); TQPixmap( const TQSize &, int depth = -1, Optimization = DefaultOptim ); #ifndef TQT_NO_IMAGEIO - TQPixmap( const TQString& fileName, const char *format=0, + TQPixmap( const TQString& fileName, const char *format=nullptr, ColorMode mode=Auto ); TQPixmap( const TQString& fileName, const char *format, int conversion_flags ); @@ -121,18 +121,18 @@ public: bool convertFromImage( const TQImage &, int conversion_flags ); #ifndef TQT_NO_IMAGEIO static const char* imageFormat( const TQString &fileName ); - bool load( const TQString& fileName, const char *format=0, + bool load( const TQString& fileName, const char *format=nullptr, ColorMode mode=Auto ); bool load( const TQString& fileName, const char *format, int conversion_flags ); bool loadFromData( const uchar *buf, uint len, - const char* format=0, + const char* format=nullptr, ColorMode mode=Auto ); bool loadFromData( const uchar *buf, uint len, const char* format, int conversion_flags ); bool loadFromData( const TQByteArray &data, - const char* format=0, + const char* format=nullptr, int conversion_flags=0 ); bool save( const TQString& fileName, const char* format, int quality = -1 ) const; bool save( TQIODevice* device, const char* format, int quality = -1 ) const; diff --git a/src/kernel/tqpixmap_x11.cpp b/src/kernel/tqpixmap_x11.cpp index 78b8d3888..ba6c868ca 100644 --- a/src/kernel/tqpixmap_x11.cpp +++ b/src/kernel/tqpixmap_x11.cpp @@ -95,7 +95,7 @@ inline static void qSafeXDestroyImage( XImage *x ) { if ( x->data ) { free( x->data ); - x->data = 0; + x->data = nullptr; } XDestroyImage( x ); } @@ -109,7 +109,7 @@ inline static void qSafeXDestroyImage( XImage *x ) static bool xshminit = false; static XShmSegmentInfo xshminfo; -static XImage *xshmimg = 0; +static XImage *xshmimg = nullptr; static Pixmap xshmpm = 0; static void tqt_cleanup_mitshm() @@ -224,17 +224,17 @@ static XImage* tqt_XShmCreateImage( Display* dpy, Visual* visual, unsigned int d return nullptr; } shminfo->readOnly = False; - shminfo->shmaddr = (char*)shmat( shminfo->shmid, 0, 0 ); + shminfo->shmaddr = (char*)shmat( shminfo->shmid, nullptr, 0 ); if( shminfo->shmaddr == (char*)-1 ) { XDestroyImage( xi ); - shmctl( shminfo->shmid, IPC_RMID, 0 ); + shmctl( shminfo->shmid, IPC_RMID, nullptr ); return nullptr; } xi->data = shminfo->shmaddr; #ifndef QT_MITSHM_RMID_IGNORES_REFCOUNT // mark as deleted to automatically free the memory in case // of a crash (but this doesn't work e.g. on Solaris) - shmctl( shminfo->shmid, IPC_RMID, 0 ); + shmctl( shminfo->shmid, IPC_RMID, nullptr ); #endif if( shm_inited == 1 ) { // first time XErrorHandler old_h = XSetErrorHandler( tqt_mitshm_errorhandler ); @@ -270,7 +270,7 @@ static XImage* tqt_XShmGetImage( const TQPixmap* pix, int format, XShmSegmentInfo* shminfo ) { XImage* xi = tqt_XShmCreateImage( pix->x11Display(), (Visual*)pix->x11Visual(), - pix->depth(), format, 0, 0, pix->width(), pix->height(), 32, 0, shminfo ); + pix->depth(), format, 0, nullptr, pix->width(), pix->height(), 32, 0, shminfo ); if( !xi ) return nullptr; if( XShmGetImage( pix->x11Display(), pix->handle(), xi, 0, 0, AllPlanes ) == False ) { @@ -331,9 +331,9 @@ static uint n_bits( uint v ) return i; } -static uint *red_scale_table = 0; -static uint *green_scale_table = 0; -static uint *blue_scale_table = 0; +static uint *red_scale_table = nullptr; +static uint *green_scale_table = nullptr; +static uint *blue_scale_table = nullptr; static void cleanup_scale_tables() { @@ -504,7 +504,7 @@ TQPixmap::TQPixmap( int w, int h, const uchar *bits, bool isXbitmap) data->d = 1; uchar *flipped_bits; if ( isXbitmap ) { - flipped_bits = 0; + flipped_bits = nullptr; } else { // not X bitmap -> flip bits flipped_bits = flip_bits( bits, ((w+7)/8)*h ); bits = flipped_bits; @@ -553,11 +553,11 @@ void TQPixmap::detach() // reset cached data if ( data->ximage ) { qSafeXDestroyImage( (XImage*)data->ximage ); - data->ximage = 0; + data->ximage = nullptr; } if ( data->maskgc ) { XFreeGC( x11Display(), (GC)data->maskgc ); - data->maskgc = 0; + data->maskgc = nullptr; } } @@ -619,7 +619,7 @@ void TQPixmap::setOptimization( Optimization optimization ) defOptim : optimization; if ( data->optim == MemoryOptim && data->ximage ) { qSafeXDestroyImage( (XImage*)data->ximage ); - data->ximage = 0; + data->ximage = nullptr; } } @@ -757,7 +757,7 @@ TQImage TQPixmap::convertToImage() const else #endif qSafeXDestroyImage( xi ); - ((TQPixmap*)this)->data->ximage = 0; + ((TQPixmap*)this)->data->ximage = nullptr; return image; } @@ -842,7 +842,7 @@ TQImage TQPixmap::convertToImage() const bppc++; for ( int y=0; ydata + xi->bytes_per_line*y; for ( int x=0; xdata->ximage = 0; + ((TQPixmap*)this)->data->ximage = nullptr; return image; } @@ -1054,12 +1054,12 @@ TQImage TQPixmap::convertToImage() const else #endif qSafeXDestroyImage( xi ); - ((TQPixmap*)this)->data->ximage = 0; + ((TQPixmap*)this)->data->ximage = nullptr; } else { // keep ximage data #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) { // copy the XImage? tqt_XShmDestroyImage( xi, &shminfo ); - xi = 0; + xi = nullptr; } #endif ((TQPixmap*)this)->data->ximage = xi; @@ -1111,11 +1111,11 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) // get rid of the mask delete data->mask; - data->mask = 0; + data->mask = nullptr; // get rid of alpha pixmap delete data->alphapm; - data->alphapm = 0; + data->alphapm = nullptr; // must be monochrome if ( force_mono ) { @@ -1207,7 +1207,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) } } else { bits = (char *)image.bits(); - tmp_bits = 0; + tmp_bits = nullptr; } hd = (HANDLE)XCreateBitmapFromData( x11Display(), RootWindow(x11Display(), x11Screen() ), @@ -1232,10 +1232,10 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) Display *dpy = x11Display(); Visual *visual = (Visual *)x11Visual(); - XImage *xi = 0; + XImage *xi = nullptr; bool trucol = (visual->c_class == TrueColor || visual->c_class == DirectColor); int nbytes = image.numBytes(); - uchar *newbits= 0; + uchar *newbits= nullptr; #ifdef QT_MITSHM_CONVERSIONS int newbits_size = 0; bool mitshm_ximage = false; @@ -1270,14 +1270,14 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) } #ifdef QT_MITSHM_CONVERSIONS - xi = tqt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0, &shminfo ); + xi = tqt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, nullptr, w, h, 32, 0, &shminfo ); if( xi ) { mitshm_ximage = true; newbits = (uchar*)xi->data; } else #endif - xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0 ); + xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, nullptr, w, h, 32, 0 ); if (!xi) return false; if( !newbits ) @@ -1729,12 +1729,12 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( !xi ) { // X image not created #ifdef QT_MITSHM_CONVERSIONS - xi = tqt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0, &shminfo ); + xi = tqt_XShmCreateImage( dpy, visual, dd, ZPixmap, 0, nullptr, w, h, 32, 0, &shminfo ); if( xi ) mitshm_ximage = true; else #endif - xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, 0, w, h, 32, 0 ); + xi = XCreateImage( dpy, visual, dd, ZPixmap, 0, nullptr, w, h, 32, 0 ); if ( xi->bits_per_pixel == 16 ) { // convert 8 bpp ==> 16 bpp ushort *p2; int p2inc = xi->bytes_per_line/sizeof(ushort); @@ -1855,13 +1855,13 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) #ifdef QT_MITSHM_CONVERSIONS axi = tqt_XShmCreateImage( x11Display(), (Visual*)x11Visual(), - 8, ZPixmap, 0, 0, w, h, 8, 0, &ashminfo ); + 8, ZPixmap, 0, nullptr, w, h, 8, 0, &ashminfo ); if( axi ) mitshm_aximage = true; else #endif axi = XCreateImage(x11Display(), (Visual *) x11Visual(), - 8, ZPixmap, 0, 0, w, h, 8, 0); + 8, ZPixmap, 0, nullptr, w, h, 8, 0); if (axi) { if( !axi->data ) { @@ -1894,7 +1894,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) } } - GC gc = XCreateGC(x11Display(), data->alphapm->hd, 0, 0); + GC gc = XCreateGC(x11Display(), data->alphapm->hd, 0, nullptr); #ifdef QT_MITSHM_CONVERSIONS if( mitshm_aximage ) XShmPutImage( dpy, data->alphapm->hd, gc, axi, 0, 0, 0, 0, w, h, False ); @@ -1919,12 +1919,12 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) else #endif qSafeXDestroyImage( xi ); - data->ximage = 0; + data->ximage = nullptr; } else { // keep ximage that we created #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) { // copy the XImage? tqt_XShmDestroyImage( xi, &shminfo ); - xi = 0; + xi = nullptr; } #endif data->ximage = xi; @@ -2195,7 +2195,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const if ( data->optim == NoOptim ) { // throw away ximage qSafeXDestroyImage( xi ); - data->ximage = 0; + data->ximage = nullptr; } else { // keep ximage that we fetched data->ximage = xi; } @@ -2234,7 +2234,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const #ifndef TQT_NO_XFTFREETYPE if ( tqt_use_xrender && tqt_has_xft && data->alphapm ) { // xform the alpha channel - XImage *axi = 0; + XImage *axi = nullptr; if ((axi = XGetImage(x11Display(), data->alphapm->handle(), 0, 0, ws, hs, AllPlanes, ZPixmap))) { sbpl = axi->bytes_per_line; @@ -2274,7 +2274,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const if (axi2) { // the data is deleted by qSafeXDestroyImage - GC gc = XCreateGC(x11Display(), pm.data->alphapm->hd, 0, 0); + GC gc = XCreateGC(x11Display(), pm.data->alphapm->hd, 0, nullptr); XPutImage(dpy, pm.data->alphapm->hd, gc, axi2, 0, 0, 0, 0, w, h); XFreeGC(x11Display(), gc); qSafeXDestroyImage(axi2); @@ -2362,7 +2362,7 @@ bool TQPixmap::hasAlpha() const */ bool TQPixmap::hasAlphaChannel() const { - return data->alphapm != 0; + return data->alphapm; } /*! @@ -2390,8 +2390,8 @@ TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, { if ( ! dst || ! src || sw == 0 || sh == 0 || dst->depth() != src->depth() ) { #ifdef QT_CHECK_NULL - Q_ASSERT( dst != 0 ); - Q_ASSERT( src != 0 ); + Q_ASSERT( dst ); + Q_ASSERT( src ); #endif return; } @@ -2457,7 +2457,7 @@ TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, dst->data->alphapm->hd, 8 ); } - GC gc = XCreateGC(dst->x11Display(), dst->data->alphapm->hd, 0, 0); + GC gc = XCreateGC(dst->x11Display(), dst->data->alphapm->hd, 0, nullptr); if ( do_init ) { // the alphapm was just created, make it fully opaque diff --git a/src/kernel/tqpixmapcache.cpp b/src/kernel/tqpixmapcache.cpp index 0976554fe..3d355f3ff 100644 --- a/src/kernel/tqpixmapcache.cpp +++ b/src/kernel/tqpixmapcache.cpp @@ -105,7 +105,7 @@ class TQPMCache: public TQObject, public TQCache { public: TQPMCache(): - TQObject( 0, "global pixmap cache" ), + TQObject( nullptr, "global pixmap cache" ), TQCache( cache_limit * 1024, cache_size ), id( 0 ), ps( 0 ), t( false ) { @@ -160,7 +160,7 @@ bool TQPMCache::insert( const TQString& k, const TQPixmap *d, int c, int p ) return r; } -static TQPMCache *pm_cache = 0; // global pixmap cache +static TQPMCache *pm_cache = nullptr; // global pixmap cache static TQSingleCleanupHandler qpm_cleanup_cache; @@ -189,7 +189,7 @@ static TQSingleCleanupHandler qpm_cleanup_cache; TQPixmap *TQPixmapCache::find( const TQString &key ) { - return pm_cache ? pm_cache->find(key) : 0; + return pm_cache ? pm_cache->find(key) : nullptr; } @@ -213,7 +213,7 @@ TQPixmap *TQPixmapCache::find( const TQString &key ) bool TQPixmapCache::find( const TQString &key, TQPixmap& pm ) { - TQPixmap* p = pm_cache ? pm_cache->find(key) : 0; + TQPixmap* p = pm_cache ? pm_cache->find(key) : nullptr; if ( p ) pm = *p; return !!p; } diff --git a/src/kernel/tqpngio.cpp b/src/kernel/tqpngio.cpp index 6da20c0e4..457d5bd7c 100644 --- a/src/kernel/tqpngio.cpp +++ b/src/kernel/tqpngio.cpp @@ -127,7 +127,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc int bit_depth; int color_type; png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); + nullptr, nullptr, nullptr); #if PNG_LIBPNG_VER>=10500 png_colorp info_ptr_palette = nullptr; @@ -211,7 +211,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr, float sc png_set_packing( png_ptr ); png_read_update_info( png_ptr, info_ptr ); png_get_IHDR(png_ptr, info_ptr, - &width, &height, &bit_depth, &color_type, 0, 0, 0); + &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr); #if PNG_LIBPNG_VER>=10500 if (!image.create(width, height, bit_depth, info_ptr_num_palette, #else /* LIBPNG 1.5 */ @@ -325,24 +325,24 @@ void read_png_image(TQImageIO* iio) png_infop end_info; png_bytep* row_pointers; - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0); + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,nullptr,nullptr,nullptr); if (!png_ptr) { iio->setStatus(-1); return; } - png_set_error_fn(png_ptr, 0, 0, tqt_png_warning); + png_set_error_fn(png_ptr, nullptr, nullptr, tqt_png_warning); info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { - png_destroy_read_struct(&png_ptr, 0, 0); + png_destroy_read_struct(&png_ptr, nullptr, nullptr); iio->setStatus(-2); return; } end_info = png_create_info_struct(png_ptr); if (!end_info) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); iio->setStatus(-3); return; } @@ -373,7 +373,7 @@ void read_png_image(TQImageIO* iio) int bit_depth; int color_type; png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); + nullptr, nullptr, nullptr); uchar** jt = image.jumpTable(); row_pointers=new png_bytep[height]; @@ -416,7 +416,7 @@ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) int num_text=0; png_get_text(png_ptr,info_ptr,&text_ptr,&num_text); while (num_text--) { - image.setText(text_ptr->key,0,text_ptr->text); + image.setText(text_ptr->key,nullptr,text_ptr->text); text_ptr++; } #endif @@ -529,16 +529,16 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_ png_infop info_ptr; png_bytep* row_pointers; - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,0,0,0); + png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,nullptr,nullptr,nullptr); if (!png_ptr) { return false; } - png_set_error_fn(png_ptr, 0, 0, tqt_png_warning); + png_set_error_fn(png_ptr, nullptr, nullptr, tqt_png_warning); info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { - png_destroy_write_struct(&png_ptr, 0); + png_destroy_write_struct(&png_ptr, nullptr); return false; } @@ -592,8 +592,8 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_ if (image.depth() == 1 && image.bitOrder() == TQImage::LittleEndian) png_set_packswap(png_ptr); - png_colorp palette = 0; - png_bytep copy_trans = 0; + png_colorp palette = nullptr; + png_bytep copy_trans = nullptr; if (image.numColors()) { // Paletted int num_palette = image.numColors(); @@ -631,7 +631,7 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_ copy_trans = new png_byte[num_trans]; for (int i=0; ijmpbuf)) { #endif /* LIBPNG 1.5 */ - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); + image = nullptr; return -1; } @@ -1166,8 +1166,8 @@ int TQPNGFormat::decode(TQImage& img, TQImageConsumer* cons, #else /* LIBPNG 1.5 */ if (setjmp(png_ptr->jmpbuf)) { #endif /* LIBPNG 1.5 */ - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); + image = nullptr; state = MovieStart; return -1; } @@ -1179,10 +1179,10 @@ int TQPNGFormat::decode(TQImage& img, TQImageConsumer* cons, if ( state != Inside ) { if ( png_ptr ) - png_destroy_read_struct(&png_ptr, &info_ptr, 0); + png_destroy_read_struct(&png_ptr, &info_ptr, nullptr); } - image = 0; + image = nullptr; return l; } @@ -1217,7 +1217,7 @@ void TQPNGFormat::end(png_structp png, png_infop info) int num_text=0; png_get_text(png,info,&text_ptr,&num_text); while (num_text--) { - image->setText(text_ptr->key,0,text_ptr->text); + image->setText(text_ptr->key,nullptr,text_ptr->text); text_ptr++; } #endif @@ -1313,7 +1313,7 @@ int TQPNGFormat::user_chunk(png_structp png, #endif -static TQPNGFormatType* globalPngFormatTypeObject = 0; +static TQPNGFormatType* globalPngFormatTypeObject = nullptr; #endif // TQT_NO_ASYNC_IMAGE_IO @@ -1323,7 +1323,7 @@ void qCleanupPngIO() #ifndef TQT_NO_ASYNC_IMAGE_IO if ( globalPngFormatTypeObject ) { delete globalPngFormatTypeObject; - globalPngFormatTypeObject = 0; + globalPngFormatTypeObject = nullptr; } #endif done = false; @@ -1333,7 +1333,7 @@ void qInitPngIO() { if ( !done ) { done = true; - TQImageIO::defineIOHandler( "PNG", "^.PNG\r", 0, read_png_image, + TQImageIO::defineIOHandler( "PNG", "^.PNG\r", nullptr, read_png_image, write_png_image); #ifndef TQT_NO_ASYNC_IMAGE_IO globalPngFormatTypeObject = new TQPNGFormatType; @@ -1344,8 +1344,8 @@ void qInitPngIO() void tqt_zlib_compression_hack() { - compress(0,0,0,0); - uncompress(0,0,0,0); + compress(nullptr,nullptr,nullptr,0); + uncompress(nullptr,nullptr,nullptr,0); } #endif // TQT_NO_IMAGEIO_PNG diff --git a/src/kernel/tqpointarray.cpp b/src/kernel/tqpointarray.cpp index 4a1e35f8c..844059e00 100644 --- a/src/kernel/tqpointarray.cpp +++ b/src/kernel/tqpointarray.cpp @@ -1058,7 +1058,7 @@ struct TQShortPoint { // Binary compatible with XPoint }; uint TQPointArray::splen = 0; -void* TQPointArray::sp = 0; // Really a TQShortPoint* +void* TQPointArray::sp = nullptr; // Really a TQShortPoint* /*! \internal @@ -1073,7 +1073,7 @@ void* TQPointArray::shortPoints( int index, int nPoints ) const { if ( isNull() || !nPoints ) - return 0; + return nullptr; TQPoint* p = data(); p += index; uint i = nPoints < 0 ? size() : nPoints; @@ -1104,6 +1104,6 @@ void TQPointArray::cleanBuffers() { if ( sp ) delete[] ((TQShortPoint*)sp); - sp = 0; + sp = nullptr; splen = 0; } diff --git a/src/kernel/tqpolygonscanner.cpp b/src/kernel/tqpolygonscanner.cpp index 54a075c66..db23e4c0d 100644 --- a/src/kernel/tqpolygonscanner.cpp +++ b/src/kernel/tqpolygonscanner.cpp @@ -434,14 +434,14 @@ miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, if (!tmpSLLBlock) return false; (*SLLBlock)->next = tmpSLLBlock; - tmpSLLBlock->next = 0; + tmpSLLBlock->next = nullptr; *SLLBlock = tmpSLLBlock; *iSLLBlock = 0; } pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]); pSLL->next = pPrevSLL->next; - pSLL->edgelist = 0; + pSLL->edgelist = nullptr; pPrevSLL->next = pSLL; } pSLL->scanline = scanline; @@ -449,7 +449,7 @@ miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, /* * now insert the edge in the right bucket */ - prev = 0; + prev = nullptr; start = pSLL->edgelist; while (start && (start->bres.minor < ETE->bres.minor)) { @@ -530,18 +530,18 @@ miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, /* * initialize the Active Edge Table */ - AET->next = 0; - AET->back = 0; - AET->nextWETE = 0; + AET->next = nullptr; + AET->back = nullptr; + AET->nextWETE = nullptr; AET->bres.minor = MININT; /* * initialize the Edge Table. */ - ET->scanlines.next = 0; + ET->scanlines.next = nullptr; ET->ymax = MININT; ET->ymin = MAXINT; - pSLLBlock->next = 0; + pSLLBlock->next = nullptr; PrevPt = &pts[count-1]; @@ -660,7 +660,7 @@ micomputeWAET(EdgeTableEntry *AET) int inside = 1; int isInside = 0; - AET->nextWETE = 0; + AET->nextWETE = nullptr; pWETE = AET; AET = AET->next; while (AET) @@ -679,7 +679,7 @@ micomputeWAET(EdgeTableEntry *AET) } AET = AET->next; } - pWETE->nextWETE = 0; + pWETE->nextWETE = nullptr; } /* diff --git a/src/kernel/tqprinter.h b/src/kernel/tqprinter.h index de561901a..ed1887d65 100644 --- a/src/kernel/tqprinter.h +++ b/src/kernel/tqprinter.h @@ -153,7 +153,7 @@ public: bool abort(); bool aborted() const; - bool setup( TQWidget *parent = 0 ); + bool setup( TQWidget *parent = nullptr ); PaperSource paperSource() const; virtual void setPaperSource( PaperSource ); diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index 0558a1d8b..3ef090ce6 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -100,7 +100,7 @@ struct PrinterDefaults { int numCopies; }; -static PrinterDefaults * globalPrinterDefaults = 0; +static PrinterDefaults * globalPrinterDefaults = nullptr; /*! Constructs a printer paint device with mode \a m. @@ -111,7 +111,7 @@ static PrinterDefaults * globalPrinterDefaults = 0; TQPrinter::TQPrinter( PrinterMode m ) : TQPaintDevice( TQInternal::Printer | TQInternal::ExternalDevice ) { - pdrv = 0; + pdrv = nullptr; pid = 0; orient = Portrait; page_size = A4; @@ -153,7 +153,7 @@ TQPrinter::~TQPrinter() delete pdrv; if ( pid ) { (void)::kill( pid, 6 ); - (void)::wait( 0 ); + (void)::wait( nullptr ); pid = 0; } delete d; @@ -168,7 +168,7 @@ TQPrinter::~TQPrinter() bool TQPrinter::newPage() { if ( state == PST_ACTIVE && pdrv ) - return ((TQPSPrinter*)pdrv)->cmd( TQPSPrinter::NewPage, 0, 0 ); + return ((TQPSPrinter*)pdrv)->cmd( TQPSPrinter::NewPage, nullptr, nullptr ); return false; } @@ -183,11 +183,11 @@ bool TQPrinter::newPage() bool TQPrinter::abort() { if ( state == PST_ACTIVE && pdrv ) { - ((TQPSPrinter*)pdrv)->cmd( TQPSPrinter::AbortPrinting, 0, 0 ); + ((TQPSPrinter*)pdrv)->cmd( TQPSPrinter::AbortPrinting, nullptr, nullptr ); state = PST_ABORTED; if ( pid ) { (void)::kill( pid, 6 ); - (void)::wait( 0 ); + (void)::wait( nullptr ); pid = 0; } } @@ -232,7 +232,7 @@ void TQPrinter::setPrinterName( const TQString &name ) static void deleteGlobalPrinterDefaults() { delete globalPrinterDefaults; - globalPrinterDefaults = 0; + globalPrinterDefaults = nullptr; } /*! @@ -298,7 +298,7 @@ static const char * const psToStr[TQPrinter::NPageSize+1] = { "A4", "B5", "Letter", "Legal", "Executive", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "A8", "A9", "B0", "B1", "B10", "B2", "B3", "B4", "B6", "B7", "B8", "B9", "C5E", "Comm10E", - "DLE", "Folio", "Ledger", "Tabloid", 0 + "DLE", "Folio", "Ledger", "Tabloid", nullptr }; @@ -420,12 +420,12 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) media += psToStr[page_size]; lpargs[++i] = (char *)media.ascii(); } - lpargs[++i] = 0; + lpargs[++i] = nullptr; char **lprargs = new char *[lprhack.size()+1]; lprargs[0] = (char *)"lpr"; for (uint x = 0; x < lprhack.size(); ++x) lprargs[x+1] = (char *)lprhack[x].ascii(); - lprargs[lprhack.size() + 1] = 0; + lprargs[lprhack.size() + 1] = nullptr; (void)execvp( "lp", lpargs ); (void)execvp( "lpr", lprargs ); (void)execv( "/bin/lp", lpargs); @@ -459,9 +459,9 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) if ( c == PdcEnd ) { state = PST_IDLE; delete pdrv; - pdrv = 0; + pdrv = nullptr; if ( pid ) { - (void)::waitpid( pid, 0, 0 ); + (void)::waitpid( pid, nullptr, 0 ); pid = 0; } } diff --git a/src/kernel/tqprocess.cpp b/src/kernel/tqprocess.cpp index 58b0bdbaf..c7421ece5 100644 --- a/src/kernel/tqprocess.cpp +++ b/src/kernel/tqprocess.cpp @@ -512,7 +512,7 @@ TQString TQProcess::readLineStdout() } uint size = a.size(); - buf->consumeBytes( size, 0 ); + buf->consumeBytes( size, nullptr ); // get rid of terminating \n or \r\n if ( size>0 && a.at( size - 1 ) == '\n' ) { @@ -548,7 +548,7 @@ TQString TQProcess::readLineStderr() } uint size = a.size(); - buf->consumeBytes( size, 0 ); + buf->consumeBytes( size, nullptr ); // get rid of terminating \n or \r\n if ( size>0 && a.at( size - 1 ) == '\n' ) { @@ -781,21 +781,21 @@ void TQProcess::connectNotify( const char * signal ) void TQProcess::disconnectNotify( const char * ) { if ( ioRedirection && - receivers( TQ_SIGNAL(readyReadStdout()) ) ==0 && - receivers( TQ_SIGNAL(readyReadStderr()) ) ==0 + !receivers( TQ_SIGNAL(readyReadStdout()) ) && + !receivers( TQ_SIGNAL(readyReadStderr()) ) ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set ioRedirection to false" ); #endif setIoRedirection( false ); } - if ( notifyOnExit && receivers( TQ_SIGNAL(processExited()) ) == 0 ) { + if ( notifyOnExit && !receivers( TQ_SIGNAL(processExited()) ) ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set notifyOnExit to false" ); #endif setNotifyOnExit( false ); } - if ( wroteToStdinConnected && receivers( TQ_SIGNAL(wroteToStdin()) ) == 0 ) { + if ( wroteToStdinConnected && !receivers( TQ_SIGNAL(wroteToStdin()) ) ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcess::disconnectNotify(): set wroteToStdinConnected to false" ); #endif diff --git a/src/kernel/tqprocess.h b/src/kernel/tqprocess.h index 40b6c11a5..9aad40be3 100644 --- a/src/kernel/tqprocess.h +++ b/src/kernel/tqprocess.h @@ -57,9 +57,9 @@ class TQ_EXPORT TQProcess : public TQObject { TQ_OBJECT public: - TQProcess( TQObject *parent=0, const char *name=0 ); - TQProcess( const TQString& arg0, TQObject *parent=0, const char *name=0 ); - TQProcess( const TQStringList& args, TQObject *parent=0, const char *name=0 ); + TQProcess( TQObject *parent=nullptr, const char *name=nullptr ); + TQProcess( const TQString& arg0, TQObject *parent=nullptr, const char *name=nullptr ); + TQProcess( const TQStringList& args, TQObject *parent=nullptr, const char *name=nullptr ); ~TQProcess(); // set and get the arguments and working directory @@ -78,9 +78,9 @@ public: int communication() const; // start the execution - virtual bool start( TQStringList *env=0 ); - virtual bool launch( const TQString& buf, TQStringList *env=0 ); - virtual bool launch( const TQByteArray& buf, TQStringList *env=0 ); + virtual bool start( TQStringList *env=nullptr ); + virtual bool launch( const TQString& buf, TQStringList *env=nullptr ); + virtual bool launch( const TQByteArray& buf, TQStringList *env=nullptr ); // inquire the status bool isRunning() const; diff --git a/src/kernel/tqprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp index 2d0c60c84..9af9acf32 100644 --- a/src/kernel/tqprocess_unix.cpp +++ b/src/kernel/tqprocess_unix.cpp @@ -131,7 +131,7 @@ public: class TQProc { public: - TQProc( pid_t p, TQProcess *proc=0 ) : pid(p), process(proc) + TQProc( pid_t p, TQProcess *proc=nullptr ) : pid(p), process(proc) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProc: Constructor for pid %d and TQProcess %p", pid, process ); @@ -152,7 +152,7 @@ public: process->d->notifierStdout->setEnabled( false ); if ( process->d->notifierStderr ) process->d->notifierStderr->setEnabled( false ); - process->d->proc = 0; + process->d->proc = nullptr; } if( socketStdin ) ::close( socketStdin ); @@ -204,7 +204,7 @@ private: static void tqprocess_cleanup() { delete TQProcessPrivate::procManager; - TQProcessPrivate::procManager = 0; + TQProcessPrivate::procManager = nullptr; } #ifdef Q_OS_QNX6 @@ -256,7 +256,7 @@ int qnx6SocketPairReplacement (int socketFD[2]) { #undef BAILOUT #endif -TQProcessManager::TQProcessManager() : sn(0) +TQProcessManager::TQProcessManager() : sn(nullptr) { procList = new TQPtrList; procList->setAutoDelete( true ); @@ -322,13 +322,13 @@ TQProcessManager::~TQProcessManager() #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcessManager: restore old sigchild handler" ); #endif - if ( sigaction( SIGCHLD, &oldactChld, 0 ) != 0 ) + if ( sigaction( SIGCHLD, &oldactChld, nullptr ) != 0 ) tqWarning( "Error restoring SIGCHLD handler" ); #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcessManager: restore old sigpipe handler" ); #endif - if ( sigaction( SIGPIPE, &oldactPipe, 0 ) != 0 ) + if ( sigaction( SIGPIPE, &oldactPipe, nullptr ) != 0 ) tqWarning( "Error restoring SIGPIPE handler" ); } @@ -360,7 +360,7 @@ void TQProcessManager::removeMe() { if ( procList->count() == 0 ) { tqRemovePostRoutine(tqprocess_cleanup); - TQProcessPrivate::procManager = 0; + TQProcessPrivate::procManager = nullptr; delete this; } } @@ -389,10 +389,10 @@ void TQProcessManager::sigchldHnd( int fd ) TQProcess *process; bool removeProc; proc = procList->first(); - while ( proc != 0 ) { + while ( proc ) { removeProc = false; process = proc->process; - if ( process != 0 ) { + if ( process ) { if ( !process->isRunning() ) { #if defined(QT_QPROCESS_DEBUG) tqDebug( "TQProcessManager::sigchldHnd() (PID: %d): process exited (TQProcess available)", proc->pid ); @@ -477,7 +477,7 @@ void TQProcessManager::sigchldHnd( int fd ) * TQProcessPrivate * **********************************************************************/ -TQProcessManager *TQProcessPrivate::procManager = 0; +TQProcessManager *TQProcessPrivate::procManager = nullptr; TQProcessPrivate::TQProcessPrivate() { @@ -486,14 +486,14 @@ TQProcessPrivate::TQProcessPrivate() #endif stdinBufRead = 0; - notifierStdin = 0; - notifierStdout = 0; - notifierStderr = 0; + notifierStdin = nullptr; + notifierStdout = nullptr; + notifierStderr = nullptr; exitValuesCalculated = false; socketReadCalled = false; - proc = 0; + proc = nullptr; } TQProcessPrivate::~TQProcessPrivate() @@ -502,12 +502,12 @@ TQProcessPrivate::~TQProcessPrivate() tqDebug( "TQProcessPrivate: Destructor" ); #endif - if ( proc != 0 ) { + if ( proc ) { if ( proc->socketStdin != 0 ) { ::close( proc->socketStdin ); proc->socketStdin = 0; } - proc->process = 0; + proc->process = nullptr; } while ( !stdinBuf.isEmpty() ) { @@ -525,14 +525,14 @@ TQProcessPrivate::~TQProcessPrivate() */ void TQProcessPrivate::closeOpenSocketsForChild() { - if ( procManager != 0 ) { + if ( procManager ) { if ( procManager->sigchldFd[0] != 0 ) ::close( procManager->sigchldFd[0] ); if ( procManager->sigchldFd[1] != 0 ) ::close( procManager->sigchldFd[1] ); // close also the sockets from other TQProcess instances - for ( TQProc *p=procManager->procList->first(); p!=0; p=procManager->procList->next() ) { + for ( TQProc *p=procManager->procList->first(); p; p=procManager->procList->next() ) { ::close( p->socketStdin ); ::close( p->socketStdout ); ::close( p->socketStderr ); @@ -543,7 +543,7 @@ void TQProcessPrivate::closeOpenSocketsForChild() void TQProcessPrivate::newProc( pid_t pid, TQProcess *process ) { proc = new TQProc( pid, process ); - if ( procManager == 0 ) { + if ( !procManager ) { procManager = new TQProcessManager; tqAddPostRoutine(tqprocess_cleanup); } @@ -558,7 +558,7 @@ void TQProcessPrivate::newProc( pid_t pid, TQProcess *process ) **********************************************************************/ QT_SIGNAL_RETTYPE tqt_C_sigchldHnd( QT_SIGNAL_ARGS ) { - if ( TQProcessPrivate::procManager == 0 ) + if ( !TQProcessPrivate::procManager ) return; if ( TQProcessPrivate::procManager->sigchldFd[0] == 0 ) return; @@ -786,11 +786,11 @@ bool TQProcess::start( TQStringList *env ) } } #endif - arglist[i] = 0; + arglist[i] = nullptr; // Must make sure signal handlers are installed before exec'ing // in case the process exits quickly. - if ( d->procManager == 0 ) { + if ( !d->procManager ) { d->procManager = new TQProcessManager; tqAddPostRoutine(tqprocess_cleanup); } @@ -826,7 +826,7 @@ bool TQProcess::start( TQStringList *env ) if ( fd[1] ) ::fcntl( fd[1], F_SETFD, FD_CLOEXEC ); // close on exec shows sucess - if ( env == 0 ) { // inherit environment and start process + if ( !env ) { // inherit environment and start process #ifndef Q_OS_QNX4 ::execvp( arglist[0], (char*const*)arglist ); // ### cast not nice #else @@ -842,7 +842,7 @@ bool TQProcess::start( TQStringList *env ) #endif bool setLibraryPath = env->grep( TQRegExp( "^" + ld_library_path + "=" ) ).empty() && - getenv( ld_library_path ) != 0; + getenv( ld_library_path ); if ( setLibraryPath ) numEntries++; TQCString *envlistQ = new TQCString[ numEntries + 1 ]; @@ -858,10 +858,10 @@ bool TQProcess::start( TQStringList *env ) envlist[i] = envlistQ[i]; i++; } - envlist[i] = 0; + envlist[i] = nullptr; // look for the executable in the search path - if ( _arguments.count()>0 && getenv("PATH")!=0 ) { + if ( _arguments.count()>0 && getenv("PATH") ) { TQString command = _arguments[0]; if ( !command.contains( '/' ) ) { TQStringList pathList = TQStringList::split( ':', getenv( "PATH" ) ); @@ -916,12 +916,12 @@ bool TQProcess::start( TQStringList *env ) int n = ::read( fd[0], &buf, 1 ); if ( n==1 ) { // socket was not closed => error - if ( ::waitpid( pid, 0, WNOHANG ) != pid ) { + if ( ::waitpid( pid, nullptr, WNOHANG ) != pid ) { // The wait did not succeed yet, so try again when we get // the sigchild (to avoid zombies). - d->newProc( pid, 0 ); + d->newProc( pid, nullptr ); } - d->proc = 0; + d->proc = nullptr; goto error; } else if ( n==-1 ) { if ( errno==EAGAIN || errno==EINTR ) @@ -1014,7 +1014,7 @@ error: */ void TQProcess::tryTerminate() const { - if ( d->proc != 0 ) + if ( d->proc ) ::kill( d->proc->pid, SIGTERM ); } @@ -1045,7 +1045,7 @@ void TQProcess::tryTerminate() const */ void TQProcess::kill() const { - if ( d->proc != 0 ) + if ( d->proc ) ::kill( d->proc->pid, SIGKILL ); } @@ -1062,7 +1062,7 @@ bool TQProcess::isRunning() const #endif return false; } - if ( d->proc == 0 ) + if ( !d->proc ) return false; int status; if ( ::waitpid( d->proc->pid, &status, WNOHANG ) == d->proc->pid ) { @@ -1083,7 +1083,7 @@ bool TQProcess::isRunning() const FD_SET( d->procManager->sigchldFd[1], &fds ); tv.tv_sec = 0; tv.tv_usec = 0; - if ( ::select( d->procManager->sigchldFd[1]+1, &fds, 0, 0, &tv ) > 0 ) + if ( ::select( d->procManager->sigchldFd[1]+1, &fds, nullptr, nullptr, &tv ) > 0 ) d->procManager->sigchldHnd( d->procManager->sigchldFd[1] ); } @@ -1110,7 +1110,7 @@ bool TQProcess::canReadLineStdout() const return d->bufStdout.size() != 0; TQProcess *that = (TQProcess*)this; - return that->membufStdout()->scanNewline( 0 ); + return that->membufStdout()->scanNewline( nullptr ); } /*! @@ -1125,7 +1125,7 @@ bool TQProcess::canReadLineStderr() const return d->bufStderr.size() != 0; TQProcess *that = (TQProcess*)this; - return that->membufStderr()->scanNewline( 0 ); + return that->membufStderr()->scanNewline( nullptr ); } /*! @@ -1153,7 +1153,7 @@ void TQProcess::writeToStdin( const TQByteArray& buf ) // tqDebug( "TQProcess::writeToStdin(): write to stdin (%d)", d->socketStdin ); #endif d->stdinBuf.enqueue( new TQByteArray(buf) ); - if ( d->notifierStdin != 0 ) + if ( d->notifierStdin ) d->notifierStdin->setEnabled( true ); } @@ -1168,14 +1168,14 @@ void TQProcess::writeToStdin( const TQByteArray& buf ) */ void TQProcess::closeStdin() { - if ( d->proc == 0 ) + if ( !d->proc ) return; if ( d->proc->socketStdin !=0 ) { while ( !d->stdinBuf.isEmpty() ) { delete d->stdinBuf.dequeue(); } delete d->notifierStdin; - d->notifierStdin = 0; + d->notifierStdin = nullptr; if ( ::close( d->proc->socketStdin ) != 0 ) { tqWarning( "Could not close stdin of child process" ); } @@ -1207,7 +1207,7 @@ void TQProcess::socketRead( int fd ) return; if ( !d->proc ) return; - TQMembuf *buffer = 0; + TQMembuf *buffer = nullptr; int n; if ( fd == d->proc->socketStdout ) { buffer = &d->bufStdout; @@ -1228,10 +1228,10 @@ void TQProcess::socketRead( int fd ) if ( n > 0 ) { ba->resize( n ); buffer->append( ba ); - ba = 0; + ba = nullptr; } else { delete ba; - ba = 0; + ba = nullptr; } // eof or error? if ( n == 0 || n == -1 ) { @@ -1241,7 +1241,7 @@ void TQProcess::socketRead( int fd ) #endif d->notifierStdout->setEnabled( false ); delete d->notifierStdout; - d->notifierStdout = 0; + d->notifierStdout = nullptr; ::close( d->proc->socketStdout ); d->proc->socketStdout = 0; return; @@ -1251,7 +1251,7 @@ void TQProcess::socketRead( int fd ) #endif d->notifierStderr->setEnabled( false ); delete d->notifierStderr; - d->notifierStderr = 0; + d->notifierStderr = nullptr; ::close( d->proc->socketStderr ); d->proc->socketStderr = 0; return; @@ -1265,7 +1265,7 @@ void TQProcess::socketRead( int fd ) FD_SET( fd, &fds ); tv.tv_sec = 0; tv.tv_usec = 0; - while ( ::select( fd+1, &fds, 0, 0, &tv ) > 0 ) { + while ( ::select( fd+1, &fds, nullptr, nullptr, &tv ) > 0 ) { // prepare for the next round FD_ZERO( &fds ); FD_SET( fd, &fds ); @@ -1275,10 +1275,10 @@ void TQProcess::socketRead( int fd ) if ( n > 0 ) { ba->resize( n ); buffer->append( ba ); - ba = 0; + ba = nullptr; } else { delete ba; - ba = 0; + ba = nullptr; break; } } @@ -1409,7 +1409,7 @@ void TQProcess::setWroteStdinConnected( bool value ) */ TQProcess::PID TQProcess::processIdentifier() { - if ( d->proc == 0 ) + if ( !d->proc ) return -1; return d->proc->pid; } diff --git a/src/kernel/tqpsprinter.cpp b/src/kernel/tqpsprinter.cpp index fd78c64b9..196eb6f5d 100644 --- a/src/kernel/tqpsprinter.cpp +++ b/src/kernel/tqpsprinter.cpp @@ -1131,7 +1131,7 @@ static const struct { { 0xFB35, "afii57723" }, // HEBREW LETTER VAV WITH DAGESH { 0xFB4B, "afii57700" }, // HEBREW LETTER VAV WITH HOLAM // end of stuff from glyphlist.txt - { 0xFFFF, 0 } + { 0xFFFF, nullptr } }; // --------------------------------------------------------------------- @@ -1271,19 +1271,19 @@ static const psfont Utopia [] = { // ### }; static const psfont * const SansSerifReplacements[] = { - Helvetica, 0 + Helvetica, nullptr }; static const psfont * const SerifReplacements[] = { - Times, 0 + Times, nullptr }; static const psfont * const FixedReplacements[] = { - Courier, 0 + Courier, nullptr }; static const psfont * const TahomaReplacements[] = { - Verdana, AvantGarde, Helvetica, 0 + Verdana, AvantGarde, Helvetica, nullptr }; static const psfont * const VerdanaReplacements[] = { - Tahoma, AvantGarde, Helvetica, 0 + Tahoma, AvantGarde, Helvetica, nullptr }; static const struct { @@ -1299,12 +1299,12 @@ static const struct { { "charter", Charter, SansSerifReplacements }, { "bitstreamcharter", Charter, SansSerifReplacements }, { "bitstreamcyberbit", Times, SerifReplacements }, // ### - { "courier", Courier, 0 }, - { "couriernew", Courier, 0 }, - { "fixed", Courier, 0 }, + { "courier", Courier, nullptr }, + { "couriernew", Courier, nullptr }, + { "fixed", Courier, nullptr }, { "garamond", Garamond, SerifReplacements }, { "gillsans", GillSans, SansSerifReplacements }, - { "helvetica", Helvetica, 0 }, + { "helvetica", Helvetica, nullptr }, { "letter", Letter, FixedReplacements }, { "lucida", LucidaSans, SansSerifReplacements }, { "lucidasans", LucidaSans, SansSerifReplacements }, @@ -1314,14 +1314,14 @@ static const struct { { "luciduxserif", LucidaBright, SerifReplacements }, { "luciduxmono", LucidaSansTT, FixedReplacements }, { "palatino", Palatino, SerifReplacements }, - { "symbol", Symbol, 0 }, + { "symbol", Symbol, nullptr }, { "tahoma", Tahoma, TahomaReplacements }, - { "terminal", Courier, 0 }, - { "times", Times, 0 }, - { "timesnewroman", Times, 0 }, + { "terminal", Courier, nullptr }, + { "times", Times, nullptr }, + { "timesnewroman", Times, nullptr }, { "verdana", Verdana, VerdanaReplacements }, { "utopia", Utopia, SerifReplacements }, - { 0, 0, 0 } + { nullptr, nullptr, nullptr } }; @@ -1443,7 +1443,7 @@ public: const TQString &text, TQPSPrinterPrivate *d, TQPainter *paint); virtual unsigned short mapUnicode( unsigned short unicode ); void downloadMapping( TQTextStream &s, bool global ); - TQString glyphName( unsigned short glyphindex, bool *glyphSet = 0 ); + TQString glyphName( unsigned short glyphindex, bool *glyphSet = nullptr ); virtual void restore(); virtual unsigned short unicode_for_glyph(int glyphindex) { return glyphindex; } @@ -1492,7 +1492,7 @@ static int getPsFontType( const TQFontEngine *fe ) return type; } -static int addPsFontNameExtension( const TQFontEngine *fe, TQString &ps, const psfont *psf = 0 ) +static int addPsFontNameExtension( const TQFontEngine *fe, TQString &ps, const psfont *psf = nullptr ) { int type = getPsFontType( fe ); @@ -1517,7 +1517,7 @@ static int addPsFontNameExtension( const TQFontEngine *fe, TQString &ps, const p return type; } -static TQString makePSFontName( const TQFontEngine *fe, int *listpos = 0, int *ftype = 0 ) +static TQString makePSFontName( const TQFontEngine *fe, int *listpos = nullptr, int *ftype = nullptr ) { TQString ps; int i; @@ -2874,7 +2874,7 @@ BYTE* TQPSPrinterFontTTF::getTable(const char* name) ptr += 16; } - return 0; + return nullptr; } void TQPSPrinterFontTTF::uni2glyphSetup() @@ -4245,7 +4245,7 @@ class TQPSPrinterFontAsian : public TQPSPrinterFontPrivate { public: TQPSPrinterFontAsian() - : TQPSPrinterFontPrivate(), codec( 0 ) {} + : TQPSPrinterFontPrivate(), codec( nullptr ) {} void download(TQTextStream& s, bool global); TQString defineFont( TQTextStream &stream, const TQString &ps, const TQFont &f, const TQString &key, TQPSPrinterPrivate *d ); @@ -4482,10 +4482,10 @@ static const psfont WadaMinAdobe [] = { static const psfont * const Japanese1Replacements[] = { - Japanese1, Japanese1a, WadaMin, WadaGo, WadaMinAdobe, WadaGoAdobe, 0 + Japanese1, Japanese1a, WadaMin, WadaGo, WadaMinAdobe, WadaGoAdobe, nullptr }; static const psfont * const Japanese2Replacements[] = { - Japanese2, Japanese2a, WadaMin, WadaGo, WadaMinAdobe, WadaGoAdobe, 0 + Japanese2, Japanese2a, WadaMin, WadaGo, WadaMinAdobe, WadaGoAdobe, nullptr }; class TQPSPrinterFontJapanese @@ -4585,7 +4585,7 @@ static const psfont BaekmukGulim [] = { static const psfont * const KoreanReplacements[] = { BaekmukGulim, SMGothic, Munhwa, MunhwaGothic, MKai, MunhwaGungSeo, - MunhwaGungSeoHeulim, MunhwaHoonMin, Helvetica, 0 + MunhwaGungSeoHeulim, MunhwaHoonMin, Helvetica, nullptr }; class TQPSPrinterFontKorean @@ -4706,7 +4706,7 @@ static const psfont MOEKai [] = { static const psfont * const TraditionalReplacements[] = { MOESung, SongB5, ShanHeiSun, MingB5, MSung, FangSongB5, KaiB5, ZenKai, HeiB5, - LinGothic, YenRound, MOEKai, Helvetica, 0 + LinGothic, YenRound, MOEKai, Helvetica, nullptr }; #if 0 // ### these are never used? @@ -4826,7 +4826,7 @@ static const psfont GBZenKai [] = { static const psfont * const SimplifiedReplacements[] = { SongGBK2K, FangSongGBK2K, KaiGBK2K, HeiGBK2K, - Simplified, MSungGBK, FangSong, BousungEG, GBZenKai, Helvetica, 0 + Simplified, MSungGBK, FangSong, BousungEG, GBZenKai, Helvetica, nullptr }; #if 0 static const psfont * const SongGBK2KReplacements[] = { @@ -4834,13 +4834,13 @@ static const psfont * const SongGBK2KReplacements[] = { }; #endif static const psfont * const FangSongGBK2KReplacements[] = { - FangSongGBK2K, FangSong, Courier, 0 + FangSongGBK2K, FangSong, Courier, nullptr }; static const psfont * const KaiGBK2KReplacements[] = { - KaiGBK2K, GBZenKai, Times, 0 + KaiGBK2K, GBZenKai, Times, nullptr }; static const psfont * const HeiGBK2KReplacements[] = { - HeiGBK2K, LucidaSans, 0 + HeiGBK2K, LucidaSans, nullptr }; class TQPSPrinterFontSimplifiedChinese @@ -4905,7 +4905,7 @@ TQPSPrinterFont::~TQPSPrinterFont() TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate *priv) - : p(0) + : p(nullptr) { TQString fontfilename; TQString fontname; @@ -4922,7 +4922,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate #ifndef TQT_NO_XFTFREETYPE if ( tqt_has_xft && engine && engine->type() == TQFontEngine::Xft ) { XftPattern *pattern = static_cast( engine )->pattern(); - char *filename = 0; + char *filename = nullptr; XftPatternGetString (pattern, XFT_FILE, 0, &filename); //tqDebug("filename for font is '%s'", filename); if ( filename ) { @@ -5139,10 +5139,10 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes ) - : buffer( 0 ), outDevice( 0 ), fd( filedes ), pageBuffer( 0 ), fonts(27, false), fontBuffer(0), savedImage( 0 ), + : buffer( nullptr ), outDevice( nullptr ), fd( filedes ), pageBuffer( nullptr ), fonts(27, false), fontBuffer(nullptr), savedImage( nullptr ), dirtypen( false ), dirtybrush( false ), dirtyBkColor( false ), bkMode( TQt::TransparentMode ), dirtyBkMode( false ), #ifndef TQT_NO_TEXTCODEC - currentFontCodec( 0 ), + currentFontCodec( nullptr ), #endif fm( TQFont() ), textY( 0 ) { @@ -5150,7 +5150,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes ) headerFontNames.setAutoDelete( true ); pageFontNames.setAutoDelete( true ); fonts.setAutoDelete( true ); - currentFontFile = 0; + currentFontFile = nullptr; scale = 1.; scriptUsed = -1; @@ -5272,7 +5272,7 @@ void TQPSPrinterPrivate::setFont( const TQFont & fnt, int script ) fontsUsed += ps; #ifndef TQT_NO_TEXTCODEC - TQTextCodec * codec = 0; + TQTextCodec * codec = nullptr; // ### // #ifndef TQT_NO_TEXTCODEC // i = 0; @@ -6028,10 +6028,10 @@ void TQPSPrinterPrivate::emitHeader( bool finished ) buffer->buffer().size() ); delete buffer; - buffer = 0; + buffer = nullptr; fontStream.unsetDevice(); delete fontBuffer; - fontBuffer = 0; + fontBuffer = nullptr; } @@ -6051,7 +6051,7 @@ void TQPSPrinterPrivate::resetDrawingTools( TQPainter *paint ) //currentUsed = currentSet; //setFont( currentSet ); - currentFontFile = 0; + currentFontFile = nullptr; TQBrush b = paint->brush(); if ( b != defaultBrush ) { @@ -6142,7 +6142,7 @@ void TQPSPrinterPrivate::initPage(TQPainter *paint) pageStream.setEncoding( TQTextStream::Latin1 ); pageStream.setDevice( pageBuffer ); delete savedImage; - savedImage = 0; + savedImage = nullptr; textY = 0; dirtyClipping = true; firstClipOnPage = true; @@ -6157,7 +6157,7 @@ void TQPSPrinterPrivate::flushPage( bool last ) { if ( last && !pageBuffer ) return; - bool pageFonts = ( buffer == 0 ); + bool pageFonts = ( !buffer ); if ( buffer && // ( last || pagesInBuffer++ > -1 || // ( pagesInBuffer > 4 && buffer->size() > 262144 ) ) ) @@ -6213,10 +6213,10 @@ TQPSPrinter::~TQPSPrinter() static void ignoreSigPipe(bool b) { - static struct sigaction *users_sigpipe_handler = 0; + static struct sigaction *users_sigpipe_handler = nullptr; if (b) { - if (users_sigpipe_handler != 0) + if (users_sigpipe_handler) return; // already ignoring sigpipe users_sigpipe_handler = new struct sigaction; @@ -6227,18 +6227,18 @@ static void ignoreSigPipe(bool b) if (sigaction(SIGPIPE, &tmp_sigpipe_handler, users_sigpipe_handler) == -1) { delete users_sigpipe_handler; - users_sigpipe_handler = 0; + users_sigpipe_handler = nullptr; } } else { - if (users_sigpipe_handler == 0) + if (!users_sigpipe_handler) return; // not ignoring sigpipe - if (sigaction(SIGPIPE, users_sigpipe_handler, 0) == -1) + if (sigaction(SIGPIPE, users_sigpipe_handler, nullptr) == -1) tqWarning("TQPSPrinter: could not restore SIGPIPE handler"); delete users_sigpipe_handler; - users_sigpipe_handler = 0; + users_sigpipe_handler = nullptr; } } @@ -6270,7 +6270,7 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) } if ( c == PdcEnd ) { // painting done - bool pageCountAtEnd = (d->buffer != 0); + bool pageCountAtEnd = (d->buffer); // we're writing to lp/lpr through a pipe, we don't want to crash with SIGPIPE // if lp/lpr dies @@ -6290,7 +6290,7 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) ::close( d->fd ); d->fd = -1; delete d->outDevice; - d->outDevice = 0; + d->outDevice = nullptr; } if ( c >= PdcDrawFirst && c <= PdcDrawLast ) { diff --git a/src/kernel/tqregion_x11.cpp b/src/kernel/tqregion_x11.cpp index 604adbf03..a522bd882 100644 --- a/src/kernel/tqregion_x11.cpp +++ b/src/kernel/tqregion_x11.cpp @@ -2199,7 +2199,7 @@ static TQRegionPrivate *PolygonRegion(TQPoint *Pts, int Count, int rule) int numFullPtBlocks = 0; if ( !(region = new TQRegionPrivate) ) - return 0; + return nullptr; /* special case a rectangle */ pts = Pts; @@ -2228,7 +2228,7 @@ static TQRegionPrivate *PolygonRegion(TQPoint *Pts, int Count, int rule) if (! (pETEs = (EdgeTableEntry *) malloc((unsigned) (sizeof(EdgeTableEntry) * Count)))) - return 0; + return nullptr; pts = FirstPtBlock.pts; CreateETandAET(Count, Pts, &ET, &AET, pETEs, &SLLBlock); @@ -2415,12 +2415,12 @@ TQRegionPrivate *tqt_bitmapToRegion(const TQBitmap& bitmap) // NOT REVISED -static TQRegion *empty_region = 0; +static TQRegion *empty_region = nullptr; static void cleanup_empty_region() { delete empty_region; - empty_region = 0; + empty_region = nullptr; } @@ -2451,8 +2451,8 @@ TQRegion::TQRegion( bool is_null ) TQ_CHECK_PTR( data ); data->region = new TQRegionPrivate; data->is_null = is_null; - data->rgn = 0; - data->xrectangles = 0; + data->rgn = nullptr; + data->xrectangles = nullptr; } /*! @@ -2479,8 +2479,8 @@ TQRegion::TQRegion( const TQRect &r, RegionType t ) data = new TQRegionData; TQ_CHECK_PTR( data ); data->is_null = false; - data->rgn = 0; - data->xrectangles = 0; + data->rgn = nullptr; + data->xrectangles = nullptr; if ( t == Rectangle ) { // rectangular region data->region = new TQRegionPrivate( r ); } else if ( t == Ellipse ) { // elliptic region @@ -2510,8 +2510,8 @@ TQRegion::TQRegion( const TQPointArray &a, bool winding ) data = new TQRegionData; TQ_CHECK_PTR( data ); data->is_null = false; - data->rgn = 0; - data->xrectangles = 0; + data->rgn = nullptr; + data->xrectangles = nullptr; data->region = PolygonRegion( (TQPoint*)a.data(), a.size(), winding ? WindingRule : EvenOddRule ); } else { @@ -2561,8 +2561,8 @@ TQRegion::TQRegion( const TQBitmap & bm ) data = new TQRegionData; TQ_CHECK_PTR( data ); data->is_null = false; - data->rgn = 0; - data->xrectangles = 0; + data->rgn = nullptr; + data->xrectangles = nullptr; data->region = tqt_bitmapToRegion(bm); } } @@ -2700,7 +2700,7 @@ void TQRegion::translate( int dx, int dy ) OffsetRegion( data->region, dx, dy ); if ( data->xrectangles ) { free( data->xrectangles ); - data->xrectangles = 0; + data->xrectangles = nullptr; } } diff --git a/src/kernel/tqrichtext.cpp b/src/kernel/tqrichtext.cpp index 427434b37..c23fc2ec3 100644 --- a/src/kernel/tqrichtext.cpp +++ b/src/kernel/tqrichtext.cpp @@ -67,8 +67,8 @@ #include -static TQTextCursor* richTextExportStart = 0; -static TQTextCursor* richTextExportEnd = 0; +static TQTextCursor* richTextExportStart = nullptr; +static TQTextCursor* richTextExportEnd = nullptr; class TQTextFormatCollection; @@ -149,7 +149,7 @@ TQTextCursor *TQTextCommandHistory::undo( TQTextCursor *c ) --current; return c2; } - return 0; + return nullptr; } TQTextCursor *TQTextCommandHistory::redo( TQTextCursor *c ) @@ -165,7 +165,7 @@ TQTextCursor *TQTextCommandHistory::redo( TQTextCursor *c ) return history.at( current )->execute( c ); } } - return 0; + return nullptr; } bool TQTextCommandHistory::isUndoAvailable() @@ -182,7 +182,7 @@ bool TQTextCommandHistory::isRedoAvailable() TQTextDeleteCommand::TQTextDeleteCommand( TQTextDocument *d, int i, int idx, const TQMemArray &str, const TQByteArray& oldStyleInfo ) - : TQTextCommand( d ), id( i ), index( idx ), parag( 0 ), text( str ), styleInformation( oldStyleInfo ) + : TQTextCommand( d ), id( i ), index( idx ), parag( nullptr ), text( str ), styleInformation( oldStyleInfo ) { for ( int j = 0; j < (int)text.size(); ++j ) { if ( text[ j ].format() ) @@ -191,7 +191,7 @@ TQTextDeleteCommand::TQTextDeleteCommand( TQTextDocument *d, int i, int idx, con } TQTextDeleteCommand::TQTextDeleteCommand( TQTextParagraph *p, int idx, const TQMemArray &str ) - : TQTextCommand( 0 ), id( -1 ), index( idx ), parag( p ), text( str ) + : TQTextCommand( nullptr ), id( -1 ), index( idx ), parag( p ), text( str ) { for ( int i = 0; i < (int)text.size(); ++i ) { if ( text[ i ].format() ) @@ -213,7 +213,7 @@ TQTextCursor *TQTextDeleteCommand::execute( TQTextCursor *c ) TQTextParagraph *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); - return 0; + return nullptr; } cursor.setParagraph( s ); @@ -248,7 +248,7 @@ TQTextCursor *TQTextDeleteCommand::unexecute( TQTextCursor *c ) TQTextParagraph *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); - return 0; + return nullptr; } cursor.setParagraph( s ); @@ -333,7 +333,7 @@ TQTextCursor *TQTextFormatCommand::unexecute( TQTextCursor *c ) TQTextParagraph *sp = doc->paragAt( startId ); TQTextParagraph *ep = doc->paragAt( endId ); if ( !sp || !ep ) - return 0; + return nullptr; int idx = startIndex; int fIndex = 0; @@ -431,7 +431,7 @@ TQTextCursor::TQTextCursor( TQTextDocument *d ) : idx( 0 ), tmpX( -1 ), ox( 0 ), oy( 0 ), valid( true ) { - para = d ? d->firstParagraph() : 0; + para = d ? d->firstParagraph() : nullptr; } TQTextCursor::TQTextCursor( const TQTextCursor &c ) @@ -705,7 +705,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool setParagraph( s ); int y = s->rect().y(); int lines = s->lines(); - TQTextStringChar *chr = 0; + TQTextStringChar *chr = nullptr; int index = 0; int i = 0; int cy = 0; @@ -1155,7 +1155,7 @@ void TQTextCursor::splitAndInsertEmptyParagraph( bool ind, bool updateIds ) if ( !para->document() ) return; tmpX = -1; - TQTextFormat *f = 0; + TQTextFormat *f = nullptr; if ( para->document()->useFormatCollection() ) { f = para->at( idx )->format(); if ( idx == para->length() - 1 && idx > 0 ) @@ -1303,7 +1303,7 @@ void TQTextCursor::fixCursorPosition() return; int lineIdx; - TQTextStringChar *start = para->lineStartOfChar( idx, &lineIdx, 0 ); + TQTextStringChar *start = para->lineStartOfChar( idx, &lineIdx, nullptr ); int x = para->string()->at( idx ).x; int diff = TQABS(start->x - x); int best = lineIdx; @@ -1330,11 +1330,11 @@ void TQTextCursor::fixCursorPosition() // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TQTextDocument::TQTextDocument( TQTextDocument *p ) - : par( p ), parentPar( 0 ) + : par( p ), parentPar( nullptr ) #ifndef TQT_NO_TEXTCUSTOMITEM - , tc( 0 ) + , tc( nullptr ) #endif - , tArray( 0 ), tStopWidth( 0 ) + , tArray( nullptr ), tStopWidth( 0 ) { fCollection = par ? par->fCollection : new TQTextFormatCollection; init(); @@ -1346,18 +1346,18 @@ void TQTextDocument::init() mightHaveCustomItems = false; if ( par ) par->insertChild( this ); - pProcessor = 0; + pProcessor = nullptr; useFC = true; - pFormatter = 0; - indenter = 0; - fParag = 0; + pFormatter = nullptr; + indenter = nullptr; + fParag = nullptr; txtFormat = TQt::AutoText; preferRichText = false; pages = false; - focusIndicator.parag = 0; + focusIndicator.parag = nullptr; minw = 0; wused = 0; - minwParag = curParag = 0; + minwParag = curParag = nullptr; align = AlignAuto; nSelections = 1; @@ -1368,8 +1368,8 @@ void TQTextDocument::init() contxt = TQString::null; underlLinks = par ? par->underlLinks : true; - backBrush = 0; - buf_pixmap = 0; + backBrush = nullptr; + buf_pixmap = nullptr; nextDoubleBuffered = false; if ( par ) @@ -1377,7 +1377,7 @@ void TQTextDocument::init() else withoutDoubleBuffer = false; - lParag = fParag = createParagraph( this, 0, 0 ); + lParag = fParag = createParagraph( this, nullptr, nullptr ); cx = 0; cy = 2; @@ -1427,10 +1427,10 @@ void TQTextDocument::clear( bool createEmptyParag ) } if ( flow_ ) flow_->clear(); - fParag = lParag = 0; + fParag = lParag = nullptr; if ( createEmptyParag ) fParag = lParag = createParagraph( this ); - focusIndicator.parag = 0; + focusIndicator.parag = nullptr; selections.clear(); oText = TQString::null; oTextValid = false; @@ -1462,7 +1462,7 @@ bool TQTextDocument::setMinimumWidth( int needed, int used, TQTextParagraph *p ) if ( needed == -1 ) { minw = 0; wused = 0; - p = 0; + p = nullptr; } if ( p == minwParag ) { if (minw > needed) { @@ -1498,7 +1498,7 @@ void TQTextDocument::setPlainText( const TQString &text ) int lastNl = 0; int nl = text.find( '\n' ); if ( nl == -1 ) { - lParag = createParagraph( this, lParag, 0 ); + lParag = createParagraph( this, lParag, nullptr ); if ( !fParag ) fParag = lParag; TQString s = text; @@ -1509,7 +1509,7 @@ void TQTextDocument::setPlainText( const TQString &text ) } } else { for (;;) { - lParag = createParagraph( this, lParag, 0 ); + lParag = createParagraph( this, lParag, nullptr ); if ( !fParag ) fParag = lParag; int l = nl - lastNl; @@ -1528,7 +1528,7 @@ void TQTextDocument::setPlainText( const TQString &text ) } } if ( !lParag ) - lParag = fParag = createParagraph( this, 0, 0 ); + lParag = fParag = createParagraph( this, nullptr, nullptr ); } struct TQ_EXPORT TQTextDocumentTag { @@ -1573,7 +1573,7 @@ struct TQ_EXPORT TQTextDocumentTag { #define NEWPAR do{ if ( !hasNewPar) { \ if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == TQChar_linesep ) \ curpar->remove( curpar->length()-2, 1 ); \ - curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); vec = 0;} \ + curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); vec = nullptr;} \ hasNewPar = true; \ curpar->rtext = true; \ curpar->align = curtag.alignment; \ @@ -1599,7 +1599,7 @@ void TQTextDocument::setRichText( const TQString &text, const TQString &context, fParag = lParag = createParagraph( this ); oTextValid = true; oText = text; - setRichTextInternal( text, 0, initialFormat ); + setRichTextInternal( text, nullptr, initialFormat ); fParag->rtext = true; } @@ -1627,7 +1627,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu // style sheet handling for margin and line spacing calculation below TQTextParagraph* stylesPar = curpar; - TQPtrVector* vec = 0; + TQPtrVector* vec = nullptr; TQPtrList< TQPtrVector > styles; styles.setAutoDelete( true ); @@ -1707,7 +1707,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu } #ifndef TQT_NO_TEXTCUSTOMITEM - TQTextCustomItem* custom = 0; + TQTextCustomItem* custom = nullptr; #else bool custom = false; #endif @@ -1778,7 +1778,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu } } } - nstyle = 0; // ignore body in textEditMode + nstyle = nullptr; // ignore body in textEditMode } // end qt- and body-tag handling } else if ( tagname == "meta" ) { @@ -2096,7 +2096,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu void TQTextDocument::setRichTextMarginsInternal( TQPtrList< TQPtrVector >& styles, TQTextParagraph* stylesPar ) { // margin and line spacing calculation - TQPtrVector* prevStyle = 0; + TQPtrVector* prevStyle = nullptr; TQPtrVector* curStyle = styles.first(); TQPtrVector* nextStyle = styles.next(); while ( stylesPar ) { @@ -2109,7 +2109,7 @@ void TQTextDocument::setRichTextMarginsInternal( TQPtrList< TQPtrVectorsize() ? (*curStyle)[curStyle->size()-1] : 0; + TQStyleSheetItem* mainStyle = curStyle->size() ? (*curStyle)[curStyle->size()-1] : nullptr; if ( mainStyle && mainStyle->displayMode() == TQStyleSheetItem::DisplayListItem ) stylesPar->setListItem( true ); int numLists = 0; @@ -2254,7 +2254,7 @@ void TQTextDocument::setRichTextMarginsInternal( TQPtrList< TQPtrVectordefaultFormat()->width( 'x' ) * 8; @@ -3197,9 +3197,9 @@ void TQTextDocument::draw( TQPainter *p, const TQRect &rect, const TQColorGroup } p->translate( 0, y ); if ( rect.isValid() ) - parag->paint( *p, cg, 0, false, rect.x(), rect.y(), rect.width(), rect.height() ); + parag->paint( *p, cg, nullptr, false, rect.x(), rect.y(), rect.width(), rect.height() ); else - parag->paint( *p, cg, 0, false ); + parag->paint( *p, cg, nullptr, false ); p->translate( 0, -y ); parag = parag->next(); if ( !flow()->isEmpty() ) @@ -3212,7 +3212,7 @@ void TQTextDocument::drawParagraph( TQPainter *p, TQTextParagraph *parag, int cx TQPixmap *&doubleBuffer, const TQColorGroup &cg, bool drawCursor, TQTextCursor *cursor, bool resetChanged ) { - TQPainter *painter = 0; + TQPainter *painter = nullptr; if ( resetChanged ) parag->setChanged( false ); TQRect ir( parag->rect() ); @@ -3250,11 +3250,11 @@ void TQTextDocument::drawParagraph( TQPainter *p, TQTextParagraph *parag, int cx painter->translate( -( ir.x() - parag->rect().x() ), -( ir.y() - parag->rect().y() ) ); - parag->paint( *painter, cg, drawCursor ? cursor : 0, true, cx, cy, cw, ch ); + parag->paint( *painter, cg, drawCursor ? cursor : nullptr, true, cx, cy, cw, ch ); if ( uDoubleBuffer ) { delete painter; - painter = 0; + painter = nullptr; p->drawPixmap( ir.topLeft(), *doubleBuffer, TQRect( TQPoint( 0, 0 ), ir.size() ) ); } else { painter->translate( -ir.x(), -ir.y() ); @@ -3270,12 +3270,12 @@ TQTextParagraph *TQTextDocument::draw( TQPainter *p, int cx, int cy, int cw, int withoutDoubleBuffer = true; TQRect r; draw( p, r, cg ); - return 0; + return nullptr; } withoutDoubleBuffer = false; if ( !firstParagraph() ) - return 0; + return nullptr; TQPainter * oldPainter = TQTextFormat::painter(); TQTextFormat::setPainter( p ); @@ -3289,10 +3289,10 @@ TQTextParagraph *TQTextDocument::draw( TQPainter *p, int cx, int cy, int cw, int ch = height(); } - TQTextParagraph *lastFormatted = 0; + TQTextParagraph *lastFormatted = nullptr; TQTextParagraph *parag = firstParagraph(); - TQPixmap *doubleBuffer = 0; + TQPixmap *doubleBuffer = nullptr; while ( parag ) { lastFormatted = parag; @@ -3332,7 +3332,7 @@ TQTextParagraph *TQTextDocument::draw( TQPainter *p, int cx, int cy, int cw, int if ( buf_pixmap && buf_pixmap->height() > 300 ) { delete buf_pixmap; - buf_pixmap = 0; + buf_pixmap = nullptr; } TQTextFormat::setPainter(oldPainter); @@ -3380,7 +3380,7 @@ void TQTextDocument::registerCustomItem( TQTextCustomItem *i, TQTextParagraph *p void TQTextDocument::unregisterCustomItem( TQTextCustomItem *i, TQTextParagraph *p ) { p->unregisterFloatingItem( i ); - i->setParagraph( 0 ); + i->setParagraph( nullptr ); flow_->unregisterFloatingItem( i ); } #endif @@ -3560,7 +3560,7 @@ bool TQTextDocument::focusNextPrevChild( bool next ) } } - focusIndicator.parag = 0; + focusIndicator.parag = nullptr; return false; } @@ -3692,7 +3692,7 @@ void TQTextString::insert( int index, const TQChar *unicode, int len, TQTextForm for ( int i = 0; i < len; ++i ) { ch->x = 0; ch->lineStart = 0; - ch->d.format = 0; + ch->d.format = nullptr; ch->nobreak = false; ch->type = TQTextStringChar::Regular; ch->d.format = f; @@ -3721,7 +3721,7 @@ void TQTextString::insert( int index, TQTextStringChar *c, bool doAddRefFormat ch.x = 0; ch.lineStart = 0; ch.rightToLeft = 0; - ch.d.format = 0; + ch.d.format = nullptr; ch.type = TQTextStringChar::Regular; ch.nobreak = false; if ( doAddRefFormat && c->format() ) @@ -3762,7 +3762,7 @@ int TQTextString::appendParagraphs( TQTextParagraph *start, TQTextParagraph *end d[i].lineStart = 0; d[i].nobreak = false; d[i].type = TQTextStringChar::Regular; - d[i].d.format = 0; + d[i].d.format = nullptr; d[i].rightToLeft = 0; d[i].c = '\n'; d += p->length(); @@ -3785,7 +3785,7 @@ void TQTextString::truncate( int index ) if ( ch.d.custom->format ) ch.d.custom->format->removeRef(); delete ch.d.custom; - ch.d.custom = 0; + ch.d.custom = nullptr; } else #endif if ( ch.format() ) { @@ -3807,7 +3807,7 @@ void TQTextString::remove( int index, int len ) if ( ch.d.custom->format ) ch.d.custom->format->removeRef(); delete ch.d.custom; - ch.d.custom = 0; + ch.d.custom = nullptr; } else #endif if ( ch.format() ) { @@ -3831,7 +3831,7 @@ void TQTextString::clear() if ( ch.d.custom->format ) ch.d.custom->format->removeRef(); delete ch.d.custom; - ch.d.custom = 0; + ch.d.custom = nullptr; } else #endif if ( ch.format() ) { @@ -3867,7 +3867,7 @@ void TQTextString::checkBidi() const // determines the properties we need for layouting - TQTextEngine textEngine( toString(), 0 ); + TQTextEngine textEngine( toString(), nullptr ); textEngine.direction = (TQChar::Direction) dir; textEngine.itemize(TQTextEngine::SingleLine); const TQCharAttributes *ca = textEngine.attributes() + length-1; @@ -3945,7 +3945,7 @@ void TQTextStringChar::setFormat( TQTextFormat *f ) #ifndef TQT_NO_TEXTCUSTOMITEM if ( !d.custom ) { d.custom = new CustomData; - d.custom->custom = 0; + d.custom->custom = nullptr; } d.custom->format = f; #endif @@ -3970,12 +3970,12 @@ void TQTextStringChar::loseCustomItem() { if ( type == Custom ) { TQTextFormat *f = d.custom->format; - d.custom->custom = 0; + d.custom->custom = nullptr; delete d.custom; type = Regular; d.format = f; } else if ( type == CustomAnchor ) { - d.custom->custom = 0; + d.custom->custom = nullptr; type = Anchor; } } @@ -4004,7 +4004,7 @@ void TQTextStringChar::setAnchor( const TQString& name, const TQString& href ) TQTextFormat *f = format(); d.custom = new CustomData; #ifndef TQT_NO_TEXTCUSTOMITEM - d.custom->custom = 0; + d.custom->custom = nullptr; #endif d.custom->format = f; type = Anchor; @@ -4051,20 +4051,20 @@ TQTextParagraph::TQTextParagraph( TQTextDocument *d, TQTextParagraph *pr, TQText : p( pr ), n( nx ), docOrPseudo( d ), changed(false), firstFormat(true), firstPProcess(true), needPreProcess(false), fullWidth(true), lastInFrame(false), visible(true), breakable(true), movedDown(false), - mightHaveCustomItems(false), hasdoc( d != 0 ), litem(false), rtext(false), - align( 0 ), lstyle( TQStyleSheetItem::ListDisc ), invalid( 0 ), mSelections( 0 ), + mightHaveCustomItems(false), hasdoc( !!d ), litem(false), rtext(false), + align( 0 ), lstyle( TQStyleSheetItem::ListDisc ), invalid( 0 ), mSelections( nullptr ), #ifndef TQT_NO_TEXTCUSTOMITEM - mFloatingItems( 0 ), + mFloatingItems( nullptr ), #endif utm( 0 ), ubm( 0 ), ulm( 0 ), urm( 0 ), uflm( 0 ), ulinespacing( 0 ), - tabStopWidth(0), minwidth(0), tArray(0), eData( 0 ), ldepth( 0 ) + tabStopWidth(0), minwidth(0), tArray(nullptr), eData( nullptr ), ldepth( 0 ) { lstyle = TQStyleSheetItem::ListDisc; if ( !hasdoc ) docOrPseudo = new TQTextParagraphPseudoDocument; - bgcol = 0; + bgcol = nullptr; list_val = -1; - paintdevice = 0; + paintdevice = nullptr; TQTextFormat* defFormat = formatCollection()->defaultFormat(); if ( !hasdoc ) { tabStopWidth = defFormat->width( 'x' ) * 8; @@ -4107,11 +4107,11 @@ TQTextParagraph::~TQTextParagraph() if ( hasdoc ) { TQTextDocument *doc = document(); if ( this == doc->minwParag ) { - doc->minwParag = 0; + doc->minwParag = nullptr; doc->minw = 0; } if ( this == doc->curParag ) - doc->curParag = 0; + doc->curParag = nullptr; } else { delete pseudoDocument(); } @@ -4249,7 +4249,7 @@ void TQTextParagraph::join( TQTextParagraph *s ) if ( !extraData() && s->extraData() ) { setExtraData( s->extraData() ); - s->setExtraData( 0 ); + s->setExtraData( nullptr ); } else if ( extraData() && s->extraData() ) { extraData()->join( s->extraData() ); } @@ -4456,7 +4456,7 @@ TQTextStringChar *TQTextParagraph::lineStartOfChar( int i, int *index, int *line } tqWarning( "TQTextParagraph::lineStartOfChar: couldn't find %d", i ); - return 0; + return nullptr; } int TQTextParagraph::lines() const @@ -4483,7 +4483,7 @@ TQTextStringChar *TQTextParagraph::lineStartOfLine( int line, int *index ) const } tqWarning( "TQTextParagraph::lineStartOfLine: couldn't find %d", line ); - return 0; + return nullptr; } int TQTextParagraph::leftGap() const @@ -4523,7 +4523,7 @@ void TQTextParagraph::setFormat( int index, int len, TQTextFormat *f, bool useCo if ( index + len >= str->length() ) len = str->length() - index; - TQTextFormatCollection *fc = 0; + TQTextFormatCollection *fc = nullptr; if ( useCollection ) fc = formatCollection(); TQTextFormat *of; @@ -4572,7 +4572,7 @@ void TQTextParagraph::paint( TQPainter &painter, const TQColorGroup &cg, TQTextC int i, y, h, baseLine, xstart, xend = 0; i = y =h = baseLine = 0; TQRect cursorRect; - drawSelections &= ( mSelections != 0 ); + drawSelections &= ( mSelections != nullptr ); // macintosh full-width selection style bool fullWidthStyle = TQApplication::style().styleHint(TQStyle::SH_RichText_FullWidthSelection); int fullSelectionWidth = 0; @@ -4592,7 +4592,7 @@ void TQTextParagraph::paint( TQPainter &painter, const TQColorGroup &cg, TQTextC int line = -1; int paintStart = 0; - TQTextStringChar *chr = 0; + TQTextStringChar *chr = nullptr; TQTextStringChar *nextchr = at( 0 ); for ( i = 0; i < length(); i++ ) { chr = nextchr; @@ -5120,7 +5120,7 @@ TQTextFormatCollection *TQTextParagraph::formatCollection() const TQString TQTextParagraph::richText() const { TQString s; - TQTextStringChar *formatChar = 0; + TQTextStringChar *formatChar = nullptr; TQString spaces; bool doStart = richTextExportStart && richTextExportStart->paragraph() == this; bool doEnd = richTextExportEnd && richTextExportEnd->paragraph() == this; @@ -5144,7 +5144,7 @@ TQString TQTextParagraph::richText() const } if ( !formatChar ) { s += c->format()->makeFormatChangeTags( formatCollection()->defaultFormat(), - 0, TQString::null, c->anchorHref() ); + nullptr, TQString::null, c->anchorHref() ); formatChar = c; } else if ( ( formatChar->format()->key() != c->format()->key() ) || (c->anchorHref() != formatChar->anchorHref() ) ) { @@ -5593,8 +5593,8 @@ int TQTextFormatterBreakInWords::format( TQTextDocument *doc,TQTextParagraph *pa // make sure bidi information is correct. (void )parag->string()->isBidi(); - TQTextStringChar *c = 0; - TQTextStringChar *firstChar = 0; + TQTextStringChar *c = nullptr; + TQTextStringChar *firstChar = nullptr; int left = doc ? parag->leftMargin() + doc->leftMargin() : 0; int x = left + ( doc ? parag->firstLineMargin() : 0 ); int dw = parag->documentVisibleWidth() - ( doc ? doc->rightMargin() : 0 ); @@ -5729,8 +5729,8 @@ int TQTextFormatterBreakWords::format( TQTextDocument *doc, TQTextParagraph *par // make sure bidi information is correct. (void )parag->string()->isBidi(); - TQTextStringChar *c = 0; - TQTextStringChar *firstChar = 0; + TQTextStringChar *c = nullptr; + TQTextStringChar *firstChar = nullptr; TQTextString *string = parag->string(); int left = doc ? parag->leftMargin() + doc->leftMargin() : 0; int x = left + ( doc ? parag->firstLineMargin() : 0 ); @@ -6063,14 +6063,14 @@ TQTextIndent::TQTextIndent() // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TQTextFormatCollection::TQTextFormatCollection() - : cKey( 307 ), paintdevice( 0 ) + : cKey( 307 ), paintdevice( nullptr ) { defFormat = new TQTextFormat( TQApplication::font(), TQApplication::palette().color( TQPalette::Active, TQColorGroup::Text ) ); - lastFormat = cres = 0; + lastFormat = cres = nullptr; cflags = -1; cKey.setAutoDelete( true ); - cachedFormat = 0; + cachedFormat = nullptr; } TQTextFormatCollection::~TQTextFormatCollection() @@ -6090,7 +6090,7 @@ void TQTextFormatCollection::setPaintDevice( TQPaintDevice *pd ) TQDictIterator it( cKey ); TQTextFormat *format; - while ( ( format = it.current() ) != 0 ) { + while ( ( format = it.current() ) ) { ++it; format->fn.x11SetScreen( scr ); format->update(); @@ -6206,11 +6206,11 @@ TQTextFormat *TQTextFormatCollection::format( const TQFont &f, const TQColor &c void TQTextFormatCollection::remove( TQTextFormat *f ) { if ( lastFormat == f ) - lastFormat = 0; + lastFormat = nullptr; if ( cres == f ) - cres = 0; + cres = nullptr; if ( cachedFormat == f ) - cachedFormat = 0; + cachedFormat = nullptr; if (cKey.find(f->key()) == f) cKey.remove( f->key() ); } @@ -6584,7 +6584,7 @@ struct TQPixmapInt int ref; }; -static TQMap *pixmap_map = 0; +static TQMap *pixmap_map = nullptr; TQTextImage::TQTextImage( TQTextDocument *p, const TQMap &attr, const TQString& context, TQMimeSourceFactory &factory ) @@ -6596,7 +6596,7 @@ TQTextImage::TQTextImage( TQTextDocument *p, const TQMap &at if ( attr.contains("height") ) height = attr["height"].toInt(); - reg = 0; + reg = nullptr; TQString imageName = attr["src"]; if (!imageName) @@ -6684,7 +6684,7 @@ TQTextImage::~TQTextImage() pixmap_map->remove( imgId ); if ( pixmap_map->isEmpty() ) { delete pixmap_map; - pixmap_map = 0; + pixmap_map = nullptr; } } } @@ -6716,7 +6716,7 @@ void TQTextImage::adjustToPainter( TQPainter* p ) #if !defined(TQ_WS_X11) #include #include -static TQPixmap *qrt_selection = 0; +static TQPixmap *qrt_selection = nullptr; static TQSingleCleanupHandler qrt_cleanup_pixmap; static void qrt_createSelectionPixmap( const TQColorGroup &cg ) { @@ -7238,11 +7238,11 @@ static const Entity entitylist [] = { -static TQMap *html_map = 0; +static TQMap *html_map = nullptr; static void tqt_cleanup_html_map() { delete html_map; - html_map = 0; + html_map = nullptr; } static TQMap *htmlMap() @@ -8118,7 +8118,7 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, if ( attr.contains("rowspan") ) rowspan_ = attr["rowspan"].toInt(); - background = 0; + background = nullptr; if ( attr.contains("bgcolor") ) { background = new TQBrush(TQColor( attr["bgcolor"] )); } @@ -8148,9 +8148,9 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, TQTextTableCell::~TQTextTableCell() { delete background; - background = 0; + background = nullptr; delete richtext; - richtext = 0; + richtext = nullptr; } TQSize TQTextTableCell::sizeHint() const @@ -8267,9 +8267,9 @@ void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, if ( cx >= 0 && cy >= 0 ) richtext->draw( p, cx - ( x + horizontalAlignmentOffset() + geom.x() ), cy - ( y + geom.y() + verticalAlignmentOffset() ), - cw, ch, g, false, false, 0 ); + cw, ch, g, false, false, nullptr ); else - richtext->draw( p, -1, -1, -1, -1, g, false, false, 0 ); + richtext->draw( p, -1, -1, -1, -1, g, false, false, nullptr ); p->restore(); } diff --git a/src/kernel/tqrichtext_p.cpp b/src/kernel/tqrichtext_p.cpp index 13dba99c6..21e82720d 100644 --- a/src/kernel/tqrichtext_p.cpp +++ b/src/kernel/tqrichtext_p.cpp @@ -138,7 +138,7 @@ int TQTextCursor::globalY() const { return totalOffsetY() + para->rect().y() + y TQTextDocument *TQTextCursor::document() const { - return para ? para->document() : 0; + return para ? para->document() : nullptr; } void TQTextCursor::gotoPosition( TQTextParagraph* p, int index ) @@ -210,7 +210,7 @@ TQTextFormat::TQTextFormat() missp = false; ha = AlignNormal; - collection = 0; + collection = nullptr; } TQTextFormat::TQTextFormat( const TQStyleSheetItem *style ) @@ -226,7 +226,7 @@ TQTextFormat::TQTextFormat( const TQStyleSheetItem *style ) missp = false; ha = AlignNormal; - collection = 0; + collection = nullptr; fn = TQFont( style->fontFamily(), style->fontSize(), style->fontWeight(), @@ -274,7 +274,7 @@ TQTextFormat::TQTextFormat( const TQTextFormat &f ) : fm( f.fm ) { ref = 0; - collection = 0; + collection = nullptr; fn = f.fn; col = f.col; leftBearing = f.leftBearing; @@ -330,8 +330,8 @@ void TQTextFormat::update() } -TQPainter* TQTextFormat::pntr = 0; -TQFontMetrics* TQTextFormat::pntr_fm = 0; +TQPainter* TQTextFormat::pntr = nullptr; +TQFontMetrics* TQTextFormat::pntr_fm = nullptr; int TQTextFormat::pntr_ldg=-1; int TQTextFormat::pntr_asc=-1; int TQTextFormat::pntr_hei=-1; @@ -339,11 +339,11 @@ int TQTextFormat::pntr_dsc=-1; void TQTextFormat::cleanupPrivateData() { delete TQTextFormat::pntr_fm; - TQTextFormat::pntr_fm = 0; - TQTextFormat::pntr = 0; + TQTextFormat::pntr_fm = nullptr; + TQTextFormat::pntr = nullptr; // Not really necessary, but better to tidy-up everything - TQTextFormat::pntr_fm = 0; + TQTextFormat::pntr_fm = nullptr; TQTextFormat::pntr_ldg=-1; TQTextFormat::pntr_asc=-1; TQTextFormat::pntr_hei=-1; @@ -454,7 +454,7 @@ TQString TQTextString::toString( const TQMemArray &data ) { TQString s; int l = data.size(); - s.setUnicode( 0, l ); + s.setUnicode( nullptr, l ); TQTextStringChar *c = data.data(); TQChar *uc = (TQChar *)s.unicode(); while ( l-- ) @@ -648,7 +648,7 @@ TQTextStringChar::~TQTextStringChar() delete d.custom; } -TQTextParagraphPseudoDocument::TQTextParagraphPseudoDocument():pFormatter(0),commandHistory(0), minw(0),wused(0),collection(){} +TQTextParagraphPseudoDocument::TQTextParagraphPseudoDocument():pFormatter(nullptr),commandHistory(nullptr), minw(0),wused(0),collection(){} TQTextParagraphPseudoDocument::~TQTextParagraphPseudoDocument(){ delete pFormatter; delete commandHistory; } diff --git a/src/kernel/tqrichtext_p.h b/src/kernel/tqrichtext_p.h index d2219b562..b633ea05a 100644 --- a/src/kernel/tqrichtext_p.h +++ b/src/kernel/tqrichtext_p.h @@ -103,7 +103,7 @@ class TQ_EXPORT TQTextStringChar public: // this is never called, initialize variables in TQTextString::insert()!!! - TQTextStringChar() : nobreak(false), lineStart( 0 ), type( Regular ) {d.format=0;} + TQTextStringChar() : nobreak(false), lineStart( 0 ), type( Regular ) {d.format=nullptr;} ~TQTextStringChar(); struct CustomData @@ -210,9 +210,9 @@ public: TQMemArray rawData() const { return data.copy(); } - void operator=( const TQString &s ) { clear(); insert( 0, s, 0 ); } - void operator+=( const TQString &s ) { insert( length(), s, 0 ); } - void prepend( const TQString &s ) { insert( 0, s, 0 ); } + void operator=( const TQString &s ) { clear(); insert( 0, s, nullptr ); } + void operator+=( const TQString &s ) { insert( length(), s, nullptr ); } + void prepend( const TQString &s ) { insert( 0, s, nullptr ); } int appendParagraphs( TQTextParagraph *start, TQTextParagraph *end ); // return next and previous valid cursor positions. @@ -309,7 +309,7 @@ Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueStack; class TQ_EXPORT TQTextCursor { public: - TQTextCursor( TQTextDocument *d = 0 ); + TQTextCursor( TQTextDocument *d = nullptr ); TQTextCursor( const TQTextCursor &c ); TQTextCursor &operator=( const TQTextCursor &c ); virtual ~TQTextCursor() {} @@ -343,7 +343,7 @@ public: void gotoWordLeft(); void gotoWordRight(); - void insert( const TQString &s, bool checkNewLine, TQMemArray *formatting = 0 ); + void insert( const TQString &s, bool checkNewLine, TQMemArray *formatting = nullptr ); void splitAndInsertEmptyParagraph( bool ind = true, bool updateIds = true ); bool remove(); bool removePreviousChar(); @@ -814,7 +814,7 @@ public: int height() const; void setWidth( int w ); int minimumWidth() const; - bool setMinimumWidth( int needed, int used = -1, TQTextParagraph *parag = 0 ); + bool setMinimumWidth( int needed, int used = -1, TQTextParagraph *parag = nullptr ); void setY( int y ); int leftMargin() const; @@ -862,8 +862,8 @@ public: TQTextParagraph *paragAt( int i ) const; void addCommand( TQTextCommand *cmd ); - TQTextCursor *undo( TQTextCursor *c = 0 ); - TQTextCursor *redo( TQTextCursor *c = 0 ); + TQTextCursor *undo( TQTextCursor *c = nullptr ); + TQTextCursor *redo( TQTextCursor *c = nullptr ); TQTextCommandHistory *commands() const { return commandHistory; } TQTextFormatCollection *formatCollection() const; @@ -895,14 +895,14 @@ public: TQBrush *paper() const { return backBrush; } void doLayout( TQPainter *p, int w ); - void draw( TQPainter *p, const TQRect& rect, const TQColorGroup &cg, const TQBrush *paper = 0 ); + void draw( TQPainter *p, const TQRect& rect, const TQColorGroup &cg, const TQBrush *paper = nullptr ); bool useDoubleBuffer( TQTextParagraph *parag, TQPainter *p ); void drawParagraph( TQPainter *p, TQTextParagraph *parag, int cx, int cy, int cw, int ch, TQPixmap *&doubleBuffer, const TQColorGroup &cg, bool drawCursor, TQTextCursor *cursor, bool resetChanged = true ); TQTextParagraph *draw( TQPainter *p, int cx, int cy, int cw, int ch, const TQColorGroup &cg, - bool onlyChanged = false, bool drawCursor = false, TQTextCursor *cursor = 0, + bool onlyChanged = false, bool drawCursor = false, TQTextCursor *cursor = nullptr, bool resetChanged = true ); #ifndef TQT_NO_TEXTCUSTOMITEM @@ -925,7 +925,7 @@ public: #endif void setPlainText( const TQString &text ); - void setRichText( const TQString &text, const TQString &context, const TQTextFormat *initialFormat = 0 ); + void setRichText( const TQString &text, const TQString &context, const TQTextFormat *initialFormat = nullptr ); TQString richText() const; TQString plainText() const; @@ -945,7 +945,7 @@ public: int length() const; void clear( bool createEmptyParag = false ); - virtual TQTextParagraph *createParagraph( TQTextDocument *d, TQTextParagraph *pr = 0, TQTextParagraph *nx = 0, bool updateIds = true ); + virtual TQTextParagraph *createParagraph( TQTextDocument *d, TQTextParagraph *pr = nullptr, TQTextParagraph *nx = nullptr, bool updateIds = true ); void insertChild( TQObject *o ) { TQObject::insertChild( o ); } void removeChild( TQObject *o ) { TQObject::removeChild( o ); } void insertChild( TQTextDocument *d ) { childList.append( d ); } @@ -978,7 +978,7 @@ private: TQChar parseHTMLSpecialChar(const TQChar* doc, int length, int& pos); TQString parseWord(const TQChar* doc, int length, int& pos, bool lower = true); TQChar parseChar(const TQChar* doc, int length, int& pos, TQStyleSheetItem::WhiteSpaceMode wsm ); - void setRichTextInternal( const TQString &text, TQTextCursor* cursor = 0, const TQTextFormat *initialFormat = 0 ); + void setRichTextInternal( const TQString &text, TQTextCursor* cursor = nullptr, const TQTextFormat *initialFormat = nullptr ); void setRichTextMarginsInternal( TQPtrList< TQPtrVector >& styles, TQTextParagraph* stylesPar ); private: @@ -1168,7 +1168,7 @@ class TQ_EXPORT TQTextParagraph friend class TQSyntaxHighlighter; public: - TQTextParagraph( TQTextDocument *d, TQTextParagraph *pr = 0, TQTextParagraph *nx = 0, bool updateIds = true ); + TQTextParagraph( TQTextDocument *d, TQTextParagraph *pr = nullptr, TQTextParagraph *nx = nullptr, bool updateIds = true ); ~TQTextParagraph(); TQTextString *string() const; @@ -1191,7 +1191,7 @@ public: inline TQTextDocument *document() const { if (hasdoc) return (TQTextDocument*) docOrPseudo; - return 0; + return nullptr; } TQTextParagraphPseudoDocument *pseudoDocument() const; @@ -1222,10 +1222,10 @@ public: bool hasChanged() const; void setChanged( bool b, bool recursive = false ); - int lineHeightOfChar( int i, int *bl = 0, int *y = 0 ) const; - TQTextStringChar *lineStartOfChar( int i, int *index = 0, int *line = 0 ) const; + int lineHeightOfChar( int i, int *bl = nullptr, int *y = nullptr ) const; + TQTextStringChar *lineStartOfChar( int i, int *index = nullptr, int *line = nullptr ) const; int lines() const; - TQTextStringChar *lineStartOfLine( int line, int *index = 0 ) const; + TQTextStringChar *lineStartOfLine( int line, int *index = nullptr ) const; int lineY( int l ) const; int lineBaseLine( int l ) const; int lineHeight( int l ) const; @@ -1248,7 +1248,7 @@ public: bool firstPreProcess() const; void setFirstPreProcess( bool b ); - void indent( int *oldIndent = 0, int *newIndent = 0 ); + void indent( int *oldIndent = nullptr, int *newIndent = nullptr ); void setExtraData( TQTextParagraphData *data ); TQTextParagraphData *extraData() const; @@ -1260,7 +1260,7 @@ public: void setAlignment( int a ); int alignment() const; - void paint( TQPainter &painter, const TQColorGroup &cg, TQTextCursor *cursor = 0, bool drawSelections = false, + void paint( TQPainter &painter, const TQColorGroup &cg, TQTextCursor *cursor = nullptr, bool drawSelections = false, int clipx = -1, int clipy = -1, int clipw = -1, int cliph = -1 ); int topMargin() const; @@ -1304,8 +1304,8 @@ public: TQString richText() const; void addCommand( TQTextCommand *cmd ); - TQTextCursor *undo( TQTextCursor *c = 0 ); - TQTextCursor *redo( TQTextCursor *c = 0 ); + TQTextCursor *undo( TQTextCursor *c = nullptr ); + TQTextCursor *redo( TQTextCursor *c = nullptr ); TQTextCommandHistory *commands() const; void copyParagData( TQTextParagraph *parag ); @@ -1456,7 +1456,7 @@ public: TQTextIndent(); virtual ~TQTextIndent() {} - virtual void indent( TQTextDocument *doc, TQTextParagraph *parag, int *oldIndent = 0, int *newIndent = 0 ) = 0; + virtual void indent( TQTextDocument *doc, TQTextParagraph *parag, int *oldIndent = nullptr, int *newIndent = nullptr ) = 0; }; @@ -1506,7 +1506,7 @@ public: virtual ~TQTextFormat(); TQTextFormat( const TQStyleSheetItem *s ); - TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent = 0 ); + TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent = nullptr ); TQTextFormat( const TQTextFormat &fm ); TQTextFormat makeTextFormat( const TQStyleSheetItem *style, const TQMap& attr, double scaleFontsFactor ) const; TQTextFormat& operator=( const TQTextFormat &fm ); @@ -1843,7 +1843,7 @@ inline void TQTextDocument::setFlow( TQTextFlow *f ) inline void TQTextDocument::takeFlow() { - flow_ = 0; + flow_ = nullptr; } inline bool TQTextDocument::useDoubleBuffer( TQTextParagraph *parag, TQPainter *p ) @@ -1934,7 +1934,7 @@ inline void TQTextParagraph::setBackgroundColor( const TQColor & c ) inline void TQTextParagraph::clearBackgroundColor() { - delete bgcol; bgcol = 0; setChanged( true ); + delete bgcol; bgcol = nullptr; setChanged( true ); } inline void TQTextParagraph::append( const TQString &s, bool reallyAtEnd ) @@ -2007,7 +2007,7 @@ inline TQTextString *TQTextParagraph::string() const inline TQTextParagraphPseudoDocument *TQTextParagraph::pseudoDocument() const { if ( hasdoc ) - return 0; + return nullptr; return (TQTextParagraphPseudoDocument*) docOrPseudo; } @@ -2015,7 +2015,7 @@ inline TQTextParagraphPseudoDocument *TQTextParagraph::pseudoDocument() const #ifndef TQT_NO_TEXTCUSTOMITEM inline TQTextTableCell *TQTextParagraph::tableCell() const { - return hasdoc ? document()->tableCell () : 0; + return hasdoc ? document()->tableCell () : nullptr; } #endif @@ -2045,7 +2045,7 @@ inline void TQTextParagraph::unregisterFloatingItem( TQTextCustomItem *i ) inline TQBrush *TQTextParagraph::background() const { #ifndef TQT_NO_TEXTCUSTOMITEM - return tableCell() ? tableCell()->backGround() : 0; + return tableCell() ? tableCell()->backGround() : nullptr; #else return 0; #endif @@ -2104,7 +2104,7 @@ inline TQTextFormat *TQTextStringChar::format() const #ifndef TQT_NO_TEXTCUSTOMITEM inline TQTextCustomItem *TQTextStringChar::customItem() const { - return isCustom() ? d.custom->custom : 0; + return isCustom() ? d.custom->custom : nullptr; } #endif diff --git a/src/kernel/tqscriptengine_x11.cpp b/src/kernel/tqscriptengine_x11.cpp index ced11e93f..748dff903 100644 --- a/src/kernel/tqscriptengine_x11.cpp +++ b/src/kernel/tqscriptengine_x11.cpp @@ -1825,7 +1825,7 @@ static bool indic_shape(TQShaperItem *item) if (openType) openType->selectScript(item->script, indic_features); #else - TQOpenType *openType = 0; + TQOpenType *openType = nullptr; #endif unsigned short *logClusters = item->log_clusters; @@ -1912,14 +1912,14 @@ static void thaiWordBreaks(const TQChar *string, const int len, TQCharAttributes #ifndef TQT_NO_TEXTCODEC typedef int (*th_brk_def)(const char*, int[], int); static TQTextCodec *thaiCodec = TQTextCodec::codecForMib(2259); - static th_brk_def th_brk = 0; + static th_brk_def th_brk = nullptr; #ifndef TQT_NO_LIBRARY /* load libthai dynamically */ if (!th_brk && thaiCodec) { th_brk = (th_brk_def)TQLibrary::resolve("thai", "th_brk"); if (!th_brk) - thaiCodec = 0; + thaiCodec = nullptr; } #endif @@ -2143,9 +2143,9 @@ static bool tibetan_shape(TQShaperItem *item) #ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) - openType = 0; + openType = nullptr; #else - TQOpenType *openType = 0; + TQOpenType *openType = nullptr; #endif unsigned short *logClusters = item->log_clusters; @@ -2775,9 +2775,9 @@ static bool khmer_shape(TQShaperItem *item) #ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) - openType = 0; + openType = nullptr; #else - TQOpenType *openType = 0; + TQOpenType *openType = nullptr; #endif unsigned short *logClusters = item->log_clusters; @@ -3285,9 +3285,9 @@ static bool myanmar_shape(TQShaperItem *item) #ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) - openType = 0; + openType = nullptr; #else - TQOpenType *openType = 0; + TQOpenType *openType = nullptr; #endif unsigned short *logClusters = item->log_clusters; @@ -3563,11 +3563,11 @@ static bool hangul_shape(TQShaperItem *item) #ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) - openType = 0; + openType = nullptr; if (openType) openType->selectScript(TQFont::Hangul, hangul_features); #else - TQOpenType *openType = 0; + TQOpenType *openType = nullptr; #endif unsigned short *logClusters = item->log_clusters; @@ -3637,33 +3637,33 @@ static void hangul_attributes(int script, const TQString &text, int from, int le const q_scriptEngine scriptEngines[] = { // Latin, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Greek, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Cyrillic, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Armenian, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Georgian, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Runic, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Ogham, - { basic_shape, 0 }, + { basic_shape, nullptr }, // SpacingModifiers, - { basic_shape, 0 }, + { basic_shape, nullptr }, // CombiningMarks, - { basic_shape, 0 }, + { basic_shape, nullptr }, // // Middle Eastern Scripts // Hebrew, - { hebrew_shape, 0 }, + { hebrew_shape, nullptr }, // Arabic, - { arabic_shape, 0 }, + { arabic_shape, nullptr }, // Syriac, - { syriac_shape, 0 }, + { syriac_shape, nullptr }, // Thaana, - { thaana_shape, 0 }, + { thaana_shape, nullptr }, // // South and Southeast Asian Scripts // Devanagari, @@ -3689,7 +3689,7 @@ const q_scriptEngine scriptEngines[] = { // Thai, { basic_shape, thai_attributes }, // Lao, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Tibetan, { tibetan_shape, tibetan_attributes }, // Myanmar, @@ -3699,62 +3699,62 @@ const q_scriptEngine scriptEngines[] = { // // East Asian Scripts // Han, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Hiragana, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Katakana, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Hangul, { hangul_shape, hangul_attributes }, // Bopomofo, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Yi, - { basic_shape, 0 }, + { basic_shape, nullptr }, // // Additional Scripts // Ethiopic, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Cherokee, - { basic_shape, 0 }, + { basic_shape, nullptr }, // CanadianAboriginal, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Mongolian, - { basic_shape, 0 }, + { basic_shape, nullptr }, // // Symbols // CurrencySymbols, - { basic_shape, 0 }, + { basic_shape, nullptr }, // LetterlikeSymbols, - { basic_shape, 0 }, + { basic_shape, nullptr }, // NumberForms, - { basic_shape, 0 }, + { basic_shape, nullptr }, // MathematicalOperators, - { basic_shape, 0 }, + { basic_shape, nullptr }, // TechnicalSymbols, - { basic_shape, 0 }, + { basic_shape, nullptr }, // GeometricSymbols, - { basic_shape, 0 }, + { basic_shape, nullptr }, // MiscellaneousSymbols, - { basic_shape, 0 }, + { basic_shape, nullptr }, // EnclosedAndSquare, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Braille, - { basic_shape, 0 }, + { basic_shape, nullptr }, // Unicode, - { basic_shape, 0 }, + { basic_shape, nullptr }, //Tagalog, - { basic_shape, 0 }, + { basic_shape, nullptr }, //Hanunoo, - { basic_shape, 0 }, + { basic_shape, nullptr }, //Buhid, - { basic_shape, 0 }, + { basic_shape, nullptr }, //Tagbanwa, - { basic_shape, 0 }, + { basic_shape, nullptr }, // KatakanaHalfWidth - { basic_shape, 0 }, + { basic_shape, nullptr }, // Limbu - { basic_shape, 0 }, + { basic_shape, nullptr }, // TaiLe - { basic_shape, 0 } + { basic_shape, nullptr } }; diff --git a/src/kernel/tqsignal.cpp b/src/kernel/tqsignal.cpp index f8f918bb2..6b0f6cc94 100644 --- a/src/kernel/tqsignal.cpp +++ b/src/kernel/tqsignal.cpp @@ -163,7 +163,7 @@ bool TQSignal::connect( const TQObject *receiver, const char *member ) bool TQSignal::disconnect( const TQObject *receiver, const char *member ) { if (!member) - return TQObject::disconnect( (TQObject *)this, 0, receiver, member); + return TQObject::disconnect( (TQObject *)this, nullptr, receiver, member); #ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif diff --git a/src/kernel/tqsignal.h b/src/kernel/tqsignal.h index 116081362..f04640c32 100644 --- a/src/kernel/tqsignal.h +++ b/src/kernel/tqsignal.h @@ -52,11 +52,11 @@ class TQ_EXPORT TQSignal : public TQObject TQ_OBJECT public: - TQSignal( TQObject *parent=0, const char *name=0 ); + TQSignal( TQObject *parent=nullptr, const char *name=nullptr ); ~TQSignal(); bool connect( const TQObject *receiver, const char *member ); - bool disconnect( const TQObject *receiver, const char *member=0 ); + bool disconnect( const TQObject *receiver, const char *member=nullptr ); void activate(); diff --git a/src/kernel/tqsignalmapper.h b/src/kernel/tqsignalmapper.h index aed7e72d4..a6f3dc638 100644 --- a/src/kernel/tqsignalmapper.h +++ b/src/kernel/tqsignalmapper.h @@ -52,7 +52,7 @@ struct TQSignalMapperRec; class TQ_EXPORT TQSignalMapper : public TQObject { TQ_OBJECT public: - TQSignalMapper( TQObject* parent, const char* name=0 ); + TQSignalMapper( TQObject* parent, const char* name=nullptr ); ~TQSignalMapper(); virtual void setMapping( const TQObject* sender, int identifier ); diff --git a/src/kernel/tqsignalslotimp.h b/src/kernel/tqsignalslotimp.h index 3b8080766..e9d4d9e05 100644 --- a/src/kernel/tqsignalslotimp.h +++ b/src/kernel/tqsignalslotimp.h @@ -83,7 +83,7 @@ public: TQSignalVec &operator=(const TQSignalVec &dict) { return (TQSignalVec&)TQPtrVector::operator=(dict); } TQConnectionList* at( uint index ) const { - return index >= size()? 0 : TQPtrVector::at(index); + return index >= size()? nullptr : TQPtrVector::at(index); } bool insert( uint index, const TQConnectionList* d ) { if (index >= size() ) diff --git a/src/kernel/tqsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp index c210f91e9..362caf287 100644 --- a/src/kernel/tqsimplerichtext.cpp +++ b/src/kernel/tqsimplerichtext.cpp @@ -51,7 +51,7 @@ public: TQFont font; int cachedWidth; bool cachedWidthWithPainter; - void adjustSize(TQPainter *p = 0); + void adjustSize(TQPainter *p = nullptr); }; // Pull this private function in from tqglobal.cpp @@ -140,7 +140,7 @@ TQSimpleRichText::TQSimpleRichText( const TQString& text, const TQFont& fnt, d->cachedWidth = -1; d->cachedWidthWithPainter = false; d->font = fnt; - d->doc = new TQTextDocument( 0 ); + d->doc = new TQTextDocument( nullptr ); d->doc->setTextFormat( TQt::RichText ); d->doc->setLeftMargin( 0 ); d->doc->setRightMargin( 0 ); @@ -186,7 +186,7 @@ TQSimpleRichText::TQSimpleRichText( const TQString& text, const TQFont& fnt, d->cachedWidth = -1; d->cachedWidthWithPainter = false; d->font = fnt; - d->doc = new TQTextDocument( 0 ); + d->doc = new TQTextDocument( nullptr ); d->doc->setTextFormat( TQt::RichText ); d->doc->setFormatter( new TQTextFormatterBreakWords ); d->doc->setStyleSheet( (TQStyleSheet*)sheet ); @@ -225,7 +225,7 @@ void TQSimpleRichText::setWidth( int w ) d->doc->formatter()->setAllowBreakInWords( d->doc->isPageBreakEnabled() ); d->cachedWidth = w; d->cachedWidthWithPainter = false; - d->doc->doLayout( 0, w ); + d->doc->doLayout( nullptr, w ); } /*! diff --git a/src/kernel/tqsimplerichtext.h b/src/kernel/tqsimplerichtext.h index 9fcae3649..d917522ae 100644 --- a/src/kernel/tqsimplerichtext.h +++ b/src/kernel/tqsimplerichtext.h @@ -60,7 +60,7 @@ class TQ_EXPORT TQSimpleRichText { public: TQSimpleRichText( const TQString& text, const TQFont& fnt, - const TQString& context = TQString::null, const TQStyleSheet* sheet = 0); + const TQString& context = TQString::null, const TQStyleSheet* sheet = nullptr); TQSimpleRichText( const TQString& text, const TQFont& fnt, const TQString& context, const TQStyleSheet* sheet, const TQMimeSourceFactory* factory, int pageBreak = -1, @@ -76,11 +76,11 @@ public: void adjustSize(); void draw( TQPainter* p, int x, int y, const TQRect& clipRect, - const TQColorGroup& cg, const TQBrush* paper = 0) const; + const TQColorGroup& cg, const TQBrush* paper = nullptr) const; // obsolete void draw( TQPainter* p, int x, int y, const TQRegion& clipRegion, - const TQColorGroup& cg, const TQBrush* paper = 0) const { + const TQColorGroup& cg, const TQBrush* paper = nullptr) const { draw( p, x, y, clipRegion.boundingRect(), cg, paper ); } diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp index 3728688bd..613f4a8b9 100644 --- a/src/kernel/tqsizegrip.cpp +++ b/src/kernel/tqsizegrip.cpp @@ -71,7 +71,7 @@ static TQWidget *tqt_sizegrip_workspace( TQWidget* w ) { while ( w && !w->inherits("TQWorkspace" ) ) { if ( w->isTopLevel() ) - return 0; + return nullptr; w = w->parentWidget(); } return w; diff --git a/src/kernel/tqsizegrip.h b/src/kernel/tqsizegrip.h index 624fb6498..1c30e6fd8 100644 --- a/src/kernel/tqsizegrip.h +++ b/src/kernel/tqsizegrip.h @@ -51,7 +51,7 @@ class TQ_EXPORT TQSizeGrip: public TQWidget { TQ_OBJECT public: - TQSizeGrip( TQWidget* parent, const char* name=0 ); + TQSizeGrip( TQWidget* parent, const char* name=nullptr ); ~TQSizeGrip(); TQSize sizeHint() const; diff --git a/src/kernel/tqsocketnotifier.h b/src/kernel/tqsocketnotifier.h index 717be3898..85bc5e83d 100644 --- a/src/kernel/tqsocketnotifier.h +++ b/src/kernel/tqsocketnotifier.h @@ -52,7 +52,7 @@ class TQ_EXPORT TQSocketNotifier : public TQObject public: enum Type { Read, Write, Exception }; - TQSocketNotifier( int socket, Type, TQObject *parent=0, const char *name=0 ); + TQSocketNotifier( int socket, Type, TQObject *parent=nullptr, const char *name=nullptr ); ~TQSocketNotifier(); int socket() const; diff --git a/src/kernel/tqsound.cpp b/src/kernel/tqsound.cpp index 07da8bf4f..d657367ad 100644 --- a/src/kernel/tqsound.cpp +++ b/src/kernel/tqsound.cpp @@ -44,7 +44,7 @@ #include "tqptrlist.h" -static TQPtrList *servers=0; +static TQPtrList *servers=nullptr; TQAuServer::TQAuServer(TQObject* parent, const char* name) : TQObject(parent,name) @@ -61,7 +61,7 @@ TQAuServer::~TQAuServer() servers->remove(this); if ( servers->count() == 0 ) { delete servers; - servers = 0; + servers = nullptr; } } @@ -82,7 +82,7 @@ static TQAuServer& server() class TQSoundData { public: TQSoundData(const TQString& fname) : - filename(fname), bucket(0), looprem(0), looptotal(1) + filename(fname), bucket(nullptr), looprem(0), looptotal(1) { } diff --git a/src/kernel/tqsound.h b/src/kernel/tqsound.h index d3ba92ed3..dcc33dcd5 100644 --- a/src/kernel/tqsound.h +++ b/src/kernel/tqsound.h @@ -54,7 +54,7 @@ public: static bool isAvailable(); static void play(const TQString& filename); - TQSound(const TQString& filename, TQObject* parent=0, const char* name=0); + TQSound(const TQString& filename, TQObject* parent=nullptr, const char* name=nullptr); ~TQSound(); /* Coming soon... diff --git a/src/kernel/tqsound_x11.cpp b/src/kernel/tqsound_x11.cpp index 25253a00a..3226a31fd 100644 --- a/src/kernel/tqsound_x11.cpp +++ b/src/kernel/tqsound_x11.cpp @@ -52,7 +52,7 @@ #include