[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [okteta] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2017-07-24 6:33:21
Message-ID: E1dZWvh-0005eL-Kg () code ! kde ! org
[Download RAW message or body]
Git commit 8d31f763aaf6ad43126f11533837e94b92e872f5 by Friedrich W. H. Kossebau.
Committed on 24/07/2017 at 05:34.
Pushed by kossebau into branch 'master'.
Use nullptr
M +1 -1 core/abstractbytearraymodel.cpp
M +1 -1 core/abstractbytearraymodel.h
M +2 -2 core/bookmarklist.cpp
M +1 -1 core/bookmarksconstiterator.h
M +3 -3 core/bytearraymodel.h
M +2 -2 core/bytearraymodel_p.cpp
M +4 -4 core/codecs/charcodec.cpp
M +1 -1 core/codecs/textcharcodec.cpp
M +1 -1 core/filebytearraymodel.h
M +3 -3 core/filebytearraymodel_p.cpp
M +2 -2 core/fixedsizebytearraymodel.h
M +5 -5 core/piecetable/piecetablechangehistory.cpp
M +1 -1 core/piecetable/piecetablechangehistory.h
M +1 -1 core/piecetable/tests/abstractpiecetablechangeiftest.h
M +3 -3 core/piecetable/tests/grouppiecetablechangetest.cpp
M +2 -2 core/piecetablebytearraymodel.h
M +1 -1 core/tests/abstractbytearraymodeliftest.h
M +1 -1 core/tests/charcodeciftest.h
M +1 -1 core/tests/charcodectest.cpp
M +3 -3 core/tests/textcharcodectest.cpp
M +1 -1 core/tests/valuecodectest.cpp
M +1 -1 core/tests/versionableiftest.h
M +1 -1 designer/bytearraycolumnviewdesignerfactory.h
M +1 -1 designer/bytearrayrowviewdesignerfactory.h
M +1 -1 designer/examples/main.cpp
M +1 -1 designer/oktetawidgetdesignerfactorycollection.h
M +4 -4 gui/abstractbytearraycolumnrenderer.cpp
M +7 -7 gui/abstractbytearrayview_p.cpp
M +1 -1 gui/bytearraycolumnview.h
M +5 -5 gui/bytearrayrowcolumnrenderer.cpp
M +1 -1 gui/bytearrayrowview.h
M +2 -2 gui/bytearraytableranges.cpp
M +1 -1 gui/libcolumnsview/columnsview.h
M +1 -1 gui/valuebytearraycolumnrenderer.cpp
M +1 -1 kasten/controllers/document/info/bytearraymodeliodevice.h
M +7 -7 kasten/controllers/document/info/documentinfotool.cpp
M +1 -1 kasten/controllers/document/info/documentinfoview.h
M +1 -1 kasten/controllers/test/arraydatainformationtest.cpp
M +9 -9 kasten/controllers/test/basicdatainformationtest.cpp
M +1 -1 kasten/controllers/test/customtostringtest.cpp
M +5 -5 kasten/controllers/test/jsparsertest.cpp
M +1 -1 kasten/controllers/test/locktooffsettest.cpp
M +4 -4 kasten/controllers/test/primitivearraytest.cpp
M +1 -1 kasten/controllers/test/primitivedatainformationtest.cpp
M +15 -15 kasten/controllers/test/scriptclassestest.cpp
M +2 -2 kasten/controllers/test/uniondatainformationtest.cpp
M +1 -1 kasten/controllers/view/bookmarks/bookmarkeditpopup.h
M +1 -1 kasten/controllers/view/bookmarks/bookmarklistmodel.h
M +8 -8 kasten/controllers/view/bookmarks/bookmarkscontroller.cpp
M +6 -6 kasten/controllers/view/bookmarks/bookmarkstool.cpp
M +1 -1 kasten/controllers/view/bookmarks/bookmarksview.h
M +1 -1 kasten/controllers/view/bytetable/bytetablemodel.h
M +4 -4 kasten/controllers/view/bytetable/bytetabletool.cpp
M +1 -1 kasten/controllers/view/bytetable/bytetableview.h
M +5 -5 kasten/controllers/view/charsetconversion/charsetconversiontool.cpp
M +2 -2 kasten/controllers/view/charsetconversion/charsetconversionview.cpp
M +1 -1 kasten/controllers/view/charsetconversion/charsetconversionview.h
M +7 -7 kasten/controllers/view/checksum/checksumtool.cpp
M +1 -1 kasten/controllers/view/checksum/checksumview.h
M +5 -5 kasten/controllers/view/filter/filtertool.cpp
M +1 -1 kasten/controllers/view/filter/filterview.h
M +5 -5 kasten/controllers/view/gotooffset/gotooffsettool.cpp
M +1 -1 kasten/controllers/view/gotooffset/gotooffsetview.h
M +6 -6 kasten/controllers/view/info/infotool.cpp
M +1 -1 kasten/controllers/view/info/infoview.h
M +1 -1 kasten/controllers/view/info/statistictablemodel.h
M +1 -1 kasten/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearraychecksum/algorithm/nobytearraychecksumparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearrayfilter/abstractbytearrayfilterparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearrayfilter/filter/nobytearrayfilterparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearrayfilter/filter/operandbytearrayfilterparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearrayfilter/filter/reversebytearrayfilterparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.h
M +1 -1 kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h
M +3 -3 kasten/controllers/view/libfinddialog/kabstractfinddialog.h
M +3 -3 kasten/controllers/view/overwritemode/overwritemodecontroller.cpp
M +9 -9 kasten/controllers/view/poddecoder/poddata.cpp
M +7 -7 kasten/controllers/view/poddecoder/poddecodertool.cpp
M +2 -2 kasten/controllers/view/poddecoder/poddelegate.cpp
M +1 -1 kasten/controllers/view/poddecoder/poddelegate.h
M +1 -1 kasten/controllers/view/poddecoder/podtablemodel.h
M +2 -2 kasten/controllers/view/poddecoder/podtableview.cpp
M +1 -1 kasten/controllers/view/poddecoder/podtableview.h
M +1 -1 kasten/controllers/view/poddecoder/typeeditors/abstractvalue8editor.h
M +1 -1 kasten/controllers/view/poddecoder/typeeditors/char8editor.cpp
M +6 -6 kasten/controllers/view/poddecoder/typeeditors/sintspinbox.h
M +6 -6 kasten/controllers/view/poddecoder/typeeditors/uintspinbox.h
M +1 -1 kasten/controllers/view/poddecoder/typeeditors/utf8editor.cpp
M +6 -6 kasten/controllers/view/print/bytearrayframerenderer.cpp
M +1 -1 kasten/controllers/view/print/printcontroller.cpp
M +7 -7 kasten/controllers/view/print/printtool.cpp
M +1 -1 kasten/controllers/view/replace/kreplacedialog.h
M +2 -2 kasten/controllers/view/replace/replacecontroller.cpp
M +6 -6 kasten/controllers/view/replace/replacetool.cpp
M +1 -1 kasten/controllers/view/search/ksearchdialog.h
M +1 -1 kasten/controllers/view/search/searchcontroller.cpp
M +6 -6 kasten/controllers/view/search/searchtool.cpp
M +5 -5 kasten/controllers/view/selectrange/selectrangetool.cpp
M +1 -1 kasten/controllers/view/selectrange/selectrangeview.h
M +1 -1 kasten/controllers/view/stringsextract/containedstringtablemodel.h
M +9 -9 kasten/controllers/view/stringsextract/stringsextracttool.cpp
M +1 -1 kasten/controllers/view/stringsextract/stringsextractview.h
M +2 -2 kasten/controllers/view/structures/datatypes/array/arraydatainformation.cpp
M +1 -1 kasten/controllers/view/structures/datatypes/array/arraydatainformation.h
M +2 -2 kasten/controllers/view/structures/datatypes/datainformation.cpp
M +2 -2 kasten/controllers/view/structures/datatypes/datainformation.h
M +2 -2 kasten/controllers/view/structures/datatypes/datainformationbase.cpp
M +2 -2 kasten/controllers/view/structures/datatypes/datainformationbase.h
M +1 -1 kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp
M +1 -1 kasten/controllers/view/structures/datatypes/datainformationwithchildren.h
M +3 -3 kasten/controllers/view/structures/datatypes/dummydatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.cpp
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/bitfield/abstractbitfielddatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/bitfield/boolbitfielddatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/bitfield/signedbitfielddatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/bitfield/unsignedbitfielddatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/enumdatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/flagdatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitive/pointerdatainformation.cpp
M +3 -3 kasten/controllers/view/structures/datatypes/primitive/primitivedatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/primitivefactory.cpp
M +2 -2 kasten/controllers/view/structures/datatypes/primitivefactory.h
M +5 -5 kasten/controllers/view/structures/datatypes/strings/stringdatainformation.cpp
M +1 -1 kasten/controllers/view/structures/datatypes/strings/stringdatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/structuredatainformation.h
M +2 -2 kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp
M +1 -1 kasten/controllers/view/structures/datatypes/taggeduniondatainformation.h
M +2 -2 kasten/controllers/view/structures/datatypes/topleveldatainformation.cpp
M +2 -2 kasten/controllers/view/structures/datatypes/topleveldatainformation.h
M +1 -1 kasten/controllers/view/structures/datatypes/uniondatainformation.h
M +28 -28 kasten/controllers/view/structures/parsers/datainformationfactory.cpp
M +2 -2 kasten/controllers/view/structures/parsers/datainformationfactory.h
M +16 -16 kasten/controllers/view/structures/parsers/osdparser.cpp
M +2 -2 kasten/controllers/view/structures/parsers/scriptfileparser.cpp
M +2 -2 kasten/controllers/view/structures/parsers/scriptvalueconverter.h
M +11 -11 kasten/controllers/view/structures/parsers/scriptvalueconverter_p.cpp
M +2 -2 kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp
M +2 -2 kasten/controllers/view/structures/script/safereference.h
M +1 -1 kasten/controllers/view/structures/script/scriptloggerview.h
M +1 -1 kasten/controllers/view/structures/settings/structureaddremovewidget.h
M +1 -1 kasten/controllers/view/structures/settings/structuresmanagerview.cpp
M +1 -1 kasten/controllers/view/structures/settings/structuresmanagerview.h
M +1 -1 kasten/controllers/view/structures/settings/structviewdisplaysettingswidget.cpp
M +6 -6 kasten/controllers/view/structures/structtool.cpp
M +2 -2 kasten/controllers/view/structures/structtreemodel.cpp
M +1 -1 kasten/controllers/view/structures/structtreemodel.h
M +1 -1 kasten/controllers/view/structures/structuredefinitionfile.cpp
M +1 -1 kasten/controllers/view/structures/structuresmanager.cpp
M +3 -3 kasten/controllers/view/structures/structview.cpp
M +1 -1 kasten/controllers/view/structures/structview.h
M +2 -2 kasten/controllers/view/structures/structviewitemdelegate.cpp
M +1 -1 kasten/controllers/view/structures/structviewitemdelegate.h
M +1 -1 kasten/controllers/view/viewconfig/bytespergroupdialog.h
M +1 -1 kasten/controllers/view/viewconfig/bytesperlinedialog.h
M +4 -4 kasten/controllers/view/viewconfig/viewconfigcontroller.cpp
M +4 -4 kasten/controllers/view/viewmode/viewmodecontroller.cpp
M +6 -6 kasten/controllers/view/viewprofiles/viewprofilecontroller.cpp
M +1 -1 kasten/controllers/view/viewprofiles/viewprofileedit.h
M +1 -1 kasten/controllers/view/viewprofiles/viewprofileeditdialog.h
M +1 -1 kasten/controllers/view/viewprofiles/viewprofilesmanagedialog.h
M +1 -1 kasten/controllers/view/viewprofiles/viewprofiletablemodel.h
M +4 -4 kasten/controllers/view/viewstatus/viewstatuscontroller.cpp
M +2 -2 kasten/core/document/tests/bytearraydocumentfactorytest.cpp
M +2 -2 kasten/core/document/tests/bytearraydocumenttest.cpp
M +1 -1 kasten/core/io/filesystem/bytearrayrawfileloadthread.cpp
M +1 -1 kasten/core/io/filesystem/bytearrayrawfileloadthread.h
M +1 -1 kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp
M +1 -1 kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp
M +4 -4 kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp
M +5 -5 kasten/gui/io/bytearrayviewprofilesynchronizer.cpp
M +1 -1 kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditor.h
M +1 -1 kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp
M +1 -1 kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditor.h
M +1 -1 kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditorfactory.cpp
M +7 -7 kasten/gui/io/streamencoder/abstractbytearraystreamencoder.cpp
M +1 -1 kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/streamencoder/bytearraytextstreamencoderpreview.cpp
M +1 -1 kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditor.h
M +1 -1 kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditorfactory.cpp
M +1 -1 kasten/gui/liboktetawidgets/addresscombobox.h
M +2 -2 kasten/gui/liboktetawidgets/addressvalidator.cpp
M +1 -1 kasten/gui/liboktetawidgets/addressvalidator.h
M +1 -1 kasten/gui/liboktetawidgets/bytearraycombobox.h
M +1 -1 kasten/gui/liboktetawidgets/bytearrayvalidator.cpp
M +1 -1 kasten/gui/liboktetawidgets/bytearrayvalidator.h
M +1 -1 kasten/gui/view/bytearrayjanusview.cpp
M +1 -1 kasten/gui/view/bytearrayjanusview.h
M +2 -2 kasten/gui/view/bytearrayviewfactory.cpp
M +8 -8 libs/kasten/controllers/document/modified/modifiedbarcontroller.cpp
M +3 -3 libs/kasten/controllers/document/readonly/readonlybarcontroller.cpp
M +3 -3 libs/kasten/controllers/document/readonly/readonlycontroller.cpp
M +2 -2 libs/kasten/controllers/document/terminal/terminaltool.cpp
M +4 -4 libs/kasten/controllers/document/terminal/terminalview.cpp
M +1 -1 libs/kasten/controllers/document/terminal/terminalview.h
M +1 -1 libs/kasten/controllers/document/versionview/versiontablemodel.h
M +2 -2 libs/kasten/controllers/document/versionview/versionview.cpp
M +1 -1 libs/kasten/controllers/document/versionview/versionview.h
M +2 -2 libs/kasten/controllers/document/versionview/versionviewtool.cpp
M +3 -3 libs/kasten/controllers/documentsystem/close/closecontroller.cpp
M +1 -1 libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.cpp
M +1 -1 libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.h
M +2 -2 libs/kasten/controllers/documentsystem/documentsbrowser/documentstool.cpp
M +1 -1 libs/kasten/controllers/documentsystem/documentsbrowser/documentsview.h
M +3 -3 libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowsertool.cpp
M +1 -1 libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.h
M +10 -10 libs/kasten/controllers/io/clipboard/clipboardcontroller.cpp
M +5 -5 libs/kasten/controllers/io/copyas/copyascontroller.cpp
M +1 -1 libs/kasten/controllers/io/copyas/copyasdialog.h
M +7 -7 libs/kasten/controllers/io/export/exportcontroller.cpp
M +1 -1 libs/kasten/controllers/io/export/exportdialog.h
M +4 -4 libs/kasten/controllers/io/insert/insertcontroller.cpp
M +1 -1 libs/kasten/controllers/io/insert/insertdialog.h
M +3 -3 libs/kasten/controllers/io/setremote/setremotecontroller.cpp
M +6 -6 libs/kasten/controllers/io/synchronize/synchronizecontroller.cpp
M +6 -6 libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp
M +5 -5 libs/kasten/controllers/view/select/selectcontroller.cpp
M +6 -6 libs/kasten/controllers/view/version/versioncontroller.cpp
M +1 -1 libs/kasten/controllers/view/zoom/zoombarcontroller.cpp
M +5 -5 libs/kasten/controllers/view/zoom/zoomcontroller.cpp
M +5 -5 libs/kasten/controllers/view/zoom/zoomslider.cpp
M +1 -1 libs/kasten/core/document/abstractdocument_p.h
M +1 -1 libs/kasten/core/document/abstractdocumentfactory.cpp
M +3 -3 libs/kasten/core/document/abstractmodel.h
M +1 -1 libs/kasten/core/document/abstractmodel_p.h
M +1 -1 libs/kasten/core/io/abstractexportjob_p.h
M +1 -1 libs/kasten/core/io/abstractloadjob_p.h
M +2 -2 libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.cpp
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.h
M +2 -2 libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.cpp
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.h
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.cpp
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.cpp
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.h
M +2 -2 libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.cpp
M +1 -1 libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
M +1 -1 libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.cpp
M +2 -2 libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.h
M +1 -1 libs/kasten/core/io/modeldatageneratethread.h
M +1 -1 libs/kasten/core/system/documentcreatemanager.cpp
M +6 -6 libs/kasten/core/system/documentsyncmanager.cpp
M +1 -1 libs/kasten/core/system/jobmanager.cpp
M +3 -3 libs/kasten/core/system/modelcodecmanager.cpp
M +2 -2 libs/kasten/core/tests/testdocumentfileloadthread.cpp
M +1 -1 libs/kasten/core/tests/testdocumentfileloadthread.h
M +1 -1 libs/kasten/core/tests/testdocumentfilesynchronizer.cpp
M +1 -1 libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp
M +8 -8 libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp
M +2 -2 libs/kasten/core/tests/testdocumenttest.cpp
M +1 -1 libs/kasten/gui/controller/abstractlinepopup.h
M +1 -1 libs/kasten/gui/controller/abstractlinepopup_p.cpp
M +2 -2 libs/kasten/gui/controller/abstractlinepopup_p.h
M +1 -1 libs/kasten/gui/controller/abstracttoolwidget.h
M +1 -1 libs/kasten/gui/controller/abstracttoolwidget_p.cpp
M +2 -2 libs/kasten/gui/controller/togglebutton.h
M +1 -1 libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.cpp
M +1 -1 libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.h
M +2 -2 libs/kasten/gui/io/abstractmodelexporterconfigeditor.cpp
M +1 -1 libs/kasten/gui/io/abstractmodelexporterconfigeditor.h
M +2 -2 libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.cpp
M +1 -1 libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.h
M +1 -1 libs/kasten/gui/io/filesystem/modelencoderfilesystemexporterconfigeditorfactory.cpp
M +4 -4 libs/kasten/gui/shell/multiviewareas_p.cpp
M +1 -1 libs/kasten/gui/shell/multiviewareas_p.h
M +9 -9 libs/kasten/gui/shell/shellwindow_p.cpp
M +6 -6 libs/kasten/gui/shell/singleviewarea_p.cpp
M +8 -8 libs/kasten/gui/shell/singleviewwindow_p.cpp
M +1 -1 libs/kasten/gui/shell/statusbar.h
M +3 -3 libs/kasten/gui/shell/statusbarlayout.cpp
M +1 -1 libs/kasten/gui/shell/statusbarlayout.h
M +5 -5 libs/kasten/gui/shell/tabbedviews_p.cpp
M +1 -1 libs/kasten/gui/shell/tabbedviews_p.h
M +1 -1 libs/kasten/gui/shell/toolinlineviewwidget.cpp
M +1 -1 libs/kasten/gui/shell/toolinlineviewwidget.h
M +4 -4 libs/kasten/gui/shell/viewareabox.cpp
M +1 -1 libs/kasten/gui/shell/viewareabox.h
M +1 -1 libs/kasten/gui/shell/viewbox.cpp
M +1 -1 libs/kasten/gui/shell/viewbox.h
M +1 -1 libs/kasten/gui/system/createdialog.h
M +1 -1 libs/kasten/gui/system/dialoghandler.h
M +3 -3 libs/kasten/gui/system/modelcodecviewmanager.cpp
M +1 -1 libs/kasten/gui/system/viewmanager.cpp
M +1 -1 libs/kasten/gui/view/abstractview.h
M +1 -1 parts/kpart/part.cpp
M +2 -2 parts/kpart/tests/oktetaparttest.cpp
M +1 -1 program/mainwindow.cpp
https://commits.kde.org/okteta/8d31f763aaf6ad43126f11533837e94b92e872f5
diff --git a/core/abstractbytearraymodel.cpp b/core/abstractbytearraymodel.cpp
index 71e1db4f..7c5fdb4e 100644
--- a/core/abstractbytearraymodel.cpp
+++ b/core/abstractbytearraymodel.cpp
@@ -52,7 +52,7 @@ Size AbstractByteArrayModel::insert( Address offset, const Byte* \
insertData, int
Size AbstractByteArrayModel::remove( const AddressRange& removeRange )
{
- replace( removeRange, 0, 0 );
+ replace( removeRange, nullptr, 0 );
return removeRange.width(); // TODO: check if this is true
}
diff --git a/core/abstractbytearraymodel.h b/core/abstractbytearraymodel.h
index 11733a06..25858e30 100644
--- a/core/abstractbytearraymodel.h
+++ b/core/abstractbytearraymodel.h
@@ -83,7 +83,7 @@ class OKTETACORE_EXPORT AbstractByteArrayModel : public QObject
Q_OBJECT
protected:
- explicit AbstractByteArrayModel( QObject* parent = 0 );
+ explicit AbstractByteArrayModel( QObject* parent = nullptr );
public:
virtual ~AbstractByteArrayModel();
diff --git a/core/bookmarklist.cpp b/core/bookmarklist.cpp
index 6cabe9de..f7568a8d 100644
--- a/core/bookmarklist.cpp
+++ b/core/bookmarklist.cpp
@@ -182,7 +182,7 @@ const Bookmark& BookmarkList::bookmark( Address offset ) const
if( it->offset() == offset )
return *it;
}
- static const Bookmark* const noBookmark = 0;
+ static const Bookmark* const noBookmark = nullptr;
return (const Bookmark&)*noBookmark;
}
@@ -215,7 +215,7 @@ const Bookmark& BookmarkList::at( unsigned int index ) const
if( i == index )
return *it;
}
- static const Bookmark* const noBookmark = 0;
+ static const Bookmark* const noBookmark = nullptr;
return (const Bookmark&)*noBookmark;
}
diff --git a/core/bookmarksconstiterator.h b/core/bookmarksconstiterator.h
index ab3c49d7..b14131a8 100644
--- a/core/bookmarksconstiterator.h
+++ b/core/bookmarksconstiterator.h
@@ -36,7 +36,7 @@ namespace Okteta
class OKTETACORE_EXPORT BookmarksConstIterator
{
public:
- explicit BookmarksConstIterator( BookmarksConstIteratorAdapter* adapter = 0 );
+ explicit BookmarksConstIterator( BookmarksConstIteratorAdapter* adapter = \
nullptr );
public:
bool hasList() const;
diff --git a/core/bytearraymodel.h b/core/bytearraymodel.h
index c639d522..9be300bb 100644
--- a/core/bytearraymodel.h
+++ b/core/bytearraymodel.h
@@ -49,9 +49,9 @@ class OKTETACORE_EXPORT ByteArrayModel : public \
AbstractByteArrayModel, friend class ByteArrayModelPrivate;
public:
- ByteArrayModel( Byte* data, int size, int rawSize = -1, bool keepsMemory = true, \
QObject* parent = 0 );
- ByteArrayModel( const Byte* data, int size, QObject* parent = 0 );
- explicit ByteArrayModel( int size = 0, int maxSize = -1, QObject* parent = 0 );
+ ByteArrayModel( Byte* data, int size, int rawSize = -1, bool keepsMemory = true, \
QObject* parent = nullptr ); + ByteArrayModel( const Byte* data, int size, \
QObject* parent = nullptr ); + explicit ByteArrayModel( int size = 0, int maxSize \
= -1, QObject* parent = nullptr );
virtual ~ByteArrayModel();
diff --git a/core/bytearraymodel_p.cpp b/core/bytearraymodel_p.cpp
index c6305237..06439abd 100644
--- a/core/bytearraymodel_p.cpp
+++ b/core/bytearraymodel_p.cpp
@@ -67,7 +67,7 @@ ByteArrayModelPrivate::ByteArrayModelPrivate( ByteArrayModel \
*parent, ByteArrayModelPrivate::ByteArrayModelPrivate( ByteArrayModel *parent,
int size, int maxSize )
: p( parent ),
- mData( (size>0) ? new Byte[size] : 0 ),
+ mData( (size>0) ? new Byte[size] : nullptr ),
mSize( size ),
mRawSize( size ),
mMaxSize( maxSize ),
@@ -201,7 +201,7 @@ Size ByteArrayModelPrivate::replace( const AddressRange& \
_removeRange, const Byt {
// create new buffer
Byte* newData = new Byte[newSize];
- if( newData == 0 )
+ if( ! newData )
return 0;
// move old data to its (new) places
diff --git a/core/codecs/charcodec.cpp b/core/codecs/charcodec.cpp
index 1720684a..f3e3fd21 100644
--- a/core/codecs/charcodec.cpp
+++ b/core/codecs/charcodec.cpp
@@ -63,10 +63,10 @@ CharCodec* CharCodec::createCodec( const QString& name )
else if( JISX0201CharCodec::codecName() == name )
result = JISX0201CharCodec::create();
else
- result = 0;
+ result = nullptr;
// ensure at least a codec
- if( result == 0 )
+ if( ! result )
result = TextCharCodec::createLocalCodec();
return result;
@@ -83,10 +83,10 @@ CharCodec* CharCodec::createCodec( CharCoding charCoding )
result = TextCharCodec::createCodec( QStringLiteral("ISO-8859-1") );
// LocalEncoding
else
- result = 0;
+ result = nullptr;
// ensure at least a codec
- if( result == 0 )
+ if( ! result )
result = TextCharCodec::createLocalCodec();
return result;
diff --git a/core/codecs/textcharcodec.cpp b/core/codecs/textcharcodec.cpp
index 8945baee..b0f147e7 100644
--- a/core/codecs/textcharcodec.cpp
+++ b/core/codecs/textcharcodec.cpp
@@ -189,7 +189,7 @@ TextCharCodec* TextCharCodec::createCodec( const QString& \
codecName )
QTextCodec* codec = KCharsets::charsets()->codecForName( codecName, isOk );
if( isOk )
isOk = is8Bit( codec );
- return isOk ? new TextCharCodec( codec ) : 0;
+ return isOk ? new TextCharCodec( codec ) : nullptr;
}
diff --git a/core/filebytearraymodel.h b/core/filebytearraymodel.h
index 166b0857..6b5094e1 100644
--- a/core/filebytearraymodel.h
+++ b/core/filebytearraymodel.h
@@ -44,7 +44,7 @@ class OKTETACORE_EXPORT FileByteArrayModel : public \
AbstractByteArrayModel
public:
/** default is only 50*4k = 200k memory image */
- explicit FileByteArrayModel( int pageNumber = 50, int pageSize = 4096, QObject* \
parent = 0 ); + explicit FileByteArrayModel( int pageNumber = 50, int pageSize = \
4096, QObject* parent = nullptr ); virtual ~FileByteArrayModel();
public: // AbstractByteArrayModel API
diff --git a/core/filebytearraymodel_p.cpp b/core/filebytearraymodel_p.cpp
index d5006bbf..f24bbbc4 100644
--- a/core/filebytearraymodel_p.cpp
+++ b/core/filebytearraymodel_p.cpp
@@ -79,7 +79,7 @@ bool FileByteArrayModelPrivate::open( const QString& fileName )
// initialize Page pointers
mData.resize( noOfPages );
for( KPageOfChar::iterator D=mData.begin(); D!=mData.end(); ++D )
- *D = 0;
+ *D = nullptr;
mFirstPage = mLastPage = 0;
@@ -113,7 +113,7 @@ bool FileByteArrayModelPrivate::ensurePageLoaded( unsigned int \
pageIndex ) const if( !isOpen() )
return false;
// page loaded?
- if( mData[pageIndex] != 0 )
+ if( mData[pageIndex] )
{
mActualPage = mData[pageIndex];
mOffsetOfActualPage = pageIndex * mPageSize;
@@ -167,7 +167,7 @@ bool FileByteArrayModelPrivate::freePage( unsigned int pageIndex \
) const return false;
delete [] mData[pageIndex];
- mData[pageIndex] = 0;
+ mData[pageIndex] = nullptr;
++mNoOfFreePages;
return true;
}
diff --git a/core/fixedsizebytearraymodel.h b/core/fixedsizebytearraymodel.h
index 5dfe099e..2e9c8481 100644
--- a/core/fixedsizebytearraymodel.h
+++ b/core/fixedsizebytearraymodel.h
@@ -42,9 +42,9 @@ class FixedSizeByteArrayModel : public AbstractByteArrayModel
public:
/** creates a readonly buffer around the given data */
- FixedSizeByteArrayModel( Byte* data, int size, Byte fillUpChar = '\0', QObject* \
parent = 0 ); + FixedSizeByteArrayModel( Byte* data, int size, Byte fillUpChar = \
'\0', QObject* parent = nullptr ); /** creates a writeable buffer which is deleted \
at the end */
- explicit FixedSizeByteArrayModel( int size, Byte fillUpChar = '\0', QObject* \
parent = 0 ); + explicit FixedSizeByteArrayModel( int size, Byte fillUpChar = \
'\0', QObject* parent = nullptr );
virtual ~FixedSizeByteArrayModel();
diff --git a/core/piecetable/piecetablechangehistory.cpp \
b/core/piecetable/piecetablechangehistory.cpp index 421b129a..d1ac55a6 100644
--- a/core/piecetable/piecetablechangehistory.cpp
+++ b/core/piecetable/piecetablechangehistory.cpp
@@ -42,7 +42,7 @@ void PieceTableChangeHistory::clear()
mBaseBeforeChangeIndex = 0;
mAppliedChangesDataSize = 0;
- mActiveGroupChange = 0;
+ mActiveGroupChange = nullptr;
}
void PieceTableChangeHistory::getChangeData( ArrayChangeMetrics* metrics, Address* \
storageOffset, @@ -70,7 +70,7 @@ void PieceTableChangeHistory::openGroupedChange( \
const QString& description )
void PieceTableChangeHistory::closeGroupedChange(const QString & description )
{
- if( mActiveGroupChange != 0 )
+ if( mActiveGroupChange )
{
if( !description.isEmpty() )
mActiveGroupChange->setDescription( description );
@@ -80,7 +80,7 @@ void PieceTableChangeHistory::closeGroupedChange(const QString & \
description )
void PieceTableChangeHistory::finishChange()
{
- if( mActiveGroupChange != 0 )
+ if( mActiveGroupChange )
mActiveGroupChange->finishChange();
else
mTryToMergeAppendedChange = false;
@@ -105,7 +105,7 @@ bool PieceTableChangeHistory::appendChange( \
AbstractPieceTableChange* change ) mAppliedChangesDataSize += change->dataSize();
bool isNotMerged = true;
- if( mActiveGroupChange != 0 )
+ if( mActiveGroupChange )
{
mActiveGroupChange->appendChange( change );
isNotMerged = false; // TODO: hack for as long as subgroups are not undoable
@@ -140,7 +140,7 @@ bool PieceTableChangeHistory::revertBeforeChange( PieceTable* \
pieceTable, int ch return false;
// close any grouped changes
- while( mActiveGroupChange != 0 )
+ while( mActiveGroupChange )
mActiveGroupChange = mActiveGroupChange->parent();
if( currentChangeId < changeId )
diff --git a/core/piecetable/piecetablechangehistory.h \
b/core/piecetable/piecetablechangehistory.h index 867aabd5..d51993e3 100644
--- a/core/piecetable/piecetablechangehistory.h
+++ b/core/piecetable/piecetablechangehistory.h
@@ -111,7 +111,7 @@ inline PieceTableChangeHistory::PieceTableChangeHistory()
mAppliedChangesCount( 0 ),
mBaseBeforeChangeIndex( 0 ),
mAppliedChangesDataSize( 0 ),
- mActiveGroupChange( 0 )
+ mActiveGroupChange( nullptr )
{}
inline int PieceTableChangeHistory::count() const { return \
mChangeStack.count(); }
diff --git a/core/piecetable/tests/abstractpiecetablechangeiftest.h \
b/core/piecetable/tests/abstractpiecetablechangeiftest.h index 6e4c750f..49742421 \
100644
--- a/core/piecetable/tests/abstractpiecetablechangeiftest.h
+++ b/core/piecetable/tests/abstractpiecetablechangeiftest.h
@@ -62,7 +62,7 @@ class AbstractPieceTableChangeIfTest : public QObject
AbstractPieceTableChange *mPieceTableChange;
};
-inline AbstractPieceTableChangeIfTest::AbstractPieceTableChangeIfTest() : \
mPieceTableChange( 0 ) {} +inline \
AbstractPieceTableChangeIfTest::AbstractPieceTableChangeIfTest() : mPieceTableChange( \
nullptr ) {}
}
diff --git a/core/piecetable/tests/grouppiecetablechangetest.cpp \
b/core/piecetable/tests/grouppiecetablechangetest.cpp index 01856f1d..5d4d5db8 100644
--- a/core/piecetable/tests/grouppiecetablechangetest.cpp
+++ b/core/piecetable/tests/grouppiecetablechangetest.cpp
@@ -43,18 +43,18 @@ static const char Description[] = "description";
void GroupPieceTableChangeTest::testConstructor()
{
- GroupPieceTableChange groupPieceTableChange( 0, QLatin1String(Description) );
+ GroupPieceTableChange groupPieceTableChange( nullptr, QLatin1String(Description) \
);
// QCOMPARE( groupPieceTableChange.count(), 0 );
QCOMPARE( groupPieceTableChange.appliedChangesCount(), 0 );
- QCOMPARE( groupPieceTableChange.parent(), (GroupPieceTableChange*)0 );
+ QCOMPARE( groupPieceTableChange.parent(), (GroupPieceTableChange*)nullptr );
QCOMPARE( groupPieceTableChange.dataSize(), 0 );
QCOMPARE( groupPieceTableChange.description(), QLatin1String(Description) );
}
void GroupPieceTableChangeTest::testAppendChange()
{
- GroupPieceTableChange groupPieceTableChange( 0, QLatin1String(Description) );
+ GroupPieceTableChange groupPieceTableChange( nullptr, QLatin1String(Description) \
);
const int type1Id = 1;
const int type2Id = 2;
diff --git a/core/piecetablebytearraymodel.h b/core/piecetablebytearraymodel.h
index 1814bed7..ff658a7e 100644
--- a/core/piecetablebytearraymodel.h
+++ b/core/piecetablebytearraymodel.h
@@ -58,8 +58,8 @@ class OKTETACORE_EXPORT PieceTableByteArrayModel : public \
AbstractByteArrayModel friend class PieceTableByteArrayModelPrivate;
public:
- explicit PieceTableByteArrayModel( const QByteArray& data, QObject* parent = 0 \
);
- explicit PieceTableByteArrayModel( int size = 0, Byte fillByte = '\0', QObject* \
parent = 0 ); + explicit PieceTableByteArrayModel( const QByteArray& data, \
QObject* parent = nullptr ); + explicit PieceTableByteArrayModel( int size = 0, \
Byte fillByte = '\0', QObject* parent = nullptr );
virtual ~PieceTableByteArrayModel();
diff --git a/core/tests/abstractbytearraymodeliftest.h \
b/core/tests/abstractbytearraymodeliftest.h index 2a4380da..64b5626b 100644
--- a/core/tests/abstractbytearraymodeliftest.h
+++ b/core/tests/abstractbytearraymodeliftest.h
@@ -84,7 +84,7 @@ class AbstractByteArrayModelIfTest : public QObject
QSignalSpy* ContentsChangeListSpy;
};
-inline AbstractByteArrayModelIfTest::AbstractByteArrayModelIfTest() : \
mByteArrayModel( 0 ) {} +inline \
AbstractByteArrayModelIfTest::AbstractByteArrayModelIfTest() : mByteArrayModel( \
nullptr ) {}
}
diff --git a/core/tests/charcodeciftest.h b/core/tests/charcodeciftest.h
index 07cd3775..8be227c0 100644
--- a/core/tests/charcodeciftest.h
+++ b/core/tests/charcodeciftest.h
@@ -56,7 +56,7 @@ class CharCodecIfTest : public QObject
};
-inline CharCodecIfTest::CharCodecIfTest() : mCharCodec( 0 ) {}
+inline CharCodecIfTest::CharCodecIfTest() : mCharCodec( nullptr ) {}
}
diff --git a/core/tests/charcodectest.cpp b/core/tests/charcodectest.cpp
index 5982449d..c0e2b5d5 100644
--- a/core/tests/charcodectest.cpp
+++ b/core/tests/charcodectest.cpp
@@ -49,7 +49,7 @@ void CharCodecTest::testCreateCodec()
CharCodec* codec = CharCodec::createCodec( codecName );
- QVERIFY( codec != 0 );
+ QVERIFY( codec != nullptr );
QCOMPARE( codec->name(), codecName );
delete codec;
diff --git a/core/tests/textcharcodectest.cpp b/core/tests/textcharcodectest.cpp
index 25ef77e6..3d047e4c 100644
--- a/core/tests/textcharcodectest.cpp
+++ b/core/tests/textcharcodectest.cpp
@@ -47,7 +47,7 @@ void TextCharCodecTest::testCreateCodec()
CharCodec* codec = TextCharCodec::createCodec( codecName );
- QVERIFY( codec != 0 );
+ QVERIFY( codec != nullptr );
QCOMPARE( codec->name(), codecName );
delete codec;
@@ -56,7 +56,7 @@ void TextCharCodecTest::testCreateCodec()
void TextCharCodecTest::testCreateLocalCodec()
{
TextCharCodec* codec = TextCharCodec::createLocalCodec();
- QVERIFY( codec != 0 );
+ QVERIFY( codec != nullptr );
delete codec;
}
@@ -64,7 +64,7 @@ void TextCharCodecTest::testCreateLocalCodec()
void TextCharCodecTest::testCreateNonexistingCodec()
{
TextCharCodec* codec = TextCharCodec::createCodec( \
QStringLiteral("NonexistingCode") );
- QVERIFY( codec == 0 );
+ QVERIFY( codec == nullptr );
}
}
diff --git a/core/tests/valuecodectest.cpp b/core/tests/valuecodectest.cpp
index 7854a7d9..347e9e8f 100644
--- a/core/tests/valuecodectest.cpp
+++ b/core/tests/valuecodectest.cpp
@@ -76,7 +76,7 @@ void ValueCodecTest::testCreateCodec()
ValueCodec* codec = ValueCodec::createCodec( (ValueCoding)codecId);
- QVERIFY( codec != 0 );
+ QVERIFY( codec != nullptr );
QCOMPARE( codec->encodingWidth(), encodingWidth );
delete codec;
diff --git a/core/tests/versionableiftest.h b/core/tests/versionableiftest.h
index b42d5a80..4237ef80 100644
--- a/core/tests/versionableiftest.h
+++ b/core/tests/versionableiftest.h
@@ -67,7 +67,7 @@ class VersionableIfTest : public QObject
QSignalSpy *mHeadVersionChangedSpy;
};
-inline VersionableIfTest::VersionableIfTest() : mObject( 0 ), mVersionableControl( 0 \
) {} +inline VersionableIfTest::VersionableIfTest() : mObject( nullptr ), \
mVersionableControl( nullptr ) {}
}
diff --git a/designer/bytearraycolumnviewdesignerfactory.h \
b/designer/bytearraycolumnviewdesignerfactory.h index a3be1897..5c40f868 100644
--- a/designer/bytearraycolumnviewdesignerfactory.h
+++ b/designer/bytearraycolumnviewdesignerfactory.h
@@ -37,7 +37,7 @@ class ByteArrayColumnViewDesignerFactory : public QObject,
)
public:
- explicit ByteArrayColumnViewDesignerFactory( QObject* parent = 0 );
+ explicit ByteArrayColumnViewDesignerFactory( QObject* parent = nullptr );
public: // QDesignerCustomWidgetInterface API
virtual QWidget* createWidget( QWidget* parent );
diff --git a/designer/bytearrayrowviewdesignerfactory.h \
b/designer/bytearrayrowviewdesignerfactory.h index 468e3851..8721639d 100644
--- a/designer/bytearrayrowviewdesignerfactory.h
+++ b/designer/bytearrayrowviewdesignerfactory.h
@@ -37,7 +37,7 @@ class ByteArrayRowViewDesignerFactory : public QObject,
)
public:
- explicit ByteArrayRowViewDesignerFactory( QObject* parent = 0 );
+ explicit ByteArrayRowViewDesignerFactory( QObject* parent = nullptr );
public: // QDesignerCustomWidgetInterface API
virtual QWidget* createWidget( QWidget* parent );
diff --git a/designer/examples/main.cpp b/designer/examples/main.cpp
index 8df45784..0e2ee088 100644
--- a/designer/examples/main.cpp
+++ b/designer/examples/main.cpp
@@ -47,7 +47,7 @@ static const int exampleInitialDataSize = \
sizeof(exampleInitialData) / sizeof(ex class Widget : public QWidget
{
public:
- explicit Widget( QWidget* parent = 0 );
+ explicit Widget( QWidget* parent = nullptr );
virtual ~Widget();
private:
diff --git a/designer/oktetawidgetdesignerfactorycollection.h \
b/designer/oktetawidgetdesignerfactorycollection.h index a41163d5..44d9876f 100644
--- a/designer/oktetawidgetdesignerfactorycollection.h
+++ b/designer/oktetawidgetdesignerfactorycollection.h
@@ -39,7 +39,7 @@ class OktetaWidgetDesignerFactoryCollection : public QObject,
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
public:
- explicit OktetaWidgetDesignerFactoryCollection( QObject* parent = 0 );
+ explicit OktetaWidgetDesignerFactoryCollection( QObject* parent = nullptr );
public: // QDesignerCustomWidgetCollectionInterface API
virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
diff --git a/gui/abstractbytearraycolumnrenderer.cpp \
b/gui/abstractbytearraycolumnrenderer.cpp index 70368110..70b4f724 100644
--- a/gui/abstractbytearraycolumnrenderer.cpp
+++ b/gui/abstractbytearraycolumnrenderer.cpp
@@ -59,8 +59,8 @@ AbstractByteArrayColumnRenderer::AbstractByteArrayColumnRenderer( \
AbstractColumn mByteSpacingWidth( DefaultByteSpacingWidth ),
mGroupSpacingWidth( DefaultGroupSpacingWidth ),
mNoOfGroupedBytes( DefaultNoOfGroupedBytes ),
- mLinePosLeftPixelX( 0 ),
- mLinePosRightPixelX( 0 ),
+ mLinePosLeftPixelX( nullptr ),
+ mLinePosRightPixelX( nullptr ),
mLastLinePos( 0 ),
mByteTypeColored( true )
{
@@ -501,7 +501,7 @@ void AbstractByteArrayColumnRenderer::renderPlain( QPainter* \
painter, const Line BookmarksConstIterator bit;
Address nextBookmarkOffset = -1;
- const bool hasBookmarks = ( mBookmarks != 0 );
+ const bool hasBookmarks = ( mBookmarks != nullptr );
if( hasBookmarks )
{
bit = mBookmarks->createBookmarksConstIterator();
@@ -546,7 +546,7 @@ void AbstractByteArrayColumnRenderer::renderSelection( QPainter* \
painter, const BookmarksConstIterator bit;
Address nextBookmarkOffset = -1;
- const bool hasBookmarks = ( mBookmarks != 0 );
+ const bool hasBookmarks = ( mBookmarks != nullptr );
if( hasBookmarks )
{
bit = mBookmarks->createBookmarksConstIterator();
diff --git a/gui/abstractbytearrayview_p.cpp b/gui/abstractbytearrayview_p.cpp
index be8acd06..7add9fcc 100644
--- a/gui/abstractbytearrayview_p.cpp
+++ b/gui/abstractbytearrayview_p.cpp
@@ -162,16 +162,16 @@ void AbstractByteArrayViewPrivate::init()
mCharCodec = CharCodec::createCodec( (CharCoding)DefaultCharCoding );
mCharCoding = DefaultCharCoding;
- mTabController = new KTabController( q, 0 );
+ mTabController = new KTabController( q, nullptr );
mNavigator = new KNavigator( q, mTabController );
mValueEditor = new KValueEditor( mTableCursor, q, mNavigator );
mCharEditor = new KCharEditor( mTableCursor, q, mNavigator );
- mMousePaster = new MousePaster( q, 0 );
+ mMousePaster = new MousePaster( q, nullptr );
mMouseNavigator = new MouseNavigator( q, mMousePaster );
mMouseController = mMouseNavigator;
- mZoomWheelController = new ZoomWheelController( q, 0 );
+ mZoomWheelController = new ZoomWheelController( q, nullptr );
mDropper = new Dropper( q );
setWheelController( mZoomWheelController );
@@ -522,7 +522,7 @@ void AbstractByteArrayViewPrivate::setValueCoding( \
AbstractByteArrayView::ValueC
ValueCodec* newValueCodec
= ValueCodec::createCodec( (ValueCoding)valueCoding );
- if( newValueCodec == 0 )
+ if( ! newValueCodec )
return;
delete mValueCodec;
@@ -536,7 +536,7 @@ void AbstractByteArrayViewPrivate::setCharCoding( \
AbstractByteArrayView::CharCod
CharCodec* newCharCodec
= CharCodec::createCodec( (CharCoding)charCoding );
- if( newCharCodec == 0 )
+ if( ! newCharCodec )
return;
delete mCharCodec;
@@ -550,7 +550,7 @@ void AbstractByteArrayViewPrivate::setCharCoding( const QString& \
charCodingName
CharCodec *newCharCodec =
CharCodec::createCodec( charCodingName );
- if( newCharCodec == 0 )
+ if( ! newCharCodec )
return;
delete mCharCodec;
@@ -762,7 +762,7 @@ QByteArray AbstractByteArrayViewPrivate::selectedData() const
QMimeData* AbstractByteArrayViewPrivate::selectionAsMimeData() const
{
if( !mTableRanges->hasSelection() )
- return 0;
+ return nullptr;
QMimeData* mimeData = new QMimeData;
mimeData->setData( octetStreamFormatName(), selectedData() );
diff --git a/gui/bytearraycolumnview.h b/gui/bytearraycolumnview.h
index 2fdc85e7..273b4c91 100644
--- a/gui/bytearraycolumnview.h
+++ b/gui/bytearraycolumnview.h
@@ -50,7 +50,7 @@ class OKTETAGUI_EXPORT ByteArrayColumnView : public \
AbstractByteArrayView Q_OBJECT
public:
- explicit ByteArrayColumnView( QWidget* parent = 0 );
+ explicit ByteArrayColumnView( QWidget* parent = nullptr );
virtual ~ByteArrayColumnView();
public: // AbstractByteArrayView API
diff --git a/gui/bytearrayrowcolumnrenderer.cpp b/gui/bytearrayrowcolumnrenderer.cpp
index 389a2d57..5900cb2c 100644
--- a/gui/bytearrayrowcolumnrenderer.cpp
+++ b/gui/bytearrayrowcolumnrenderer.cpp
@@ -65,11 +65,11 @@ ByteArrayRowColumnRenderer::ByteArrayRowColumnRenderer( \
AbstractColumnStylist* s mByteSpacingWidth( DefaultByteSpacingWidth ),
mGroupSpacingWidth( DefaultGroupSpacingWidth ),
mNoOfGroupedBytes( DefaultNoOfGroupedBytes ),
- mLinePosLeftPixelX( 0 ),
- mLinePosRightPixelX( 0 ),
+ mLinePosLeftPixelX( nullptr ),
+ mLinePosRightPixelX( nullptr ),
mLastLinePos( 0 ),
mByteTypeColored( true ),
- mValueCodec( 0 ),
+ mValueCodec( nullptr ),
mBinaryGapWidth( DefaultBinaryGapWidth ),
mShowingNonprinting( DefaultShowingNonprinting ),
mSubstituteChar( DefaultSubstituteChar ),
@@ -654,7 +654,7 @@ void ByteArrayRowColumnRenderer::renderPlain( QPainter* painter, \
const LinePosit BookmarksConstIterator bit;
Address nextBookmarkOffset = -1;
- const bool hasBookmarks = ( mBookmarks != 0 );
+ const bool hasBookmarks = ( mBookmarks != nullptr );
if( hasBookmarks )
{
bit = mBookmarks->createBookmarksConstIterator();
@@ -699,7 +699,7 @@ void ByteArrayRowColumnRenderer::renderSelection( QPainter* \
painter, const LineP BookmarksConstIterator bit;
Address nextBookmarkOffset = -1;
- const bool hasBookmarks = ( mBookmarks != 0 );
+ const bool hasBookmarks = ( mBookmarks != nullptr );
if( hasBookmarks )
{
bit = mBookmarks->createBookmarksConstIterator();
diff --git a/gui/bytearrayrowview.h b/gui/bytearrayrowview.h
index fa88db6c..62b75f0e 100644
--- a/gui/bytearrayrowview.h
+++ b/gui/bytearrayrowview.h
@@ -37,7 +37,7 @@ class OKTETAGUI_EXPORT ByteArrayRowView : public \
AbstractByteArrayView Q_OBJECT
public:
- explicit ByteArrayRowView( QWidget* parent = 0 );
+ explicit ByteArrayRowView( QWidget* parent = nullptr );
virtual ~ByteArrayRowView();
public: // AbstractByteArrayView API
diff --git a/gui/bytearraytableranges.cpp b/gui/bytearraytableranges.cpp
index 8d4d40ed..12adc4cf 100644
--- a/gui/bytearraytableranges.cpp
+++ b/gui/bytearraytableranges.cpp
@@ -196,13 +196,13 @@ bool ByteArrayTableRanges::overlapsMarking( Address FirstIndex, \
Address LastInde
const AddressRange *ByteArrayTableRanges::firstOverlappingSelection( const \
AddressRange &Range ) const {
- return mSelection.range().overlaps(Range) ? &mSelection.range() : 0;
+ return mSelection.range().overlaps(Range) ? &mSelection.range() : nullptr;
}
const AddressRange *ByteArrayTableRanges::overlappingMarking( const AddressRange \
&Range ) const {
- return mMarking.overlaps(Range) ? &mMarking : 0;
+ return mMarking.overlaps(Range) ? &mMarking : nullptr;
}
/*
diff --git a/gui/libcolumnsview/columnsview.h b/gui/libcolumnsview/columnsview.h
index 9023b1ff..2743510f 100644
--- a/gui/libcolumnsview/columnsview.h
+++ b/gui/libcolumnsview/columnsview.h
@@ -49,7 +49,7 @@ class OKTETAGUI_EXPORT ColumnsView : public QAbstractScrollArea
Q_OBJECT
public:
- explicit ColumnsView( /*bool R = false,*/ QWidget* parent = 0 );
+ explicit ColumnsView( /*bool R = false,*/ QWidget* parent = nullptr );
virtual ~ColumnsView();
public: // data-wise sizes
diff --git a/gui/valuebytearraycolumnrenderer.cpp \
b/gui/valuebytearraycolumnrenderer.cpp index 52628f0a..fc442598 100644
--- a/gui/valuebytearraycolumnrenderer.cpp
+++ b/gui/valuebytearraycolumnrenderer.cpp
@@ -43,7 +43,7 @@ namespace Okteta
ValueByteArrayColumnRenderer::ValueByteArrayColumnRenderer( AbstractColumnStylist* \
stylist,
AbstractByteArrayModel* byteArrayModel, ByteArrayTableLayout* layout, \
ByteArrayTableRanges* ranges ) : AbstractByteArrayColumnRenderer( stylist, \
byteArrayModel, layout, ranges ),
- mValueCodec( 0 ),
+ mValueCodec( nullptr ),
mBinaryGapWidth( DefaultBinaryGapWidth )
{
}
diff --git a/kasten/controllers/document/info/bytearraymodeliodevice.h \
b/kasten/controllers/document/info/bytearraymodeliodevice.h index 7e6a6704..b3992a9e \
100644
--- a/kasten/controllers/document/info/bytearraymodeliodevice.h
+++ b/kasten/controllers/document/info/bytearraymodeliodevice.h
@@ -40,7 +40,7 @@ class ByteArrayModelIoDevice : public QIODevice
Q_OBJECT
public:
- explicit ByteArrayModelIoDevice( AbstractByteArrayModel* byteArrayModel, \
QObject* parent = 0 ); + explicit ByteArrayModelIoDevice( AbstractByteArrayModel* \
byteArrayModel, QObject* parent = nullptr ); virtual ~ByteArrayModelIoDevice();
public: // QIODevice API
diff --git a/kasten/controllers/document/info/documentinfotool.cpp \
b/kasten/controllers/document/info/documentinfotool.cpp index b623fea7..676e54a1 \
100644
--- a/kasten/controllers/document/info/documentinfotool.cpp
+++ b/kasten/controllers/document/info/documentinfotool.cpp
@@ -47,9 +47,9 @@ static const int mimeTypeUpdateTimeInterval = 500; // msec
DocumentInfoTool::DocumentInfoTool( DocumentSyncManager* syncManager )
- : mDocument( 0 ),
- mByteArrayModel( 0 ),
- mSynchronizer( 0 ),
+ : mDocument( nullptr ),
+ mByteArrayModel( nullptr ),
+ mSynchronizer( nullptr ),
mDocumentSyncManager( syncManager ),
mMimeTypeUpdateTimer( new QTimer(this) ),
mMimeType()
@@ -94,11 +94,11 @@ void DocumentInfoTool::setTargetModel( AbstractModel* model )
if( mDocument ) mDocument->disconnect( this );
if( mByteArrayModel ) mByteArrayModel->disconnect( this );
- mDocument = model ? model->findBaseModel<ByteArrayDocument*>() : 0;
- mByteArrayModel = mDocument ? mDocument->content() : 0;
+ mDocument = model ? model->findBaseModel<ByteArrayDocument*>() : nullptr;
+ mByteArrayModel = mDocument ? mDocument->content() : nullptr;
- const bool hasDocument = ( mDocument != 0 );
- AbstractModelSynchronizer* synchronizer = 0;
+ const bool hasDocument = ( mDocument != nullptr );
+ AbstractModelSynchronizer* synchronizer = nullptr;
QString documentTitle;
int documentSize = -1;
if( hasDocument )
diff --git a/kasten/controllers/document/info/documentinfoview.h \
b/kasten/controllers/document/info/documentinfoview.h index d31c8412..2767e75f 100644
--- a/kasten/controllers/document/info/documentinfoview.h
+++ b/kasten/controllers/document/info/documentinfoview.h
@@ -43,7 +43,7 @@ class DocumentInfoView : public QWidget
Q_OBJECT
public:
- explicit DocumentInfoView( DocumentInfoTool* tool, QWidget* parent = 0 );
+ explicit DocumentInfoView( DocumentInfoTool* tool, QWidget* parent = nullptr );
virtual ~DocumentInfoView();
public:
diff --git a/kasten/controllers/test/arraydatainformationtest.cpp \
b/kasten/controllers/test/arraydatainformationtest.cpp index fe77679d..1229d365 \
100644
--- a/kasten/controllers/test/arraydatainformationtest.cpp
+++ b/kasten/controllers/test/arraydatainformationtest.cpp
@@ -52,7 +52,7 @@ void ArrayDataInformationTest::initTestCase()
{
qRegisterMetaType<const DataInformation*>();
qRegisterMetaType<DataInformation*>();
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
primitive = new ArrayDataInformation(QStringLiteral("primitives"), 0,
PrimitiveFactory::newInstance(QStringLiteral("child"), Type_UInt32, \
lwc));
diff --git a/kasten/controllers/test/basicdatainformationtest.cpp \
b/kasten/controllers/test/basicdatainformationtest.cpp index d3e3792b..b6e26ec6 \
100644
--- a/kasten/controllers/test/basicdatainformationtest.cpp
+++ b/kasten/controllers/test/basicdatainformationtest.cpp
@@ -37,7 +37,7 @@
struct ExpectedResults {
ExpectedResults()
- : parent(0), size(0),isTopLevel(false), isEnum(false), isStruct(false), \
isUnion(false), isArray(false), + : parent(nullptr), size(0),isTopLevel(false), \
isEnum(false), isStruct(false), isUnion(false), isArray(false),
isBitfield(false), isPrimitive(false), isString(false), isDummy(false), \
canHaveChildren(false), hasChildren(false) {
columnFlags[DataInformation::ColumnName] = Qt::ItemIsSelectable | \
Qt::ItemIsEnabled; @@ -138,8 +138,8 @@ template<typename T> void castChecker(bool \
isValid, DataInformationBase* data, c }
else
{
- QCOMPARE(constValue, static_cast<const T*>(0));
- QCOMPARE(nonConstValue, static_cast<T*>(0));
+ QCOMPARE(constValue, static_cast<const T*>(nullptr));
+ QCOMPARE(nonConstValue, static_cast<T*>(nullptr));
}
}
#define CAST_CHECKER(isValid, value, func, type) do {\
@@ -237,7 +237,7 @@ void BasicDataInformationTest::basicTest(DataInformationBase* \
data, const Expect QCOMPARE(top->actualDataInformation(), clone1);
QScopedPointer<DataInformation> clone2(clone1->clone());
- QVERIFY(clone2->parent() == 0); //cloning should reset parent to NULL, else we \
get dangling pointers + QVERIFY(clone2->parent() == nullptr); //cloning should \
reset parent to NULL, else we get dangling pointers
QCOMPARE(dataInf->flags(DataInformation::ColumnName, true), \
expected.columnFlags[DataInformation::ColumnName]);
QCOMPARE(dataInf->flags(DataInformation::ColumnType, true), \
expected.columnFlags[DataInformation::ColumnType]); @@ -253,14 +253,14 @@ void \
BasicDataInformationTest::initTestCase() {
// qRegisterMetaType<const DataInformation*>();
// qRegisterMetaType<DataInformation*>();
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
for (int i = Type_START; i < Type_Bitfield; ++i) {
primitives.append(PrimitiveFactory::newInstance(QStringLiteral("prim"),
PrimitiveDataType(static_cast<PrimitiveDataTypeEnum>(i)), lwc));
}
- QCOMPARE(PrimitiveFactory::newInstance(QStringLiteral("invalid"), Type_Bitfield, \
lwc), static_cast<PrimitiveDataInformation*>(0));
- QCOMPARE(PrimitiveFactory::newInstance(QStringLiteral("invalid"), \
QStringLiteral("invalid_type"), lwc), static_cast<PrimitiveDataInformation*>(0)); \
+ QCOMPARE(PrimitiveFactory::newInstance(QStringLiteral("invalid"), Type_Bitfield, \
lwc), static_cast<PrimitiveDataInformation*>(nullptr)); \
+ QCOMPARE(PrimitiveFactory::newInstance(QStringLiteral("invalid"), \
QStringLiteral("invalid_type"), lwc), \
static_cast<PrimitiveDataInformation*>(nullptr)); bitfields.append(new \
BoolBitfieldDataInformation(QStringLiteral("bitfield"), 24)); bitfields.append(new \
UnsignedBitfieldDataInformation(QStringLiteral("bitfield"), 24)); \
bitfields.append(new SignedBitfieldDataInformation(QStringLiteral("bitfield"), 24)); \
@@ -290,8 +290,8 @@ void BasicDataInformationTest::initTestCase() flagData = new \
FlagDataInformation(QStringLiteral("flagData"), \
PrimitiveFactory::newInstance(QStringLiteral("prim"), Type_UInt32, lwc), edef); \
enumData = new EnumDataInformation(QStringLiteral("enumData"), \
PrimitiveFactory::newInstance(QStringLiteral("prim"), Type_UInt32, \
lwc), edef);
emptyString = new StringDataInformation(QStringLiteral("string"), \
StringDataInformation::ASCII);
- dummy = new DummyDataInformation(0);
- topLevel = new TopLevelDataInformation(new DummyDataInformation(0));
+ dummy = new DummyDataInformation(nullptr);
+ topLevel = new TopLevelDataInformation(new DummyDataInformation(nullptr));
}
void BasicDataInformationTest::testBitfields()
diff --git a/kasten/controllers/test/customtostringtest.cpp \
b/kasten/controllers/test/customtostringtest.cpp index 58557564..6b74aadc 100644
--- a/kasten/controllers/test/customtostringtest.cpp
+++ b/kasten/controllers/test/customtostringtest.cpp
@@ -87,7 +87,7 @@ void CustomToStringTest::testUuid()
QScriptEngine* eng = ScriptEngineInitializer::newEngine();
ScriptLogger* logger = new ScriptLogger();
logger->setLogToStdOut(true);
- DataInformation* structure = 0;
+ DataInformation* structure = nullptr;
if (isGUID)
structure = Utils::evalAndParse(eng, "var u = importScript('uuid.js'); \
u.GUID();", logger); else
diff --git a/kasten/controllers/test/jsparsertest.cpp \
b/kasten/controllers/test/jsparsertest.cpp index 1140e3e3..590704a6 100644
--- a/kasten/controllers/test/jsparsertest.cpp
+++ b/kasten/controllers/test/jsparsertest.cpp
@@ -188,7 +188,7 @@ void JsParserTest::testCommon(DataInformation** dataPtr) {
void JsParserTest::testByteOrder()
{
- DataInformation* data = 0;
+ DataInformation* data = nullptr;
testCommon(&data);
if (QTest::currentTestFailed())
return; //Qt doesn't use exceptions, we must manually check after each call
@@ -222,7 +222,7 @@ void JsParserTest::testUpdateFunc_data()
void JsParserTest::testUpdateFunc()
{
- DataInformation* data = 0;
+ DataInformation* data = nullptr;
testCommon(&data);
if (QTest::currentTestFailed())
return; //Qt doesn't use exceptions, we must manually check after each call
@@ -259,7 +259,7 @@ void JsParserTest::testValidationFunc_data()
void JsParserTest::testValidationFunc()
{
- DataInformation* data = 0;
+ DataInformation* data = nullptr;
testCommon(&data);
if (QTest::currentTestFailed())
return; //Qt doesn't use exceptions, we must manually check after each call
@@ -288,7 +288,7 @@ void JsParserTest::testName_data()
void JsParserTest::testName()
{
- DataInformation* data = 0;
+ DataInformation* data = nullptr;
testCommon(&data);
if (QTest::currentTestFailed())
return; //Qt doesn't use exceptions, we must manually check after each call
@@ -314,7 +314,7 @@ void JsParserTest::testCustomTypeName_data()
void JsParserTest::testCustomTypeName()
{
- DataInformation* data = 0;
+ DataInformation* data = nullptr;
testCommon(&data);
if (QTest::currentTestFailed())
return; //Qt doesn't use exceptions, we must manually check after each call
diff --git a/kasten/controllers/test/locktooffsettest.cpp \
b/kasten/controllers/test/locktooffsettest.cpp index 458ae3f8..c1d5efe9 100644
--- a/kasten/controllers/test/locktooffsettest.cpp
+++ b/kasten/controllers/test/locktooffsettest.cpp
@@ -143,7 +143,7 @@ void LockToOffsetTest::testReadingNecessary_data()
QTest::addColumn<bool>("expected");
Okteta::ArrayChangeMetricsList noChanges;
- TopLevelDataInformation* top = newStructure(0, 5);
+ TopLevelDataInformation* top = newStructure(nullptr, 5);
addRow("new model, same offset, no changes", top, 5, model, noChanges, true);
top = newStructure(model, 5);
diff --git a/kasten/controllers/test/primitivearraytest.cpp \
b/kasten/controllers/test/primitivearraytest.cpp index 43efad4b..93f6b28b 100644
--- a/kasten/controllers/test/primitivearraytest.cpp
+++ b/kasten/controllers/test/primitivearraytest.cpp
@@ -199,7 +199,7 @@ QScriptValue customToStringFunc(QScriptContext *context, \
QScriptEngine *engine) template<PrimitiveDataTypeEnum primType, typename T>
void PrimitiveArrayTest::testReadCustomizedPrimitiveInternal()
{
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
QScriptEngine* engine = ScriptEngineInitializer::newEngine();
PrimitiveDataInformation* \
primInfo(PrimitiveFactory::newInstance(QStringLiteral("value"), primType, lwc)); @@ \
-210,7 +210,7 @@ void \
PrimitiveArrayTest::testReadCustomizedPrimitiveInternal()
ArrayDataInformation* dataInf = new \
ArrayDataInformation(QStringLiteral("values"), endianModel->size() / sizeof(T),
primInfo);
- QScopedPointer<TopLevelDataInformation> top(new TopLevelDataInformation(dataInf, \
0, engine)); + QScopedPointer<TopLevelDataInformation> top(new \
TopLevelDataInformation(dataInf, nullptr, engine));
QCOMPARE(dataInf->childCount(), uint(ENDIAN_SIZE / sizeof(T)));
quint8 bitOffs = 0;
@@ -249,12 +249,12 @@ void PrimitiveArrayTest::testReadCustomizedPrimitiveInternal()
template<PrimitiveDataTypeEnum primType, typename T>
void PrimitiveArrayTest::testReadPrimitiveInternal()
{
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
ArrayDataInformation* dataInf = new \
ArrayDataInformation(QStringLiteral("values"), model->size() / sizeof(T),
PrimitiveFactory::newInstance(QStringLiteral("value"), primType, lwc));
dataInf->setByteOrder(CURRENT_BYTE_ORDER);
- QScopedPointer<TopLevelDataInformation> top(new TopLevelDataInformation(dataInf, \
0, + QScopedPointer<TopLevelDataInformation> top(new \
TopLevelDataInformation(dataInf, nullptr, ScriptEngineInitializer::newEngine()));
QCOMPARE(dataInf->childCount(), uint(SIZE / sizeof(T)));
quint8 bitOffs = 0;
diff --git a/kasten/controllers/test/primitivedatainformationtest.cpp \
b/kasten/controllers/test/primitivedatainformationtest.cpp index bc189cbb..b47bb392 \
100644
--- a/kasten/controllers/test/primitivedatainformationtest.cpp
+++ b/kasten/controllers/test/primitivedatainformationtest.cpp
@@ -112,7 +112,7 @@ void PrimitiveDataInformationTest::initTestCase()
locale.setNumberOptions(QLocale::OmitGroupSeparator);
QLocale::setDefault(locale);
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
for (int i = Type_START; i < Type_Bitfield; ++i)
{
diff --git a/kasten/controllers/test/scriptclassestest.cpp \
b/kasten/controllers/test/scriptclassestest.cpp index 7a788b66..796dc0b2 100644
--- a/kasten/controllers/test/scriptclassestest.cpp
+++ b/kasten/controllers/test/scriptclassestest.cpp
@@ -133,7 +133,7 @@ void ScriptClassesTest::initTestCase()
<< pair("float") << pair("double") << pair("int64high32") << \
pair("int64low32")
<< pair("uint64high32") << pair("uint64low32") << pair("type");
std::sort(primitiveProperties.begin(), primitiveProperties.end());
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
for (int i = Type_START; i < Type_Bitfield; ++i)
{
PrimitiveDataInformation* prim = PrimitiveFactory::newInstance(
@@ -156,23 +156,23 @@ void ScriptClassesTest::initTestCase()
enumData = new EnumDataInformation(QStringLiteral("enumData"),
PrimitiveFactory::newInstance(QStringLiteral("dummy"), Type_Int32, lwc), \
enumDef); enumDataTop.reset(
- new TopLevelDataInformation(enumData, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(enumData, nullptr, ScriptEngineInitializer::newEngine())); \
flagData = new FlagDataInformation(QStringLiteral("flagData"),
PrimitiveFactory::newInstance(QStringLiteral("dummy"), Type_Int32, lwc), \
enumDef); flagDataTop.reset(
- new TopLevelDataInformation(flagData, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(flagData, nullptr, ScriptEngineInitializer::newEngine()));
bitfieldProperties << primitiveProperties << pair("width", \
QScriptValue::Undeletable); std::sort(bitfieldProperties.begin(), \
bitfieldProperties.end());
unsignedBitfield = new \
UnsignedBitfieldDataInformation(QStringLiteral("unsignedBit"), 42); \
unsignedBitfieldTop.reset(
- new TopLevelDataInformation(unsignedBitfield, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(unsignedBitfield, nullptr, \
ScriptEngineInitializer::newEngine()));
signedBitfield = new SignedBitfieldDataInformation(QStringLiteral("signedBit"), \
42); signedBitfieldTop.reset(
- new TopLevelDataInformation(signedBitfield, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(signedBitfield, nullptr, \
ScriptEngineInitializer::newEngine()));
boolBitfield = new BoolBitfieldDataInformation(QStringLiteral("boolBit"), 42);
boolBitfieldTop.reset(
- new TopLevelDataInformation(boolBitfield, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(boolBitfield, nullptr, \
ScriptEngineInitializer::newEngine()));
stringProperties << commonProperties << pair("terminatedBy", \
QScriptValue::Undeletable)
<< pair("byteCount") << pair("maxCharCount", QScriptValue::Undeletable)
@@ -181,7 +181,7 @@ void ScriptClassesTest::initTestCase()
std::sort(stringProperties.begin(), stringProperties.end());
stringData = new StringDataInformation(QStringLiteral("string"), \
StringDataInformation::Latin1); stringDataTop.reset(
- new TopLevelDataInformation(stringData, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(stringData, nullptr, ScriptEngineInitializer::newEngine())); \
arrayProperties << commonProperties << pair("length", QScriptValue::Undeletable)
<< pair("type", QScriptValue::Undeletable);
@@ -189,16 +189,16 @@ void ScriptClassesTest::initTestCase()
arrayData = new ArrayDataInformation(QStringLiteral("array"), 20,
PrimitiveFactory::newInstance(QStringLiteral("inner"), Type_Int32, \
lwc)); arrayDataTop.reset(
- new TopLevelDataInformation(arrayData, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(arrayData, nullptr, ScriptEngineInitializer::newEngine()));
structUnionProperties << commonProperties << pair("childCount");
//property children is only writable -> it is not in the iterator
structData = new StructureDataInformation(QStringLiteral("struct"));
structDataTop.reset(
- new TopLevelDataInformation(structData, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(structData, nullptr, ScriptEngineInitializer::newEngine())); \
unionData = new UnionDataInformation(QStringLiteral("union")); unionDataTop.reset(
- new TopLevelDataInformation(unionData, 0, \
ScriptEngineInitializer::newEngine())); + new \
TopLevelDataInformation(unionData, nullptr, \
ScriptEngineInitializer::newEngine()));
std::sort(structUnionProperties.begin(), structUnionProperties.end());
}
@@ -314,7 +314,7 @@ void ScriptClassesTest::testReplaceObject()
QT_UNICODE_LITERAL("});\n"));
QScriptValue val = eng->evaluate(unionDef);
QVERIFY(val.isObject());
- DataInformation* main = ScriptValueConverter::convert(val, \
QStringLiteral("container"), logger, 0); + DataInformation* main = \
ScriptValueConverter::convert(val, QStringLiteral("container"), logger, nullptr); \
QVERIFY(main); QCOMPARE(logger->rowCount(), 0);
TopLevelDataInformation top(main, logger, eng);
@@ -403,11 +403,11 @@ void ScriptClassesTest::testSafePrimitiveArrayReference()
arrayDataTop->scriptHandler()->handlerInfo()->setMode(ScriptHandlerInfo::Updating);
QScriptValue v0 = eng->evaluate(QStringLiteral("myArray[0]"));
QCOMPARE(Utils::property(v0, "name").toString(), QString::number(0));
- QVERIFY(DefaultScriptClass::toDataInformation(v0) != 0);
+ QVERIFY(DefaultScriptClass::toDataInformation(v0) != nullptr);
//access index 1 -> index 0 should become invalid, since there is only one \
object available QScriptValue v1 = eng->evaluate(QStringLiteral("myArray[1]"));
- QVERIFY(DefaultScriptClass::toDataInformation(v1) != 0);
- QVERIFY(DefaultScriptClass::toDataInformation(v0) == 0);
+ QVERIFY(DefaultScriptClass::toDataInformation(v1) != nullptr);
+ QVERIFY(DefaultScriptClass::toDataInformation(v0) == nullptr);
QVERIFY(!eng->hasUncaughtException());
QCOMPARE(Utils::property(v1, "name").toString(), QString::number(1));
QVERIFY(!eng->hasUncaughtException());
@@ -430,7 +430,7 @@ void ScriptClassesTest::testSafeReferenceDeleteObject()
QVERIFY(name.isValid());
QVERIFY(!name.isError());
QCOMPARE(name.toString(), QString(QStringLiteral("foo")));
- top->setActualDataInformation(new DummyDataInformation(0));
+ top->setActualDataInformation(new DummyDataInformation(nullptr));
//val should now point to an invalid reference -> accessing name should throw an \
error name = Utils::property(val, "name");
QVERIFY(name.isValid());
diff --git a/kasten/controllers/test/uniondatainformationtest.cpp \
b/kasten/controllers/test/uniondatainformationtest.cpp index 8fd0b127..d6111385 \
100644
--- a/kasten/controllers/test/uniondatainformationtest.cpp
+++ b/kasten/controllers/test/uniondatainformationtest.cpp
@@ -62,7 +62,7 @@ void UnionDataInformationTest::initTestCase()
void UnionDataInformationTest::testSize()
{
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
UnionDataInformation empty(QStringLiteral("empty"));
QCOMPARE(empty.size(), BitCount32(0));
@@ -77,7 +77,7 @@ void UnionDataInformationTest::testSize()
void UnionDataInformationTest::testReadData1()
{
- LoggerWithContext lwc(0, QString());
+ LoggerWithContext lwc(nullptr, QString());
PrimitiveDataInformation* b8 = \
PrimitiveFactory::newInstance(QStringLiteral("8"), Type_Bool8, lwc);
PrimitiveDataInformation* u32 = \
PrimitiveFactory::newInstance(QStringLiteral("32"), Type_UInt32, \
lwc);
diff --git a/kasten/controllers/view/bookmarks/bookmarkeditpopup.h \
b/kasten/controllers/view/bookmarks/bookmarkeditpopup.h index e3436dce..1a3356bf \
100644
--- a/kasten/controllers/view/bookmarks/bookmarkeditpopup.h
+++ b/kasten/controllers/view/bookmarks/bookmarkeditpopup.h
@@ -38,7 +38,7 @@ class BookmarkEditPopup : public AbstractLinePopup
Q_OBJECT
public:
- explicit BookmarkEditPopup( QWidget* parent = 0 );
+ explicit BookmarkEditPopup( QWidget* parent = nullptr );
virtual ~BookmarkEditPopup();
public:
diff --git a/kasten/controllers/view/bookmarks/bookmarklistmodel.h \
b/kasten/controllers/view/bookmarks/bookmarklistmodel.h index 77238195..5fd532b9 \
100644
--- a/kasten/controllers/view/bookmarks/bookmarklistmodel.h
+++ b/kasten/controllers/view/bookmarks/bookmarklistmodel.h
@@ -53,7 +53,7 @@ class BookmarkListModel : public QAbstractTableModel
};
public:
- explicit BookmarkListModel( BookmarksTool* tool, QObject* parent = 0 );
+ explicit BookmarkListModel( BookmarksTool* tool, QObject* parent = nullptr );
virtual ~BookmarkListModel();
public: // QAbstractTableModel API
diff --git a/kasten/controllers/view/bookmarks/bookmarkscontroller.cpp \
b/kasten/controllers/view/bookmarks/bookmarkscontroller.cpp index 7f89f6fa..b90cef8c \
100644
--- a/kasten/controllers/view/bookmarks/bookmarkscontroller.cpp
+++ b/kasten/controllers/view/bookmarks/bookmarkscontroller.cpp
@@ -55,7 +55,7 @@ static const char BookmarkListActionListId[] = "bookmark_list";
// TODO: Sortieren nach Offset oder Zeit
BookmarksController::BookmarksController( KXMLGUIClient* guiClient )
- : mGuiClient( guiClient ), mByteArrayView( 0 ), mByteArray( 0 ), mBookmarks( 0 )
+ : mGuiClient( guiClient ), mByteArrayView( nullptr ), mByteArray( nullptr ), \
mBookmarks( nullptr ) {
KActionCollection* actionCollection = mGuiClient->actionCollection();
@@ -86,7 +86,7 @@ BookmarksController::BookmarksController( KXMLGUIClient* guiClient \
) connect( mBookmarksActionGroup, &QActionGroup::triggered,
this, &BookmarksController::onBookmarkTriggered );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void BookmarksController::setTargetModel( AbstractModel* model )
@@ -94,14 +94,14 @@ void BookmarksController::setTargetModel( AbstractModel* model )
if( mByteArrayView ) mByteArrayView->disconnect( this );
if( mByteArray ) mByteArray->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArray = document ? document->content() : 0;
- mBookmarks = ( mByteArray && mByteArrayView ) ? \
qobject_cast<Okteta::Bookmarkable*>( mByteArray ) : 0; + mByteArrayView ? \
qobject_cast<ByteArrayDocument*>( mByteArrayView->baseModel() ) : nullptr; + \
mByteArray = document ? document->content() : nullptr; + mBookmarks = ( mByteArray \
&& mByteArrayView ) ? qobject_cast<Okteta::Bookmarkable*>( mByteArray ) : nullptr;
- const bool hasViewWithBookmarks = ( mBookmarks != 0 );
+ const bool hasViewWithBookmarks = ( mBookmarks != nullptr );
int bookmarksCount = 0;
if( hasViewWithBookmarks )
{
@@ -139,7 +139,7 @@ void BookmarksController::updateBookmarks()
qDeleteAll( mBookmarksActionGroup->actions() );
- if( mBookmarks == 0 )
+ if( ! mBookmarks )
return;
const int startOffset = mByteArrayView->startOffset();
diff --git a/kasten/controllers/view/bookmarks/bookmarkstool.cpp \
b/kasten/controllers/view/bookmarks/bookmarkstool.cpp index 7db7928a..55c9afe6 100644
--- a/kasten/controllers/view/bookmarks/bookmarkstool.cpp
+++ b/kasten/controllers/view/bookmarks/bookmarkstool.cpp
@@ -46,7 +46,7 @@ namespace Kasten
{
BookmarksTool::BookmarksTool()
- : mByteArrayView( 0 ), mByteArray( 0 ), mBookmarks( 0 ), mCanCreateBookmark( false \
) + : mByteArrayView( nullptr ), mByteArray( nullptr ), mBookmarks( nullptr ), \
mCanCreateBookmark( false ) {
setObjectName( QStringLiteral( "Bookmarks" ) );
}
@@ -83,14 +83,14 @@ void BookmarksTool::setTargetModel( AbstractModel* model )
if( mByteArrayView ) mByteArrayView->disconnect( this );
if( mByteArray ) mByteArray->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArray = document ? document->content() : 0;
- mBookmarks = ( mByteArray && mByteArrayView ) ? \
qobject_cast<Okteta::Bookmarkable*>( mByteArray ) : 0; + mByteArrayView ? \
qobject_cast<ByteArrayDocument*>( mByteArrayView->baseModel() ) : nullptr; + \
mByteArray = document ? document->content() : nullptr; + mBookmarks = ( mByteArray \
&& mByteArrayView ) ? qobject_cast<Okteta::Bookmarkable*>( mByteArray ) : nullptr;
- const bool hasViewWithBookmarks = ( mBookmarks != 0 );
+ const bool hasViewWithBookmarks = ( mBookmarks != nullptr );
if( hasViewWithBookmarks )
{
onCursorPositionChanged( mByteArrayView->cursorPosition() );
diff --git a/kasten/controllers/view/bookmarks/bookmarksview.h \
b/kasten/controllers/view/bookmarks/bookmarksview.h index ead4fc9b..b0c360cf 100644
--- a/kasten/controllers/view/bookmarks/bookmarksview.h
+++ b/kasten/controllers/view/bookmarks/bookmarksview.h
@@ -43,7 +43,7 @@ class BookmarksView : public QWidget
Q_OBJECT
public:
- explicit BookmarksView( BookmarksTool* tool, QWidget* parent = 0 );
+ explicit BookmarksView( BookmarksTool* tool, QWidget* parent = nullptr );
virtual ~BookmarksView();
public:
diff --git a/kasten/controllers/view/bytetable/bytetablemodel.h \
b/kasten/controllers/view/bytetable/bytetablemodel.h index 7b7b2ba6..3b141cf9 100644
--- a/kasten/controllers/view/bytetable/bytetablemodel.h
+++ b/kasten/controllers/view/bytetable/bytetablemodel.h
@@ -51,7 +51,7 @@ class ByteTableModel : public QAbstractTableModel
};
public:
- explicit ByteTableModel( QObject *parent = 0 );
+ explicit ByteTableModel( QObject *parent = nullptr );
virtual ~ByteTableModel();
public: // QAbstractTableModel API
diff --git a/kasten/controllers/view/bytetable/bytetabletool.cpp \
b/kasten/controllers/view/bytetable/bytetabletool.cpp index 96bfd2a1..628ed567 100644
--- a/kasten/controllers/view/bytetable/bytetabletool.cpp
+++ b/kasten/controllers/view/bytetable/bytetabletool.cpp
@@ -41,7 +41,7 @@ namespace Kasten
ByteTableTool::ByteTableTool()
: mByteTableModel( new ByteTableModel(this) ),
- mByteArrayView( 0 ), mByteArrayModel( 0 )
+ mByteArrayView( nullptr ), mByteArrayModel( nullptr )
{
setObjectName( QStringLiteral( "ByteTable" ) );
}
@@ -62,11 +62,11 @@ void ByteTableTool::setTargetModel( AbstractModel* model )
mByteArrayView->disconnect( this );
}
- mByteArrayView = model ? qobject_cast<ByteArrayView*>( model ) : 0;
+ mByteArrayView = model ? qobject_cast<ByteArrayView*>( model ) : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
const bool hasView = ( mByteArrayView && mByteArrayModel );
if( hasView )
diff --git a/kasten/controllers/view/bytetable/bytetableview.h \
b/kasten/controllers/view/bytetable/bytetableview.h index 9b043b34..7e004df6 100644
--- a/kasten/controllers/view/bytetable/bytetableview.h
+++ b/kasten/controllers/view/bytetable/bytetableview.h
@@ -43,7 +43,7 @@ class ByteTableView : public AbstractToolWidget
Q_OBJECT
public:
- explicit ByteTableView( ByteTableTool *tool, QWidget* parent = 0 );
+ explicit ByteTableView( ByteTableTool *tool, QWidget* parent = nullptr );
virtual ~ByteTableView();
public:
diff --git a/kasten/controllers/view/charsetconversion/charsetconversiontool.cpp \
b/kasten/controllers/view/charsetconversion/charsetconversiontool.cpp index \
38d91403..b066a093 100644
--- a/kasten/controllers/view/charsetconversion/charsetconversiontool.cpp
+++ b/kasten/controllers/view/charsetconversion/charsetconversiontool.cpp
@@ -45,8 +45,8 @@ CharsetConversionTool::CharsetConversionTool()
: mConversionDirection( ConvertFrom ),
mSubstitutingMissingChars(false),
mSubstituteByte( 0 ),
- mByteArrayView( 0 ),
- mByteArrayModel( 0 )
+ mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr )
{
setObjectName( QStringLiteral("CharsetConversion") );
}
@@ -90,11 +90,11 @@ void CharsetConversionTool::setTargetModel( AbstractModel* model \
) {
if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
diff --git a/kasten/controllers/view/charsetconversion/charsetconversionview.cpp \
b/kasten/controllers/view/charsetconversion/charsetconversionview.cpp index \
4c4bc862..9371c0cd 100644
--- a/kasten/controllers/view/charsetconversion/charsetconversionview.cpp
+++ b/kasten/controllers/view/charsetconversion/charsetconversionview.cpp
@@ -221,14 +221,14 @@ void CharsetConversionView::onConversionDone( bool success, int \
convertedBytesCo i18nc( "@info", "No bytes substituted.") :
i18ncp( "@info", "1 byte substituted.", "%1 bytes substituted.", \
totalFailedByteCount ); }
- KMessageBox::information( /*mParentWidget*/0,
+ KMessageBox::information( /*mParentWidget*/nullptr,
conversionReport,
messageBoxTitle );
}
else
{
// TODO: show/goto byte which on which conversion fails
- KMessageBox::sorry( /*mParentWidget*/0,
+ KMessageBox::sorry( /*mParentWidget*/nullptr,
i18nc("@info",
"Conversion cancelled because of chars which are \
not " "in the target charset."),
diff --git a/kasten/controllers/view/charsetconversion/charsetconversionview.h \
b/kasten/controllers/view/charsetconversion/charsetconversionview.h index \
e0697f45..a05d8cf7 100644
--- a/kasten/controllers/view/charsetconversion/charsetconversionview.h
+++ b/kasten/controllers/view/charsetconversion/charsetconversionview.h
@@ -45,7 +45,7 @@ class CharsetConversionView : public QWidget
Q_OBJECT
public:
- explicit CharsetConversionView( CharsetConversionTool* tool, QWidget* parent = 0 \
); + explicit CharsetConversionView( CharsetConversionTool* tool, QWidget* parent \
= nullptr ); virtual ~CharsetConversionView();
public:
diff --git a/kasten/controllers/view/checksum/checksumtool.cpp \
b/kasten/controllers/view/checksum/checksumtool.cpp index 062a65e5..fa7ddf65 100644
--- a/kasten/controllers/view/checksum/checksumtool.cpp
+++ b/kasten/controllers/view/checksum/checksumtool.cpp
@@ -59,9 +59,9 @@ ChecksumTool::ChecksumTool()
mChecksumUptodate( false ),
mSourceByteArrayModelUptodate( false ),
mAlgorithmId( 0 ),
- mByteArrayView( 0 ), mByteArrayModel( 0 ),
+ mByteArrayView( nullptr ), mByteArrayModel( nullptr ),
mSourceAlgorithmId( -1 ),
- mSourceByteArrayModel( 0 )
+ mSourceByteArrayModel( nullptr )
{
setObjectName( QStringLiteral( "Checksum" ) );
@@ -89,18 +89,18 @@ AbstractByteArrayChecksumParameterSet* \
ChecksumTool::parameterSet() {
AbstractByteArrayChecksumAlgorithm* algorithm = mAlgorithmList.at( mAlgorithmId \
);
- return algorithm ? algorithm->parameterSet() : 0;
+ return algorithm ? algorithm->parameterSet() : nullptr;
}
void ChecksumTool::setTargetModel( AbstractModel* model )
{
if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
@@ -196,7 +196,7 @@ void ChecksumTool::onSourceChanged()
void ChecksumTool::onSourceDestroyed()
{
- mSourceByteArrayModel = 0;
+ mSourceByteArrayModel = nullptr;
onSourceChanged();
}
diff --git a/kasten/controllers/view/checksum/checksumview.h \
b/kasten/controllers/view/checksum/checksumview.h index 5090c581..8b3f9c15 100644
--- a/kasten/controllers/view/checksum/checksumview.h
+++ b/kasten/controllers/view/checksum/checksumview.h
@@ -46,7 +46,7 @@ class ChecksumView : public AbstractToolWidget
Q_OBJECT
public:
- explicit ChecksumView( ChecksumTool* tool, QWidget* parent = 0 );
+ explicit ChecksumView( ChecksumTool* tool, QWidget* parent = nullptr );
virtual ~ChecksumView();
public:
diff --git a/kasten/controllers/view/filter/filtertool.cpp \
b/kasten/controllers/view/filter/filtertool.cpp index 8652f553..2c8fdabb 100644
--- a/kasten/controllers/view/filter/filtertool.cpp
+++ b/kasten/controllers/view/filter/filtertool.cpp
@@ -44,7 +44,7 @@ namespace Kasten
{
FilterTool::FilterTool()
- : mByteArrayView( 0 ), mByteArrayModel( 0 ), mHasWritable( false )
+ : mByteArrayView( nullptr ), mByteArrayModel( nullptr ), mHasWritable( false )
{
setObjectName( QStringLiteral( "BinaryFilter" ) );
@@ -64,18 +64,18 @@ AbstractByteArrayFilterParameterSet *FilterTool::parameterSet( \
int filterId ) {
AbstractByteArrayFilter *byteArrayFilter = mFilterList.at( filterId );
- return byteArrayFilter ? byteArrayFilter->parameterSet() : 0;
+ return byteArrayFilter ? byteArrayFilter->parameterSet() : nullptr;
}
void FilterTool::setTargetModel( AbstractModel* model )
{
if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument *document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
const bool hasByteArray = ( mByteArrayModel && mByteArrayView );
QString newCharCodecName;
diff --git a/kasten/controllers/view/filter/filterview.h \
b/kasten/controllers/view/filter/filterview.h index 81bf6eb4..34334d57 100644
--- a/kasten/controllers/view/filter/filterview.h
+++ b/kasten/controllers/view/filter/filterview.h
@@ -46,7 +46,7 @@ class FilterView : public AbstractToolWidget
Q_OBJECT
public:
- explicit FilterView( FilterTool *tool, QWidget* parent = 0 );
+ explicit FilterView( FilterTool *tool, QWidget* parent = nullptr );
virtual ~FilterView();
public:
diff --git a/kasten/controllers/view/gotooffset/gotooffsettool.cpp \
b/kasten/controllers/view/gotooffset/gotooffsettool.cpp index a6ace3bb..621cb5e9 \
100644
--- a/kasten/controllers/view/gotooffset/gotooffsettool.cpp
+++ b/kasten/controllers/view/gotooffset/gotooffsettool.cpp
@@ -40,8 +40,8 @@ GotoOffsetTool::GotoOffsetTool()
mIsRelative( false ),
mIsSelectionToExtent( false ),
mIsBackwards( false ),
- mByteArrayView( 0 ),
- mByteArrayModel( 0 )
+ mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr )
{
setObjectName( QStringLiteral( "GotoOffset" ) );
}
@@ -76,11 +76,11 @@ void GotoOffsetTool::setTargetModel( AbstractModel* model )
if( mByteArrayView ) mByteArrayView->disconnect( this );
if( mByteArrayModel ) mByteArrayModel->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
diff --git a/kasten/controllers/view/gotooffset/gotooffsetview.h \
b/kasten/controllers/view/gotooffset/gotooffsetview.h index 072cc899..6478cf09 100644
--- a/kasten/controllers/view/gotooffset/gotooffsetview.h
+++ b/kasten/controllers/view/gotooffset/gotooffsetview.h
@@ -46,7 +46,7 @@ class GotoOffsetView : public AbstractToolWidget
Q_OBJECT
public:
- explicit GotoOffsetView( GotoOffsetTool* tool, QWidget* parent = 0 );
+ explicit GotoOffsetView( GotoOffsetTool* tool, QWidget* parent = nullptr );
virtual ~GotoOffsetView();
public:
diff --git a/kasten/controllers/view/info/infotool.cpp \
b/kasten/controllers/view/info/infotool.cpp index 6017e4af..f3364cc6 100644
--- a/kasten/controllers/view/info/infotool.cpp
+++ b/kasten/controllers/view/info/infotool.cpp
@@ -42,7 +42,7 @@ namespace Kasten
InfoTool::InfoTool()
: mStatisticTableModel( new StatisticTableModel(mByteCount,this) ),
- mByteArrayView( 0 ), mByteArrayModel( 0 ), mSourceByteArrayModelUptodate( false \
), mSourceByteArrayModel( 0 ) + mByteArrayView( nullptr ), mByteArrayModel( nullptr \
), mSourceByteArrayModelUptodate( false ), mSourceByteArrayModel( nullptr ) {
setObjectName( QStringLiteral( "Info" ) );
updateStatistic();
@@ -50,7 +50,7 @@ InfoTool::InfoTool()
QString InfoTool::title() const { return i18nc("@title:window", "Statistics"); }
StatisticTableModel *InfoTool::statisticTableModel() const { return \
mStatisticTableModel; }
-int InfoTool::size() const { return (mByteArrayModel!=0) ? mByteArrayModel->size() : \
-1; } +int InfoTool::size() const { return (mByteArrayModel!=nullptr) ? \
mByteArrayModel->size() : -1; } bool InfoTool::isApplyable() const
{
return ( mByteArrayModel && mByteArrayView && mByteArrayView->hasSelectedData() \
&& !isStatisticUptodate() ); @@ -71,11 +71,11 @@ void InfoTool::setTargetModel( \
AbstractModel* model ) mByteArrayView->disconnect( this );
}
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
@@ -113,7 +113,7 @@ void InfoTool::onSourceChanged()
void InfoTool::onSourceDestroyed()
{
- mSourceByteArrayModel = 0;
+ mSourceByteArrayModel = nullptr;
onSourceChanged();
}
diff --git a/kasten/controllers/view/info/infoview.h \
b/kasten/controllers/view/info/infoview.h index 4ae7c0a2..53ad6bd3 100644
--- a/kasten/controllers/view/info/infoview.h
+++ b/kasten/controllers/view/info/infoview.h
@@ -42,7 +42,7 @@ class InfoView : public QWidget
Q_OBJECT
public:
- explicit InfoView( InfoTool *tool, QWidget* parent = 0 );
+ explicit InfoView( InfoTool *tool, QWidget* parent = nullptr );
virtual ~InfoView();
public:
diff --git a/kasten/controllers/view/info/statistictablemodel.h \
b/kasten/controllers/view/info/statistictablemodel.h index 995fd139..40dfaa54 100644
--- a/kasten/controllers/view/info/statistictablemodel.h
+++ b/kasten/controllers/view/info/statistictablemodel.h
@@ -52,7 +52,7 @@ class StatisticTableModel : public QAbstractTableModel
};
public:
- explicit StatisticTableModel( int *byteCount, QObject *parent = 0 );
+ explicit StatisticTableModel( int *byteCount, QObject *parent = nullptr );
virtual ~StatisticTableModel();
public: // QAbstractTableModel API
diff --git a/kasten/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h \
b/kasten/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h
index 1fe59c1d..5a3948a3 100644
--- a/kasten/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h
+++ b/kasten/controllers/view/libbytearraychecksum/abstractbytearraychecksumparametersetedit.h
@@ -34,7 +34,7 @@ class AbstractByteArrayChecksumParameterSetEdit : public QWidget
Q_OBJECT
protected:
- explicit AbstractByteArrayChecksumParameterSetEdit( QWidget* parent = 0 );
+ explicit AbstractByteArrayChecksumParameterSetEdit( QWidget* parent = nullptr );
public:
virtual ~AbstractByteArrayChecksumParameterSetEdit();
diff --git a/kasten/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h \
b/kasten/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h
index 1f99cd56..89ebbc86 100644
--- a/kasten/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h
+++ b/kasten/controllers/view/libbytearraychecksum/algorithm/modsumbytearraychecksumparametersetedit.h
@@ -37,7 +37,7 @@ class ModSumByteArrayChecksumParameterSetEdit : public \
AbstractByteArrayChecksum static const char Id[];
public:
- explicit ModSumByteArrayChecksumParameterSetEdit( QWidget* parent = 0 );
+ explicit ModSumByteArrayChecksumParameterSetEdit( QWidget* parent = nullptr );
virtual ~ModSumByteArrayChecksumParameterSetEdit();
public: // AbstractByteArrayFilterParameterSetEdit API
diff --git a/kasten/controllers/view/libbytearraychecksum/algorithm/nobytearraychecksumparametersetedit.h \
b/kasten/controllers/view/libbytearraychecksum/algorithm/nobytearraychecksumparametersetedit.h
index 706f152d..8dc50822 100644
--- a/kasten/controllers/view/libbytearraychecksum/algorithm/nobytearraychecksumparametersetedit.h
+++ b/kasten/controllers/view/libbytearraychecksum/algorithm/nobytearraychecksumparametersetedit.h
@@ -35,7 +35,7 @@ class NoByteArrayChecksumParameterSetEdit : public \
AbstractByteArrayChecksumPara static const char Id[];
public:
- explicit NoByteArrayChecksumParameterSetEdit( QWidget* parent = 0 );
+ explicit NoByteArrayChecksumParameterSetEdit( QWidget* parent = nullptr );
virtual ~NoByteArrayChecksumParameterSetEdit();
public: // AbstractByteArrayChecksumParameterSetEdit API
diff --git a/kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h \
b/kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h
index d98e1f73..c473d3fe 100644
--- a/kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h
+++ b/kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h
@@ -34,7 +34,7 @@ class Template_ByteArrayChecksumParameterSetEdit : public \
AbstractByteArrayCheck static const char Id[];
public:
- explicit Template_ByteArrayChecksumParameterSetEdit( QWidget* parent = 0 );
+ explicit Template_ByteArrayChecksumParameterSetEdit( QWidget* parent = nullptr \
);
virtual ~Template_ByteArrayChecksumParameterSetEdit();
diff --git a/kasten/controllers/view/libbytearrayfilter/abstractbytearrayfilterparametersetedit.h \
b/kasten/controllers/view/libbytearrayfilter/abstractbytearrayfilterparametersetedit.h
index 71e4b80e..4dd7dfc0 100644
--- a/kasten/controllers/view/libbytearrayfilter/abstractbytearrayfilterparametersetedit.h
+++ b/kasten/controllers/view/libbytearrayfilter/abstractbytearrayfilterparametersetedit.h
@@ -34,7 +34,7 @@ class AbstractByteArrayFilterParameterSetEdit : public QWidget
Q_OBJECT
protected:
- explicit AbstractByteArrayFilterParameterSetEdit( QWidget* parent = 0 );
+ explicit AbstractByteArrayFilterParameterSetEdit( QWidget* parent = nullptr );
public:
virtual ~AbstractByteArrayFilterParameterSetEdit();
diff --git a/kasten/controllers/view/libbytearrayfilter/filter/nobytearrayfilterparametersetedit.h \
b/kasten/controllers/view/libbytearrayfilter/filter/nobytearrayfilterparametersetedit.h
index 333bc86b..139fcea0 100644
--- a/kasten/controllers/view/libbytearrayfilter/filter/nobytearrayfilterparametersetedit.h
+++ b/kasten/controllers/view/libbytearrayfilter/filter/nobytearrayfilterparametersetedit.h
@@ -35,7 +35,7 @@ class NoByteArrayFilterParameterSetEdit : public \
AbstractByteArrayFilterParamete static const char Id[];
public:
- explicit NoByteArrayFilterParameterSetEdit( QWidget* parent = 0 );
+ explicit NoByteArrayFilterParameterSetEdit( QWidget* parent = nullptr );
virtual ~NoByteArrayFilterParameterSetEdit();
public: // AbstractByteArrayFilterParameterSetEdit API
diff --git a/kasten/controllers/view/libbytearrayfilter/filter/operandbytearrayfilterparametersetedit.h \
b/kasten/controllers/view/libbytearrayfilter/filter/operandbytearrayfilterparametersetedit.h
index 9dad5e80..5ffe5d6c 100644
--- a/kasten/controllers/view/libbytearrayfilter/filter/operandbytearrayfilterparametersetedit.h
+++ b/kasten/controllers/view/libbytearrayfilter/filter/operandbytearrayfilterparametersetedit.h
@@ -40,7 +40,7 @@ class OperandByteArrayFilterParameterSetEdit : public \
AbstractByteArrayFilterPar static const char Id[];
public:
- explicit OperandByteArrayFilterParameterSetEdit( QWidget* parent = 0 );
+ explicit OperandByteArrayFilterParameterSetEdit( QWidget* parent = nullptr );
virtual ~OperandByteArrayFilterParameterSetEdit();
public: // AbstractByteArrayFilterParameterSetEdit API
diff --git a/kasten/controllers/view/libbytearrayfilter/filter/reversebytearrayfilterparametersetedit.h \
b/kasten/controllers/view/libbytearrayfilter/filter/reversebytearrayfilterparametersetedit.h
index 2e6e6927..ff0676d5 100644
--- a/kasten/controllers/view/libbytearrayfilter/filter/reversebytearrayfilterparametersetedit.h
+++ b/kasten/controllers/view/libbytearrayfilter/filter/reversebytearrayfilterparametersetedit.h
@@ -37,7 +37,7 @@ class ReverseByteArrayFilterParameterSetEdit : public \
AbstractByteArrayFilterPar static const char Id[];
public:
- explicit ReverseByteArrayFilterParameterSetEdit( QWidget* parent = 0 );
+ explicit ReverseByteArrayFilterParameterSetEdit( QWidget* parent = nullptr );
virtual ~ReverseByteArrayFilterParameterSetEdit();
public: // AbstractByteArrayFilterParameterSetEdit API
diff --git a/kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.h \
b/kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.h
index 399ac236..244dfd3f 100644
--- a/kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.h
+++ b/kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.h
@@ -37,7 +37,7 @@ class RotateByteArrayFilterParameterSetEdit : public \
AbstractByteArrayFilterPara static const char Id[];
public:
- explicit RotateByteArrayFilterParameterSetEdit( QWidget* parent = 0 );
+ explicit RotateByteArrayFilterParameterSetEdit( QWidget* parent = nullptr );
virtual ~RotateByteArrayFilterParameterSetEdit();
public: // AbstractByteArrayFilterParameterSetEdit API
diff --git a/kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h \
b/kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h
index ba65b285..e1c7a538 100644
--- a/kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h
+++ b/kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h
@@ -34,7 +34,7 @@ class Template_ByteArrayFilterParameterSetEdit : public \
AbstractByteArrayFilterP static const char Id[];
public:
- explicit Template_ByteArrayFilterParameterSetEdit( QWidget* parent = 0 );
+ explicit Template_ByteArrayFilterParameterSetEdit( QWidget* parent = nullptr );
virtual ~Template_ByteArrayFilterParameterSetEdit();
diff --git a/kasten/controllers/view/libfinddialog/kabstractfinddialog.h \
b/kasten/controllers/view/libfinddialog/kabstractfinddialog.h index \
fa8fbb2a..3223f5f1 100644
--- a/kasten/controllers/view/libfinddialog/kabstractfinddialog.h
+++ b/kasten/controllers/view/libfinddialog/kabstractfinddialog.h
@@ -48,7 +48,7 @@ class KAbstractFindDialog : public QDialog
Q_OBJECT
public:
- explicit KAbstractFindDialog( QWidget* parent = 0 );
+ explicit KAbstractFindDialog( QWidget* parent = nullptr );
virtual ~KAbstractFindDialog();
public: // set
@@ -73,8 +73,8 @@ class KAbstractFindDialog : public QDialog
const QString& buttonToolTip, const QString& buttonWhatsThis \
); void setFindButtonEnabled( bool enabled );
void setupFindBox();
- void setupOperationBox( QGroupBox *operationBox = 0 );
- void setupCheckBoxes( QCheckBox *optionCheckBox = 0 );
+ void setupOperationBox( QGroupBox *operationBox = nullptr );
+ void setupCheckBoxes( QCheckBox *optionCheckBox = nullptr );
protected: // API to be implemented
virtual void onFindButtonClicked();
diff --git a/kasten/controllers/view/overwritemode/overwritemodecontroller.cpp \
b/kasten/controllers/view/overwritemode/overwritemodecontroller.cpp index \
b2568c57..7c332fdf 100644
--- a/kasten/controllers/view/overwritemode/overwritemodecontroller.cpp
+++ b/kasten/controllers/view/overwritemode/overwritemodecontroller.cpp
@@ -35,7 +35,7 @@ namespace Kasten
{
OverwriteModeController::OverwriteModeController( KXMLGUIClient* guiClient )
- : mByteArrayView( 0 )
+ : mByteArrayView( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -49,14 +49,14 @@ OverwriteModeController::OverwriteModeController( KXMLGUIClient* \
guiClient )
actionCollection->setDefaultShortcut( mSetOverWriteAction, \
QKeySequence(Qt::Key_Insert) );
connect( mSetOverWriteAction, &KToggleAction::triggered, this, \
&OverwriteModeController::setOverWrite );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void OverwriteModeController::setTargetModel( AbstractModel* model )
{
if( mByteArrayView ) mByteArrayView->disconnect( mSetOverWriteAction );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
if( mByteArrayView )
{
diff --git a/kasten/controllers/view/poddecoder/poddata.cpp \
b/kasten/controllers/view/poddecoder/poddata.cpp index d24995b8..83192111 100644
--- a/kasten/controllers/view/poddecoder/poddata.cpp
+++ b/kasten/controllers/view/poddecoder/poddata.cpp
@@ -35,8 +35,8 @@ static inline void copyInvertedBytes( Byte* data, const Byte* \
sourceData, const
PODData::PODData()
- : mCurrentOriginalData( 0 ),
- mCurrentEndiannessSetData( 0 ),
+ : mCurrentOriginalData( nullptr ),
+ mCurrentEndiannessSetData( nullptr ),
mCurrentSize( 0 ),
mByteOrder( QSysInfo::ByteOrder )
{
@@ -132,8 +132,8 @@ bool PODData::updateRawData( int size )
}
else
{
- mCurrentOriginalData = 0;
- mCurrentEndiannessSetData = 0;
+ mCurrentOriginalData = nullptr;
+ mCurrentEndiannessSetData = nullptr;
mCurrentSize = 0;
}
@@ -148,10 +148,10 @@ void PODData::getPointers( const void** P8Bit, const void** \
P16Bit, const void**
const int* offsets = ( mByteOrder == QSysInfo::ByteOrder ) ? MachineOffsets : \
ReversedOffsets; const Byte* data = mByteOrderSetAligned64Bit.mBytes;
- *P8Bit = (mCurrentSize>=1) ? data + offsets[0] : 0;
- *P16Bit = (mCurrentSize>=2) ? data + offsets[1] : 0;
- *P32Bit = (mCurrentSize>=4) ? data + offsets[2] : 0;
- *P64Bit = (mCurrentSize>=8) ? data + offsets[3] : 0;
+ *P8Bit = (mCurrentSize>=1) ? data + offsets[0] : nullptr;
+ *P16Bit = (mCurrentSize>=2) ? data + offsets[1] : nullptr;
+ *P32Bit = (mCurrentSize>=4) ? data + offsets[2] : nullptr;
+ *P64Bit = (mCurrentSize>=8) ? data + offsets[3] : nullptr;
}
const void* PODData::pointer( int byteCount ) const
@@ -162,7 +162,7 @@ const void* PODData::pointer( int byteCount ) const
const int offset = ( mByteOrder == QSysInfo::ByteOrder ) ? 0 : 8-byteCount;
const Byte* data = mByteOrderSetAligned64Bit.mBytes;
- return (byteCount>0) ? data + offset : 0;
+ return (byteCount>0) ? data + offset : nullptr;
}
}
diff --git a/kasten/controllers/view/poddecoder/poddecodertool.cpp \
b/kasten/controllers/view/poddecoder/poddecodertool.cpp index 38ae9a1e..8c14b550 \
100644
--- a/kasten/controllers/view/poddecoder/poddecodertool.cpp
+++ b/kasten/controllers/view/poddecoder/poddecodertool.cpp
@@ -77,13 +77,13 @@ enum PODTypes
PODDecoderTool::PODDecoderTool()
- : mByteArrayView( 0 ),
- mByteArrayModel( 0 ),
+ : mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr ),
mCursorIndex( 0 ),
mReadOnly( true ),
mIsPodMarked( false ),
mCharCodec( Okteta::CharCodec::createCodec(Okteta::LocalEncoding) ),
- mDifferentSizeDialog( 0 ),
+ mDifferentSizeDialog( nullptr ),
mUnsignedAsHex( true )
{
setObjectName( QStringLiteral( "PODDecoder" ) );
@@ -93,7 +93,7 @@ PODDecoderTool::PODDecoderTool()
QString PODDecoderTool::title() const { return i18nc("@title:window", "Decoding \
Table"); } bool PODDecoderTool::isReadOnly() const { return mReadOnly; }
-bool PODDecoderTool::isApplyable() const { return (mByteArrayModel != 0); }
+bool PODDecoderTool::isApplyable() const { return (mByteArrayModel != nullptr); }
void PODDecoderTool::setTargetModel( AbstractModel* model )
{
@@ -107,10 +107,10 @@ void PODDecoderTool::setTargetModel( AbstractModel* model )
}
if( mByteArrayModel ) mByteArrayModel->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument *document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayModel && mByteArrayView )
{
diff --git a/kasten/controllers/view/poddecoder/poddelegate.cpp \
b/kasten/controllers/view/poddecoder/poddelegate.cpp index d3bc11af..4d07a2f0 100644
--- a/kasten/controllers/view/poddecoder/poddelegate.cpp
+++ b/kasten/controllers/view/poddecoder/poddelegate.cpp
@@ -52,7 +52,7 @@ namespace Kasten
PODDelegate::PODDelegate( PODDecoderTool* tool, QObject* parent )
: QStyledItemDelegate( parent ),
mTool( tool ),
- mEditor( 0 )
+ mEditor( nullptr )
{
qRegisterMetaType<Binary8>();
qRegisterMetaType<Octal8>();
@@ -477,7 +477,7 @@ QString PODDelegate::displayText( const QVariant& data, const \
QLocale& locale ) void PODDelegate::onEditorDone()
{
QWidget* editor = qobject_cast<QWidget*>( sender() );
- mEditor = 0;
+ mEditor = nullptr;
emit commitData( editor );
emit closeEditor( editor );
}
diff --git a/kasten/controllers/view/poddecoder/poddelegate.h \
b/kasten/controllers/view/poddecoder/poddelegate.h index c2b64d07..dd06c63b 100644
--- a/kasten/controllers/view/poddecoder/poddelegate.h
+++ b/kasten/controllers/view/poddecoder/poddelegate.h
@@ -38,7 +38,7 @@ class PODDelegate : public QStyledItemDelegate
Q_OBJECT
public:
- explicit PODDelegate( PODDecoderTool* tool, QObject* parent = 0 );
+ explicit PODDelegate( PODDecoderTool* tool, QObject* parent = nullptr );
virtual ~PODDelegate();
diff --git a/kasten/controllers/view/poddecoder/podtablemodel.h \
b/kasten/controllers/view/poddecoder/podtablemodel.h index cdf528f6..ef468c8f 100644
--- a/kasten/controllers/view/poddecoder/podtablemodel.h
+++ b/kasten/controllers/view/poddecoder/podtablemodel.h
@@ -47,7 +47,7 @@ class PODTableModel : public QAbstractTableModel
};
public:
- explicit PODTableModel( PODDecoderTool* tool, QObject* parent = 0 );
+ explicit PODTableModel( PODDecoderTool* tool, QObject* parent = nullptr );
virtual ~PODTableModel();
public: // QAbstractItemModel API
diff --git a/kasten/controllers/view/poddecoder/podtableview.cpp \
b/kasten/controllers/view/poddecoder/podtableview.cpp index ad724c52..810cde46 100644
--- a/kasten/controllers/view/poddecoder/podtableview.cpp
+++ b/kasten/controllers/view/poddecoder/podtableview.cpp
@@ -46,7 +46,7 @@ namespace Kasten
PODTableView::PODTableView( PODDecoderTool* tool, QWidget* parent )
: QWidget( parent ),
mTool( tool ),
- mPODTableViewFocusChild( 0 )
+ mPODTableViewFocusChild( nullptr )
{
QBoxLayout* baseLayout = new QVBoxLayout( this );
baseLayout->setMargin( 0 );
@@ -196,7 +196,7 @@ bool PODTableView::eventFilter( QObject* object, QEvent* event )
if( ! mPODTableView->hasFocus() && mTool->isApplyable() )
mTool->unmarkPOD();
mPODTableViewFocusChild->removeEventFilter( this );
- mPODTableViewFocusChild = 0;
+ mPODTableViewFocusChild = nullptr;
}
}
diff --git a/kasten/controllers/view/poddecoder/podtableview.h \
b/kasten/controllers/view/poddecoder/podtableview.h index 0cb49393..5f616c20 100644
--- a/kasten/controllers/view/poddecoder/podtableview.h
+++ b/kasten/controllers/view/poddecoder/podtableview.h
@@ -46,7 +46,7 @@ class PODTableView : public QWidget, public \
AbstractDifferentSizeDialog Q_OBJECT
public:
- explicit PODTableView( PODDecoderTool* tool, QWidget* parent = 0 );
+ explicit PODTableView( PODDecoderTool* tool, QWidget* parent = nullptr );
virtual ~PODTableView();
public:
diff --git a/kasten/controllers/view/poddecoder/typeeditors/abstractvalue8editor.h \
b/kasten/controllers/view/poddecoder/typeeditors/abstractvalue8editor.h index \
7d6c087d..8b004bf9 100644
--- a/kasten/controllers/view/poddecoder/typeeditors/abstractvalue8editor.h
+++ b/kasten/controllers/view/poddecoder/typeeditors/abstractvalue8editor.h
@@ -40,7 +40,7 @@ class AbstractValue8Editor : public QSpinBox
Q_OBJECT
public:
- explicit AbstractValue8Editor( Okteta::ValueCoding valueCoding, QWidget* parent \
= 0 ); + explicit AbstractValue8Editor( Okteta::ValueCoding valueCoding, QWidget* \
parent = nullptr );
virtual ~AbstractValue8Editor();
diff --git a/kasten/controllers/view/poddecoder/typeeditors/char8editor.cpp \
b/kasten/controllers/view/poddecoder/typeeditors/char8editor.cpp index \
14aaee0e..9b6a05ab 100644
--- a/kasten/controllers/view/poddecoder/typeeditors/char8editor.cpp
+++ b/kasten/controllers/view/poddecoder/typeeditors/char8editor.cpp
@@ -34,7 +34,7 @@ class Char8Validator : public QValidator
Q_OBJECT
public:
- Char8Validator( Okteta::CharCodec* charCodec, QObject* parent = 0 );
+ Char8Validator( Okteta::CharCodec* charCodec, QObject* parent = nullptr );
virtual ~Char8Validator();
diff --git a/kasten/controllers/view/poddecoder/typeeditors/sintspinbox.h \
b/kasten/controllers/view/poddecoder/typeeditors/sintspinbox.h index \
3d62a817..707467ac 100644
--- a/kasten/controllers/view/poddecoder/typeeditors/sintspinbox.h
+++ b/kasten/controllers/view/poddecoder/typeeditors/sintspinbox.h
@@ -34,7 +34,7 @@ class SIntSpinBox : public QAbstractSpinBox
Q_OBJECT
Q_PROPERTY( qint64 value READ value WRITE setValue USER true )
public:
- explicit SIntSpinBox( QWidget* parent = 0, int base = 10 );
+ explicit SIntSpinBox( QWidget* parent = nullptr, int base = 10 );
virtual ~SIntSpinBox();
@@ -48,10 +48,10 @@ Q_PROPERTY( qint64 value READ value WRITE setValue USER true )
void setRange( qint64 minimum, qint64 maximum );
void setBase( int base );
- static SIntSpinBox* createSInt64Spinbox( QWidget* parent = 0 );
- static SIntSpinBox* createSInt32Spinbox( QWidget* parent = 0 );
- static SIntSpinBox* createSInt16Spinbox( QWidget* parent = 0 );
- static SIntSpinBox* createSInt8Spinbox( QWidget* parent = 0 );
+ static SIntSpinBox* createSInt64Spinbox( QWidget* parent = nullptr );
+ static SIntSpinBox* createSInt32Spinbox( QWidget* parent = nullptr );
+ static SIntSpinBox* createSInt16Spinbox( QWidget* parent = nullptr );
+ static SIntSpinBox* createSInt8Spinbox( QWidget* parent = nullptr );
protected: // QAbstractSpinBox API
virtual QValidator::State validate( QString& input, int& pos ) const;
@@ -131,7 +131,7 @@ inline void SIntSpinBox::setBase( int base )
(base == 16) ? "0x" :
(base == 8) ? "0o" :
(base == 2) ? "0b" :
- /* else */ 0 );
+ /* else */ nullptr );
}
inline SIntSpinBox::~SIntSpinBox() {}
diff --git a/kasten/controllers/view/poddecoder/typeeditors/uintspinbox.h \
b/kasten/controllers/view/poddecoder/typeeditors/uintspinbox.h index \
03822959..313f8507 100644
--- a/kasten/controllers/view/poddecoder/typeeditors/uintspinbox.h
+++ b/kasten/controllers/view/poddecoder/typeeditors/uintspinbox.h
@@ -34,7 +34,7 @@ class UIntSpinBox : public QAbstractSpinBox
Q_OBJECT
Q_PROPERTY( quint64 value READ value WRITE setValue USER true )
public:
- explicit UIntSpinBox( QWidget* parent = 0, int base = 10 );
+ explicit UIntSpinBox( QWidget* parent = nullptr, int base = 10 );
virtual ~UIntSpinBox();
@@ -49,10 +49,10 @@ Q_PROPERTY( quint64 value READ value WRITE setValue USER true )
void setMaximum( quint64 max );
void setBase( int base );
- static UIntSpinBox* createUInt64Spinbox( QWidget* parent = 0 );
- static UIntSpinBox* createUInt32Spinbox( QWidget* parent = 0 );
- static UIntSpinBox* createUInt16Spinbox( QWidget* parent = 0 );
- static UIntSpinBox* createUInt8Spinbox( QWidget* parent = 0 );
+ static UIntSpinBox* createUInt64Spinbox( QWidget* parent = nullptr );
+ static UIntSpinBox* createUInt32Spinbox( QWidget* parent = nullptr );
+ static UIntSpinBox* createUInt16Spinbox( QWidget* parent = nullptr );
+ static UIntSpinBox* createUInt8Spinbox( QWidget* parent = nullptr );
protected: // QAbstractSpinBox API
virtual QValidator::State validate( QString& input, int& pos ) const;
@@ -126,7 +126,7 @@ inline void UIntSpinBox::setBase( int base )
(base == 16) ? "0x" :
(base == 8) ? "0o" :
(base == 2) ? "0b" :
- /* else */ 0 );
+ /* else */ nullptr );
}
inline UIntSpinBox::~UIntSpinBox() {}
diff --git a/kasten/controllers/view/poddecoder/typeeditors/utf8editor.cpp \
b/kasten/controllers/view/poddecoder/typeeditors/utf8editor.cpp index \
08b8fceb..1a1ebf62 100644
--- a/kasten/controllers/view/poddecoder/typeeditors/utf8editor.cpp
+++ b/kasten/controllers/view/poddecoder/typeeditors/utf8editor.cpp
@@ -31,7 +31,7 @@ class Utf8CharValidator : public QValidator
Q_OBJECT
public:
- explicit Utf8CharValidator( QObject* parent = 0 );
+ explicit Utf8CharValidator( QObject* parent = nullptr );
virtual ~Utf8CharValidator();
diff --git a/kasten/controllers/view/print/bytearrayframerenderer.cpp \
b/kasten/controllers/view/print/bytearrayframerenderer.cpp index 35e29a70..7001598b \
100644
--- a/kasten/controllers/view/print/bytearrayframerenderer.cpp
+++ b/kasten/controllers/view/print/bytearrayframerenderer.cpp
@@ -60,8 +60,8 @@ static const int BAFInitialWidth = 50;
ByteArrayFrameRenderer::ByteArrayFrameRenderer()
: mHeight( BAFInitialHeight ),
mWidth( BAFInitialWidth ),
- mByteArrayModel( 0 ),
- mCharCodec( 0 ),
+ mByteArrayModel( nullptr ),
+ mCharCodec( nullptr ),
mResizeStyle( DefaultResizeStyle )
{
mLayout = new Okteta::ByteArrayTableLayout( DefaultNoOfBytesPerLine, \
DefaultFirstLineOffset, DefaultStartOffset, 0, 0 ); @@ -143,7 +143,7 @@ void \
ByteArrayFrameRenderer::setByteArrayModel( \
Okteta::AbstractByteArrayModel*
Okteta::Address offset, Okteta::Size \
length ) {
mByteArrayModel = byteArrayModel;
- length = ( byteArrayModel == 0 ) ? 0 :
+ length = ( ! byteArrayModel ) ? 0 :
( length == -1 ) ? \
byteArrayModel->size()-offset : ( length <= byteArrayModel->size()-offset ) ? \
length :
\
byteArrayModel->size()-offset; @@ -278,7 +278,7 @@ void \
ByteArrayFrameRenderer::setValueCoding( Okteta::ValueCoding valueCoding )
Okteta::ValueCodec* newValueCodec =
Okteta::ValueCodec::createCodec( valueCoding );
- if( newValueCodec == 0 )
+ if( ! newValueCodec )
return;
delete mValueCodec;
@@ -301,7 +301,7 @@ void ByteArrayFrameRenderer::setCharCoding( Okteta::CharCoding \
charCoding ) return;
Okteta::CharCodec* newCharCodec = Okteta::CharCodec::createCodec( charCoding );
- if( newCharCodec == 0 )
+ if( ! newCharCodec )
return;
delete mCharCodec;
@@ -319,7 +319,7 @@ void ByteArrayFrameRenderer::setCharCoding( const QString& \
newCharCodingName ) return;
Okteta::CharCodec* newCharCodec = Okteta::CharCodec::createCodec( \
newCharCodingName );
- if( newCharCodec == 0 )
+ if( ! newCharCodec )
return;
delete mCharCodec;
diff --git a/kasten/controllers/view/print/printcontroller.cpp \
b/kasten/controllers/view/print/printcontroller.cpp index 272c467b..e773a7c8 100644
--- a/kasten/controllers/view/print/printcontroller.cpp
+++ b/kasten/controllers/view/print/printcontroller.cpp
@@ -43,7 +43,7 @@ PrintController::PrintController( KXMLGUIClient* guiClient )
connect( mPrintTool, &PrintTool::viewChanged,
mPrintAction, &QAction::setEnabled );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void PrintController::setTargetModel( AbstractModel* model )
diff --git a/kasten/controllers/view/print/printtool.cpp \
b/kasten/controllers/view/print/printtool.cpp index a823bd36..96bd9893 100644
--- a/kasten/controllers/view/print/printtool.cpp
+++ b/kasten/controllers/view/print/printtool.cpp
@@ -49,7 +49,7 @@ namespace Kasten
{
PrintTool::PrintTool()
- : mDocument( 0 ), mByteArrayView( 0 ), mByteArrayModel( 0 )
+ : mDocument( nullptr ), mByteArrayView( nullptr ), mByteArrayModel( nullptr )
{
}
@@ -57,10 +57,10 @@ void PrintTool::setTargetModel( AbstractModel* model )
{
// if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
- mDocument = mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = mDocument ? mDocument->content() : 0;
+ mDocument = mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = mDocument ? \
mDocument->content() : nullptr;
const bool hasView = ( mByteArrayView && mByteArrayModel );
emit viewChanged( hasView );
@@ -73,9 +73,9 @@ void PrintTool::print()
QPrinter printer;
// LayoutDialogPage* layoutPage = new LayoutDialogPage();
- QList<QWidget*> customDialogPages;
+// QList<QWidget*> customDialogPages;
// customDialogPages << layoutPage;
- QPrintDialog *printDialog = new QPrintDialog( &printer, 0 );
+ QPrintDialog *printDialog = new QPrintDialog( &printer, nullptr );
// Disable PrintPageRange, this tells Qt we can't do client-side page selection,
// so it will try do server-side page selection if supported
printDialog->setOption(QPrintDialog::PrintPageRange, false);
@@ -173,7 +173,7 @@ void PrintTool::print()
{
const QString message = i18nc( "@info","Could not print." );
- KMessageBox::sorry( 0, message, processTitle );
+ KMessageBox::sorry( nullptr, message, processTitle );
}
}
diff --git a/kasten/controllers/view/replace/kreplacedialog.h \
b/kasten/controllers/view/replace/kreplacedialog.h index b59fadc0..ca750fba 100644
--- a/kasten/controllers/view/replace/kreplacedialog.h
+++ b/kasten/controllers/view/replace/kreplacedialog.h
@@ -38,7 +38,7 @@ class KReplaceDialog : public KAbstractFindDialog
Q_OBJECT
public:
- explicit KReplaceDialog( ReplaceTool* tool, QWidget* parent = 0 );
+ explicit KReplaceDialog( ReplaceTool* tool, QWidget* parent = nullptr );
virtual ~KReplaceDialog();
public: // set
diff --git a/kasten/controllers/view/replace/replacecontroller.cpp \
b/kasten/controllers/view/replace/replacecontroller.cpp index 4bcfebed..7317c679 \
100644
--- a/kasten/controllers/view/replace/replacecontroller.cpp
+++ b/kasten/controllers/view/replace/replacecontroller.cpp
@@ -42,8 +42,8 @@ namespace Kasten
// TODO: for docked widgets signal widgets if embedded or floating, if \
horizontal/vertical ReplaceController::ReplaceController( KXMLGUIClient* guiClient, \
QWidget* parentWidget ) : mParentWidget( parentWidget ),
- mReplaceDialog( 0 ),
- mReplacePrompt( 0 )
+ mReplaceDialog( nullptr ),
+ mReplacePrompt( nullptr )
{
KActionCollection* ActionCollection = guiClient->actionCollection();
diff --git a/kasten/controllers/view/replace/replacetool.cpp \
b/kasten/controllers/view/replace/replacetool.cpp index abf9a01c..5d61be4e 100644
--- a/kasten/controllers/view/replace/replacetool.cpp
+++ b/kasten/controllers/view/replace/replacetool.cpp
@@ -43,9 +43,9 @@ namespace Kasten
ReplaceTool::ReplaceTool()
: mCaseSensitivity( Qt::CaseSensitive ),
- mUserQueryAgent( 0 ),
- mByteArrayView( 0 ),
- mByteArrayModel( 0 )
+ mUserQueryAgent( nullptr ),
+ mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr )
{
setObjectName( QStringLiteral( "Replace" ) );
}
@@ -72,11 +72,11 @@ void ReplaceTool::setTargetModel( AbstractModel* model )
if( mByteArrayView ) mByteArrayView->disconnect( this );
if( mByteArrayModel ) mByteArrayModel->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
diff --git a/kasten/controllers/view/search/ksearchdialog.h \
b/kasten/controllers/view/search/ksearchdialog.h index 89a76bc1..37f184b5 100644
--- a/kasten/controllers/view/search/ksearchdialog.h
+++ b/kasten/controllers/view/search/ksearchdialog.h
@@ -38,7 +38,7 @@ class KSearchDialog : public KAbstractFindDialog
Q_OBJECT
public:
- explicit KSearchDialog( SearchTool* tool, QWidget* parent = 0 );
+ explicit KSearchDialog( SearchTool* tool, QWidget* parent = nullptr );
virtual ~KSearchDialog();
protected: // KAbstractFindDialog API
diff --git a/kasten/controllers/view/search/searchcontroller.cpp \
b/kasten/controllers/view/search/searchcontroller.cpp index 13587dbd..dca424d6 100644
--- a/kasten/controllers/view/search/searchcontroller.cpp
+++ b/kasten/controllers/view/search/searchcontroller.cpp
@@ -41,7 +41,7 @@ namespace Kasten
// TODO: for docked widgets signal widgets if embedded or floating, if \
horizontal/vertical SearchController::SearchController( KXMLGUIClient* guiClient, \
QWidget* parentWidget ) : mParentWidget( parentWidget ),
- mSearchDialog( 0 )
+ mSearchDialog( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
diff --git a/kasten/controllers/view/search/searchtool.cpp \
b/kasten/controllers/view/search/searchtool.cpp index 6eb85082..f4a8d74b 100644
--- a/kasten/controllers/view/search/searchtool.cpp
+++ b/kasten/controllers/view/search/searchtool.cpp
@@ -42,9 +42,9 @@ namespace Kasten
SearchTool::SearchTool()
: mCaseSensitivity( Qt::CaseSensitive ),
- mUserQueryAgent( 0 ),
- mByteArrayView( 0 ),
- mByteArrayModel( 0 )
+ mUserQueryAgent( nullptr ),
+ mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr )
{
setObjectName( QStringLiteral( "Search" ) );
}
@@ -70,11 +70,11 @@ void SearchTool::setTargetModel( AbstractModel* model )
if( mByteArrayView ) mByteArrayView->disconnect( this );
if( mByteArrayModel ) mByteArrayModel->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
diff --git a/kasten/controllers/view/selectrange/selectrangetool.cpp \
b/kasten/controllers/view/selectrange/selectrangetool.cpp index 7e8a7b05..7c46a88c \
100644
--- a/kasten/controllers/view/selectrange/selectrangetool.cpp
+++ b/kasten/controllers/view/selectrange/selectrangetool.cpp
@@ -40,8 +40,8 @@ SelectRangeTool::SelectRangeTool()
mTargetEnd( -1 ),
mIsEndRelative( false ),
mIsEndBackwards( false ),
- mByteArrayView( 0 ),
- mByteArrayModel( 0 )
+ mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr )
{
setObjectName( QStringLiteral( "SelectRange" ) );
}
@@ -85,11 +85,11 @@ void SelectRangeTool::setTargetModel( AbstractModel* model )
if( mByteArrayView ) mByteArrayView->disconnect( this );
if( mByteArrayModel ) mByteArrayModel->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
diff --git a/kasten/controllers/view/selectrange/selectrangeview.h \
b/kasten/controllers/view/selectrange/selectrangeview.h index c6798e00..fd56d939 \
100644
--- a/kasten/controllers/view/selectrange/selectrangeview.h
+++ b/kasten/controllers/view/selectrange/selectrangeview.h
@@ -46,7 +46,7 @@ class SelectRangeView : public AbstractToolWidget
Q_OBJECT
public:
- explicit SelectRangeView( SelectRangeTool* tool, QWidget* parent = 0 );
+ explicit SelectRangeView( SelectRangeTool* tool, QWidget* parent = nullptr );
virtual ~SelectRangeView();
public:
diff --git a/kasten/controllers/view/stringsextract/containedstringtablemodel.h \
b/kasten/controllers/view/stringsextract/containedstringtablemodel.h index \
2c526889..e9cea232 100644
--- a/kasten/controllers/view/stringsextract/containedstringtablemodel.h
+++ b/kasten/controllers/view/stringsextract/containedstringtablemodel.h
@@ -46,7 +46,7 @@ class ContainedStringTableModel : public QAbstractTableModel
public:
ContainedStringTableModel( const QList<ContainedString> *containedStringList, \
int offsetCoding,
- QObject *parent = 0 );
+ QObject *parent = nullptr );
virtual ~ContainedStringTableModel();
public: // QAbstractTableModel API
diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp \
b/kasten/controllers/view/stringsextract/stringsextracttool.cpp index \
a0d0b7b3..8dccba3c 100644
--- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp
+++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
@@ -45,10 +45,10 @@ StringsExtractTool::StringsExtractTool()
: mExtractedStringsUptodate( false ),
mSourceByteArrayModelUptodate( false ),
mMinLength( DefaultMinLength ),
- mByteArrayView( 0 ),
- mByteArrayModel( 0 ),
- mSourceByteArrayView( 0 ),
- mSourceByteArrayModel( 0 ),
+ mByteArrayView( nullptr ),
+ mByteArrayModel( nullptr ),
+ mSourceByteArrayView( nullptr ),
+ mSourceByteArrayModel( nullptr ),
mSourceMinLength( 0 )
{
setObjectName( QStringLiteral( "Strings" ) );
@@ -76,11 +76,11 @@ void StringsExtractTool::setTargetModel( AbstractModel* model )
{
if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document =
- mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : 0;
- mByteArrayModel = document ? document->content() : 0;
+ mByteArrayView ? qobject_cast<ByteArrayDocument*>( \
mByteArrayView->baseModel() ) : nullptr; + mByteArrayModel = document ? \
document->content() : nullptr;
if( mByteArrayView && mByteArrayModel )
{
@@ -165,13 +165,13 @@ void StringsExtractTool::onSourceChanged()
void StringsExtractTool::onSourceDestroyed()
{
- mSourceByteArrayModel = 0;
+ mSourceByteArrayModel = nullptr;
onSourceChanged();
}
void StringsExtractTool::onSourceViewDestroyed()
{
- mSourceByteArrayView = 0;
+ mSourceByteArrayView = nullptr;
}
diff --git a/kasten/controllers/view/stringsextract/stringsextractview.h \
b/kasten/controllers/view/stringsextract/stringsextractview.h index \
4fedd713..48073ca1 100644
--- a/kasten/controllers/view/stringsextract/stringsextractview.h
+++ b/kasten/controllers/view/stringsextract/stringsextractview.h
@@ -47,7 +47,7 @@ class StringsExtractView : public QWidget
Q_OBJECT
public:
- explicit StringsExtractView( StringsExtractTool *tool, QWidget* parent = 0 );
+ explicit StringsExtractView( StringsExtractTool *tool, QWidget* parent = nullptr \
); virtual ~StringsExtractView();
public:
diff --git a/kasten/controllers/view/structures/datatypes/array/arraydatainformation.cpp \
b/kasten/controllers/view/structures/datatypes/array/arraydatainformation.cpp index \
281a27f8..db9c50fd 100644
--- a/kasten/controllers/view/structures/datatypes/array/arraydatainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/array/arraydatainformation.cpp
@@ -52,7 +52,7 @@ ArrayDataInformation::ArrayDataInformation(const QString& name, \
uint length, Dat }
ArrayDataInformation::ArrayDataInformation(const ArrayDataInformation& d)
- : DataInformationWithDummyChildren(d), mData(0)
+ : DataInformationWithDummyChildren(d), mData(nullptr)
{
uint length = d.mData->length();
DataInformation* childType = d.mData.data()->childType();
@@ -125,7 +125,7 @@ QVariant ArrayDataInformation::childData(int row, int column, int \
role) const QWidget* ArrayDataInformation::createEditWidget(QWidget*) const
{
Q_ASSERT_X(false, "ArrayDataInformation::createEditWidget", "this should never \
happen!");
- return 0;
+ return nullptr;
}
QVariant ArrayDataInformation::dataFromWidget(const QWidget*) const
diff --git a/kasten/controllers/view/structures/datatypes/array/arraydatainformation.h \
b/kasten/controllers/view/structures/datatypes/array/arraydatainformation.h index \
be376a5a..1ef8440e 100644
--- a/kasten/controllers/view/structures/datatypes/array/arraydatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/array/arraydatainformation.h
@@ -43,7 +43,7 @@ public:
* length should be > 0
*/
ArrayDataInformation(const QString& name, uint length, DataInformation* \
childType,
- DataInformation* parent = 0, const QScriptValue& lengthFuntion = \
QScriptValue()); + DataInformation* parent = nullptr, const QScriptValue& \
lengthFuntion = QScriptValue()); virtual ~ArrayDataInformation();
public:
uint length() const;
diff --git a/kasten/controllers/view/structures/datatypes/datainformation.cpp \
b/kasten/controllers/view/structures/datatypes/datainformation.cpp index \
273866a1..1d8e621c 100644
--- a/kasten/controllers/view/structures/datatypes/datainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/datainformation.cpp
@@ -41,7 +41,7 @@ DataInformation::DataInformation(const QString& name, \
DataInformationBase* paren }
DataInformation::DataInformation(const DataInformation& d)
- : mAdditionalData(d.mAdditionalData), mParent(0), mName(d.mName),
+ : mAdditionalData(d.mAdditionalData), mParent(nullptr), mName(d.mName),
mValidationSuccessful(false), mHasBeenValidated(false), \
mHasBeenUpdated(false),
mWasAbleToRead(false), mByteOrder(d.mByteOrder), \
mLoggedData(ScriptLogger::LogInvalid) {
@@ -234,7 +234,7 @@ DataInformation* DataInformation::child(const QString& name) \
const if (child->name() == name)
return child;
}
- return 0;
+ return nullptr;
}
TopLevelDataInformation* DataInformation::topLevelDataInformation() const
diff --git a/kasten/controllers/view/structures/datatypes/datainformation.h \
b/kasten/controllers/view/structures/datatypes/datainformation.h index \
8563a854..2835e72f 100644
--- a/kasten/controllers/view/structures/datatypes/datainformation.h
+++ b/kasten/controllers/view/structures/datatypes/datainformation.h
@@ -76,7 +76,7 @@ protected:
public:
virtual DataInformation* clone() const = 0;
- explicit DataInformation(const QString& name, DataInformationBase* parent = \
NULL); + explicit DataInformation(const QString& name, DataInformationBase* parent \
= nullptr); virtual ~DataInformation();
enum Columns
@@ -267,7 +267,7 @@ inline void DataInformation::setName(const QString& newName)
inline DataInformation* DataInformation::childAt(unsigned int) const
{
- return 0;
+ return nullptr;
}
inline bool DataInformation::canHaveChildren() const
diff --git a/kasten/controllers/view/structures/datatypes/datainformationbase.cpp \
b/kasten/controllers/view/structures/datatypes/datainformationbase.cpp index \
7a8e155b..1da871d1 100644
--- a/kasten/controllers/view/structures/datatypes/datainformationbase.cpp
+++ b/kasten/controllers/view/structures/datatypes/datainformationbase.cpp
@@ -95,11 +95,11 @@ inline bool \
DataInformationBase::isDataInformationWithDummyChildren() const \
TopLevelDataInformation* DataInformationBase::asTopLevel() {
//multiple inheritance -> we can't use reinterpret_cast -> we have to include \
the file
- return isTopLevel() ? static_cast<TopLevelDataInformation*>(this) : 0;
+ return isTopLevel() ? static_cast<TopLevelDataInformation*>(this) : nullptr;
}
const TopLevelDataInformation* DataInformationBase::asTopLevel() const
{
//multiple inheritance -> we can't use reinterpret_cast -> we have to include \
the file
- return isTopLevel() ? static_cast<const TopLevelDataInformation*>(this) : 0;
+ return isTopLevel() ? static_cast<const TopLevelDataInformation*>(this) : \
nullptr; }
diff --git a/kasten/controllers/view/structures/datatypes/datainformationbase.h \
b/kasten/controllers/view/structures/datatypes/datainformationbase.h index \
5df00edd..a35b390f 100644
--- a/kasten/controllers/view/structures/datatypes/datainformationbase.h
+++ b/kasten/controllers/view/structures/datatypes/datainformationbase.h
@@ -116,12 +116,12 @@ CAST_FUNCS_2(DataInformationWithDummyChildren, \
DataInformationWithDummyChildren) //this is not handled by the macro
inline DataInformation* DataInformationBase::asDataInformation()
{
- return isTopLevel() ? 0 : reinterpret_cast<DataInformation*>(this);
+ return isTopLevel() ? nullptr : reinterpret_cast<DataInformation*>(this);
}
inline const DataInformation* DataInformationBase::asDataInformation() const
{
- return isTopLevel() ? 0 : reinterpret_cast<const DataInformation*>(this);
+ return isTopLevel() ? nullptr : reinterpret_cast<const DataInformation*>(this);
}
#undef CAST_FUNCS_2
diff --git a/kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp \
b/kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp index \
3a403340..6c97a79d 100644
--- a/kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp
+++ b/kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp
@@ -34,7 +34,7 @@
DataInformation* DataInformationWithChildren::childAt(unsigned int idx) const
{
if (idx >= (unsigned) mChildren.size())
- return 0;
+ return nullptr;
return mChildren[idx];
}
diff --git a/kasten/controllers/view/structures/datatypes/datainformationwithchildren.h \
b/kasten/controllers/view/structures/datatypes/datainformationwithchildren.h index \
f5980472..30a85ffe 100644
--- a/kasten/controllers/view/structures/datatypes/datainformationwithchildren.h
+++ b/kasten/controllers/view/structures/datatypes/datainformationwithchildren.h
@@ -33,7 +33,7 @@ protected:
explicit DataInformationWithChildren(const DataInformationWithChildren& d);
public:
explicit DataInformationWithChildren(const QString& name, const \
QVector<DataInformation*>& children
- = QVector<DataInformation*>(), DataInformation* parent = 0);
+ = QVector<DataInformation*>(), DataInformation* parent = nullptr);
virtual ~DataInformationWithChildren();
virtual QVariant childData(int row, int column, int role) const;
diff --git a/kasten/controllers/view/structures/datatypes/dummydatainformation.h \
b/kasten/controllers/view/structures/datatypes/dummydatainformation.h index \
5f4bfd59..cef0320a 100644
--- a/kasten/controllers/view/structures/datatypes/dummydatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/dummydatainformation.h
@@ -51,7 +51,7 @@ public:
virtual bool canHaveChildren() const { return false; }
virtual unsigned int childCount() const { return 0; }
- virtual DataInformation* childAt(unsigned int) const { Q_ASSERT(false); return \
0; } + virtual DataInformation* childAt(unsigned int) const { Q_ASSERT(false); \
return nullptr; }
virtual BitCount64 childPosition(const DataInformation*, Okteta::Address) const \
{ Q_ASSERT(false); return 0; }
virtual int indexOf(const DataInformation* const) const { Q_ASSERT(false); \
return -1; }
@@ -60,7 +60,7 @@ public:
inline uint dummyIndex() const { return mIndex; }
private:
- virtual QScriptClass* scriptClass(ScriptHandlerInfo*) const { Q_ASSERT(false); \
return 0; } + virtual QScriptClass* scriptClass(ScriptHandlerInfo*) const { \
Q_ASSERT(false); return nullptr; } virtual QString typeNameImpl() const;
private:
uint mIndex;
@@ -75,7 +75,7 @@ class DataInformationWithDummyChildren : public DataInformation
protected:
DataInformationWithDummyChildren(const DataInformationWithDummyChildren& d) : \
DataInformation(d) {} public:
- explicit DataInformationWithDummyChildren(const QString& name, \
DataInformationBase* parent = 0) + explicit DataInformationWithDummyChildren(const \
QString& name, DataInformationBase* parent = nullptr) : DataInformation(name, \
parent) {} virtual ~DataInformationWithDummyChildren() {}
diff --git a/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.cpp \
b/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.cpp
index b9e54568..06f29e4d 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.cpp
@@ -48,7 +48,7 @@ inline QScriptClass* BasicPrimitiveDataInformation<T, \
C>::scriptClass(ScriptHand template<typename T, typename C>
QScriptValue BasicPrimitiveDataInformation<T, C>::valueAsQScriptValue() const
{
- return C::asScriptValue(mValue, 0, 0);
+ return C::asScriptValue(mValue, nullptr, nullptr);
}
template<typename T, typename C>
diff --git a/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.h
index 1eb483f9..1c321d28 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/basicprimitivedatainformation.h
@@ -33,7 +33,7 @@ template<typename T, class C>
class BasicPrimitiveDataInformation : public PrimitiveDataInformation
{
public:
- BasicPrimitiveDataInformation(const QString& name, DataInformation* parent = 0);
+ BasicPrimitiveDataInformation(const QString& name, DataInformation* parent = \
nullptr); virtual ~BasicPrimitiveDataInformation();
virtual PrimitiveDataType type() const;
virtual AllPrimitiveTypes value() const;
diff --git a/kasten/controllers/view/structures/datatypes/primitive/bitfield/abstractbitfielddatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/bitfield/abstractbitfielddatainformation.h
index eaa6484d..d02f0c40 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/bitfield/abstractbitfielddatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/bitfield/abstractbitfielddatainformation.h
@@ -32,7 +32,7 @@ public:
Signed, Unsigned, Boolean
};
- AbstractBitfieldDataInformation(const QString& name, BitCount32 width, \
DataInformation* parent = 0); + AbstractBitfieldDataInformation(const QString& \
name, BitCount32 width, DataInformation* parent = nullptr); virtual \
~AbstractBitfieldDataInformation();
BitCount32 width() const;
diff --git a/kasten/controllers/view/structures/datatypes/primitive/bitfield/boolbitfielddatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/bitfield/boolbitfielddatainformation.h
index 283aef1f..91b16adc 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/bitfield/boolbitfielddatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/bitfield/boolbitfielddatainformation.h
@@ -31,7 +31,7 @@ class BoolBitfieldDataInformation : public \
AbstractBitfieldDataInformation {
DATAINFORMATION_CLONE(BoolBitfieldDataInformation, \
AbstractBitfieldDataInformation) {} public:
- BoolBitfieldDataInformation(const QString& name, BitCount32 width, \
DataInformation* parent = 0) + BoolBitfieldDataInformation(const QString& name, \
BitCount32 width, DataInformation* parent = nullptr) : \
AbstractBitfieldDataInformation(name, width, parent) {} virtual \
~BoolBitfieldDataInformation() {}
diff --git a/kasten/controllers/view/structures/datatypes/primitive/bitfield/signedbitfielddatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/bitfield/signedbitfielddatainformation.h
index 0fb52950..fa534a83 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/bitfield/signedbitfielddatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/bitfield/signedbitfielddatainformation.h
@@ -30,7 +30,7 @@ class SignedBitfieldDataInformation : public \
AbstractBitfieldDataInformation {
DATAINFORMATION_CLONE(SignedBitfieldDataInformation, \
AbstractBitfieldDataInformation) {} public:
- SignedBitfieldDataInformation(const QString& name, BitCount32 width, \
DataInformation* parent = 0) + SignedBitfieldDataInformation(const QString& name, \
BitCount32 width, DataInformation* parent = nullptr) : \
AbstractBitfieldDataInformation(name, width, parent) {} virtual \
~SignedBitfieldDataInformation() {}
virtual AllPrimitiveTypes fromVariant(const QVariant& variant, bool* ok) const;
diff --git a/kasten/controllers/view/structures/datatypes/primitive/bitfield/unsignedbitfielddatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/bitfield/unsignedbitfielddatainformation.h
index d2e7970a..08430526 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/bitfield/unsignedbitfielddatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/bitfield/unsignedbitfielddatainformation.h
@@ -30,7 +30,7 @@ class UnsignedBitfieldDataInformation : public \
AbstractBitfieldDataInformation {
DATAINFORMATION_CLONE(UnsignedBitfieldDataInformation, \
AbstractBitfieldDataInformation) {} public:
- UnsignedBitfieldDataInformation(const QString& name, BitCount32 width, \
DataInformation* parent = 0) + UnsignedBitfieldDataInformation(const QString& \
name, BitCount32 width, DataInformation* parent = nullptr) : \
AbstractBitfieldDataInformation(name, width, parent) {} virtual \
~UnsignedBitfieldDataInformation() {}
diff --git a/kasten/controllers/view/structures/datatypes/primitive/enumdatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/enumdatainformation.h index \
227938d9..f42cd420 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/enumdatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/enumdatainformation.h
@@ -32,7 +32,7 @@ class EnumDataInformation: public PrimitiveDataInformationWrapper
public:
/** this object takes ownership of @p type */
EnumDataInformation(const QString& name, PrimitiveDataInformation* type,
- EnumDefinition::Ptr enumDef, DataInformation* parent = 0);
+ EnumDefinition::Ptr enumDef, DataInformation* parent = nullptr);
virtual ~EnumDataInformation();
virtual bool isEnum() const;
diff --git a/kasten/controllers/view/structures/datatypes/primitive/flagdatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/flagdatainformation.h index \
15b740f8..2087ecb2 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/flagdatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/flagdatainformation.h
@@ -31,7 +31,7 @@ class FlagDataInformation : public EnumDataInformation
DATAINFORMATION_CLONE(FlagDataInformation, EnumDataInformation) {}
public:
FlagDataInformation(const QString& name, PrimitiveDataInformation* type, \
EnumDefinition::Ptr enumDef,
- DataInformation* parent = 0);
+ DataInformation* parent = nullptr);
private:
virtual QString valueStringImpl() const;
virtual QString typeNameImpl() const;
diff --git a/kasten/controllers/view/structures/datatypes/primitive/pointerdatainformation.cpp \
b/kasten/controllers/view/structures/datatypes/primitive/pointerdatainformation.cpp \
index 67c44d12..de917cb7 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/pointerdatainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/primitive/pointerdatainformation.cpp
@@ -140,7 +140,7 @@ uint PointerDataInformation::childCount() const
DataInformation* PointerDataInformation::childAt(uint index) const
{
Q_ASSERT(index == 0);
- return index == 0 ? mPointerTarget.data() : 0;
+ return index == 0 ? mPointerTarget.data() : nullptr;
}
bool PointerDataInformation::setPointerType(DataInformation* type)
diff --git a/kasten/controllers/view/structures/datatypes/primitive/primitivedatainformation.h \
b/kasten/controllers/view/structures/datatypes/primitive/primitivedatainformation.h \
index 08573687..75d503bd 100644
--- a/kasten/controllers/view/structures/datatypes/primitive/primitivedatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/primitive/primitivedatainformation.h
@@ -35,7 +35,7 @@ class PrimitiveDataInformation : public DataInformation
{
friend class PrimitiveDataInformationTest; //that unit test needs to change \
mWasAbleToRead public:
- explicit PrimitiveDataInformation(const QString& name, DataInformation* parent = \
0); + explicit PrimitiveDataInformation(const QString& name, DataInformation* \
parent = nullptr); virtual ~PrimitiveDataInformation();
virtual PrimitiveDataInformation* clone() const = 0;
@@ -48,7 +48,7 @@ public:
virtual PrimitiveDataType type() const = 0;
virtual unsigned int childCount() const { return 0; }
- virtual DataInformation* childAt(unsigned int) const { Q_ASSERT(false); return \
0; } + virtual DataInformation* childAt(unsigned int) const { Q_ASSERT(false); \
return nullptr; } virtual bool canHaveChildren() const { return false; }
virtual BitCount64 childPosition(const DataInformation*, Okteta::Address) const \
{ Q_ASSERT(false); return 0; }
virtual int indexOf(const DataInformation* const) const {Q_ASSERT(false); return \
-1; } @@ -78,7 +78,7 @@ protected:
public:
/** takes ownership of @p valueType */
PrimitiveDataInformationWrapper(const QString& name, PrimitiveDataInformation* \
valueType,
- DataInformation* parent = 0);
+ DataInformation* parent = nullptr);
virtual ~PrimitiveDataInformationWrapper() {}
//delegate all these to the underlying object:
diff --git a/kasten/controllers/view/structures/datatypes/primitivefactory.cpp \
b/kasten/controllers/view/structures/datatypes/primitivefactory.cpp index \
24897afb..4ab039aa 100644
--- a/kasten/controllers/view/structures/datatypes/primitivefactory.cpp
+++ b/kasten/controllers/view/structures/datatypes/primitivefactory.cpp
@@ -100,7 +100,7 @@ PrimitiveDataInformation* newInstance(const QString& name, \
PrimitiveDataType typ return new PrimitiveInfo<Type_Double>::Class(name, parent);
default:
logger.error().nospace() << "could not convert '" << type << "' to a \
primitive type";
- return 0; //invalid type
+ return nullptr; //invalid type
}
}
diff --git a/kasten/controllers/view/structures/datatypes/primitivefactory.h \
b/kasten/controllers/view/structures/datatypes/primitivefactory.h index \
49c2595c..e659c00e 100644
--- a/kasten/controllers/view/structures/datatypes/primitivefactory.h
+++ b/kasten/controllers/view/structures/datatypes/primitivefactory.h
@@ -39,10 +39,10 @@ namespace PrimitiveFactory
PrimitiveDataType typeStringToType(const QString& typeStr, const LoggerWithContext& \
logger);
PrimitiveDataInformation* newInstance(const QString& name, PrimitiveDataType type,
- const LoggerWithContext& logger, DataInformation* parent = 0);
+ const LoggerWithContext& logger, DataInformation* parent = nullptr);
inline PrimitiveDataInformation* newInstance(const QString& name, const QString& \
typeString,
- const LoggerWithContext& logger, DataInformation* parent = 0)
+ const LoggerWithContext& logger, DataInformation* parent = nullptr)
{
return newInstance(name, typeStringToType(typeString, logger), logger, parent);
}
diff --git a/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.cpp \
b/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.cpp \
index bcc966e3..1a23d6b9 100644
--- a/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.cpp
@@ -43,13 +43,13 @@
#include <KLocalizedString>
StringDataInformation::StringDataInformation(const QString& name, StringType \
encoding, DataInformationBase* parent)
- : DataInformationWithDummyChildren(name, parent), mDummy(new \
DummyDataInformation(this)), mData(0), mEncoding(InvalidEncoding) + : \
DataInformationWithDummyChildren(name, parent), mDummy(new \
DummyDataInformation(this)), mData(nullptr), mEncoding(InvalidEncoding) {
setEncoding(encoding); //sets mData
}
StringDataInformation::StringDataInformation(const StringDataInformation& d)
- : DataInformationWithDummyChildren(d), mDummy(new DummyDataInformation(this)), \
mData(0), mEncoding(InvalidEncoding) + : DataInformationWithDummyChildren(d), \
mDummy(new DummyDataInformation(this)), mData(nullptr), mEncoding(InvalidEncoding) {
setEncoding(d.mEncoding); //sets mData
mData->copyTerminationFrom(d.mData.data());
@@ -125,7 +125,7 @@ QWidget* StringDataInformation::createEditWidget(QWidget*) const
{
//TODO
Q_ASSERT(false);
- return 0;
+ return nullptr;
}
QString StringDataInformation::typeNameImpl() const
@@ -198,7 +198,7 @@ void \
StringDataInformation::setEncoding(StringDataInformation::StringType encodi }
else
{
- StringData* data = 0;
+ StringData* data = nullptr;
switch (encoding) {
case ASCII:
data = new AsciiStringData(this);
@@ -273,7 +273,7 @@ QWidget* StringDataInformation::createChildEditWidget(uint index, \
QWidget* paren Q_ASSERT(false);
Q_UNUSED(parent)
Q_UNUSED(index)
- return 0;
+ return nullptr;
}
QScriptValue StringDataInformation::childToScriptValue(uint index, QScriptEngine*, \
ScriptHandlerInfo*) const
diff --git a/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.h \
b/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.h index \
64b00720..3bf894cd 100644
--- a/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/strings/stringdatainformation.h
@@ -46,7 +46,7 @@ public:
InvalidEncoding = -1, ASCII = 0, Latin1, UTF8, UTF16_LE, UTF16_BE, UTF32_LE, \
UTF32_BE, EBCDIC };
- StringDataInformation(const QString& name, StringType encoding, \
DataInformationBase* parent = 0); + StringDataInformation(const QString& name, \
StringType encoding, DataInformationBase* parent = nullptr); virtual \
~StringDataInformation();
virtual bool canHaveChildren() const;
diff --git a/kasten/controllers/view/structures/datatypes/structuredatainformation.h \
b/kasten/controllers/view/structures/datatypes/structuredatainformation.h index \
f6b30049..26562e09 100644
--- a/kasten/controllers/view/structures/datatypes/structuredatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/structuredatainformation.h
@@ -30,7 +30,7 @@ class StructureDataInformation : public DataInformationWithChildren
DATAINFORMATION_CLONE(StructureDataInformation, DataInformationWithChildren) {}
public:
explicit StructureDataInformation(const QString& name, const \
QVector<DataInformation*>& children =
- QVector<DataInformation*>(), DataInformation* parent = 0);
+ QVector<DataInformation*>(), DataInformation* parent = nullptr);
virtual ~StructureDataInformation();
virtual qint64 readData(Okteta::AbstractByteArrayModel *input, Okteta::Address \
address,
diff --git a/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp \
b/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp index \
dfff6954..e7f6ef56 100644
--- a/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp
@@ -53,7 +53,7 @@ TaggedUnionDataInformation::TaggedUnionDataInformation(const \
QString& name, Data TaggedUnionDataInformation::TaggedUnionDataInformation(const \
TaggedUnionDataInformation& d)
: DataInformationWithChildren(d), mDefaultFields(cloneList(d.mDefaultFields, \
this)), mLastIndex(-1) {
- Q_ASSERT(mDefaultFields.isEmpty() || mDefaultFields.at(0) != 0);
+ Q_ASSERT(mDefaultFields.isEmpty() || mDefaultFields.at(0) != nullptr);
Q_FOREACH(const FieldInfo& fi, d.mAlternatives)
{
mAlternatives.append(FieldInfo(fi.name, fi.selectIf, cloneList(fi.fields, \
this))); @@ -269,7 +269,7 @@ DataInformation* \
TaggedUnionDataInformation::childAt(unsigned int index) const if (index < \
permanentChildCount + others.size()) return others.at(index - permanentChildCount);
Q_ASSERT(false); //should never happen
- return 0;
+ return nullptr;
}
unsigned int TaggedUnionDataInformation::childCount() const
diff --git a/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.h \
b/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.h index \
e9061a2b..7a055f66 100644
--- a/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/taggeduniondatainformation.h
@@ -47,7 +47,7 @@ public:
QVector<DataInformation*> fields;
};
- explicit TaggedUnionDataInformation(const QString& name, DataInformation* parent \
= 0); + explicit TaggedUnionDataInformation(const QString& name, DataInformation* \
parent = nullptr); virtual ~TaggedUnionDataInformation();
virtual qint64 readData(Okteta::AbstractByteArrayModel *input,
diff --git a/kasten/controllers/view/structures/datatypes/topleveldatainformation.cpp \
b/kasten/controllers/view/structures/datatypes/topleveldatainformation.cpp index \
04b55502..1144ec81 100644
--- a/kasten/controllers/view/structures/datatypes/topleveldatainformation.cpp
+++ b/kasten/controllers/view/structures/datatypes/topleveldatainformation.cpp
@@ -42,9 +42,9 @@ const quint64 TopLevelDataInformation::INVALID_OFFSET = \
std::numeric_limits<quin
TopLevelDataInformation::TopLevelDataInformation(DataInformation* data, \
ScriptLogger* logger, QScriptEngine* engine, const QFileInfo& structureFile)
- : QObject(0), mData(data), mLogger(logger), mStructureFile(structureFile),
+ : QObject(nullptr), mData(data), mLogger(logger), \
mStructureFile(structureFile), mIndex(-1), mValid(!data->isDummy()), \
mChildDataChanged(false),
- mDefaultLockOffset(INVALID_OFFSET), mLastReadOffset(INVALID_OFFSET), \
mLastModel(0) + mDefaultLockOffset(INVALID_OFFSET), \
mLastReadOffset(INVALID_OFFSET), mLastModel(nullptr) {
Q_CHECK_PTR(mData);
mData->setParent(this);
diff --git a/kasten/controllers/view/structures/datatypes/topleveldatainformation.h \
b/kasten/controllers/view/structures/datatypes/topleveldatainformation.h index \
400231b1..fa2ed135 100644
--- a/kasten/controllers/view/structures/datatypes/topleveldatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/topleveldatainformation.h
@@ -54,8 +54,8 @@ public:
* @param engine the script engine to use. If null this object contains no \
dynamic elements
* @param structureFile the file which this was loaded from
*/
- explicit TopLevelDataInformation(DataInformation* data, ScriptLogger* logger = \
0,
- QScriptEngine* engine = 0, const QFileInfo& structureFile = \
QFileInfo()); + explicit TopLevelDataInformation(DataInformation* data, \
ScriptLogger* logger = nullptr, + QScriptEngine* engine = nullptr, const \
QFileInfo& structureFile = QFileInfo()); virtual ~TopLevelDataInformation();
typedef QSharedPointer<TopLevelDataInformation> Ptr;
diff --git a/kasten/controllers/view/structures/datatypes/uniondatainformation.h \
b/kasten/controllers/view/structures/datatypes/uniondatainformation.h index \
0a0c4033..9446795d 100644
--- a/kasten/controllers/view/structures/datatypes/uniondatainformation.h
+++ b/kasten/controllers/view/structures/datatypes/uniondatainformation.h
@@ -30,7 +30,7 @@ class UnionDataInformation : public DataInformationWithChildren
DATAINFORMATION_CLONE(UnionDataInformation, DataInformationWithChildren) {}
public:
explicit UnionDataInformation(const QString& name, const \
QVector<DataInformation*>& children
- = QVector<DataInformation*>(), DataInformation* parent = 0);
+ = QVector<DataInformation*>(), DataInformation* parent = nullptr);
virtual ~UnionDataInformation();
virtual bool isUnion() const;
diff --git a/kasten/controllers/view/structures/parsers/datainformationfactory.cpp \
b/kasten/controllers/view/structures/parsers/datainformationfactory.cpp index \
2d509386..fc4d0def 100644
--- a/kasten/controllers/view/structures/parsers/datainformationfactory.cpp
+++ b/kasten/controllers/view/structures/parsers/datainformationfactory.cpp
@@ -37,14 +37,14 @@ AbstractBitfieldDataInformation* \
DataInformationFactory::newBitfield(const Bitfi pd.error() << "Bitfield is missing \
width."; else
pd.error() << "Width of bitfield is not a valid number: " << \
pd.width.string;
- return 0;
+ return nullptr;
}
if (pd.width.value <= 0 || pd.width.value > 64)
{
pd.error() << "Width of bitfield is not a value from 1-64:" << \
pd.width.value;
- return 0;
+ return nullptr;
}
- AbstractBitfieldDataInformation* bitf = 0;
+ AbstractBitfieldDataInformation* bitf = nullptr;
const QString type = pd.type.toLower();
if (type.isEmpty())
{
@@ -60,7 +60,7 @@ AbstractBitfieldDataInformation* \
DataInformationFactory::newBitfield(const Bitfi else
{
pd.error() << "invalid bitfield type attribute given:" << type;
- return 0;
+ return nullptr;
}
return bitf;
}
@@ -70,14 +70,14 @@ PrimitiveDataInformation* \
DataInformationFactory::newPrimitive(const PrimitivePa if (pd.type.isEmpty())
{
pd.error() << "Type of primitive not specified, cannot create it!";
- return 0;
+ return nullptr;
}
LoggerWithContext lwc(pd.logger, pd.context());
PrimitiveDataType primitiveType = PrimitiveFactory::typeStringToType(pd.type, \
lwc); if (primitiveType == Type_Invalid || primitiveType == Type_Bitfield)
{
pd.error() << "Unrecognized primitive type: " << pd.type;
- return 0;
+ return nullptr;
}
return PrimitiveFactory::newInstance(pd.name, primitiveType, lwc, pd.parent);
}
@@ -92,12 +92,12 @@ T* newEnumOrFlags(const EnumParsedData& pd)
if (primitiveType == Type_Invalid || primitiveType == Type_Bitfield)
{
pd.error() << "Unrecognized enum type: " << pd.type;
- return 0;
+ return nullptr;
}
if (primitiveType == Type_Float || primitiveType == Type_Double)
{
pd.error() << "Floating-point enums are not allowed since they make little \
sense.";
- return 0;
+ return nullptr;
}
EnumDefinition::Ptr definition = pd.enumDef;
if (!definition)
@@ -107,7 +107,7 @@ T* newEnumOrFlags(const EnumParsedData& pd)
if (enumValues.isEmpty())
{
pd.error() << "No enum values specified!";
- return 0;
+ return nullptr;
}
definition = EnumDefinition::Ptr(new EnumDefinition(enumValues, pd.enumName, \
primitiveType)); }
@@ -115,14 +115,14 @@ T* newEnumOrFlags(const EnumParsedData& pd)
{
pd.error().nospace() << "Enum type (" << definition->type() << ") and value \
type (" << primitiveType << ") do not match!";
- return 0;
+ return nullptr;
}
PrimitiveDataInformation* primData = PrimitiveFactory::newInstance(pd.name, \
primitiveType, lwc); //TODO allow bitfields?
if (!primData)
{
pd.error() << "Could not create a value object for this enum!";
- return 0;
+ return nullptr;
}
return new T(pd.name, primData, definition, pd.parent);
}
@@ -138,7 +138,7 @@ T* newStructOrUnion(const StructOrUnionParsedData& supd)
if (data)
structOrUnion->appendChild(data, false);
else
- return 0; //error message should be logged already
+ return nullptr; //error message should be logged already
}
if (structOrUnion->childCount() == 0)
supd.info() << "No children were found, this is probably a mistake.";
@@ -205,12 +205,12 @@ ArrayDataInformation* DataInformationFactory::newArray(const \
ArrayParsedData& pd if (!pd.arrayType)
{
pd.error() << "Failed to parse array type!";
- return 0;
+ return nullptr;
}
if (!pd.length.isValid())
{
pd.error() << "No array length specified!";
- return 0;
+ return nullptr;
}
const ParsedNumber<uint> fixedLength = \
ParserUtils::uintFromScriptValue(pd.length); if (fixedLength.isValid)
@@ -229,17 +229,17 @@ ArrayDataInformation* DataInformationFactory::newArray(const \
ArrayParsedData& pd {
pd.error() << "Toplevel array has length depending on other field (" << \
lengthStr << "). This is not possible.";
- return 0;
+ return nullptr;
}
if (lengthStr.contains(QLatin1Char('.')))
{
pd.error() << "Referenced array length element (" << lengthStr << ") \
contains '.', this is not allowed!";
- return 0; //TODO maybe add possible shorthand \
length="this.parent.length" + return nullptr; //TODO maybe add possible \
shorthand length="this.parent.length" }
- QString lengthFunctionString = generateLengthFunction(pd.parent, 0, \
lengthStr, QString(), pd); + QString lengthFunctionString = \
generateLengthFunction(pd.parent, nullptr, lengthStr, QString(), pd); if \
(lengthFunctionString.isEmpty()) {
pd.error() << "Could not find element " << lengthStr << " referenced as \
array length!";
- return 0;
+ return nullptr;
}
QScriptValue lengthFunction = ParserUtils::functionSafeEval(pd.engine, \
lengthFunctionString);
return new ArrayDataInformation(pd.name, 0, pd.arrayType, pd.parent, \
lengthFunction); @@ -251,14 +251,14 @@ StringDataInformation* \
DataInformationFactory::newString(const StringParsedData& if \
(pd.maxByteCount.isValid && pd.maxCharCount.isValid) {
pd.error() << "Both maxCharCount and maxByteCount are set, only one is \
allowed.";
- return 0;
+ return nullptr;
}
StringDataInformation::StringType encoding = \
ParserUtils::toStringEncoding(pd.encoding, LoggerWithContext(pd.logger, \
pd.context())); if (encoding == StringDataInformation::InvalidEncoding)
{
pd.error() << "Bad string encoding given:" << pd.encoding;
- return 0;
+ return nullptr;
}
StringDataInformation* data = new StringDataInformation(pd.name, encoding, \
pd.parent); bool modeSet = false;
@@ -348,24 +348,24 @@ PointerDataInformation* \
DataInformationFactory::newPointer(const PointerParsedDa if (!pd.pointerTarget)
{
pd.error() << "Missing pointer target";
- return 0;
+ return nullptr;
}
if (!pd.valueType)
{
pd.error() << "Missing pointer type";
- return 0;
+ return nullptr;
}
if (!pd.valueType->isPrimitive())
{
pd.error() << "Bad pointer type, only unsigned integers are allowed";
- return 0;
+ return nullptr;
}
PrimitiveDataInformation* primValue = pd.valueType->asPrimitive();
if (!(primValue->type() == Type_UInt8 || primValue->type() == Type_UInt16
|| primValue->type() == Type_UInt32 || primValue->type() == \
Type_UInt64)) {
pd.error() << "Bad pointer type, only unsigned integers are allowed"; //TODO \
offsets (signed int + bitfields)
- return 0;
+ return nullptr;
}
return new PointerDataInformation(pd.name, pd.pointerTarget, primValue, \
pd.parent); }
@@ -380,12 +380,12 @@ TaggedUnionDataInformation* \
DataInformationFactory::newTaggedUnion(const TaggedU if (data)
tagged->appendChild(data, false);
else
- return 0; //error message should be logged already
+ return nullptr; //error message should be logged already
}
if (tagged->childCount() == 0)
{
pd.error() << "No children in tagged union. At least one is required so that \
tag can be evaluated.";
- return 0;
+ return nullptr;
}
//verify alternatives
bool alternativesValid = true;
@@ -428,7 +428,7 @@ TaggedUnionDataInformation* \
DataInformationFactory::newTaggedUnion(const TaggedU {
for (int i = 0; i < altInfo.size(); ++i)
qDeleteAll(altInfo.at(i).fields);
- return 0;
+ return nullptr;
}
tagged->setAlternatives(altInfo, false);
@@ -439,7 +439,7 @@ TaggedUnionDataInformation* \
DataInformationFactory::newTaggedUnion(const TaggedU if (data)
tagged->appendDefaultField(data, false);
else
- return 0; //error message should be logged already
+ return nullptr; //error message should be logged already
}
return tagged.take();
}
diff --git a/kasten/controllers/view/structures/parsers/datainformationfactory.h \
b/kasten/controllers/view/structures/parsers/datainformationfactory.h index \
695af5c7..70d4c9e0 100644
--- a/kasten/controllers/view/structures/parsers/datainformationfactory.h
+++ b/kasten/controllers/view/structures/parsers/datainformationfactory.h
@@ -91,7 +91,7 @@ private:
};
struct ArrayParsedData : public ParserInfo {
- inline explicit ArrayParsedData(const ParserInfo& i) : ParserInfo(i), \
arrayType(0) {} + inline explicit ArrayParsedData(const ParserInfo& i) : \
ParserInfo(i), arrayType(nullptr) {} QScriptValue length;
DataInformation* arrayType;
private:
@@ -99,7 +99,7 @@ private:
};
struct PointerParsedData : public ParserInfo {
- inline explicit PointerParsedData(const ParserInfo& i) : ParserInfo(i), \
valueType(0), pointerTarget(0) {} + inline explicit PointerParsedData(const \
ParserInfo& i) : ParserInfo(i), valueType(nullptr), pointerTarget(nullptr) {} \
DataInformation* valueType; DataInformation* pointerTarget;
private:
diff --git a/kasten/controllers/view/structures/parsers/osdparser.cpp \
b/kasten/controllers/view/structures/parsers/osdparser.cpp index b6c2d8d4..40759ae8 \
100644
--- a/kasten/controllers/view/structures/parsers/osdparser.cpp
+++ b/kasten/controllers/view/structures/parsers/osdparser.cpp
@@ -155,7 +155,7 @@ QVector<TopLevelDataInformation*> OsdParser::parseStructures() \
const if (document.isNull())
{
structures.append(new TopLevelDataInformation(
- new DummyDataInformation(0, fileInfo.fileName()), rootLogger.take(), \
0, fileInfo)); + new DummyDataInformation(nullptr, \
fileInfo.fileName()), rootLogger.take(), nullptr, fileInfo)); return structures;
}
@@ -164,7 +164,7 @@ QVector<TopLevelDataInformation*> OsdParser::parseStructures() \
const {
rootLogger->error() << "Missing top level <data> element!";
structures.append(new TopLevelDataInformation(
- new DummyDataInformation(0, fileInfo.fileName()), rootLogger.take(), \
0, fileInfo)); + new DummyDataInformation(nullptr, \
fileInfo.fileName()), rootLogger.take(), nullptr, fileInfo)); return structures;
}
int count = 1;
@@ -176,7 +176,7 @@ QVector<TopLevelDataInformation*> OsdParser::parseStructures() \
const
QScriptEngine* eng = ScriptEngineInitializer::newEngine(); //we need this \
for dynamic arrays ScriptLogger* logger = new ScriptLogger();
QVector<EnumDefinition::Ptr> enums = parseEnums(rootElem, logger);
- OsdParserInfo info(QString(), logger, 0, eng, enums);
+ OsdParserInfo info(QString(), logger, nullptr, eng, enums);
DataInformation* data = parseElement(elem, info);
@@ -187,7 +187,7 @@ QVector<TopLevelDataInformation*> OsdParser::parseStructures() \
const
name = fileInfo.absoluteFilePath() + QLatin1String("_element") + \
QString::number(count);
qCDebug(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES) << "Failed to parse \
element" << elem.tagName() << name;
qCDebug(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES) << "Parsing messages \
were:" << logger->messages();
- data = new DummyDataInformation(0, name);
+ data = new DummyDataInformation(nullptr, name);
}
TopLevelDataInformation* topData = new TopLevelDataInformation(data, logger, \
eng, fileInfo);
QString lockOffsetStr = readProperty(elem, PROPERTY_DEFAULT_LOCK_OFFSET());
@@ -270,7 +270,7 @@ ArrayDataInformation* OsdParser::arrayFromXML(const QDomElement& \
xmlElem, const if (lengthStr.isEmpty())
{
info.error() << "No array length specified!";
- return 0;
+ return nullptr;
}
//must wrap in parentheses, cannot just evaluate. See \
https://bugreports.qt-project.org/browse/QTBUG-5757
const QScriptValue lengthFunc = ParserUtils::functionSafeEval(info.engine, \
lengthStr); @@ -295,8 +295,8 @@ ArrayDataInformation* OsdParser::arrayFromXML(const \
QDomElement& xmlElem, const {
info.error() << "More than one possible type for array!";
delete apd.arrayType;
- apd.arrayType = 0;
- return 0;
+ apd.arrayType = nullptr;
+ return nullptr;
}
}
}
@@ -331,7 +331,7 @@ DataInformation* OsdParser::parseType(const QDomElement& xmlElem, \
const OsdParse if (toParse.isNull())
{
//don't log an error here, it may be okay (i.e. in arrays <type> can be \
omitted)
- return 0;
+ return nullptr;
}
if (!toParse.nextSiblingElement().isNull()) {
info.warn() << "<type> element has more than one child!";
@@ -360,14 +360,14 @@ PointerDataInformation* OsdParser::pointerFromXML(const \
QDomElement& xmlElem, co if (childElement.isNull())
{
info.error() << "Pointer target is missing! Please add a <target> child \
element.";
- return 0;
+ return nullptr;
}
else if (childElement != xmlElem.lastChildElement())
{
//there is more than one child element
info.error() << "There is more than one child element, cannot determine \
which one "
"is the pointer target. Wrap the correct one in a <target> \
element.";
- return 0;
+ return nullptr;
}
}
ppd.pointerTarget = parseChildElement(childElement, info, \
NAME_POINTER_TARGET()); @@ -417,7 +417,7 @@ EnumDataInformation* \
OsdParser::enumFromXML(const QDomElement& xmlElem, bool isF if (!epd.enumDef)
{
info.error().nospace() << "Enum definition '" << epd.enumName << "' does not \
exist!";
- return 0;
+ return nullptr;
}
if (isFlags)
@@ -440,7 +440,7 @@ StringDataInformation* OsdParser::stringFromXML(const \
QDomElement& xmlElem, DataInformation* OsdParser::parseElement(const QDomElement& \
elem, const OsdParserInfo& oldInfo) {
Q_ASSERT(!elem.isNull());
- DataInformation* data = 0;
+ DataInformation* data = nullptr;
const QString tag = elem.tagName();
OsdParserInfo info(oldInfo);
info.name = readProperty(elem, PROPERTY_NAME(), QStringLiteral("<anonymous>"));
@@ -487,7 +487,7 @@ DataInformation* OsdParser::parseElement(const QDomElement& elem, \
const OsdParse if (!DataInformationFactory::commonInitialization(data, cpd))
{
delete data; //error message has already been logged
- return 0;
+ return nullptr;
}
}
return data;
@@ -502,7 +502,7 @@ EnumDefinition::Ptr OsdParser::findEnum(const QString& defName, \
const OsdParserI return def;
}
info.error() << "Could not find enum definition with name" << defName;
- return EnumDefinition::Ptr(0);
+ return EnumDefinition::Ptr(nullptr);
}
QString OsdParser::readProperty(const QDomElement& elem, const QString& property, \
const QString& defaultVal) @@ -533,7 +533,7 @@ TaggedUnionDataInformation* \
OsdParser::taggedUnionFromXML(const QDomElement& xml if (alternatives.isNull())
{
info.error() << "Missing <alternatives> element, tagged union cannot exist \
without at least one alternative";
- return 0;
+ return nullptr;
}
for (QDomElement elem = alternatives.firstChildElement(); !elem.isNull(); elem = \
elem.nextSiblingElement()) {
@@ -569,7 +569,7 @@ DataInformation* OsdChildrenParser::next()
if (mElem.isNull())
{
mInfo.warn() << "Reached end of fields, but next() was requested!";
- return 0;
+ return nullptr;
}
DataInformation* ret = OsdParser::parseElement(mElem, mInfo);
mElem = mElem.nextSiblingElement();
diff --git a/kasten/controllers/view/structures/parsers/scriptfileparser.cpp \
b/kasten/controllers/view/structures/parsers/scriptfileparser.cpp index \
92a7d68c..abcd99d1 100644
--- a/kasten/controllers/view/structures/parsers/scriptfileparser.cpp
+++ b/kasten/controllers/view/structures/parsers/scriptfileparser.cpp
@@ -55,12 +55,12 @@ QVector<TopLevelDataInformation*> \
ScriptFileParser::parseStructures() const QScriptValue value = \
loadScriptValue(logger, engine); DataInformation* dataInf;
if (!value.isValid())
- dataInf = new DummyDataInformation(0, mPluginName);
+ dataInf = new DummyDataInformation(nullptr, mPluginName);
else
dataInf = ScriptValueConverter::convert(value, mPluginName, logger);
if (!dataInf)
- dataInf = new DummyDataInformation(0, mPluginName);
+ dataInf = new DummyDataInformation(nullptr, mPluginName);
const QFileInfo fileInfo(mAbsolutePath);
TopLevelDataInformation* top = new TopLevelDataInformation(dataInf, logger, \
engine, fileInfo); //handle default lock offset
diff --git a/kasten/controllers/view/structures/parsers/scriptvalueconverter.h \
b/kasten/controllers/view/structures/parsers/scriptvalueconverter.h index \
68696671..7eb7a047 100644
--- a/kasten/controllers/view/structures/parsers/scriptvalueconverter.h
+++ b/kasten/controllers/view/structures/parsers/scriptvalueconverter.h
@@ -36,10 +36,10 @@ namespace ScriptValueConverter
//FIXME remove the = 0
/** If the value is one element */
DataInformation* convert(const QScriptValue& value, const QString& name, \
ScriptLogger* logger,
- DataInformation* parent = 0);
+ DataInformation* parent = nullptr);
/** If the value is a list of elements or an object with many elements */
QVector<DataInformation*> convertValues(const QScriptValue& value, ScriptLogger* \
logger,
- DataInformation* parent = 0);
+ DataInformation* parent = nullptr);
}
#endif /* SCRIPTVALUECONVERTER_H_ */
diff --git a/kasten/controllers/view/structures/parsers/scriptvalueconverter_p.cpp \
b/kasten/controllers/view/structures/parsers/scriptvalueconverter_p.cpp index \
eeb34461..62be8061 100644
--- a/kasten/controllers/view/structures/parsers/scriptvalueconverter_p.cpp
+++ b/kasten/controllers/view/structures/parsers/scriptvalueconverter_p.cpp
@@ -41,7 +41,7 @@ DataInformation* toDataInformation(const QScriptValue& value, const \
ParserInfo& if (!value.isValid())
{
oldInfo.error() << "invalid value passed!";
- return 0;
+ return nullptr;
}
ParserInfo info(oldInfo);
QString nameOverride = value.property(PROPERTY_NAME()).toString();
@@ -53,27 +53,27 @@ DataInformation* toDataInformation(const QScriptValue& value, \
const ParserInfo& {
//apparently regexp is a function
info.error() << "Cannot convert a RegExp object to DataInformation!";
- return 0;
+ return nullptr;
}
if (value.isFunction())
{
info.error() << "Cannot convert a Function object to DataInformation!";
- return 0;
+ return nullptr;
}
if (value.isArray())
{
info.error() << "Cannot convert a Array object to DataInformation!";
- return 0;
+ return nullptr;
}
if (value.isDate())
{
info.error() << "Cannot convert a Date object to DataInformation!";
- return 0;
+ return nullptr;
}
if (value.isError())
{
info.error() << "Cannot convert a Error object to DataInformation!";
- return 0;
+ return nullptr;
}
//variant and qobject are also object types, however they cannot appear from \
user code, no need to check
@@ -94,16 +94,16 @@ DataInformation* toDataInformation(const QScriptValue& value, \
const ParserInfo& else
info.error() << "Cannot convert object of unknown type to \
DataInformation!";
- return 0; //no point trying to convert
+ return nullptr; //no point trying to convert
}
QString type = value.property(PROPERTY_INTERNAL_TYPE()).toString();
if (type.isEmpty())
{
info.error() << "Cannot convert object since type of object could not be \
determined!";
- return 0;
+ return nullptr;
}
- DataInformation* returnVal = 0;
+ DataInformation* returnVal = nullptr;
if (type == TYPE_ARRAY())
returnVal = toArray(value, info);
@@ -152,7 +152,7 @@ DataInformation* toDataInformation(const QScriptValue& value, \
const ParserInfo&
if (!DataInformationFactory::commonInitialization(returnVal, cpd))
{
delete returnVal; //error message has already been logged
- return 0;
+ return nullptr;
}
}
return returnVal;
@@ -250,7 +250,7 @@ TaggedUnionDataInformation* toTaggedUnion(const QScriptValue& \
value, const Parse if (!alternatives.isArray())
{
info.error() << "Alternatives must be an array!";
- return 0;
+ return nullptr;
}
int length = alternatives.property(PROPERTY_LENGTH()).toInt32();
for (int i = 0; i < length; ++i)
diff --git a/kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp \
b/kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp index \
298a6b18..b18e756f 100644
--- a/kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp
+++ b/kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp
@@ -75,7 +75,7 @@ DefaultScriptClass::~DefaultScriptClass()
DataInformation* DefaultScriptClass::toDataInformation(const QScriptValue& obj)
{
if (!obj.scriptClass())
- return 0;
+ return nullptr;
Q_ASSERT(obj.data().isVariant());
const QVariant variant = obj.data().toVariant();
if (variant.isValid() && variant.canConvert<SafeReference>() && \
variant.userType() == qMetaTypeId<SafeReference>()) @@ -83,7 +83,7 @@ \
DataInformation* DefaultScriptClass::toDataInformation(const \
QScriptValue& obj)
const SafeReference& ref = *reinterpret_cast<const \
SafeReference*>(variant.constData()); return ref.data();
}
- return 0;
+ return nullptr;
}
QScriptClass::QueryFlags DefaultScriptClass::queryProperty(const QScriptValue& \
object,
diff --git a/kasten/controllers/view/structures/script/safereference.h \
b/kasten/controllers/view/structures/script/safereference.h index e47247bd..12b88e0a \
100644
--- a/kasten/controllers/view/structures/script/safereference.h
+++ b/kasten/controllers/view/structures/script/safereference.h
@@ -67,7 +67,7 @@ private:
Q_DECLARE_METATYPE(SafeReference)
-inline SafeReference::SafeReference() : mData(0)
+inline SafeReference::SafeReference() : mData(nullptr)
{
qCDebug(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES) << "default constructed safe \
reference"; }
@@ -94,7 +94,7 @@ inline DataInformation* SafeReference::data() const
inline void SafeReference::invalidate()
{
- mData = 0;
+ mData = nullptr;
}
inline void SafeReferenceHolder::safeReferenceDestroyed(SafeReference* ref)
diff --git a/kasten/controllers/view/structures/script/scriptloggerview.h \
b/kasten/controllers/view/structures/script/scriptloggerview.h index \
6d862009..0f207b19 100644
--- a/kasten/controllers/view/structures/script/scriptloggerview.h
+++ b/kasten/controllers/view/structures/script/scriptloggerview.h
@@ -34,7 +34,7 @@ class ScriptLoggerView : public QWidget
Q_OBJECT
Q_DISABLE_COPY(ScriptLoggerView)
public:
- explicit ScriptLoggerView(const TopLevelDataInformation::List& data, QWidget* \
parent = 0); + explicit ScriptLoggerView(const TopLevelDataInformation::List& \
data, QWidget* parent = nullptr); virtual ~ScriptLoggerView();
protected Q_SLOTS:
diff --git a/kasten/controllers/view/structures/settings/structureaddremovewidget.h \
b/kasten/controllers/view/structures/settings/structureaddremovewidget.h index \
9e486b68..d757b7f7 100644
--- a/kasten/controllers/view/structures/settings/structureaddremovewidget.h
+++ b/kasten/controllers/view/structures/settings/structureaddremovewidget.h
@@ -51,7 +51,7 @@ Q_OBJECT
QStringList mValues;
public:
- explicit StructureAddRemoveWidget(const QStringList& selected, \
Kasten::StructTool* tool, QWidget* parent = 0); + explicit \
StructureAddRemoveWidget(const QStringList& selected, Kasten::StructTool* tool, \
QWidget* parent = nullptr); ~StructureAddRemoveWidget();
QStringList values() const;
public Q_SLOTS:
diff --git a/kasten/controllers/view/structures/settings/structuresmanagerview.cpp \
b/kasten/controllers/view/structures/settings/structuresmanagerview.cpp index \
35f40ad5..7c5c504c 100644
--- a/kasten/controllers/view/structures/settings/structuresmanagerview.cpp
+++ b/kasten/controllers/view/structures/settings/structuresmanagerview.cpp
@@ -44,7 +44,7 @@
StructuresManagerView::StructuresManagerView(Kasten::StructTool* tool, QWidget* \
parent)
- : QWidget(parent), mTool(tool), mStructuresSelector(0), \
mRebuildingPluginsList(false) + : QWidget(parent), mTool(tool), \
mStructuresSelector(nullptr), mRebuildingPluginsList(false) {
KConfigDialogManager::changedMap()->insert(QStringLiteral("StructuresManagerView"), \
SIGNAL(changed(QStringList))); \
setObjectName(QStringLiteral("kcfg_LoadedStructures"));
diff --git a/kasten/controllers/view/structures/settings/structuresmanagerview.h \
b/kasten/controllers/view/structures/settings/structuresmanagerview.h index \
15e2737f..c3335015 100644
--- a/kasten/controllers/view/structures/settings/structuresmanagerview.h
+++ b/kasten/controllers/view/structures/settings/structuresmanagerview.h
@@ -49,7 +49,7 @@ Q_OBJECT
public:
Q_PROPERTY(QStringList values READ values USER true)
- explicit StructuresManagerView(Kasten::StructTool* manager, QWidget* parent = \
0); + explicit StructuresManagerView(Kasten::StructTool* manager, QWidget* parent \
= nullptr);
virtual ~StructuresManagerView();
QStringList values();
diff --git a/kasten/controllers/view/structures/settings/structviewdisplaysettingswidget.cpp \
b/kasten/controllers/view/structures/settings/structviewdisplaysettingswidget.cpp \
index 64ada04b..9fba7bd2 100644
--- a/kasten/controllers/view/structures/settings/structviewdisplaysettingswidget.cpp
+++ b/kasten/controllers/view/structures/settings/structviewdisplaysettingswidget.cpp
@@ -28,7 +28,7 @@
StructViewDisplaySettingsWidget::StructViewDisplaySettingsWidget() :
- QWidget(NULL)
+ QWidget(nullptr)
{
ui.setupUi(this);
ui.combo_CharDisplayBase->setEnabled(ui.kcfg_ShowCharNumericalValue->isChecked());
diff --git a/kasten/controllers/view/structures/structtool.cpp \
b/kasten/controllers/view/structures/structtool.cpp index a87c35d2..69ec4eba 100644
--- a/kasten/controllers/view/structures/structtool.cpp
+++ b/kasten/controllers/view/structures/structtool.cpp
@@ -49,7 +49,7 @@ namespace Kasten
class StructToolPrivate
{
public:
- StructToolPrivate() : mByteArrayView(0), mByteArrayModel(0), mCursorIndex(0),
+ StructToolPrivate() : mByteArrayView(nullptr), mByteArrayModel(nullptr), \
mCursorIndex(0),
mByteOrder(StructViewPreferences::byteOrder()), mManager(new \
StructuresManager()), mWritingData(false), mCurrentItemDataChanged(false) {}
@@ -112,10 +112,10 @@ void StructTool::setTargetModel(AbstractModel* model)
if (d->mByteArrayModel)
d->mByteArrayModel->disconnect(this);
- d->mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ d->mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
ByteArrayDocument* document = d->mByteArrayView ?
- qobject_cast<ByteArrayDocument*>(d->mByteArrayView->baseModel()) : 0;
- d->mByteArrayModel = document ? document->content() : 0;
+ qobject_cast<ByteArrayDocument*>(d->mByteArrayView->baseModel()) : \
nullptr; + d->mByteArrayModel = document ? document->content() : nullptr;
if (d->mByteArrayModel && d->mByteArrayView)
{
@@ -233,7 +233,7 @@ DataInformation* StructTool::childAt(int idx) const
{
if (idx >= d->mData.size() || idx < 0)
{
- return 0;
+ return nullptr;
}
//don't expose the topLevelDataInformation, since this may cause crashes
return d->mData.at(idx)->actualDataInformation();
@@ -363,7 +363,7 @@ void StructTool::validateAllStructures()
bool StructTool::isFileLoaded() const
{
- return d->mByteArrayModel != NULL;
+ return ( d->mByteArrayModel != nullptr );
}
void StructTool::lockStructure(const QModelIndex& idx)
diff --git a/kasten/controllers/view/structures/structtreemodel.cpp \
b/kasten/controllers/view/structures/structtreemodel.cpp index d1b44cd4..832af6ae \
100644
--- a/kasten/controllers/view/structures/structtreemodel.cpp
+++ b/kasten/controllers/view/structures/structtreemodel.cpp
@@ -33,7 +33,7 @@
namespace Kasten
{
StructTreeModel::StructTreeModel(StructTool* tool, QObject *parent) :
- QAbstractItemModel(parent), mTool(tool), mLastSender(0), mLastStartIndex(0), \
mLastEndIndex(0) + QAbstractItemModel(parent), mTool(tool), mLastSender(nullptr), \
mLastStartIndex(0), mLastEndIndex(0) {
connect(mTool, &StructTool::dataChanged, this, \
&StructTreeModel::onToolDataChange);
connect(mTool, &StructTool::dataCleared, this, \
&StructTreeModel::onToolDataClear); @@ -180,7 +180,7 @@ QModelIndex \
StructTreeModel::index(int row, int column, const QModelIndex &paren if \
(!hasIndex(row, column, parent)) return QModelIndex();
- DataInformation* childItem = NULL;
+ DataInformation* childItem = nullptr;
if (!parent.isValid())
childItem = mTool->childAt(row);
diff --git a/kasten/controllers/view/structures/structtreemodel.h \
b/kasten/controllers/view/structures/structtreemodel.h index 89e2247e..5a86591f \
100644
--- a/kasten/controllers/view/structures/structtreemodel.h
+++ b/kasten/controllers/view/structures/structtreemodel.h
@@ -37,7 +37,7 @@ class StructTreeModel: public QAbstractItemModel
{
Q_OBJECT
public:
- explicit StructTreeModel(StructTool* tool, QObject* parent = NULL);
+ explicit StructTreeModel(StructTool* tool, QObject* parent = nullptr);
virtual ~StructTreeModel();
QVariant data(const QModelIndex& index, int role) const;
Qt::ItemFlags flags(const QModelIndex& index) const;
diff --git a/kasten/controllers/view/structures/structuredefinitionfile.cpp \
b/kasten/controllers/view/structures/structuredefinitionfile.cpp index \
4fffe78c..eb8c52ec 100644
--- a/kasten/controllers/view/structures/structuredefinitionfile.cpp
+++ b/kasten/controllers/view/structures/structuredefinitionfile.cpp
@@ -71,7 +71,7 @@ TopLevelDataInformation* StructureDefinitionFile::structure(const \
QString& name) {
Q_CHECK_PTR(mParser);
QVector<TopLevelDataInformation*> list = mParser->parseStructures();
- TopLevelDataInformation* ret = 0;
+ TopLevelDataInformation* ret = nullptr;
for (int i = 0; i < list.size(); ++i)
{
if (list.at(i)->actualDataInformation()->name() == name)
diff --git a/kasten/controllers/view/structures/structuresmanager.cpp \
b/kasten/controllers/view/structures/structuresmanager.cpp index 712c9b6f..bd68bec5 \
100644
--- a/kasten/controllers/view/structures/structuresmanager.cpp
+++ b/kasten/controllers/view/structures/structuresmanager.cpp
@@ -91,7 +91,7 @@ StructureDefinitionFile* StructuresManager::definition(QString& \
pluginName) if (!mDefs.contains(pluginName))
{
qCWarning(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES) << "could not find \
structuredefinitionFile with name=" << pluginName;
- return NULL;
+ return nullptr;
}
return mDefs.value(pluginName);
}
diff --git a/kasten/controllers/view/structures/structview.cpp \
b/kasten/controllers/view/structures/structview.cpp index ad3f3aec..179a20a4 100644
--- a/kasten/controllers/view/structures/structview.cpp
+++ b/kasten/controllers/view/structures/structview.cpp
@@ -59,7 +59,7 @@ namespace Kasten
StructView::StructView(StructTool* tool, QWidget* parent) :
QWidget(parent), mTool(tool), mDelegate(new StructViewItemDelegate(this)),
- mStructTreeViewFocusChild(0)
+ mStructTreeViewFocusChild(nullptr)
{
QBoxLayout* baseLayout = new QVBoxLayout(this);
setLayout(baseLayout);
@@ -208,7 +208,7 @@ bool StructView::eventFilter(QObject* object, QEvent* event)
if (!mStructTreeView->hasFocus())
mTool->unmark();
mStructTreeViewFocusChild->removeEventFilter(this);
- mStructTreeViewFocusChild = 0;
+ mStructTreeViewFocusChild = nullptr;
}
}
@@ -297,7 +297,7 @@ void StructView::openScriptConsole()
void StructView::onByteArrayModelChanged(Okteta::AbstractByteArrayModel* model)
{
- const bool validModel = model != 0;
+ const bool validModel = ( model != nullptr );
QModelIndex current = mStructTreeView->currentIndex();
mLockStructureButton->setEnabled(mTool->canStructureBeLocked(current));
setLockButtonState(mTool->isStructureLocked(current));
diff --git a/kasten/controllers/view/structures/structview.h \
b/kasten/controllers/view/structures/structview.h index 404481e3..2a9b93ce 100644
--- a/kasten/controllers/view/structures/structview.h
+++ b/kasten/controllers/view/structures/structview.h
@@ -46,7 +46,7 @@ class StructView: public QWidget
Q_OBJECT
public:
- explicit StructView(StructTool* tool, QWidget* parent = 0);
+ explicit StructView(StructTool* tool, QWidget* parent = nullptr);
virtual ~StructView();
public:
diff --git a/kasten/controllers/view/structures/structviewitemdelegate.cpp \
b/kasten/controllers/view/structures/structviewitemdelegate.cpp index \
ae555232..0070289a 100644
--- a/kasten/controllers/view/structures/structviewitemdelegate.cpp
+++ b/kasten/controllers/view/structures/structviewitemdelegate.cpp
@@ -40,10 +40,10 @@ QWidget* StructViewItemDelegate::createEditor(QWidget* parent, \
const QStyleOptio {
Q_UNUSED(option)
if (!index.isValid())
- return 0;
+ return nullptr;
DataInformationBase* dataB = static_cast<DataInformationBase*> \
(index.internalPointer()); if (!dataB || dataB->isTopLevel())
- return 0;
+ return nullptr;
DataInformation* data = dataB->asDataInformation();
QWidget* ret = data->createEditWidget(parent);
ret->setFocusPolicy(Qt::WheelFocus);
diff --git a/kasten/controllers/view/structures/structviewitemdelegate.h \
b/kasten/controllers/view/structures/structviewitemdelegate.h index \
ea509a4e..1e69b9be 100644
--- a/kasten/controllers/view/structures/structviewitemdelegate.h
+++ b/kasten/controllers/view/structures/structviewitemdelegate.h
@@ -30,7 +30,7 @@ class StructViewItemDelegate: public QStyledItemDelegate
Q_OBJECT
public:
- explicit StructViewItemDelegate(QObject * parent = 0);
+ explicit StructViewItemDelegate(QObject * parent = nullptr);
virtual ~StructViewItemDelegate();
virtual void setModelData(QWidget * editor, QAbstractItemModel * model,
const QModelIndex & index) const;
diff --git a/kasten/controllers/view/viewconfig/bytespergroupdialog.h \
b/kasten/controllers/view/viewconfig/bytespergroupdialog.h index 4bc4a10c..049ad2bd \
100644
--- a/kasten/controllers/view/viewconfig/bytespergroupdialog.h
+++ b/kasten/controllers/view/viewconfig/bytespergroupdialog.h
@@ -37,7 +37,7 @@ class BytesPerGroupDialog : public QDialog
Q_OBJECT
public:
- explicit BytesPerGroupDialog( QWidget* parent = 0 );
+ explicit BytesPerGroupDialog( QWidget* parent = nullptr );
virtual ~BytesPerGroupDialog();
diff --git a/kasten/controllers/view/viewconfig/bytesperlinedialog.h \
b/kasten/controllers/view/viewconfig/bytesperlinedialog.h index fbdda3a7..bbac9d88 \
100644
--- a/kasten/controllers/view/viewconfig/bytesperlinedialog.h
+++ b/kasten/controllers/view/viewconfig/bytesperlinedialog.h
@@ -37,7 +37,7 @@ class BytesPerLineDialog : public QDialog
Q_OBJECT
public:
- explicit BytesPerLineDialog( QWidget* parent = 0 );
+ explicit BytesPerLineDialog( QWidget* parent = nullptr );
virtual ~BytesPerLineDialog();
diff --git a/kasten/controllers/view/viewconfig/viewconfigcontroller.cpp \
b/kasten/controllers/view/viewconfig/viewconfigcontroller.cpp index \
0d5a52c8..fc8b9bed 100644
--- a/kasten/controllers/view/viewconfig/viewconfigcontroller.cpp
+++ b/kasten/controllers/view/viewconfig/viewconfigcontroller.cpp
@@ -40,7 +40,7 @@ namespace Kasten
{
ViewConfigController::ViewConfigController( KXMLGUIClient* guiClient )
- : mByteArrayView( 0 )
+ : mByteArrayView( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -118,16 +118,16 @@ ViewConfigController::ViewConfigController( KXMLGUIClient* \
guiClient ) mToggleColumnsAction->setItems( list );
connect( mToggleColumnsAction, static_cast<void \
(KSelectAction::*)(int)>(&KSelectAction::triggered), this, \
&ViewConfigController::toggleValueCharColumns );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ViewConfigController::setTargetModel( AbstractModel* model )
{
if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
- const bool hasView = ( mByteArrayView != 0 );
+ const bool hasView = ( mByteArrayView != nullptr );
if( hasView )
{
onOffsetColumnVisibleChanged( mByteArrayView->offsetColumnVisible() );
diff --git a/kasten/controllers/view/viewmode/viewmodecontroller.cpp \
b/kasten/controllers/view/viewmode/viewmodecontroller.cpp index c71da8e2..0a5e2fcc \
100644
--- a/kasten/controllers/view/viewmode/viewmodecontroller.cpp
+++ b/kasten/controllers/view/viewmode/viewmodecontroller.cpp
@@ -35,7 +35,7 @@ namespace Kasten
{
ViewModeController::ViewModeController( KXMLGUIClient* guiClient )
- : mByteArrayView( 0 )
+ : mByteArrayView( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -48,16 +48,16 @@ ViewModeController::ViewModeController( KXMLGUIClient* guiClient \
) mViewModeAction->setItems( list );
connect( mViewModeAction, static_cast<void \
(KSelectAction::*)(int)>(&KSelectAction::triggered), this, \
&ViewModeController::setViewMode );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ViewModeController::setTargetModel( AbstractModel* model )
{
// if( mByteArrayView ) mByteArrayView->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
- const bool hasView = ( mByteArrayView != 0 );
+ const bool hasView = ( mByteArrayView != nullptr );
if( hasView )
{
mViewModeAction->setCurrentItem( (int)mByteArrayView->viewModus() );
diff --git a/kasten/controllers/view/viewprofiles/viewprofilecontroller.cpp \
b/kasten/controllers/view/viewprofiles/viewprofilecontroller.cpp index \
849889b2..67d50ce0 100644
--- a/kasten/controllers/view/viewprofiles/viewprofilecontroller.cpp
+++ b/kasten/controllers/view/viewprofiles/viewprofilecontroller.cpp
@@ -48,8 +48,8 @@ ViewProfileController::ViewProfileController( \
ByteArrayViewProfileManager* viewP , mGuiClient( guiClient )
, mViewProfileManager( viewProfileManager )
, mParentWidget( parentWidget )
- , mByteArrayView( 0 )
- , mByteArrayViewProfileSynchronizer( 0 )
+ , mByteArrayView( nullptr )
+ , mByteArrayViewProfileSynchronizer( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -96,7 +96,7 @@ ViewProfileController::ViewProfileController( \
ByteArrayViewProfileManager* viewP
onViewProfilesChanged();
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ViewProfileController::setTargetModel( AbstractModel* model )
@@ -104,10 +104,10 @@ void ViewProfileController::setTargetModel( AbstractModel* \
model ) if( mByteArrayViewProfileSynchronizer )
mByteArrayViewProfileSynchronizer->disconnect( this );
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
- mByteArrayViewProfileSynchronizer = mByteArrayView ? \
mByteArrayView->synchronizer() : 0; + mByteArrayView = model ? \
model->findBaseModel<ByteArrayView*>() : nullptr; + \
mByteArrayViewProfileSynchronizer = mByteArrayView ? mByteArrayView->synchronizer() : \
nullptr;
- const bool hasSynchronizer = ( mByteArrayViewProfileSynchronizer != 0 );
+ const bool hasSynchronizer = ( mByteArrayViewProfileSynchronizer != nullptr );
if( hasSynchronizer )
{
onViewProfileChanged( mByteArrayViewProfileSynchronizer->viewProfileId() );
diff --git a/kasten/controllers/view/viewprofiles/viewprofileedit.h \
b/kasten/controllers/view/viewprofiles/viewprofileedit.h index be4e0d17..f3c54093 \
100644
--- a/kasten/controllers/view/viewprofiles/viewprofileedit.h
+++ b/kasten/controllers/view/viewprofiles/viewprofileedit.h
@@ -44,7 +44,7 @@ class ViewProfileEdit : public QWidget
Q_OBJECT
public:
- explicit ViewProfileEdit( QWidget* parent = 0 );
+ explicit ViewProfileEdit( QWidget* parent = nullptr );
virtual ~ViewProfileEdit();
diff --git a/kasten/controllers/view/viewprofiles/viewprofileeditdialog.h \
b/kasten/controllers/view/viewprofiles/viewprofileeditdialog.h index \
1fc1cf3e..de18e4ff 100644
--- a/kasten/controllers/view/viewprofiles/viewprofileeditdialog.h
+++ b/kasten/controllers/view/viewprofiles/viewprofileeditdialog.h
@@ -39,7 +39,7 @@ class ViewProfileEditDialog : public QDialog
Q_OBJECT
public:
- explicit ViewProfileEditDialog( QWidget* parent = 0 );
+ explicit ViewProfileEditDialog( QWidget* parent = nullptr );
virtual ~ViewProfileEditDialog();
diff --git a/kasten/controllers/view/viewprofiles/viewprofilesmanagedialog.h \
b/kasten/controllers/view/viewprofiles/viewprofilesmanagedialog.h index \
c449f698..3ea90a09 100644
--- a/kasten/controllers/view/viewprofiles/viewprofilesmanagedialog.h
+++ b/kasten/controllers/view/viewprofiles/viewprofilesmanagedialog.h
@@ -46,7 +46,7 @@ class ViewProfilesManageDialog : public QDialog
public:
explicit ViewProfilesManageDialog( ByteArrayViewProfileManager* \
viewProfileManager,
- QWidget* parent = 0 );
+ QWidget* parent = nullptr );
virtual ~ViewProfilesManageDialog();
diff --git a/kasten/controllers/view/viewprofiles/viewprofiletablemodel.h \
b/kasten/controllers/view/viewprofiles/viewprofiletablemodel.h index \
93e7d87a..085581d0 100644
--- a/kasten/controllers/view/viewprofiles/viewprofiletablemodel.h
+++ b/kasten/controllers/view/viewprofiles/viewprofiletablemodel.h
@@ -50,7 +50,7 @@ class ViewProfileTableModel : public QAbstractTableModel
public:
explicit ViewProfileTableModel( const ByteArrayViewProfileManager* \
viewProfileManager,
- QObject* parent = 0 );
+ QObject* parent = nullptr );
virtual ~ViewProfileTableModel();
public: // QAbstractTableModel API
diff --git a/kasten/controllers/view/viewstatus/viewstatuscontroller.cpp \
b/kasten/controllers/view/viewstatus/viewstatuscontroller.cpp index \
aa2b02aa..db63cdb6 100644
--- a/kasten/controllers/view/viewstatus/viewstatuscontroller.cpp
+++ b/kasten/controllers/view/viewstatus/viewstatuscontroller.cpp
@@ -45,7 +45,7 @@ namespace Kasten
{
ViewStatusController::ViewStatusController( StatusBar* statusBar )
- : mByteArrayView( 0 ), mStatusBar( statusBar )
+ : mByteArrayView( nullptr ), mStatusBar( statusBar )
{
mPrintFunction = Okteta::OffsetFormat::printFunction( \
Okteta::OffsetFormat::Hexadecimal );
@@ -85,7 +85,7 @@ ViewStatusController::ViewStatusController( StatusBar* statusBar )
fixWidths( 0 );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
@@ -154,9 +154,9 @@ void ViewStatusController::setTargetModel( AbstractModel* model )
mByteArrayView->disconnect( mOverwriteModeToggleButton );
}
- mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : 0;
+ mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
- const bool hasView = ( mByteArrayView != 0 );
+ const bool hasView = ( mByteArrayView != nullptr );
if( hasView )
{
mStartOffset = mByteArrayView->startOffset();
diff --git a/kasten/core/document/tests/bytearraydocumentfactorytest.cpp \
b/kasten/core/document/tests/bytearraydocumentfactorytest.cpp index \
7ce0ebf1..b3e29efb 100644
--- a/kasten/core/document/tests/bytearraydocumentfactorytest.cpp
+++ b/kasten/core/document/tests/bytearraydocumentfactorytest.cpp
@@ -40,8 +40,8 @@ void ByteArrayDocumentFactoryTest::testCreate()
AbstractDocument* document = factory->create();
ByteArrayDocument* byteArrayDocument = qobject_cast<ByteArrayDocument*>( \
document );
- QVERIFY( document != 0 );
- QVERIFY( byteArrayDocument != 0 );
+ QVERIFY( document != nullptr );
+ QVERIFY( byteArrayDocument != nullptr );
QCOMPARE( document->contentFlags(), Kasten::ContentStateNormal );
delete document;
diff --git a/kasten/core/document/tests/bytearraydocumenttest.cpp \
b/kasten/core/document/tests/bytearraydocumenttest.cpp index 3ff2b874..c28d9c27 \
100644
--- a/kasten/core/document/tests/bytearraydocumenttest.cpp
+++ b/kasten/core/document/tests/bytearraydocumenttest.cpp
@@ -42,11 +42,11 @@ void ByteArrayDocumentTest::testCreateNew()
{
ByteArrayDocument* document = new ByteArrayDocument(QStringLiteral("New created \
for test."));
- QVERIFY( document != 0 );
+ QVERIFY( document != nullptr );
QCOMPARE( document->contentFlags(), Kasten::ContentStateNormal );
Okteta::PieceTableByteArrayModel *byteArray = \
qobject_cast<Okteta::PieceTableByteArrayModel*>( document->content() \
);
- QVERIFY( byteArray != 0 );
+ QVERIFY( byteArray != nullptr );
QCOMPARE( byteArray->size(), 0 );
QVERIFY( !byteArray->isModified() );
diff --git a/kasten/core/io/filesystem/bytearrayrawfileloadthread.cpp \
b/kasten/core/io/filesystem/bytearrayrawfileloadthread.cpp index d06c5058..878dfff9 \
100644
--- a/kasten/core/io/filesystem/bytearrayrawfileloadthread.cpp
+++ b/kasten/core/io/filesystem/bytearrayrawfileloadthread.cpp
@@ -85,7 +85,7 @@ void ByteArrayRawFileLoadThread::run()
mErrorString = i18n( "Support to load files larger than 2 GiB has not yet \
been implemented." );
if( ! success )
- mDocument = 0;
+ mDocument = nullptr;
emit documentRead( mDocument );
}
diff --git a/kasten/core/io/filesystem/bytearrayrawfileloadthread.h \
b/kasten/core/io/filesystem/bytearrayrawfileloadthread.h index c8a05925..9117bfaa \
100644
--- a/kasten/core/io/filesystem/bytearrayrawfileloadthread.h
+++ b/kasten/core/io/filesystem/bytearrayrawfileloadthread.h
@@ -65,7 +65,7 @@ class ByteArrayRawFileLoadThread : public QThread
inline ByteArrayRawFileLoadThread::ByteArrayRawFileLoadThread( QObject* parent, \
QFile* file ) : QThread( parent ),
mFile( file ),
- mDocument( 0 )
+ mDocument( nullptr )
{}
inline ByteArrayDocument* ByteArrayRawFileLoadThread::document() const { return \
mDocument; }
diff --git a/kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp \
b/kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp index a415f33c..2cd86f81 \
100644
--- a/kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp
+++ b/kasten/core/io/filesystem/bytearrayrawfilesynchronizer.cpp
@@ -39,7 +39,7 @@ namespace Kasten
{
ByteArrayRawFileSynchronizer::ByteArrayRawFileSynchronizer()
- : mDocument( 0 )
+ : mDocument( nullptr )
{
connect( this, &ByteArrayRawFileSynchronizer::urlChanged, this, \
&ByteArrayRawFileSynchronizer::onUrlChange ); }
diff --git a/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp \
b/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp index \
62bee85a..a787af22 100644
--- a/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp
+++ b/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp
@@ -87,7 +87,7 @@ void ByteArrayRawFileSynchronizerFactoryTest::testCreate()
{
Kasten::ByteArrayRawFileSynchronizerFactory *factory = new \
Kasten::ByteArrayRawFileSynchronizerFactory();
- QVERIFY( factory != 0 );
+ QVERIFY( factory != nullptr );
delete factory;
}
diff --git a/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp \
b/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp index 5a9fb5a3..516f56ae \
100644
--- a/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp
+++ b/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp
@@ -99,9 +99,9 @@ void ByteArrayRawFileSynchronizerTest::testLoadFromUrl()
ByteArrayDocument* byteArrayDocument = qobject_cast<ByteArrayDocument*>( \
document );
- QVERIFY( document != 0 );
- QVERIFY( byteArrayDocument != 0 );
- QVERIFY( document->synchronizer() != 0 );
+ QVERIFY( document != nullptr );
+ QVERIFY( byteArrayDocument != nullptr );
+ QVERIFY( document->synchronizer() != nullptr );
QCOMPARE( document->synchronizer()->document(), document );
QCOMPARE( document->contentFlags(), Kasten::ContentStateNormal );
QCOMPARE( document->synchronizer()->localSyncState(), Kasten::LocalInSync );
@@ -120,7 +120,7 @@ void \
ByteArrayRawFileSynchronizerTest::testLoadFromNotExistingUrl() \
synchronizer->startLoad( fileUrl )->exec(); AbstractDocument* document = \
synchronizer->document();
- QVERIFY( document == 0 );
+ QVERIFY( document == nullptr );
delete synchronizer;
}
diff --git a/kasten/gui/io/bytearrayviewprofilesynchronizer.cpp \
b/kasten/gui/io/bytearrayviewprofilesynchronizer.cpp index 706fc990..26a29f93 100644
--- a/kasten/gui/io/bytearrayviewprofilesynchronizer.cpp
+++ b/kasten/gui/io/bytearrayviewprofilesynchronizer.cpp
@@ -32,7 +32,7 @@ namespace Kasten
ByteArrayViewProfileSynchronizer::ByteArrayViewProfileSynchronizer( \
ByteArrayViewProfileManager* viewProfileManager ) : QObject()
- , mView( 0 )
+ , mView( nullptr )
, mViewProfileId()
, mDirtyFlags( 0 )
, mUpdatingView( false )
@@ -111,7 +111,7 @@ void ByteArrayViewProfileSynchronizer::setViewProfileId( const \
ByteArrayViewProf void
ByteArrayViewProfileSynchronizer::syncToRemote()
{
- if( (mView == 0) || (mViewProfileId.isEmpty()) )
+ if( (! mView) || (mViewProfileId.isEmpty()) )
return;
ByteArrayViewProfile viewProfile = mViewProfileManager->viewProfile( \
mViewProfileId ); @@ -130,7 +130,7 @@ \
ByteArrayViewProfileSynchronizer::syncToRemote() void
ByteArrayViewProfileSynchronizer::syncFromRemote()
{
- if( (mView == 0) || (mViewProfileId.isEmpty()) )
+ if( (! mView) || (mViewProfileId.isEmpty()) )
return;
const ByteArrayViewProfile viewProfile = mViewProfileManager->viewProfile( \
mViewProfileId ); @@ -146,7 +146,7 @@ \
ByteArrayViewProfileSynchronizer::syncFromRemote() void
ByteArrayViewProfileSynchronizer::onViewProfilesChanged( const \
QList<ByteArrayViewProfile>& viewProfiles ) {
- if( mView == 0 )
+ if( ! mView )
return;
foreach( const ByteArrayViewProfile& viewProfile, viewProfiles )
@@ -277,7 +277,7 @@ void ByteArrayViewProfileSynchronizer::connectViewSignals()
void ByteArrayViewProfileSynchronizer::onViewProfilesRemoved( const \
QList<ByteArrayViewProfile::Id>& viewProfileIds ) {
- if( mView == 0 )
+ if( ! mView )
return;
foreach( const ByteArrayViewProfile::Id& viewProfileId, viewProfileIds )
diff --git a/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditor.h \
b/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditor.h index \
803c02dc..5459d678 100644
--- a/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditor.h
+++ b/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditor.h
@@ -42,7 +42,7 @@ class ByteArrayPatternGeneratorConfigEditor : public \
AbstractModelDataGeneratorC Q_OBJECT
public:
- explicit ByteArrayPatternGeneratorConfigEditor( ByteArrayPatternGenerator* \
generator, QWidget* parent = 0 ); + explicit \
ByteArrayPatternGeneratorConfigEditor( ByteArrayPatternGenerator* generator, QWidget* \
parent = nullptr );
virtual ~ByteArrayPatternGeneratorConfigEditor();
diff --git a/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditorfactory.cpp \
b/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditorfactory.cpp \
index c897663e..7bdf9a77 100644
--- a/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditorfactory.cpp
+++ b/kasten/gui/io/generator/pattern/bytearraypatterngeneratorconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayPatternGeneratorConfigEditorFactory::ByteArrayPatternGeneratorConfigEdi
AbstractModelDataGeneratorConfigEditor* \
ByteArrayPatternGeneratorConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelDataGenerator* generator ) const {
- AbstractModelDataGeneratorConfigEditor* result = 0;
+ AbstractModelDataGeneratorConfigEditor* result = nullptr;
ByteArrayPatternGenerator* patternGenerator =
qobject_cast<ByteArrayPatternGenerator*>( generator );
diff --git a/kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp \
b/kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp index \
8d6d5888..261bac23 100644
--- a/kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp
+++ b/kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp
@@ -57,7 +57,7 @@ ByteArrayRandomDataGenerator::ByteArrayRandomDataGenerator()
// TODO: use different RNG, with multiple characteristics and offer them in the \
config QMimeData* ByteArrayRandomDataGenerator::generateData()
{
- qsrand( (unsigned int)time(0) );
+ qsrand( (unsigned int)time(nullptr) );
const int insertDataSize = mSettings.size;
QByteArray insertData( insertDataSize, '\0' );
diff --git a/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditor.h \
b/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditor.h index \
f89ff605..bfd05511 100644
--- a/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditor.h
+++ b/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditor.h
@@ -39,7 +39,7 @@ class ByteArrayRandomDataGeneratorConfigEditor : public \
AbstractModelDataGenerat Q_OBJECT
public:
- explicit ByteArrayRandomDataGeneratorConfigEditor( ByteArrayRandomDataGenerator* \
generator, QWidget* parent = 0 ); + explicit \
ByteArrayRandomDataGeneratorConfigEditor( ByteArrayRandomDataGenerator* generator, \
QWidget* parent = nullptr );
virtual ~ByteArrayRandomDataGeneratorConfigEditor();
diff --git a/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditorfactory.cpp \
b/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditorfactory.cpp
index e8b30a0e..7a828a97 100644
--- a/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditorfactory.cpp
+++ b/kasten/gui/io/generator/randomdata/bytearrayrandomdatageneratorconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayRandomDataGeneratorConfigEditorFactory::ByteArrayRandomDataGeneratorCon
AbstractModelDataGeneratorConfigEditor* \
ByteArrayRandomDataGeneratorConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelDataGenerator* generator ) const {
- AbstractModelDataGeneratorConfigEditor* result = 0;
+ AbstractModelDataGeneratorConfigEditor* result = nullptr;
ByteArrayRandomDataGenerator* randomDataGenerator =
qobject_cast<ByteArrayRandomDataGenerator*>( generator );
diff --git a/kasten/gui/io/streamencoder/abstractbytearraystreamencoder.cpp \
b/kasten/gui/io/streamencoder/abstractbytearraystreamencoder.cpp index \
f7e6ebc7..8817279e 100644
--- a/kasten/gui/io/streamencoder/abstractbytearraystreamencoder.cpp
+++ b/kasten/gui/io/streamencoder/abstractbytearraystreamencoder.cpp
@@ -49,7 +49,7 @@ Q_UNUSED( selection )
const ByteArrayDocument* byteArrayDocument = model->findBaseModel<const \
ByteArrayDocument*>();
- return ( byteArrayDocument == 0 ) ? QString() : byteArrayDocument->typeName();
+ return byteArrayDocument ? byteArrayDocument->typeName() : QString();
}
@@ -59,14 +59,14 @@ bool AbstractByteArrayStreamEncoder::encodeToStream( QIODevice* \
device,
const ByteArrayView* byteArrayView = qobject_cast<const ByteArrayView*>( model \
);
const ByteArrayDocument* byteArrayDocument =
- byteArrayView ? qobject_cast<const ByteArrayDocument*>( \
byteArrayView->baseModel() ) : 0;
- if( byteArrayDocument == 0 )
+ byteArrayView ? qobject_cast<const ByteArrayDocument*>( \
byteArrayView->baseModel() ) : nullptr; + if( ! byteArrayDocument )
return false;
const Okteta::AbstractByteArrayModel* byteArray = byteArrayDocument->content();
const ByteArraySelection* byteArraySelection =
- selection ? static_cast<const ByteArraySelection*>( selection ) : 0;
+ selection ? static_cast<const ByteArraySelection*>( selection ) : nullptr;
const Okteta::AddressRange range = byteArraySelection && \
byteArraySelection->isValid() ? byteArraySelection->range() :
@@ -82,14 +82,14 @@ QString AbstractByteArrayStreamEncoder::previewData( \
AbstractModel* model, const
const ByteArrayView* byteArrayView = qobject_cast<const ByteArrayView*>( model \
);
const ByteArrayDocument* byteArrayDocument =
- byteArrayView ? qobject_cast<const ByteArrayDocument*>( \
byteArrayView->baseModel() ) : 0;
- if( byteArrayDocument == 0 )
+ byteArrayView ? qobject_cast<const ByteArrayDocument*>( \
byteArrayView->baseModel() ) : nullptr; + if( ! byteArrayDocument )
return QString();
const Okteta::AbstractByteArrayModel* byteArray = byteArrayDocument->content();
const ByteArraySelection* byteArraySelection =
- selection ? static_cast<const ByteArraySelection*>( selection ) : 0;
+ selection ? static_cast<const ByteArraySelection*>( selection ) : nullptr;
Okteta::AddressRange range = byteArraySelection && byteArraySelection->isValid() \
? byteArraySelection->range() :
diff --git a/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditor.h index \
33d9e032..30f2d3dd 100644
--- a/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditor.h
@@ -39,7 +39,7 @@ class ByteArrayBase32StreamEncoderConfigEditor : public \
AbstractModelStreamEncod Q_OBJECT
public:
- explicit ByteArrayBase32StreamEncoderConfigEditor( ByteArrayBase32StreamEncoder* \
encoder, QWidget* parent = 0 ); + explicit \
ByteArrayBase32StreamEncoderConfigEditor( ByteArrayBase32StreamEncoder* encoder, \
QWidget* parent = nullptr ); virtual ~ByteArrayBase32StreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditorfactory.cpp
index a807dbc1..68b6b5d8 100644
--- a/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/base32/bytearraybase32streamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayBase32StreamEncoderConfigEditorFactory::ByteArrayBase32StreamEncoderCon
AbstractModelStreamEncoderConfigEditor* \
ByteArrayBase32StreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArrayBase32StreamEncoder* base32StreamEncoder =
qobject_cast<ByteArrayBase32StreamEncoder*>( encoder );
diff --git a/kasten/gui/io/streamencoder/bytearraytextstreamencoderpreview.cpp \
b/kasten/gui/io/streamencoder/bytearraytextstreamencoderpreview.cpp index \
7a256fd0..5f9cd2b3 100644
--- a/kasten/gui/io/streamencoder/bytearraytextstreamencoderpreview.cpp
+++ b/kasten/gui/io/streamencoder/bytearraytextstreamencoderpreview.cpp
@@ -34,7 +34,7 @@ namespace Kasten
{
ByteArrayTextStreamEncoderPreview::ByteArrayTextStreamEncoderPreview( \
AbstractByteArrayStreamEncoder* encoder )
- : mEncoder( encoder ), mModel( 0 )
+ : mEncoder( encoder ), mModel( nullptr )
{
mWidget = new QTextEdit(); // TODO: use Kate for syntax highlighting
mWidget->setReadOnly( true );
diff --git a/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditor.h index \
a8d93a37..0762abc9 100644
--- a/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditor.h
@@ -39,7 +39,7 @@ class ByteArrayIHexStreamEncoderConfigEditor : public \
AbstractModelStreamEncoder Q_OBJECT
public:
- explicit ByteArrayIHexStreamEncoderConfigEditor( ByteArrayIHexStreamEncoder* \
encoder, QWidget* parent = 0 ); + explicit ByteArrayIHexStreamEncoderConfigEditor( \
ByteArrayIHexStreamEncoder* encoder, QWidget* parent = nullptr ); virtual \
~ByteArrayIHexStreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditorfactory.cpp \
index 297b94f9..72d930b5 100644
--- a/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/ihex/bytearrayihexstreamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayIHexStreamEncoderConfigEditorFactory::ByteArrayIHexStreamEncoderConfigE
AbstractModelStreamEncoderConfigEditor* \
ByteArrayIHexStreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArrayIHexStreamEncoder* srecStreamEncoder =
qobject_cast<ByteArrayIHexStreamEncoder*>( encoder );
diff --git a/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditor.h
index 76ab8526..2193c918 100644
--- a/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditor.h
@@ -42,7 +42,7 @@ class ByteArraySourceCodeStreamEncoderConfigEditor : public \
AbstractModelStreamE Q_OBJECT
public:
- explicit ByteArraySourceCodeStreamEncoderConfigEditor( \
ByteArraySourceCodeStreamEncoder* encoder, QWidget* parent = 0 ); + explicit \
ByteArraySourceCodeStreamEncoderConfigEditor( ByteArraySourceCodeStreamEncoder* \
encoder, QWidget* parent = nullptr ); virtual \
~ByteArraySourceCodeStreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditorfactory.cpp
index 4ae205a6..4f3bc1af 100644
--- a/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/sourcecode/bytearraysourcecodestreamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArraySourceCodeStreamEncoderConfigEditorFactory::ByteArraySourceCodeStreamEn
AbstractModelStreamEncoderConfigEditor* \
ByteArraySourceCodeStreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArraySourceCodeStreamEncoder* sourceCodeStreamEncoder =
qobject_cast<ByteArraySourceCodeStreamEncoder*>( encoder );
diff --git a/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditor.h index \
de6d3a5e..8d9c5a26 100644
--- a/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditor.h
@@ -39,7 +39,7 @@ class ByteArraySRecStreamEncoderConfigEditor : public \
AbstractModelStreamEncoder Q_OBJECT
public:
- explicit ByteArraySRecStreamEncoderConfigEditor( ByteArraySRecStreamEncoder* \
encoder, QWidget* parent = 0 ); + explicit ByteArraySRecStreamEncoderConfigEditor( \
ByteArraySRecStreamEncoder* encoder, QWidget* parent = nullptr ); virtual \
~ByteArraySRecStreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditorfactory.cpp \
index ae0dc8a0..a8687b21 100644
--- a/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/srec/bytearraysrecstreamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArraySRecStreamEncoderConfigEditorFactory::ByteArraySRecStreamEncoderConfigE
AbstractModelStreamEncoderConfigEditor* \
ByteArraySRecStreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArraySRecStreamEncoder* srecStreamEncoder =
qobject_cast<ByteArraySRecStreamEncoder*>( encoder );
diff --git a/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditor.h
index 9b845ad4..5bd7f024 100644
--- a/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditor.h
@@ -40,7 +40,7 @@ class ByteArrayUuencodingStreamEncoderConfigEditor : public \
AbstractModelStreamE Q_OBJECT
public:
- explicit ByteArrayUuencodingStreamEncoderConfigEditor( \
ByteArrayUuencodingStreamEncoder* encoder, QWidget* parent = 0 ); + explicit \
ByteArrayUuencodingStreamEncoderConfigEditor( ByteArrayUuencodingStreamEncoder* \
encoder, QWidget* parent = nullptr ); virtual \
~ByteArrayUuencodingStreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditorfactory.cpp
index 2d6a6008..21b72cdc 100644
--- a/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/uuencoding/bytearrayuuencodingstreamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayUuencodingStreamEncoderConfigEditorFactory::ByteArrayUuencodingStreamEn
AbstractModelStreamEncoderConfigEditor* \
ByteArrayUuencodingStreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArrayUuencodingStreamEncoder* uuencodingStreamEncoder =
qobject_cast<ByteArrayUuencodingStreamEncoder*>( encoder );
diff --git a/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditor.h index \
167ab99a..a4325717 100644
--- a/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditor.h
@@ -40,7 +40,7 @@ class ByteArrayValuesStreamEncoderConfigEditor : public \
AbstractModelStreamEncod Q_OBJECT
public:
- explicit ByteArrayValuesStreamEncoderConfigEditor( ByteArrayValuesStreamEncoder* \
encoder, QWidget* parent = 0 ); + explicit \
ByteArrayValuesStreamEncoderConfigEditor( ByteArrayValuesStreamEncoder* encoder, \
QWidget* parent = nullptr ); virtual ~ByteArrayValuesStreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditorfactory.cpp
index 13f95074..65725ac8 100644
--- a/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/values/bytearrayvaluesstreamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayValuesStreamEncoderConfigEditorFactory::ByteArrayValuesStreamEncoderCon
AbstractModelStreamEncoderConfigEditor* \
ByteArrayValuesStreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArrayValuesStreamEncoder* valuesStreamEncoder =
qobject_cast<ByteArrayValuesStreamEncoder*>( encoder );
diff --git a/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditor.h \
b/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditor.h
index abfb4dbc..b61e2d48 100644
--- a/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditor.h
+++ b/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditor.h
@@ -40,7 +40,7 @@ class ByteArrayXxencodingStreamEncoderConfigEditor : public \
AbstractModelStreamE Q_OBJECT
public:
- explicit ByteArrayXxencodingStreamEncoderConfigEditor( \
ByteArrayXxencodingStreamEncoder* encoder, QWidget* parent = 0 ); + explicit \
ByteArrayXxencodingStreamEncoderConfigEditor( ByteArrayXxencodingStreamEncoder* \
encoder, QWidget* parent = nullptr ); virtual \
~ByteArrayXxencodingStreamEncoderConfigEditor();
public: // AbstractModelStreamEncoderConfigEditor API
diff --git a/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditorfactory.cpp \
b/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditorfactory.cpp
index 12eb7748..34d4fd81 100644
--- a/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditorfactory.cpp
+++ b/kasten/gui/io/streamencoder/xxencoding/bytearrayxxencodingstreamencoderconfigeditorfactory.cpp
@@ -37,7 +37,7 @@ ByteArrayXxencodingStreamEncoderConfigEditorFactory::ByteArrayXxencodingStreamEn
AbstractModelStreamEncoderConfigEditor* \
ByteArrayXxencodingStreamEncoderConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
ByteArrayXxencodingStreamEncoder* xxencodingStreamEncoder =
qobject_cast<ByteArrayXxencodingStreamEncoder*>( encoder );
diff --git a/kasten/gui/liboktetawidgets/addresscombobox.h \
b/kasten/gui/liboktetawidgets/addresscombobox.h index c7f0ecad..de35e466 100644
--- a/kasten/gui/liboktetawidgets/addresscombobox.h
+++ b/kasten/gui/liboktetawidgets/addresscombobox.h
@@ -50,7 +50,7 @@ class OKTETAKASTENGUI_EXPORT AddressComboBox : public QWidget
enum Coding { InvalidCoding = -1, HexadecimalCoding=0, DecimalCoding=1, \
OctalCoding=2, BinaryCoding=3, CharCoding=4 };
public:
- explicit AddressComboBox( QWidget* parent = 0 );
+ explicit AddressComboBox( QWidget* parent = nullptr );
virtual ~AddressComboBox();
public: // set
diff --git a/kasten/gui/liboktetawidgets/addressvalidator.cpp \
b/kasten/gui/liboktetawidgets/addressvalidator.cpp index b19ccc1f..74670f19 100644
--- a/kasten/gui/liboktetawidgets/addressvalidator.cpp
+++ b/kasten/gui/liboktetawidgets/addressvalidator.cpp
@@ -41,7 +41,7 @@ namespace Okteta
AddressValidator::AddressValidator( QObject* parent, Coding codecId )
: QValidator( parent ),
mCodecId( InvalidCoding ),
- mValueCodec( 0 )
+ mValueCodec( nullptr )
{
setCodec( codecId );
}
@@ -132,7 +132,7 @@ Address AddressValidator::toAddress( const QString& string, \
AddressType* address {
const bool isHexadecimal = ( mCodecId == HexadecimalCoding );
const int base = isHexadecimal ? 16 : 10;
- address = expression.toInt( 0, base );
+ address = expression.toInt( nullptr, base );
}
return address;
diff --git a/kasten/gui/liboktetawidgets/addressvalidator.h \
b/kasten/gui/liboktetawidgets/addressvalidator.h index d26aaf9d..0c3168f8 100644
--- a/kasten/gui/liboktetawidgets/addressvalidator.h
+++ b/kasten/gui/liboktetawidgets/addressvalidator.h
@@ -59,7 +59,7 @@ class AddressValidator : public QValidator
void setCodec( Coding codecId );
public:
- Address toAddress( const QString& string, AddressType* type = 0 ) const;
+ Address toAddress( const QString& string, AddressType* type = nullptr ) const;
QString toString( Address address, AddressType addressType ) const;
private:
diff --git a/kasten/gui/liboktetawidgets/bytearraycombobox.h \
b/kasten/gui/liboktetawidgets/bytearraycombobox.h index 64b84fcb..551c2644 100644
--- a/kasten/gui/liboktetawidgets/bytearraycombobox.h
+++ b/kasten/gui/liboktetawidgets/bytearraycombobox.h
@@ -47,7 +47,7 @@ class OKTETAKASTENGUI_EXPORT ByteArrayComboBox : public QWidget
enum Coding { InvalidCoding = -1, HexadecimalCoding=0, DecimalCoding=1, \
OctalCoding=2, BinaryCoding=3, CharCoding=4, Utf8Coding=5 };
public:
- explicit ByteArrayComboBox( QWidget* parent = 0 );
+ explicit ByteArrayComboBox( QWidget* parent = nullptr );
virtual ~ByteArrayComboBox();
public: // set
diff --git a/kasten/gui/liboktetawidgets/bytearrayvalidator.cpp \
b/kasten/gui/liboktetawidgets/bytearrayvalidator.cpp index c0d8f31b..11c0aa3d 100644
--- a/kasten/gui/liboktetawidgets/bytearrayvalidator.cpp
+++ b/kasten/gui/liboktetawidgets/bytearrayvalidator.cpp
@@ -34,7 +34,7 @@ namespace Okteta
ByteArrayValidator::ByteArrayValidator( QObject* parent, Coding codecId, int \
charCodecId ) : QValidator( parent ),
mCodecId( InvalidCoding ),
- mValueCodec( 0 ),
+ mValueCodec( nullptr ),
mCharCodec( CharCodec::createCodec(Okteta::LocalEncoding) ),
mMaxLength( 32767 ),
mMinLength( 0 )
diff --git a/kasten/gui/liboktetawidgets/bytearrayvalidator.h \
b/kasten/gui/liboktetawidgets/bytearrayvalidator.h index b4d6ec2c..80cde52f 100644
--- a/kasten/gui/liboktetawidgets/bytearrayvalidator.h
+++ b/kasten/gui/liboktetawidgets/bytearrayvalidator.h
@@ -52,7 +52,7 @@ class ByteArrayValidator : public QValidator
};
public:
- explicit ByteArrayValidator( QObject* parent = 0,
+ explicit ByteArrayValidator( QObject* parent = nullptr,
Coding codecId = CharCoding,
int charCodecId = LocalEncoding );
diff --git a/kasten/gui/view/bytearrayjanusview.cpp \
b/kasten/gui/view/bytearrayjanusview.cpp index 359f048e..9489cbc9 100644
--- a/kasten/gui/view/bytearrayjanusview.cpp
+++ b/kasten/gui/view/bytearrayjanusview.cpp
@@ -35,7 +35,7 @@ namespace Okteta
ByteArrayJanusView::ByteArrayJanusView( QWidget* parent )
: QWidget( parent ),
- mView( 0 ),
+ mView( nullptr ),
mViewModus( -1 )
{
mLayout = new QHBoxLayout( this );
diff --git a/kasten/gui/view/bytearrayjanusview.h \
b/kasten/gui/view/bytearrayjanusview.h index 9ba8e133..c69a5422 100644
--- a/kasten/gui/view/bytearrayjanusview.h
+++ b/kasten/gui/view/bytearrayjanusview.h
@@ -46,7 +46,7 @@ class ByteArrayJanusView : public QWidget
enum { ColumnViewId = 0, RowViewId };
public:
- explicit ByteArrayJanusView( QWidget* parent = 0 );
+ explicit ByteArrayJanusView( QWidget* parent = nullptr );
virtual ~ByteArrayJanusView();
public:
diff --git a/kasten/gui/view/bytearrayviewfactory.cpp \
b/kasten/gui/view/bytearrayviewfactory.cpp index 06e11213..5f074749 100644
--- a/kasten/gui/view/bytearrayviewfactory.cpp
+++ b/kasten/gui/view/bytearrayviewfactory.cpp
@@ -41,7 +41,7 @@ ByteArrayViewFactory::ByteArrayViewFactory( \
ByteArrayViewProfileManager* byteArr
AbstractView* ByteArrayViewFactory::createViewFor( AbstractDocument* _document )
{
- ByteArrayView* result = 0;
+ ByteArrayView* result = nullptr;
ByteArrayDocument* document = static_cast<ByteArrayDocument*>( _document );
if( document )
@@ -59,7 +59,7 @@ AbstractView* ByteArrayViewFactory::createViewFor( \
AbstractDocument* _document )
AbstractView* ByteArrayViewFactory::createCopyOfView( AbstractView* _view, \
Qt::Alignment alignment ) {
- ByteArrayView* result = 0;
+ ByteArrayView* result = nullptr;
ByteArrayView* view = qobject_cast<ByteArrayView*>( _view );
if( view )
diff --git a/libs/kasten/controllers/document/modified/modifiedbarcontroller.cpp \
b/libs/kasten/controllers/document/modified/modifiedbarcontroller.cpp index \
da74c42e..51adf911 100644
--- a/libs/kasten/controllers/document/modified/modifiedbarcontroller.cpp
+++ b/libs/kasten/controllers/document/modified/modifiedbarcontroller.cpp
@@ -40,8 +40,8 @@ static const int modifiedPixmapWidth = 16;
ModifiedBarController::ModifiedBarController( StatusBar* statusBar )
- : mDocument( 0 )
- , mSynchronizer( 0 )
+ : mDocument( nullptr )
+ , mSynchronizer( nullptr )
{
// TODO: depend an statusbar height
const QSize modifiedPixmapSize = QSize(modifiedPixmapWidth, \
modifiedPixmapWidth); @@ -56,13 +56,13 @@ \
ModifiedBarController::ModifiedBarController( StatusBar* statusBar ) \
mRemoteStateLabel->setFixedSize( modifiedPixmapSize ); statusBar->addWidget( \
mRemoteStateLabel );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ModifiedBarController::setTargetModel( AbstractModel* model )
{
- AbstractDocument* newDocument = model ? \
model->findBaseModel<AbstractDocument*>() : 0; + AbstractDocument* newDocument = \
model ? model->findBaseModel<AbstractDocument*>() : nullptr;
if( mDocument == newDocument )
return;
@@ -80,7 +80,7 @@ void ModifiedBarController::setTargetModel( AbstractModel* model )
mLocalStateLabel->setEnabled( mDocument );
mRemoteStateLabel->setEnabled( mDocument );
- onSynchronizerChanged( mDocument ? mDocument->synchronizer() : 0 );
+ onSynchronizerChanged( mDocument ? mDocument->synchronizer() : nullptr );
}
@@ -109,12 +109,12 @@ void ModifiedBarController::onLocalSyncStateChanged( \
LocalSyncState localSyncSta void ModifiedBarController::onRemoteSyncStateChanged( \
RemoteSyncState remoteSyncState ) {
const char* const iconName =
- ( mSynchronizer == 0 ) ? "document-new" :
+ ( ! mSynchronizer ) ? "document-new" :
( remoteSyncState == RemoteHasChanges ) ? "document-save" :
( remoteSyncState == RemoteDeleted ) ? "edit-delete" :
( remoteSyncState == RemoteUnknown ) ? "flag-yellow" :
( remoteSyncState == RemoteUnreachable ) ? "network-disconnect" :
- /* else */ 0;
+ /* else */ nullptr;
// TODO: depend an statusbar height
const QPixmap pixmap = iconName ?
@@ -176,7 +176,7 @@ void ModifiedBarController::onSynchronizerDeleted( QObject* \
synchronizer ) if( synchronizer != mSynchronizer )
return;
- mSynchronizer = 0;
+ mSynchronizer = nullptr;
// switch to document state
connect( mDocument, &Kasten::AbstractDocument::contentFlagsChanged,
diff --git a/libs/kasten/controllers/document/readonly/readonlybarcontroller.cpp \
b/libs/kasten/controllers/document/readonly/readonlybarcontroller.cpp index \
13b36130..240f36d6 100644
--- a/libs/kasten/controllers/document/readonly/readonlybarcontroller.cpp
+++ b/libs/kasten/controllers/document/readonly/readonlybarcontroller.cpp
@@ -35,7 +35,7 @@ namespace Kasten
{
ReadOnlyBarController::ReadOnlyBarController( StatusBar* statusBar )
- : mDocument( 0 )
+ : mDocument( nullptr )
{
const QString readWriteText = i18nc( "@option:check the document is read-write", \
"Read-write" );
const QString readOnlyText = i18nc( "@option:check the document is read-only", \
"Read-only" ); @@ -45,7 +45,7 @@ ReadOnlyBarController::ReadOnlyBarController( \
StatusBar* statusBar ) connect( mReadOnlyButton, &QAbstractButton::clicked,
this, &ReadOnlyBarController::setReadOnly );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
@@ -53,7 +53,7 @@ void ReadOnlyBarController::setTargetModel( AbstractModel* model )
{
if( mDocument ) mDocument->disconnect( mReadOnlyButton );
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
if( mDocument )
{
diff --git a/libs/kasten/controllers/document/readonly/readonlycontroller.cpp \
b/libs/kasten/controllers/document/readonly/readonlycontroller.cpp index \
6829be2f..8beef2a2 100644
--- a/libs/kasten/controllers/document/readonly/readonlycontroller.cpp
+++ b/libs/kasten/controllers/document/readonly/readonlycontroller.cpp
@@ -36,7 +36,7 @@ namespace Kasten
{
ReadOnlyController::ReadOnlyController( KXMLGUIClient* guiClient )
- : mDocument( 0 )
+ : mDocument( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -50,14 +50,14 @@ ReadOnlyController::ReadOnlyController( KXMLGUIClient* guiClient \
) connect( mSetReadOnlyAction, &QAction::triggered,
this, &ReadOnlyController::setReadOnly );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ReadOnlyController::setTargetModel( AbstractModel* model )
{
if( mDocument ) mDocument->disconnect( mSetReadOnlyAction );
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
if( mDocument )
{
diff --git a/libs/kasten/controllers/document/terminal/terminaltool.cpp \
b/libs/kasten/controllers/document/terminal/terminaltool.cpp index dc4435a4..dff4ed13 \
100644
--- a/libs/kasten/controllers/document/terminal/terminaltool.cpp
+++ b/libs/kasten/controllers/document/terminal/terminaltool.cpp
@@ -39,7 +39,7 @@ namespace Kasten
TerminalTool::TerminalTool( DocumentSyncManager* documentSyncManager )
: AbstractTool(),
mDocumentSyncManager( documentSyncManager ),
- mDocument( 0 )
+ mDocument( nullptr )
{
setObjectName( QStringLiteral( "Terminal" ) );
}
@@ -62,7 +62,7 @@ void TerminalTool::setTargetModel( AbstractModel* model )
{
const QUrl oldCurrentUrl = currentUrl();
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
const QUrl newCurrentUrl = currentUrl();
diff --git a/libs/kasten/controllers/document/terminal/terminalview.cpp \
b/libs/kasten/controllers/document/terminal/terminalview.cpp index c7e45cab..03e7d94d \
100644
--- a/libs/kasten/controllers/document/terminal/terminalview.cpp
+++ b/libs/kasten/controllers/document/terminal/terminalview.cpp
@@ -42,8 +42,8 @@ namespace Kasten
TerminalView::TerminalView( TerminalTool* tool, QWidget* parent )
: QWidget( parent ),
mTool( tool ),
- mTerminalPart( 0 ),
- mTerminalInterface( 0 )
+ mTerminalPart( nullptr ),
+ mTerminalInterface( nullptr )
{
QVBoxLayout* layout = new QVBoxLayout( this );
layout->setMargin( 0 );
@@ -93,8 +93,8 @@ void TerminalView::onCurrentUrlChanged( const QUrl& currentUrl )
void TerminalView::onTerminalPartDestroyed()
{
- mTerminalPart = 0;
- mTerminalInterface = 0;
+ mTerminalPart = nullptr;
+ mTerminalInterface = nullptr;
createTerminalPart();
}
diff --git a/libs/kasten/controllers/document/terminal/terminalview.h \
b/libs/kasten/controllers/document/terminal/terminalview.h index 67aca8af..9cfc9b51 \
100644
--- a/libs/kasten/controllers/document/terminal/terminalview.h
+++ b/libs/kasten/controllers/document/terminal/terminalview.h
@@ -45,7 +45,7 @@ class TerminalView : public QWidget
Q_OBJECT
public:
- explicit TerminalView( TerminalTool* tool, QWidget* parent = 0 );
+ explicit TerminalView( TerminalTool* tool, QWidget* parent = nullptr );
virtual ~TerminalView();
public:
diff --git a/libs/kasten/controllers/document/versionview/versiontablemodel.h \
b/libs/kasten/controllers/document/versionview/versiontablemodel.h index \
2fce9766..6ddd3e66 100644
--- a/libs/kasten/controllers/document/versionview/versiontablemodel.h
+++ b/libs/kasten/controllers/document/versionview/versiontablemodel.h
@@ -52,7 +52,7 @@ class VersionTableModel : public QAbstractTableModel
};
public:
- VersionTableModel( AbstractModel* model, If::Versionable* versionControl, \
QObject* parent = 0 ); + VersionTableModel( AbstractModel* model, If::Versionable* \
versionControl, QObject* parent = nullptr ); virtual ~VersionTableModel();
public: // QAbstractTableModel API
diff --git a/libs/kasten/controllers/document/versionview/versionview.cpp \
b/libs/kasten/controllers/document/versionview/versionview.cpp index \
45ecb52b..6ae3b4ae 100644
--- a/libs/kasten/controllers/document/versionview/versionview.cpp
+++ b/libs/kasten/controllers/document/versionview/versionview.cpp
@@ -39,7 +39,7 @@ namespace Kasten
VersionView::VersionView( VersionViewTool* tool, QWidget* parent )
: QWidget( parent ), mTool( tool )
{
- mVersionTableModel = new VersionTableModel( 0, 0, this );
+ mVersionTableModel = new VersionTableModel( nullptr, nullptr, this );
QVBoxLayout *baseLayout = new QVBoxLayout( this );
baseLayout->setMargin( 0 );
@@ -62,7 +62,7 @@ VersionView::VersionView( VersionViewTool* tool, QWidget* parent )
void VersionView::setModel( AbstractModel* model )
{
- If::Versionable* versionControl = model ? qobject_cast<If::Versionable*>( model \
) : 0; + If::Versionable* versionControl = model ? qobject_cast<If::Versionable*>( \
model ) : nullptr;
mVersionTableModel->setModel( model, versionControl );
diff --git a/libs/kasten/controllers/document/versionview/versionview.h \
b/libs/kasten/controllers/document/versionview/versionview.h index 939acae1..37648c16 \
100644
--- a/libs/kasten/controllers/document/versionview/versionview.h
+++ b/libs/kasten/controllers/document/versionview/versionview.h
@@ -43,7 +43,7 @@ class VersionView : public QWidget
Q_OBJECT
public:
- explicit VersionView( VersionViewTool* tool, QWidget* parent = 0 );
+ explicit VersionView( VersionViewTool* tool, QWidget* parent = nullptr );
virtual ~VersionView();
public:
diff --git a/libs/kasten/controllers/document/versionview/versionviewtool.cpp \
b/libs/kasten/controllers/document/versionview/versionviewtool.cpp index \
0ecaed5f..f0300662 100644
--- a/libs/kasten/controllers/document/versionview/versionviewtool.cpp
+++ b/libs/kasten/controllers/document/versionview/versionviewtool.cpp
@@ -33,7 +33,7 @@ namespace Kasten
{
VersionViewTool::VersionViewTool()
- : mModel( 0 )
+ : mModel( nullptr )
{
setObjectName( QStringLiteral( "Versions" ) );
}
@@ -43,7 +43,7 @@ QString VersionViewTool::title() const { return \
i18nc("@title:window", "Versions
void VersionViewTool::setTargetModel( AbstractModel* model )
{
- mModel = model ? model->findBaseModelWithInterface<If::Versionable*>() : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::Versionable*>() : \
nullptr; emit modelChanged( mModel );
}
diff --git a/libs/kasten/controllers/documentsystem/close/closecontroller.cpp \
b/libs/kasten/controllers/documentsystem/close/closecontroller.cpp index \
8d63ec7c..c428bc90 100644
--- a/libs/kasten/controllers/documentsystem/close/closecontroller.cpp
+++ b/libs/kasten/controllers/documentsystem/close/closecontroller.cpp
@@ -43,7 +43,7 @@ CloseController::CloseController( AbstractDocumentStrategy* \
documentStrategy, bool supportMultiple )
: AbstractXmlGuiController()
, mDocumentStrategy( documentStrategy )
- , mDocument( 0 )
+ , mDocument( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -73,8 +73,8 @@ CloseController::CloseController( AbstractDocumentStrategy* \
documentStrategy,
void CloseController::setTargetModel( AbstractModel* model )
{
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
- const bool hasDocument = ( mDocument != 0 );
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
+ const bool hasDocument = ( mDocument != nullptr );
mCloseAction->setEnabled( hasDocument );
}
diff --git a/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.cpp \
b/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.cpp index \
7953b941..419484dc 100644
--- a/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.cpp
+++ b/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.cpp
@@ -81,7 +81,7 @@ QVariant DocumentListModel::data( const QModelIndex& index, int \
role ) const {
const int documentIndex = index.row();
const AbstractDocument* document = mDocumentsTool->documents().at( \
documentIndex );
- const AbstractModelSynchronizer* synchronizer = document ? \
document->synchronizer() : 0; + const AbstractModelSynchronizer* synchronizer \
= document ? document->synchronizer() : nullptr;
const int tableColumn = index.column();
switch( tableColumn )
diff --git a/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.h \
b/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.h index \
e0e9c3d2..21236dfe 100644
--- a/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.h
+++ b/libs/kasten/controllers/documentsystem/documentsbrowser/documentlistmodel.h
@@ -50,7 +50,7 @@ class DocumentListModel : public QAbstractTableModel
};
public:
- explicit DocumentListModel( DocumentsTool* documentsTool, QObject* parent = 0 );
+ explicit DocumentListModel( DocumentsTool* documentsTool, QObject* parent = \
nullptr ); virtual ~DocumentListModel();
public: // QAbstractTableModel API
diff --git a/libs/kasten/controllers/documentsystem/documentsbrowser/documentstool.cpp \
b/libs/kasten/controllers/documentsystem/documentsbrowser/documentstool.cpp index \
7ed7bb22..13dea3c2 100644
--- a/libs/kasten/controllers/documentsystem/documentsbrowser/documentstool.cpp
+++ b/libs/kasten/controllers/documentsystem/documentsbrowser/documentstool.cpp
@@ -33,7 +33,7 @@ namespace Kasten
{
DocumentsTool::DocumentsTool( DocumentManager* documentManager )
- : mDocumentManager( documentManager ), mFocussedDocument( 0 )
+ : mDocumentManager( documentManager ), mFocussedDocument( nullptr )
{
setObjectName( QStringLiteral( "Documents" ) );
@@ -50,7 +50,7 @@ QString DocumentsTool::title() const { return \
i18nc("@title:window", "Documents" // TODO: this is an abuse of setTargetModel. Find \
other way to get focused model void DocumentsTool::setTargetModel( AbstractModel* \
model ) {
- mFocussedDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mFocussedDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
emit focussedDocumentChanged( mFocussedDocument );
}
diff --git a/libs/kasten/controllers/documentsystem/documentsbrowser/documentsview.h \
b/libs/kasten/controllers/documentsystem/documentsbrowser/documentsview.h index \
e7a146e3..443917ad 100644
--- a/libs/kasten/controllers/documentsystem/documentsbrowser/documentsview.h
+++ b/libs/kasten/controllers/documentsystem/documentsbrowser/documentsview.h
@@ -42,7 +42,7 @@ class DocumentsView : public QWidget
Q_OBJECT
public:
- explicit DocumentsView( DocumentsTool* tool, QWidget* parent = 0 );
+ explicit DocumentsView( DocumentsTool* tool, QWidget* parent = nullptr );
virtual ~DocumentsView();
public:
diff --git a/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowsertool.cpp \
b/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowsertool.cpp \
index e50829f4..131e6dfc 100644
--- a/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowsertool.cpp
+++ b/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowsertool.cpp
@@ -41,7 +41,7 @@ namespace Kasten
FileSystemBrowserTool::FileSystemBrowserTool( DocumentSyncManager* \
documentSyncManager ) : AbstractTool(),
mDocumentSyncManager( documentSyncManager ),
- mDocument( 0 )
+ mDocument( nullptr )
{
setObjectName( QStringLiteral( "FileSystemBrowser" ) );
}
@@ -62,14 +62,14 @@ QUrl FileSystemBrowserTool::currentUrl() const
bool FileSystemBrowserTool::hasCurrentUrl() const
{
- return ( mDocument && mDocument->synchronizer() != 0 );
+ return ( mDocument && mDocument->synchronizer() );
}
void FileSystemBrowserTool::setTargetModel( AbstractModel* model )
{
const bool oldHasCurrentUrl = hasCurrentUrl();
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
const bool newHasCurrentUrl = hasCurrentUrl();
diff --git a/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.h \
b/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.h \
index 2a0325c8..11e443fb 100644
--- a/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.h
+++ b/libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.h
@@ -45,7 +45,7 @@ class FileSystemBrowserView : public QWidget
Q_OBJECT
public:
- explicit FileSystemBrowserView( FileSystemBrowserTool* tool, QWidget* parent = 0 \
); + explicit FileSystemBrowserView( FileSystemBrowserTool* tool, QWidget* parent \
= nullptr ); virtual ~FileSystemBrowserView();
public:
diff --git a/libs/kasten/controllers/io/clipboard/clipboardcontroller.cpp \
b/libs/kasten/controllers/io/clipboard/clipboardcontroller.cpp index \
4d6bbbb0..94582038 100644
--- a/libs/kasten/controllers/io/clipboard/clipboardcontroller.cpp
+++ b/libs/kasten/controllers/io/clipboard/clipboardcontroller.cpp
@@ -43,7 +43,7 @@ namespace Kasten
{
ClipboardController::ClipboardController( KXMLGUIClient* guiClient )
- : mModel( 0 ), mSelectionControl( 0 ), mMimeDataControl( 0 )
+ : mModel( nullptr ), mSelectionControl( nullptr ), mMimeDataControl( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -54,15 +54,15 @@ ClipboardController::ClipboardController( KXMLGUIClient* \
guiClient ) connect( QApplication::clipboard(), &QClipboard::dataChanged,
this, &ClipboardController::onClipboardDataChanged );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ClipboardController::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : 0;
- mSelectionControl = mModel ? qobject_cast<If::DataSelectable *>( mModel ) : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : \
nullptr; + mSelectionControl = mModel ? qobject_cast<If::DataSelectable *>( mModel \
) : nullptr;
if( mSelectionControl )
{
@@ -74,12 +74,12 @@ void ClipboardController::setTargetModel( AbstractModel* model )
this, &ClipboardController::onReadOnlyChanged );
}
else
- mMimeDataControl = 0;
+ mMimeDataControl = nullptr;
const QMimeData* mimeData = QApplication::clipboard()->mimeData( \
QClipboard::Clipboard );
- const bool hasSelectedData = ( mSelectionControl != 0 ) ? \
mSelectionControl->hasSelectedData() : false;
- const bool isWriteable = ( mMimeDataControl != 0 && !mModel->isReadOnly() );
+ const bool hasSelectedData = mSelectionControl ? \
mSelectionControl->hasSelectedData() : false; + const bool isWriteable = ( \
mMimeDataControl && !mModel->isReadOnly() );
const bool isPastable = isWriteable && ! mimeData->formats().isEmpty() && \
mMimeDataControl->canReadData( mimeData );
mCopyAction->setEnabled( hasSelectedData );
@@ -118,7 +118,7 @@ void ClipboardController::onReadOnlyChanged( bool isReadOnly )
{
const QMimeData* mimeData = QApplication::clipboard()->mimeData( \
QClipboard::Clipboard );
- const bool hasSelectedData = ( mSelectionControl != 0 ) ? \
mSelectionControl->hasSelectedData() : false; + const bool hasSelectedData = \
mSelectionControl ? mSelectionControl->hasSelectedData() : false; const bool \
isWriteable = !isReadOnly;
const bool isPastable = isWriteable && ! mimeData->formats().isEmpty() && \
mMimeDataControl->canReadData( mimeData );
@@ -128,7 +128,7 @@ void ClipboardController::onReadOnlyChanged( bool isReadOnly )
void ClipboardController::onHasSelectedDataChanged( bool hasSelectedData )
{
- const bool isWriteable = ( mMimeDataControl != 0 && !mModel->isReadOnly() );
+ const bool isWriteable = ( mMimeDataControl && !mModel->isReadOnly() );
mCopyAction->setEnabled( hasSelectedData );
mCutAction->setEnabled( hasSelectedData && isWriteable );
@@ -138,7 +138,7 @@ void ClipboardController::onClipboardDataChanged()
{
const QMimeData* mimeData = QApplication::clipboard()->mimeData( \
QClipboard::Clipboard );
- const bool isWriteable = ( mMimeDataControl != 0 && !mModel->isReadOnly() );
+ const bool isWriteable = ( mMimeDataControl && !mModel->isReadOnly() );
const bool isPastable = isWriteable && ! mimeData->formats().isEmpty() && \
mMimeDataControl->canReadData( mimeData );
mPasteAction->setEnabled( isPastable );
diff --git a/libs/kasten/controllers/io/copyas/copyascontroller.cpp \
b/libs/kasten/controllers/io/copyas/copyascontroller.cpp index 23dcdd2b..fd55240c \
100644
--- a/libs/kasten/controllers/io/copyas/copyascontroller.cpp
+++ b/libs/kasten/controllers/io/copyas/copyascontroller.cpp
@@ -57,7 +57,7 @@ CopyAsController::CopyAsController( ModelCodecViewManager* \
modelCodecViewManager : AbstractXmlGuiController(),
mModelCodecViewManager( modelCodecViewManager ),
mModelCodecManager( modelCodecManager ),
- mModel( 0 )
+ mModel( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -68,15 +68,15 @@ CopyAsController::CopyAsController( ModelCodecViewManager* \
modelCodecViewManager
connect( mCopyAsSelectAction, \
static_cast<void(KSelectAction::*)(QAction*)>(&KSelectAction::triggered), this, \
&CopyAsController::onActionTriggered );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void CopyAsController::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : 0;
- mSelectionControl = mModel ? qobject_cast<If::DataSelectable*>( mModel ) : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : \
nullptr; + mSelectionControl = mModel ? qobject_cast<If::DataSelectable*>( mModel \
) : nullptr;
if( mSelectionControl )
{
@@ -92,7 +92,7 @@ void CopyAsController::updateActions()
{
mCopyAsSelectAction->removeAllActions();
- const AbstractModelSelection* selection = ( mSelectionControl != 0 ) ? \
mSelectionControl->modelSelection() : 0; + const AbstractModelSelection* selection \
= mSelectionControl ? mSelectionControl->modelSelection() : nullptr;
const QList<AbstractModelStreamEncoder*> encoderList =
mModelCodecManager->encoderList( mModel, selection );
diff --git a/libs/kasten/controllers/io/copyas/copyasdialog.h \
b/libs/kasten/controllers/io/copyas/copyasdialog.h index 7a51b6c7..adbbb6fb 100644
--- a/libs/kasten/controllers/io/copyas/copyasdialog.h
+++ b/libs/kasten/controllers/io/copyas/copyasdialog.h
@@ -42,7 +42,7 @@ class CopyAsDialog : public QDialog
public:
CopyAsDialog( const QString& remoteTypeName, \
AbstractModelStreamEncoderConfigEditor* configEditor,
- QWidget* parent = 0 );
+ QWidget* parent = nullptr );
virtual ~CopyAsDialog();
diff --git a/libs/kasten/controllers/io/export/exportcontroller.cpp \
b/libs/kasten/controllers/io/export/exportcontroller.cpp index 62ee578c..d400762a \
100644
--- a/libs/kasten/controllers/io/export/exportcontroller.cpp
+++ b/libs/kasten/controllers/io/export/exportcontroller.cpp
@@ -52,7 +52,7 @@ ExportController::ExportController( ModelCodecViewManager* \
modelCodecViewManager : AbstractXmlGuiController(),
mModelCodecViewManager( modelCodecViewManager ),
mModelCodecManager( modelCodecManager ),
- mModel( 0 )
+ mModel( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -63,15 +63,15 @@ ExportController::ExportController( ModelCodecViewManager* \
modelCodecViewManager
connect( mExportSelectAction, \
static_cast<void(KSelectAction::*)(QAction*)>(&KSelectAction::triggered), this, \
&ExportController::onActionTriggered );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ExportController::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : 0;
- mSelectionControl = mModel ? qobject_cast<If::DataSelectable *>( mModel ) : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : \
nullptr; + mSelectionControl = mModel ? qobject_cast<If::DataSelectable *>( mModel \
) : nullptr;
if( mSelectionControl )
{
@@ -87,7 +87,7 @@ void ExportController::updateActions()
{
mExportSelectAction->removeAllActions();
- const AbstractModelSelection* selection = ( mSelectionControl != 0 ) ? \
mSelectionControl->modelSelection() : 0; + const AbstractModelSelection* selection \
= mSelectionControl ? mSelectionControl->modelSelection() : nullptr;
const QList<AbstractModelExporter*> exporterList =
mModelCodecManager->exporterList( mModel, selection );
@@ -112,14 +112,14 @@ void ExportController::updateActions()
mExportSelectAction->addAction( noneAction );
}
- mExportSelectAction->setEnabled( mModel != 0 );
+ mExportSelectAction->setEnabled( mModel != nullptr );
}
void ExportController::onActionTriggered( QAction *action )
{
AbstractModelExporter* exporter = action->data().value<AbstractModelExporter* \
>();
- const AbstractModelSelection* selection = ( mSelectionControl != 0 ) ? \
mSelectionControl->modelSelection() : 0; + const AbstractModelSelection* selection \
= mSelectionControl ? mSelectionControl->modelSelection() : nullptr;
AbstractModelExporterConfigEditor* configEditor =
mModelCodecViewManager->createConfigEditor( exporter );
diff --git a/libs/kasten/controllers/io/export/exportdialog.h \
b/libs/kasten/controllers/io/export/exportdialog.h index b5076a71..7ec2eda9 100644
--- a/libs/kasten/controllers/io/export/exportdialog.h
+++ b/libs/kasten/controllers/io/export/exportdialog.h
@@ -42,7 +42,7 @@ class ExportDialog : public QDialog
public:
ExportDialog( const QString& remoteTypeName, AbstractModelExporterConfigEditor* \
configEditor,
- QWidget* parent = 0 );
+ QWidget* parent = nullptr );
virtual ~ExportDialog();
diff --git a/libs/kasten/controllers/io/insert/insertcontroller.cpp \
b/libs/kasten/controllers/io/insert/insertcontroller.cpp index ffbcda2e..571d9f40 \
100644
--- a/libs/kasten/controllers/io/insert/insertcontroller.cpp
+++ b/libs/kasten/controllers/io/insert/insertcontroller.cpp
@@ -58,7 +58,7 @@ InsertController::InsertController( ModelCodecViewManager* \
modelCodecViewManager : AbstractXmlGuiController(),
mModelCodecViewManager( modelCodecViewManager ),
mModelCodecManager( modelCodecManager ),
- mModel( 0 )
+ mModel( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -69,15 +69,15 @@ InsertController::InsertController( ModelCodecViewManager* \
modelCodecViewManager
connect( mInsertSelectAction, \
static_cast<void(KSelectAction::*)(QAction*)>(&KSelectAction::triggered), this, \
&InsertController::onActionTriggered );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void InsertController::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::SelectedDataWriteable*>() \
: 0;
- mSelectedDataWriteableControl = mModel ? \
qobject_cast<If::SelectedDataWriteable*>( mModel ) : 0; + mModel = model ? \
model->findBaseModelWithInterface<If::SelectedDataWriteable*>() : nullptr; + \
mSelectedDataWriteableControl = mModel ? qobject_cast<If::SelectedDataWriteable*>( \
mModel ) : nullptr;
if( mSelectedDataWriteableControl )
{
diff --git a/libs/kasten/controllers/io/insert/insertdialog.h \
b/libs/kasten/controllers/io/insert/insertdialog.h index c24e87d5..1453e514 100644
--- a/libs/kasten/controllers/io/insert/insertdialog.h
+++ b/libs/kasten/controllers/io/insert/insertdialog.h
@@ -38,7 +38,7 @@ class InsertDialog : public QDialog
Q_OBJECT
public:
- explicit InsertDialog( AbstractModelDataGeneratorConfigEditor* configEditor, \
QWidget* parent = 0 ); + explicit InsertDialog( \
AbstractModelDataGeneratorConfigEditor* configEditor, QWidget* parent = nullptr ); \
virtual ~InsertDialog();
private:
diff --git a/libs/kasten/controllers/io/setremote/setremotecontroller.cpp \
b/libs/kasten/controllers/io/setremote/setremotecontroller.cpp index \
acd62b13..07d93e43 100644
--- a/libs/kasten/controllers/io/setremote/setremotecontroller.cpp
+++ b/libs/kasten/controllers/io/setremote/setremotecontroller.cpp
@@ -43,15 +43,15 @@ SetRemoteController::SetRemoteController( DocumentSyncManager* \
syncManager, KXML
mSaveAsAction = KStandardAction::saveAs( this, SLOT(saveAs()), actionCollection \
);
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void SetRemoteController::setTargetModel( AbstractModel* model )
{
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
const bool canBeSaved = mDocument ?
- ( mDocument->synchronizer() != 0 ||
+ ( mDocument->synchronizer() ||
\
mSyncManager->hasSynchronizerForLocal(mDocument->mimeType()) ) : false;
diff --git a/libs/kasten/controllers/io/synchronize/synchronizecontroller.cpp \
b/libs/kasten/controllers/io/synchronize/synchronizecontroller.cpp index \
882bace4..7ae67fae 100644
--- a/libs/kasten/controllers/io/synchronize/synchronizecontroller.cpp
+++ b/libs/kasten/controllers/io/synchronize/synchronizecontroller.cpp
@@ -41,8 +41,8 @@ namespace Kasten
SynchronizeController::SynchronizeController( DocumentSyncManager* syncManager, \
KXMLGUIClient* guiClient ) : mSyncManager( syncManager ),
- mDocument( 0 ),
- mSynchronizer( 0 )
+ mDocument( nullptr ),
+ mSynchronizer( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -54,21 +54,21 @@ SynchronizeController::SynchronizeController( \
DocumentSyncManager* syncManager,
mReloadAction->setIcon( QIcon::fromTheme( QStringLiteral("view-refresh") ) );
actionCollection->setDefaultShortcuts( mReloadAction, \
KStandardShortcut::reload() );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void SynchronizeController::setTargetModel( AbstractModel* model )
{
if( mDocument ) mDocument->disconnect( this );
- mDocument = model ? model->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = model ? model->findBaseModel<AbstractDocument*>() : nullptr;
if( mDocument )
{
connect( mDocument, &AbstractDocument::synchronizerChanged,
this, &SynchronizeController::onSynchronizerChanged );
}
- onSynchronizerChanged( mDocument ? mDocument->synchronizer() : 0 );
+ onSynchronizerChanged( mDocument ? mDocument->synchronizer() : nullptr );
}
void SynchronizeController::save()
@@ -115,7 +115,7 @@ void SynchronizeController::onSynchronizerDeleted( QObject* \
synchronizer ) if( synchronizer != mSynchronizer )
return;
- mSynchronizer = 0;
+ mSynchronizer = nullptr;
mSaveAction->setEnabled( false );
mReloadAction->setEnabled( false );
diff --git a/libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp \
b/libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp index \
5927688c..dfc4279f 100644
--- a/libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp
+++ b/libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp
@@ -41,10 +41,10 @@ namespace Kasten
ViewAreaSplitController::ViewAreaSplitController( ViewManager* viewManager, \
AbstractGroupedViews* groupedViews, KXMLGUIClient* guiClient ) : mViewManager( \
viewManager ), mGroupedViews( groupedViews ),
- mViewAreaSplitable( 0 ),
- mCurrentViewArea( 0 )
+ mViewAreaSplitable( nullptr ),
+ mCurrentViewArea( nullptr )
{
- mViewAreaSplitable = mGroupedViews ? qobject_cast<If::ViewAreaSplitable*>( \
mGroupedViews ) : 0; + mViewAreaSplitable = mGroupedViews ? \
qobject_cast<If::ViewAreaSplitable*>( mGroupedViews ) : nullptr; if( \
mViewAreaSplitable ) {
connect( mGroupedViews, \
SIGNAL(viewAreaFocusChanged(Kasten::AbstractViewArea*)), @@ -62,14 +62,14 @@ \
ViewAreaSplitController::ViewAreaSplitController( ViewManager* \
viewManager, Abst
mSplitVerticallyAction->setText( i18nc("@title:menu","Split Vertically") );
mSplitVerticallyAction->setIcon( QIcon::fromTheme( \
QStringLiteral("view-split-left-right") ) );
actionCollection->setDefaultShortcut( mSplitVerticallyAction, Qt::CTRL + \
Qt::SHIFT + Qt::Key_L );
- mSplitVerticallyAction->setEnabled( mViewAreaSplitable != 0 );
+ mSplitVerticallyAction->setEnabled( mViewAreaSplitable != nullptr );
mSplitHorizontallyAction = actionCollection->addAction( \
QStringLiteral("view_area_split_horizontally"),
this, \
SLOT(splitHorizontally()) );
mSplitHorizontallyAction->setText( i18nc("@title:menu","Split Horizontal") );
mSplitHorizontallyAction->setIcon( QIcon::fromTheme( \
QStringLiteral("view-split-top-bottom") ) );
actionCollection->setDefaultShortcut( mSplitHorizontallyAction, Qt::CTRL + \
Qt::SHIFT + Qt::Key_T );
- mSplitHorizontallyAction->setEnabled( mViewAreaSplitable != 0 );
+ mSplitHorizontallyAction->setEnabled( mViewAreaSplitable != nullptr );
mCloseAction = actionCollection->addAction( QStringLiteral("view_area_close"),
this, SLOT(close()) );
@@ -77,7 +77,7 @@ ViewAreaSplitController::ViewAreaSplitController( ViewManager* \
viewManager, Abst
mCloseAction->setIcon( QIcon::fromTheme( QStringLiteral("view-close") ) );
actionCollection->setDefaultShortcut( mCloseAction, Qt::CTRL + Qt::SHIFT + \
Qt::Key_R );
- onViewAreaFocusChanged( mViewAreaSplitable ? mViewAreaSplitable->viewAreaFocus() \
: 0 ); + onViewAreaFocusChanged( mViewAreaSplitable ? \
mViewAreaSplitable->viewAreaFocus() : nullptr ); onViewAreasChanged();
}
diff --git a/libs/kasten/controllers/view/select/selectcontroller.cpp \
b/libs/kasten/controllers/view/select/selectcontroller.cpp index 85e412d1..65bbc47d \
100644
--- a/libs/kasten/controllers/view/select/selectcontroller.cpp
+++ b/libs/kasten/controllers/view/select/selectcontroller.cpp
@@ -38,24 +38,24 @@ namespace Kasten
{
SelectController::SelectController( KXMLGUIClient* guiClient )
- : mModel( 0 ), mSelectControl( 0 )
+ : mModel( nullptr ), mSelectControl( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
mSelectAllAction = KStandardAction::selectAll( this, SLOT(selectAll()), \
actionCollection );
mDeselectAction = KStandardAction::deselect( this, SLOT(unselect()), \
actionCollection );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void SelectController::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : 0;
- mSelectControl = mModel ? qobject_cast<If::DataSelectable *>( mModel ) : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::DataSelectable*>() : \
nullptr; + mSelectControl = mModel ? qobject_cast<If::DataSelectable *>( mModel ) \
: nullptr;
- const bool hasSelectionControl = ( mSelectControl != 0 );
+ const bool hasSelectionControl = ( mSelectControl != nullptr );
if( hasSelectionControl )
{
connect( mModel, SIGNAL(hasSelectedDataChanged(bool)), \
SLOT(onHasSelectedDataChanged(bool)) );
diff --git a/libs/kasten/controllers/view/version/versioncontroller.cpp \
b/libs/kasten/controllers/view/version/versioncontroller.cpp index df3e8b76..2107399f \
100644
--- a/libs/kasten/controllers/view/version/versioncontroller.cpp
+++ b/libs/kasten/controllers/view/version/versioncontroller.cpp
@@ -42,7 +42,7 @@ namespace Kasten
static const int MaxMenuEntries = 10;
VersionController::VersionController( KXMLGUIClient* guiClient )
- : mModel( 0 )
+ : mModel( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -68,7 +68,7 @@ VersionController::VersionController( KXMLGUIClient* guiClient )
connect( mSetToNewerVersionAction->menu(), &QMenu::triggered,
this, &VersionController::onNewerVersionMenuTriggered );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void VersionController::setTargetModel( AbstractModel* model )
@@ -81,8 +81,8 @@ void VersionController::setTargetModel( AbstractModel* model )
}
mModel = model;
- AbstractModel* versionedModel = mModel ? \
mModel->findBaseModelWithInterface<If::Versionable*>() : 0;
- mVersionControl = versionedModel ? qobject_cast<If::Versionable*>( \
versionedModel ) : 0; + AbstractModel* versionedModel = mModel ? \
mModel->findBaseModelWithInterface<If::Versionable*>() : nullptr; + \
mVersionControl = versionedModel ? qobject_cast<If::Versionable*>( versionedModel ) : \
nullptr;
if( mVersionControl )
{
@@ -92,9 +92,9 @@ void VersionController::setTargetModel( AbstractModel* model )
this, &VersionController::onReadOnlyChanged );
}
else
- mModel = 0;
+ mModel = nullptr;
- const bool isVersionable = ( mVersionControl != 0 && !mModel->isReadOnly() );
+ const bool isVersionable = ( mVersionControl && !mModel->isReadOnly() );
if( isVersionable )
onVersionIndexChanged( mVersionControl->versionIndex() );
diff --git a/libs/kasten/controllers/view/zoom/zoombarcontroller.cpp \
b/libs/kasten/controllers/view/zoom/zoombarcontroller.cpp index adde0d47..cdd53f60 \
100644
--- a/libs/kasten/controllers/view/zoom/zoombarcontroller.cpp
+++ b/libs/kasten/controllers/view/zoom/zoombarcontroller.cpp
@@ -36,7 +36,7 @@ ZoomBarController::ZoomBarController( StatusBar* statusBar )
mZoomSlider = new ZoomSlider( statusBar );
statusBar->addWidget( mZoomSlider );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
diff --git a/libs/kasten/controllers/view/zoom/zoomcontroller.cpp \
b/libs/kasten/controllers/view/zoom/zoomcontroller.cpp index 904cfdb0..de2ecba4 \
100644
--- a/libs/kasten/controllers/view/zoom/zoomcontroller.cpp
+++ b/libs/kasten/controllers/view/zoom/zoomcontroller.cpp
@@ -39,7 +39,7 @@ namespace Kasten
{
ZoomController::ZoomController( KXMLGUIClient* guiClient )
- : mModel( 0 ), mZoomControl( 0 )
+ : mModel( nullptr ), mZoomControl( nullptr )
{
KActionCollection* actionCollection = guiClient->actionCollection();
@@ -73,15 +73,15 @@ ZoomController::ZoomController( KXMLGUIClient* guiClient )
FitToSizeAction = new KAction( i18n( "&Fit to Size" ), ActionCollection, \
"fit_to_size" );
connect( FitToSizeAction, SIGNAL(triggered(bool) ), SLOT(fitToSize()));
#endif
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
void ZoomController::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::Zoomable*>() : 0;
- mZoomControl = mModel ? qobject_cast<If::Zoomable *>( mModel ) : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::Zoomable*>() : nullptr;
+ mZoomControl = mModel ? qobject_cast<If::Zoomable *>( mModel ) : nullptr;
if( mZoomControl )
{
@@ -89,7 +89,7 @@ void ZoomController::setTargetModel( AbstractModel* model )
connect( mModel, SIGNAL(zoomLevelChanged(double)), \
SLOT(onZoomLevelChange(double)) ); }
- const bool hasView = ( mZoomControl != 0 );
+ const bool hasView = ( mZoomControl != nullptr );
mZoomInAction->setEnabled( hasView );
mZoomOutAction->setEnabled( hasView );
}
diff --git a/libs/kasten/controllers/view/zoom/zoomslider.cpp \
b/libs/kasten/controllers/view/zoom/zoomslider.cpp index 7aae9ed0..ec9407ff 100644
--- a/libs/kasten/controllers/view/zoom/zoomslider.cpp
+++ b/libs/kasten/controllers/view/zoom/zoomslider.cpp
@@ -47,7 +47,7 @@ static const int ZoomSliderWidth = 150;
// where to put this, behind interface? or better into a zoomtool?
ZoomSlider::ZoomSlider( QWidget* parent )
- : QWidget( parent ), mModel( 0 ), mZoomControl( 0 )
+ : QWidget( parent ), mModel( nullptr ), mZoomControl( nullptr )
{
mZoomOutButton = new QToolButton( this );
mZoomOutButton->setIcon( QIcon::fromTheme( QStringLiteral("zoom-out") ) );
@@ -77,7 +77,7 @@ ZoomSlider::ZoomSlider( QWidget* parent )
setFixedWidth( ZoomSliderWidth );
- setTargetModel( 0 );
+ setTargetModel( nullptr );
}
@@ -85,10 +85,10 @@ void ZoomSlider::setTargetModel( AbstractModel* model )
{
if( mModel ) mModel->disconnect( this );
- mModel = model ? model->findBaseModelWithInterface<If::Zoomable*>() : 0;
- mZoomControl = mModel ? qobject_cast<If::Zoomable *>( mModel ) : 0;
+ mModel = model ? model->findBaseModelWithInterface<If::Zoomable*>() : nullptr;
+ mZoomControl = mModel ? qobject_cast<If::Zoomable *>( mModel ) : nullptr;
- const bool hasView = ( mZoomControl != 0 );
+ const bool hasView = ( mZoomControl != nullptr );
if( hasView )
{
mSlider->setSingleStep( 1 ); // mZoomControl->zoomLevelSingleStep()?
diff --git a/libs/kasten/core/document/abstractdocument_p.h \
b/libs/kasten/core/document/abstractdocument_p.h index d6d1f245..19d16a83 100644
--- a/libs/kasten/core/document/abstractdocument_p.h
+++ b/libs/kasten/core/document/abstractdocument_p.h
@@ -59,7 +59,7 @@ class AbstractDocumentPrivate : public AbstractModelPrivate
inline AbstractDocumentPrivate::AbstractDocumentPrivate( AbstractDocument* parent )
: AbstractModelPrivate( parent ),
- mSynchronizer( 0 )
+ mSynchronizer( nullptr )
{}
inline const QString& AbstractDocumentPrivate::id() const { return mId; }
diff --git a/libs/kasten/core/document/abstractdocumentfactory.cpp \
b/libs/kasten/core/document/abstractdocumentfactory.cpp index 08894647..0dc03340 \
100644
--- a/libs/kasten/core/document/abstractdocumentfactory.cpp
+++ b/libs/kasten/core/document/abstractdocumentfactory.cpp
@@ -38,7 +38,7 @@ AbstractDocument* AbstractDocumentFactory::createFromData( const \
QMimeData* mime Q_UNUSED( mimeData );
Q_UNUSED( setModified );
- return 0;
+ return nullptr;
}
AbstractDocumentFactory::~AbstractDocumentFactory() {}
diff --git a/libs/kasten/core/document/abstractmodel.h \
b/libs/kasten/core/document/abstractmodel.h index 23bfbe6c..cc1d09b8 100644
--- a/libs/kasten/core/document/abstractmodel.h
+++ b/libs/kasten/core/document/abstractmodel.h
@@ -42,7 +42,7 @@ class KASTENCORE_EXPORT AbstractModel : public QObject
Q_OBJECT
protected:
- explicit AbstractModel( AbstractModel* baseModel = 0 );
+ explicit AbstractModel( AbstractModel* baseModel = nullptr );
explicit AbstractModel( AbstractModelPrivate* d );
public:
@@ -102,7 +102,7 @@ T AbstractModel::findBaseModel() const
}
while( model );
- return 0;
+ return nullptr;
}
template <typename T>
@@ -118,7 +118,7 @@ AbstractModel* AbstractModel::findBaseModelWithInterface() const
}
while( model );
- return 0;
+ return nullptr;
}
}
diff --git a/libs/kasten/core/document/abstractmodel_p.h \
b/libs/kasten/core/document/abstractmodel_p.h index f51fa1fc..5eea4331 100644
--- a/libs/kasten/core/document/abstractmodel_p.h
+++ b/libs/kasten/core/document/abstractmodel_p.h
@@ -32,7 +32,7 @@ namespace Kasten
class AbstractModelPrivate
{
public:
- explicit AbstractModelPrivate( AbstractModel* parent, AbstractModel* baseModel \
= 0 ); + explicit AbstractModelPrivate( AbstractModel* parent, AbstractModel* \
baseModel = nullptr );
virtual ~AbstractModelPrivate();
diff --git a/libs/kasten/core/io/abstractexportjob_p.h \
b/libs/kasten/core/io/abstractexportjob_p.h index 455f6670..01f8baae 100644
--- a/libs/kasten/core/io/abstractexportjob_p.h
+++ b/libs/kasten/core/io/abstractexportjob_p.h
@@ -49,7 +49,7 @@ class AbstractExportJobPrivate
inline AbstractExportJobPrivate::AbstractExportJobPrivate( AbstractExportJob* \
parent) : q_ptr( parent ),
- mDocument( 0 )
+ mDocument( nullptr )
{}
inline AbstractDocument* AbstractExportJobPrivate::document() const { return \
mDocument; }
diff --git a/libs/kasten/core/io/abstractloadjob_p.h \
b/libs/kasten/core/io/abstractloadjob_p.h index 6a93a4a0..10bc6654 100644
--- a/libs/kasten/core/io/abstractloadjob_p.h
+++ b/libs/kasten/core/io/abstractloadjob_p.h
@@ -54,7 +54,7 @@ class AbstractLoadJobPrivate
inline AbstractLoadJobPrivate::AbstractLoadJobPrivate( AbstractLoadJob* parent )
: q_ptr( parent ),
- mDocument( 0 )
+ mDocument( nullptr )
{}
inline AbstractLoadJobPrivate::~AbstractLoadJobPrivate() {}
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.cpp \
b/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.cpp index \
e9b3d51c..55295655 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.cpp
@@ -79,7 +79,7 @@ void AbstractFileSystemConnectJobPrivate::connectWithFile()
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( mUrl, QUrl::fromLocalFile(mWorkFilePath), -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
isWorkFileOk = fileCopyJob->exec();
if( ! isWorkFileOk )
@@ -122,7 +122,7 @@ void AbstractFileSystemConnectJobPrivate::complete( bool success \
) {
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( QUrl::fromLocalFile(mWorkFilePath), mUrl, -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
const bool uploaded = fileCopyJob->exec();
if( ! uploaded )
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h \
b/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h index \
b708c69a..fa72fb8d 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
@@ -79,7 +79,7 @@ inline \
AbstractFileSystemConnectJobPrivate::AbstractFileSystemConnectJobPrivate( mDocument( \
document ), mUrl( url ),
mOption( option ),
- mFile( 0 )
+ mFile( nullptr )
{}
inline AbstractFileSystemConnectJobPrivate::~AbstractFileSystemConnectJobPrivate() \
{}
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp \
b/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp index \
3702760e..08f2a614 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
@@ -74,7 +74,7 @@ void AbstractFileSystemExportJobPrivate::completeExport( bool \
success ) {
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( QUrl::fromLocalFile(mWorkFilePath), mUrl, -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
success = fileCopyJob->exec();
if( ! success )
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.h \
b/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.h index \
d0a1e3bb..f8a75c7a 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.h
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.h
@@ -74,7 +74,7 @@ inline \
AbstractFileSystemExportJobPrivate::AbstractFileSystemExportJobPrivate( A mModel( \
model ), mSelection( selection ),
mUrl( url ),
- mFile( 0 )
+ mFile( nullptr )
{}
inline AbstractFileSystemExportJobPrivate::~AbstractFileSystemExportJobPrivate() {}
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.cpp \
b/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.cpp index \
fcc46df2..b1ae5871 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.cpp
@@ -58,7 +58,7 @@ void AbstractFileSystemLoadJobPrivate::load()
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( mUrl, QUrl::fromLocalFile(mWorkFilePath), -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
isWorkFileOk = fileCopyJob->exec();
if( ! isWorkFileOk )
@@ -79,7 +79,7 @@ void AbstractFileSystemLoadJobPrivate::load()
{
q->setError( KJob::KilledJobError );
// TODO: should we rather skip setDocument in the API?
- q->AbstractLoadJob::setDocument( 0 );
+ q->AbstractLoadJob::setDocument( nullptr );
}
}
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.h \
b/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.h index \
3560c2d8..cafbfa71 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.h
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemloadjob_p.h
@@ -71,7 +71,7 @@ inline \
AbstractFileSystemLoadJobPrivate::AbstractFileSystemLoadJobPrivate( Abstr : \
AbstractLoadJobPrivate( parent ), mSynchronizer( synchronizer ),
mUrl( url ),
- mFile( 0 )
+ mFile( nullptr )
{}
inline AbstractFileSystemLoadJobPrivate::~AbstractFileSystemLoadJobPrivate() {}
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.cpp \
b/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.cpp index \
0572df14..9925f508 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.cpp
@@ -60,7 +60,7 @@ void AbstractFileSystemSyncFromRemoteJobPrivate::syncFromRemote()
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( url, QUrl::fromLocalFile(mWorkFilePath), -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
isWorkFileOk = fileCopyJob->exec();
if( ! isWorkFileOk )
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h \
b/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h index \
6b462618..ad17a345 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
@@ -71,7 +71,7 @@ inline \
AbstractFileSystemSyncFromRemoteJobPrivate::AbstractFileSystemSyncFromRem \
AbstractModelFileSystemSynchronizer* synchronizer ) : \
AbstractSyncFromRemoteJobPrivate( parent ), mSynchronizer( synchronizer ),
- mFile( 0 )
+ mFile( nullptr )
{
}
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.cpp \
b/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.cpp index \
fe05af56..3b49d821 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.cpp
@@ -84,7 +84,7 @@ void AbstractFileSystemSyncToRemoteJobPrivate::completeWrite( bool \
success ) {
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( QUrl::fromLocalFile(mWorkFilePath), url, -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
success = fileCopyJob->exec();
if( ! success )
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.h \
b/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.h index \
d9e010b6..5120e736 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.h
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemsynctoremotejob_p.h
@@ -69,7 +69,7 @@ inline \
AbstractFileSystemSyncToRemoteJobPrivate::AbstractFileSystemSyncToRemoteJ \
AbstractModelFileSystemSynchronizer* synchronizer ) : \
AbstractSyncToRemoteJobPrivate( parent ), mSynchronizer( synchronizer ),
- mFile( 0 )
+ mFile( nullptr )
{}
inline QFile* AbstractFileSystemSyncToRemoteJobPrivate::file() const { return \
mFile; }
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.cpp \
b/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.cpp index \
fe391975..e513e2ba 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.cpp
@@ -78,7 +78,7 @@ void AbstractFileSystemSyncWithRemoteJobPrivate::syncWithRemote()
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( mUrl, QUrl::fromLocalFile(mWorkFilePath), -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
isWorkFileOk = fileCopyJob->exec();
if( ! isWorkFileOk )
@@ -130,7 +130,7 @@ void AbstractFileSystemSyncWithRemoteJobPrivate::completeSync( \
bool success ) {
KIO::FileCopyJob* fileCopyJob =
KIO::file_copy( QUrl::fromLocalFile(mWorkFilePath), mUrl, -1, \
KIO::Overwrite );
- KJobWidgets::setWindow( fileCopyJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( fileCopyJob, /*mWidget*/nullptr );
const bool uploaded = fileCopyJob->exec();
if( ! uploaded )
diff --git a/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h \
b/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h index \
ee17af02..494a703b 100644
--- a/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
+++ b/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
@@ -75,7 +75,7 @@ inline \
AbstractFileSystemSyncWithRemoteJobPrivate::AbstractFileSystemSyncWithRem \
mSynchronizer( synchronizer ), mUrl( url ),
mOption( option ),
- mFile( 0 )
+ mFile( nullptr )
{}
inline AbstractFileSystemSyncWithRemoteJobPrivate::~AbstractFileSystemSyncWithRemoteJobPrivate() \
{}
diff --git a/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.cpp \
b/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.cpp index \
de24935e..289cb1c0 100644
--- a/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.cpp
+++ b/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.cpp
@@ -86,7 +86,7 @@ void \
AbstractModelFileSystemSynchronizerPrivate::startNetworkWatching() void \
AbstractModelFileSystemSynchronizerPrivate::stopNetworkWatching() {
delete mNetworkConfigurationManager;
- mNetworkConfigurationManager = 0;
+ mNetworkConfigurationManager = nullptr;
}
void AbstractModelFileSystemSynchronizerPrivate::onFileDirty( const QString& \
fileName )
diff --git a/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.h \
b/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.h index \
20b593e2..7c47e9f8 100644
--- a/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.h
+++ b/libs/kasten/core/io/filesystem/abstractmodelfilesystemsynchronizer_p.h
@@ -78,8 +78,8 @@ class AbstractModelFileSystemSynchronizerPrivate : public \
AbstractModelSynchroni inline \
AbstractModelFileSystemSynchronizerPrivate::AbstractModelFileSystemSynchronizerPrivate( \
AbstractModelFileSystemSynchronizer* parent ) : AbstractModelSynchronizerPrivate( \
parent ), mRemoteState( RemoteUnknown ),
- mNetworkConfigurationManager( 0 ),
- mDirWatch( 0 )
+ mNetworkConfigurationManager( nullptr ),
+ mDirWatch( nullptr )
{
}
inline RemoteSyncState AbstractModelFileSystemSynchronizerPrivate::remoteSyncState() \
const { return mRemoteState; }
diff --git a/libs/kasten/core/io/modeldatageneratethread.h \
b/libs/kasten/core/io/modeldatageneratethread.h index 2876ed04..b7d74598 100644
--- a/libs/kasten/core/io/modeldatageneratethread.h
+++ b/libs/kasten/core/io/modeldatageneratethread.h
@@ -67,7 +67,7 @@ inline ModelDataGenerateThread::ModelDataGenerateThread( QObject* \
parent, AbstractModelDataGenerator* generator )
: QThread( parent ),
mGenerator( generator ),
- mMimeData( 0 )
+ mMimeData( nullptr )
{}
inline QMimeData* ModelDataGenerateThread::data() const { return mMimeData; }
diff --git a/libs/kasten/core/system/documentcreatemanager.cpp \
b/libs/kasten/core/system/documentcreatemanager.cpp index ff732d9a..b262e90d 100644
--- a/libs/kasten/core/system/documentcreatemanager.cpp
+++ b/libs/kasten/core/system/documentcreatemanager.cpp
@@ -33,7 +33,7 @@ namespace Kasten
DocumentCreateManager::DocumentCreateManager( DocumentManager* manager )
: mManager( manager ),
- mFactory( 0 )
+ mFactory( nullptr )
{
}
diff --git a/libs/kasten/core/system/documentsyncmanager.cpp \
b/libs/kasten/core/system/documentsyncmanager.cpp index ea925d4a..d027c4b3 100644
--- a/libs/kasten/core/system/documentsyncmanager.cpp
+++ b/libs/kasten/core/system/documentsyncmanager.cpp
@@ -50,9 +50,9 @@ namespace Kasten
DocumentSyncManager::DocumentSyncManager( DocumentManager* manager )
: mManager( manager ),
- mSynchronizerFactory( 0 ),
- mSaveDiscardDialog( 0 ),
- mOverwriteDialog( 0 )
+ mSynchronizerFactory( nullptr ),
+ mSaveDiscardDialog( nullptr ),
+ mOverwriteDialog( nullptr )
{}
void DocumentSyncManager::setSaveDiscardDialog( AbstractSaveDiscardDialog* \
saveDiscardDialog ) @@ -125,21 +125,21 @@ bool DocumentSyncManager::setSynchronizer( \
AbstractDocument* document ) i18nc( "@title:window", "Save As" );
do
{
- QFileDialog dialog( /*mWidget*/0, processTitle, \
/*mWorkingUrl.url()*/QString() ); + QFileDialog dialog( /*mWidget*/nullptr, \
processTitle, /*mWorkingUrl.url()*/QString() ); dialog.setMimeTypeFilters( \
supportedRemoteTypes() ); dialog.setAcceptMode( QFileDialog::AcceptSave );
const QUrl newUrl = dialog.exec() ? dialog.selectedUrls().value(0) : QUrl();
if( newUrl.isValid() )
{
- const bool isNewUrl = ( currentSynchronizer == 0 )
+ const bool isNewUrl = ( ! currentSynchronizer )
|| ( newUrl != currentSynchronizer->url() );
if( isNewUrl )
{
KIO::StatJob* statJob = KIO::stat( newUrl );
statJob->setSide( KIO::StatJob::DestinationSide );
- KJobWidgets::setWindow( statJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( statJob, /*mWidget*/nullptr );
const bool isUrlInUse = statJob->exec();
diff --git a/libs/kasten/core/system/jobmanager.cpp \
b/libs/kasten/core/system/jobmanager.cpp index e1c46507..5e97f57e 100644
--- a/libs/kasten/core/system/jobmanager.cpp
+++ b/libs/kasten/core/system/jobmanager.cpp
@@ -45,7 +45,7 @@ bool JobManager::executeJob( KJob* job )
QGuiApplication::restoreOverrideCursor();
if( !success )
- KMessageBox::error( 0, job->errorText() ); // TODO: feed into notification \
system + KMessageBox::error( nullptr, job->errorText() ); // TODO: feed into \
notification system
return success;
}
diff --git a/libs/kasten/core/system/modelcodecmanager.cpp \
b/libs/kasten/core/system/modelcodecmanager.cpp index 708dc334..6899d7d2 100644
--- a/libs/kasten/core/system/modelcodecmanager.cpp
+++ b/libs/kasten/core/system/modelcodecmanager.cpp
@@ -45,7 +45,7 @@ namespace Kasten
ModelCodecManager::ModelCodecManager( DocumentManager* manager )
: mManager( manager ),
- mOverwriteDialog( 0 )
+ mOverwriteDialog( nullptr )
{
}
@@ -115,7 +115,7 @@ void ModelCodecManager::exportDocument( AbstractModelExporter* \
exporter, i18nc( "@title:window", "Export" );
do
{
- QFileDialog exportFileDialog(/*mWidget*/0, dialogTitle );
+ QFileDialog exportFileDialog(/*mWidget*/nullptr, dialogTitle );
exportFileDialog.setAcceptMode( QFileDialog::AcceptSave );
exportFileDialog.setFileMode( QFileDialog::AnyFile );
@@ -134,7 +134,7 @@ void ModelCodecManager::exportDocument( AbstractModelExporter* \
exporter,
KIO::StatJob* statJob = KIO::stat( exportUrl );
statJob->setSide( KIO::StatJob::DestinationSide );
- KJobWidgets::setWindow( statJob, /*mWidget*/0 );
+ KJobWidgets::setWindow( statJob, /*mWidget*/nullptr );
const bool isUrlInUse = statJob->exec();
diff --git a/libs/kasten/core/tests/testdocumentfileloadthread.cpp \
b/libs/kasten/core/tests/testdocumentfileloadthread.cpp index 8c60f456..4601df78 \
100644
--- a/libs/kasten/core/tests/testdocumentfileloadthread.cpp
+++ b/libs/kasten/core/tests/testdocumentfileloadthread.cpp
@@ -47,7 +47,7 @@ void TestDocumentFileLoadThread::run()
QByteArray header( headerSize, ' ' );
const int headerResult = inStream.readRawData( header.data(), headerSize );
if( headerResult == -1 || header != mHeader )
- mDocument = 0;
+ mDocument = nullptr;
else
{
QByteArray byteArray( fileSize, ' ' );
@@ -66,7 +66,7 @@ void TestDocumentFileLoadThread::run()
}
else
{
- mDocument = 0;
+ mDocument = nullptr;
}
}
diff --git a/libs/kasten/core/tests/testdocumentfileloadthread.h \
b/libs/kasten/core/tests/testdocumentfileloadthread.h index e35634d5..41da96f1 100644
--- a/libs/kasten/core/tests/testdocumentfileloadthread.h
+++ b/libs/kasten/core/tests/testdocumentfileloadthread.h
@@ -60,7 +60,7 @@ class TestDocumentFileLoadThread : public QThread
inline TestDocumentFileLoadThread::TestDocumentFileLoadThread( QObject* parent, \
const QByteArray& header, QFile* file )
- : QThread( parent ), mFile( file ), mHeader( header ), mDocument( 0 )
+ : QThread( parent ), mFile( file ), mHeader( header ), mDocument( nullptr )
{}
inline TestDocument* TestDocumentFileLoadThread::document() const { return \
mDocument; }
diff --git a/libs/kasten/core/tests/testdocumentfilesynchronizer.cpp \
b/libs/kasten/core/tests/testdocumentfilesynchronizer.cpp index 6e6b3d2c..c4727d78 \
100644
--- a/libs/kasten/core/tests/testdocumentfilesynchronizer.cpp
+++ b/libs/kasten/core/tests/testdocumentfilesynchronizer.cpp
@@ -37,7 +37,7 @@ namespace Kasten
{
TestDocumentFileSynchronizer::TestDocumentFileSynchronizer( const QByteArray& header \
)
- : mDocument(0), mHeader( header )
+ : mDocument(nullptr), mHeader( header )
{
// TODO: where to catch this? who decides about this?
// mDocument->setTitle( url.fileName() );
diff --git a/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp \
b/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp index \
daffdecd..e1a26b54 100644
--- a/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp
+++ b/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp
@@ -105,7 +105,7 @@ void TestDocumentFileSynchronizerFactoryTest::testCreate()
{
Kasten::TestDocumentFileSynchronizerFactory* factory = new \
Kasten::TestDocumentFileSynchronizerFactory();
- QVERIFY( factory != 0 );
+ QVERIFY( factory != nullptr );
delete factory;
}
diff --git a/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp \
b/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp index \
80f3b3d9..813e50c3 100644
--- a/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp
+++ b/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp
@@ -93,7 +93,7 @@ void TestDocumentFileSynchronizerTest::checkFileContent( const \
QUrl& fileUrl, co
Kasten::TestDocument* testDocument = qobject_cast<Kasten::TestDocument* >( \
document );
- QVERIFY( testDocument != 0 );
+ QVERIFY( testDocument != nullptr );
QCOMPARE( *testDocument->data(), data );
delete document;
@@ -112,9 +112,9 @@ void TestDocumentFileSynchronizerTest::testLoadFromFile()
Kasten::TestDocument* testDocument = qobject_cast<Kasten::TestDocument* >( \
document );
- QVERIFY( document != 0 );
- QVERIFY( testDocument != 0 );
- QVERIFY( document->synchronizer() != 0 );
+ QVERIFY( document != nullptr );
+ QVERIFY( testDocument != nullptr );
+ QVERIFY( document->synchronizer() != nullptr );
QCOMPARE( document->synchronizer()->document(), document );
QCOMPARE( document->contentFlags(), Kasten::ContentStateNormal );
QCOMPARE( *testDocument->data(), testData );
@@ -132,7 +132,7 @@ void \
TestDocumentFileSynchronizerTest::testLoadFromNotExistingUrl() loadJob->exec();
Kasten::AbstractDocument* document = synchronizer->document();
- QVERIFY( document == 0 );
+ QVERIFY( document == nullptr );
delete synchronizer;
}
@@ -143,7 +143,7 @@ void \
TestDocumentFileSynchronizerTest::testLoadFromNotExistingFile() \
synchronizer->startLoad( fileUrl )->exec(); Kasten::AbstractDocument* document = \
synchronizer->document();
- QVERIFY( document == 0 );
+ QVERIFY( document == nullptr );
delete synchronizer;
}
@@ -156,7 +156,7 @@ void TestDocumentFileSynchronizerTest::testLoadSaveFile()
Kasten::AbstractDocument* document = synchronizer->document();
Kasten::TestDocument* testDocument = qobject_cast<Kasten::TestDocument* >( \
document );
- QVERIFY( testDocument != 0 );
+ QVERIFY( testDocument != nullptr );
// change and save
testDocument->setData( otherData );
document->synchronizer()->startSyncToRemote()->exec();
@@ -178,7 +178,7 @@ void TestDocumentFileSynchronizerTest::testLoadReloadFile()
Kasten::AbstractDocument* document = synchronizer->document();
Kasten::TestDocument* testDocument = qobject_cast<Kasten::TestDocument* >( \
document );
- QVERIFY( testDocument != 0 );
+ QVERIFY( testDocument != nullptr );
// change on disc and reload
writeToFile( filePath, otherData );
diff --git a/libs/kasten/core/tests/testdocumenttest.cpp \
b/libs/kasten/core/tests/testdocumenttest.cpp index 0a0879ca..135f93d8 100644
--- a/libs/kasten/core/tests/testdocumenttest.cpp
+++ b/libs/kasten/core/tests/testdocumenttest.cpp
@@ -56,7 +56,7 @@ void TestDocumentTest::testPlainConstructor()
{
Kasten::TestDocument* document = new Kasten::TestDocument();
- QVERIFY( document != 0 );
+ QVERIFY( document != nullptr );
QCOMPARE( *document->data(), QByteArray() );
QCOMPARE( document->title(), QString() );
QCOMPARE( document->contentFlags(), Kasten::ContentStateNormal );
@@ -69,7 +69,7 @@ void TestDocumentTest::testDataConstructor()
const QByteArray testData( TestData );
Kasten::TestDocument* document = new Kasten::TestDocument( testData );
- QVERIFY( document != 0 );
+ QVERIFY( document != nullptr );
QCOMPARE( *document->data(), testData );
QCOMPARE( document->title(), QString() );
QCOMPARE( document->contentFlags(), Kasten::ContentStateNormal );
diff --git a/libs/kasten/gui/controller/abstractlinepopup.h \
b/libs/kasten/gui/controller/abstractlinepopup.h index 4301973b..04ab0c7e 100644
--- a/libs/kasten/gui/controller/abstractlinepopup.h
+++ b/libs/kasten/gui/controller/abstractlinepopup.h
@@ -48,7 +48,7 @@ class KASTENGUI_EXPORT AbstractLinePopup : public QWidget
Q_OBJECT
public:
- explicit AbstractLinePopup( QWidget* parent = 0 );
+ explicit AbstractLinePopup( QWidget* parent = nullptr );
virtual ~AbstractLinePopup();
public:
diff --git a/libs/kasten/gui/controller/abstractlinepopup_p.cpp \
b/libs/kasten/gui/controller/abstractlinepopup_p.cpp index 762f7fae..15154ad0 100644
--- a/libs/kasten/gui/controller/abstractlinepopup_p.cpp
+++ b/libs/kasten/gui/controller/abstractlinepopup_p.cpp
@@ -83,7 +83,7 @@ int AbstractLinePopupPrivate::exec()
QEventLoop eventLoop;
mEventLoop = &eventLoop;
eventLoop.exec();
- mEventLoop = 0;
+ mEventLoop = nullptr;
return mResult;
}
diff --git a/libs/kasten/gui/controller/abstractlinepopup_p.h \
b/libs/kasten/gui/controller/abstractlinepopup_p.h index ffda43b7..3b7d4920 100644
--- a/libs/kasten/gui/controller/abstractlinepopup_p.h
+++ b/libs/kasten/gui/controller/abstractlinepopup_p.h
@@ -73,8 +73,8 @@ class AbstractLinePopupPrivate
inline AbstractLinePopupPrivate::AbstractLinePopupPrivate( AbstractLinePopup* parent \
) : p( parent ),
- mWidget( 0 ),
- mEventLoop( 0 ),
+ mWidget( nullptr ),
+ mEventLoop( nullptr ),
mResult( 0 )
{
}
diff --git a/libs/kasten/gui/controller/abstracttoolwidget.h \
b/libs/kasten/gui/controller/abstracttoolwidget.h index f651827e..033a5115 100644
--- a/libs/kasten/gui/controller/abstracttoolwidget.h
+++ b/libs/kasten/gui/controller/abstracttoolwidget.h
@@ -46,7 +46,7 @@ class KASTENGUI_EXPORT AbstractToolWidget : public QWidget
enum DefaultType { AutoDefault, Default };
public:
- explicit AbstractToolWidget( QWidget* parent = 0 );
+ explicit AbstractToolWidget( QWidget* parent = nullptr );
virtual ~AbstractToolWidget();
diff --git a/libs/kasten/gui/controller/abstracttoolwidget_p.cpp \
b/libs/kasten/gui/controller/abstracttoolwidget_p.cpp index 3b79a965..5c26479c 100644
--- a/libs/kasten/gui/controller/abstracttoolwidget_p.cpp
+++ b/libs/kasten/gui/controller/abstracttoolwidget_p.cpp
@@ -32,7 +32,7 @@ namespace Kasten
AbstractToolWidgetPrivate::AbstractToolWidgetPrivate( AbstractToolWidget* parent )
: p( parent ),
- mDefaultButton( 0 )
+ mDefaultButton( nullptr )
{
mReturnShortcut = new QShortcut( Qt::Key_Return, p ); //TODO: what about Enter?
diff --git a/libs/kasten/gui/controller/togglebutton.h \
b/libs/kasten/gui/controller/togglebutton.h index 34705c05..6662f7a0 100644
--- a/libs/kasten/gui/controller/togglebutton.h
+++ b/libs/kasten/gui/controller/togglebutton.h
@@ -39,8 +39,8 @@ class KASTENGUI_EXPORT ToggleButton : public QToolButton
Q_OBJECT
public:
- ToggleButton( const QString& text, const QString& toolTip, QWidget* parent = 0 \
);
- ToggleButton( const QIcon& icon, const QString& text, const QString& toolTip, \
QWidget* parent = 0 ); + ToggleButton( const QString& text, const QString& \
toolTip, QWidget* parent = nullptr ); + ToggleButton( const QIcon& icon, const \
QString& text, const QString& toolTip, QWidget* parent = nullptr ); virtual \
~ToggleButton();
public:
diff --git a/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.cpp \
b/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.cpp index \
9dfa76b3..e681a3af 100644
--- a/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.cpp
+++ b/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.cpp
@@ -28,7 +28,7 @@ namespace Kasten
AbstractModelDataGeneratorConfigEditor::AbstractModelDataGeneratorConfigEditor( \
QWidget* parent ) : QWidget( parent ),
- d( 0 )
+ d( nullptr )
{}
bool AbstractModelDataGeneratorConfigEditor::isValid() const
diff --git a/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.h \
b/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.h index \
20c31ee2..c94e1a4a 100644
--- a/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.h
+++ b/libs/kasten/gui/io/abstractmodeldatageneratorconfigeditor.h
@@ -39,7 +39,7 @@ class KASTENGUI_EXPORT AbstractModelDataGeneratorConfigEditor : \
public QWidget Q_OBJECT
protected:
- explicit AbstractModelDataGeneratorConfigEditor( QWidget* parent = 0 );
+ explicit AbstractModelDataGeneratorConfigEditor( QWidget* parent = nullptr );
public:
virtual ~AbstractModelDataGeneratorConfigEditor();
diff --git a/libs/kasten/gui/io/abstractmodelexporterconfigeditor.cpp \
b/libs/kasten/gui/io/abstractmodelexporterconfigeditor.cpp index 4ce1b9d4..2bedabca \
100644
--- a/libs/kasten/gui/io/abstractmodelexporterconfigeditor.cpp
+++ b/libs/kasten/gui/io/abstractmodelexporterconfigeditor.cpp
@@ -28,7 +28,7 @@ namespace Kasten
AbstractModelExporterConfigEditor::AbstractModelExporterConfigEditor( QWidget* \
parent ) : QWidget( parent ),
- d( 0 )
+ d( nullptr )
{}
bool AbstractModelExporterConfigEditor::isValid() const
@@ -38,7 +38,7 @@ bool AbstractModelExporterConfigEditor::isValid() const
AbstractSelectionView* AbstractModelExporterConfigEditor::createPreviewView() const
{
- return 0;
+ return nullptr;
}
AbstractModelExporterConfigEditor::~AbstractModelExporterConfigEditor()
diff --git a/libs/kasten/gui/io/abstractmodelexporterconfigeditor.h \
b/libs/kasten/gui/io/abstractmodelexporterconfigeditor.h index f08be17e..9c2de57c \
100644
--- a/libs/kasten/gui/io/abstractmodelexporterconfigeditor.h
+++ b/libs/kasten/gui/io/abstractmodelexporterconfigeditor.h
@@ -40,7 +40,7 @@ class KASTENGUI_EXPORT AbstractModelExporterConfigEditor : public \
QWidget Q_OBJECT
protected:
- explicit AbstractModelExporterConfigEditor( QWidget* parent = 0 );
+ explicit AbstractModelExporterConfigEditor( QWidget* parent = nullptr );
public:
virtual ~AbstractModelExporterConfigEditor();
diff --git a/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.cpp \
b/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.cpp index \
f72a71d6..9f998fff 100644
--- a/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.cpp
+++ b/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.cpp
@@ -28,7 +28,7 @@ namespace Kasten
AbstractModelStreamEncoderConfigEditor::AbstractModelStreamEncoderConfigEditor( \
QWidget* parent ) : QWidget( parent ),
- d( 0 )
+ d( nullptr )
{}
bool AbstractModelStreamEncoderConfigEditor::isValid() const
@@ -38,7 +38,7 @@ bool AbstractModelStreamEncoderConfigEditor::isValid() const
AbstractSelectionView* AbstractModelStreamEncoderConfigEditor::createPreviewView() \
const {
- return 0;
+ return nullptr;
}
AbstractModelStreamEncoderConfigEditor::~AbstractModelStreamEncoderConfigEditor()
diff --git a/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.h \
b/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.h index \
de35bd81..86da8e8e 100644
--- a/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.h
+++ b/libs/kasten/gui/io/abstractmodelstreamencoderconfigeditor.h
@@ -40,7 +40,7 @@ class KASTENGUI_EXPORT AbstractModelStreamEncoderConfigEditor : \
public QWidget Q_OBJECT
protected:
- explicit AbstractModelStreamEncoderConfigEditor( QWidget* parent = 0 );
+ explicit AbstractModelStreamEncoderConfigEditor( QWidget* parent = nullptr );
public:
virtual ~AbstractModelStreamEncoderConfigEditor();
diff --git a/libs/kasten/gui/io/filesystem/modelencoderfilesystemexporterconfigeditorfactory.cpp \
b/libs/kasten/gui/io/filesystem/modelencoderfilesystemexporterconfigeditorfactory.cpp \
index 0aa5aeba..4a34f1f2 100644
--- a/libs/kasten/gui/io/filesystem/modelencoderfilesystemexporterconfigeditorfactory.cpp
+++ b/libs/kasten/gui/io/filesystem/modelencoderfilesystemexporterconfigeditorfactory.cpp
@@ -40,7 +40,7 @@ ModelEncoderFileSystemExporterConfigEditorFactory::ModelEncoderFileSystemExporte
AbstractModelExporterConfigEditor* \
ModelEncoderFileSystemExporterConfigEditorFactory::tryCreateConfigEditor( \
AbstractModelExporter* exporter ) const {
- AbstractModelExporterConfigEditor* result = 0;
+ AbstractModelExporterConfigEditor* result = nullptr;
ModelEncoderFileSystemExporter* modelEncoderFileSystemExporter =
qobject_cast<ModelEncoderFileSystemExporter*>( exporter );
diff --git a/libs/kasten/gui/shell/multiviewareas_p.cpp \
b/libs/kasten/gui/shell/multiviewareas_p.cpp index f5f746a9..e1406be6 100644
--- a/libs/kasten/gui/shell/multiviewareas_p.cpp
+++ b/libs/kasten/gui/shell/multiviewareas_p.cpp
@@ -38,7 +38,7 @@ namespace Kasten
// TODO: catch area focues change!
MultiViewAreasPrivate::MultiViewAreasPrivate( MultiViewAreas* parent )
: AbstractGroupedViewsPrivate( parent ),
- mCurrentInlineToolViewArea( 0 )
+ mCurrentInlineToolViewArea( nullptr )
{
}
@@ -153,7 +153,7 @@ void MultiViewAreasPrivate::onViewsRemoved()
const QList<int> baseOfBaseSplitterSizes = baseOfBaseSplitter->sizes();
const int indexOfBaseSplitter = baseOfBaseSplitter->indexOf( \
baseSplitter );
baseOfBaseSplitter->insertWidget( indexOfBaseSplitter, otherWidget );
- viewAreaWidget->setParent( 0 );
+ viewAreaWidget->setParent( nullptr );
delete baseSplitter;
baseOfBaseSplitter->setSizes( baseOfBaseSplitterSizes );
}
@@ -161,7 +161,7 @@ void MultiViewAreasPrivate::onViewsRemoved()
mViewAreaList.removeOne( viewArea );
if( mCurrentInlineToolViewArea == viewArea )
- mCurrentInlineToolViewArea = 0;
+ mCurrentInlineToolViewArea = nullptr;
if( mCurrentViewArea == viewArea )
{
@@ -203,7 +203,7 @@ void MultiViewAreasPrivate::onViewAreaFocusChanged( bool hasFocus \
) return;
if( mCurrentInlineToolViewArea && mCurrentInlineToolViewArea == mCurrentViewArea \
)
- mCurrentInlineToolViewArea->setCurrentToolInlineView( 0 );
+ mCurrentInlineToolViewArea->setCurrentToolInlineView( nullptr );
// TODO: care for ! hasFocus?
if( hasFocus )
diff --git a/libs/kasten/gui/shell/multiviewareas_p.h \
b/libs/kasten/gui/shell/multiviewareas_p.h index fb92f639..f271f315 100644
--- a/libs/kasten/gui/shell/multiviewareas_p.h
+++ b/libs/kasten/gui/shell/multiviewareas_p.h
@@ -167,7 +167,7 @@ inline void MultiViewAreasPrivate::removeViews( const \
QList<AbstractView*>& view inline void \
MultiViewAreasPrivate::setCurrentToolInlineView( AbstractToolInlineView* view ) {
if( mCurrentInlineToolViewArea && mCurrentInlineToolViewArea != mCurrentViewArea \
)
- mCurrentInlineToolViewArea->setCurrentToolInlineView( 0 );
+ mCurrentInlineToolViewArea->setCurrentToolInlineView( nullptr );
mCurrentInlineToolViewArea = mCurrentViewArea;
diff --git a/libs/kasten/gui/shell/shellwindow_p.cpp \
b/libs/kasten/gui/shell/shellwindow_p.cpp index a7d6c7d5..f5c7909f 100644
--- a/libs/kasten/gui/shell/shellwindow_p.cpp
+++ b/libs/kasten/gui/shell/shellwindow_p.cpp
@@ -45,9 +45,9 @@ ShellWindowPrivate::ShellWindowPrivate( ShellWindow* parent,
ViewManager* viewManager )
: q_ptr( parent )
, mGroupedViews( new MultiViewAreas() )// TabbedViews() )
- , mCurrentView( 0 )
- , mCurrentDocument( 0 )
- , mCurrentSynchronizer( 0 )
+ , mCurrentView( nullptr )
+ , mCurrentDocument( nullptr )
+ , mCurrentSynchronizer( nullptr )
, mViewManager( viewManager )
{
parent->setCentralWidget( mGroupedViews->widget() );
@@ -84,7 +84,7 @@ void ShellWindowPrivate::showDocument( AbstractDocument* document )
AbstractGroupedViews* currentGroupedViews = static_cast<AbstractGroupedViews*>( \
mGroupedViews->viewAreaFocus() );
const QList<AbstractView*> viewList = currentGroupedViews->viewList();
- AbstractView* viewOfDocument = 0;
+ AbstractView* viewOfDocument = nullptr;
foreach( AbstractView* view, viewList )
{
if( view->findBaseModel<AbstractDocument*>() == document )
@@ -160,11 +160,11 @@ void ShellWindowPrivate::onViewFocusChanged( AbstractView* view \
) updateControllers( view );
AbstractDocument* oldDocument = mCurrentDocument;
- mCurrentDocument = view ? view->findBaseModel<AbstractDocument*>() : 0;
+ mCurrentDocument = view ? view->findBaseModel<AbstractDocument*>() : nullptr;
const bool isNewDocument = (mCurrentDocument != oldDocument);
AbstractModelSynchronizer* oldSynchronizer = mCurrentSynchronizer;
- mCurrentSynchronizer = mCurrentDocument ? mCurrentDocument->synchronizer() : 0;
+ mCurrentSynchronizer = mCurrentDocument ? mCurrentDocument->synchronizer() : \
nullptr;
const bool isNewSynchronizer = (mCurrentSynchronizer != oldSynchronizer);
if( oldSynchronizer )
@@ -212,7 +212,7 @@ void ShellWindowPrivate::onToolVisibilityChanged( bool isVisible \
)
ToolViewDockWidget* dockWidget = qobject_cast<ToolViewDockWidget *>( q->sender() \
); if( dockWidget )
{
- AbstractView* view = isVisible ? mCurrentView : 0;
+ AbstractView* view = isVisible ? mCurrentView : nullptr;
dockWidget->toolView()->tool()->setTargetModel( view );
}
}
@@ -224,7 +224,7 @@ void ShellWindowPrivate::onSynchronizerDeleted( QObject* \
synchronizer ) if( synchronizer != mCurrentSynchronizer )
return;
- mCurrentSynchronizer = 0;
+ mCurrentSynchronizer = nullptr;
// switch to document state
QObject::connect( mCurrentDocument, &AbstractDocument::contentFlagsChanged,
@@ -241,7 +241,7 @@ ShellWindowPrivate::~ShellWindowPrivate()
// The other option would be to first delete the view, but for reasons if do not
// remember currently I prefer the destruction in this order
// TODO: make this call unneeded
- mGroupedViews->setCurrentToolInlineView( 0 );
+ mGroupedViews->setCurrentToolInlineView( nullptr );
qDeleteAll( mControllers );
qDeleteAll( mDockWidgets );
diff --git a/libs/kasten/gui/shell/singleviewarea_p.cpp \
b/libs/kasten/gui/shell/singleviewarea_p.cpp index 6d4a60ff..7fb15b4d 100644
--- a/libs/kasten/gui/shell/singleviewarea_p.cpp
+++ b/libs/kasten/gui/shell/singleviewarea_p.cpp
@@ -32,8 +32,8 @@ namespace Kasten
SingleViewAreaPrivate::SingleViewAreaPrivate( SingleViewArea* parent )
: AbstractViewAreaPrivate( parent ),
- mViewAreaBox( 0 ),
- mCurrentView( 0 )
+ mViewAreaBox( nullptr ),
+ mCurrentView( nullptr )
{
}
@@ -42,7 +42,7 @@ void SingleViewAreaPrivate::init()
{
// Q_Q( SingleViewArea );
- mViewAreaBox = new ViewAreaBox( 0 ); //TODO: atm cannot replace this
+ mViewAreaBox = new ViewAreaBox( nullptr ); //TODO: atm cannot replace this
// TODO: get drag/drop events
// q->connect( mTabWidget, SIGNAL(testCanDecode(const QDragMoveEvent*,bool&)),
@@ -56,12 +56,12 @@ void SingleViewAreaPrivate::setCurrentToolInlineView( \
AbstractToolInlineView* vi ToolInlineViewWidget* currentViewWidget =
qobject_cast<ToolInlineViewWidget*>( mViewAreaBox->bottomWidget() );
AbstractToolInlineView* currentToolInlineView =
- currentViewWidget ? currentViewWidget->view() : 0;
+ currentViewWidget ? currentViewWidget->view() : nullptr;
if( currentToolInlineView != view )
{
ToolInlineViewWidget* toolInlineViewWidget =
- view ? new ToolInlineViewWidget( view/*->widget()*/ ) : 0;
+ view ? new ToolInlineViewWidget( view/*->widget()*/ ) : nullptr;
mViewAreaBox->setBottomWidget( toolInlineViewWidget );
}
@@ -75,7 +75,7 @@ void SingleViewAreaPrivate::setCurrentToolInlineView( \
AbstractToolInlineView* vi void SingleViewAreaPrivate::setView( AbstractView* view )
{
mCurrentView = view;
- mViewAreaBox->setCentralWidget( view ? view->widget() : 0 );
+ mViewAreaBox->setCentralWidget( view ? view->widget() : nullptr );
}
SingleViewAreaPrivate::~SingleViewAreaPrivate()
diff --git a/libs/kasten/gui/shell/singleviewwindow_p.cpp \
b/libs/kasten/gui/shell/singleviewwindow_p.cpp index 83c6db0e..fef64856 100644
--- a/libs/kasten/gui/shell/singleviewwindow_p.cpp
+++ b/libs/kasten/gui/shell/singleviewwindow_p.cpp
@@ -40,9 +40,9 @@ namespace Kasten
SingleViewWindowPrivate::SingleViewWindowPrivate( SingleViewWindow* parent,
AbstractView* view )
: q_ptr( parent )
- , mView( 0 )
- , mDocument( 0 )
- , mSynchronizer( 0 )
+ , mView( nullptr )
+ , mDocument( nullptr )
+ , mSynchronizer( nullptr )
, mViewArea( new SingleViewArea() )
{
parent->setCentralWidget( mViewArea->widget() );
@@ -73,11 +73,11 @@ void SingleViewWindowPrivate::setView( AbstractView* view )
}
AbstractDocument* oldDocument = mDocument;
- mDocument = view ? view->findBaseModel<AbstractDocument*>() : 0;
+ mDocument = view ? view->findBaseModel<AbstractDocument*>() : nullptr;
const bool isNewDocument = (mDocument != oldDocument);
AbstractModelSynchronizer* oldSynchronizer = mSynchronizer;
- mSynchronizer = mDocument ? mDocument->synchronizer() : 0;
+ mSynchronizer = mDocument ? mDocument->synchronizer() : nullptr;
const bool isNewSynchronizer = (mSynchronizer != oldSynchronizer);
if( oldSynchronizer )
@@ -186,7 +186,7 @@ void SingleViewWindowPrivate::onSynchronizerDeleted( QObject* \
synchronizer ) if( synchronizer != mSynchronizer )
return;
- mSynchronizer = 0;
+ mSynchronizer = nullptr;
// switch to document state
QObject::connect( mDocument, &AbstractDocument::contentFlagsChanged,
@@ -203,7 +203,7 @@ void SingleViewWindowPrivate::onToolVisibilityChanged( bool \
isVisible )
ToolViewDockWidget* dockWidget = qobject_cast<ToolViewDockWidget *>( q->sender() \
); if( dockWidget )
{
- AbstractView* view = isVisible ? mView : 0;
+ AbstractView* view = isVisible ? mView : nullptr;
dockWidget->toolView()->tool()->setTargetModel( view );
}
}
@@ -216,7 +216,7 @@ SingleViewWindowPrivate::~SingleViewWindowPrivate()
// The other option would be to first delete the view, but for reasons if do not
// remember currently I prefer the destruction in this order
// TODO: make this call unneeded
- mViewArea->setCurrentToolInlineView( 0 );
+ mViewArea->setCurrentToolInlineView( nullptr );
qDeleteAll( mControllers );
qDeleteAll( mDockWidgets );
diff --git a/libs/kasten/gui/shell/statusbar.h b/libs/kasten/gui/shell/statusbar.h
index 0223f48b..880a029b 100644
--- a/libs/kasten/gui/shell/statusbar.h
+++ b/libs/kasten/gui/shell/statusbar.h
@@ -41,7 +41,7 @@ class KASTENGUI_EXPORT StatusBar : public QStatusBar
Q_OBJECT
public:
- explicit StatusBar( QWidget* parent = 0 );
+ explicit StatusBar( QWidget* parent = nullptr );
virtual ~StatusBar();
public: // overwrite QStatusBar API
diff --git a/libs/kasten/gui/shell/statusbarlayout.cpp \
b/libs/kasten/gui/shell/statusbarlayout.cpp index 7c8a3673..f6c8bf3f 100644
--- a/libs/kasten/gui/shell/statusbarlayout.cpp
+++ b/libs/kasten/gui/shell/statusbarlayout.cpp
@@ -55,7 +55,7 @@ bool StatusBarLayout::isEmpty() const
QLayoutItem* StatusBarLayout::itemAt( int index ) const
{
if( index < 0 || mWidgetList.count() <= index )
- return 0;
+ return nullptr;
return mWidgetList.at( index );
}
@@ -99,7 +99,7 @@ Q_UNUSED( item )
QLayoutItem* StatusBarLayout::takeAt( int index )
{
if( index < 0 || mWidgetList.count() <= index )
- return 0;
+ return nullptr;
QWidgetItem* item = mWidgetList.takeAt( index );
@@ -115,7 +115,7 @@ void StatusBarLayout::invalidate()
QLayout::invalidate();
}
-Qt::Orientations StatusBarLayout::expandingDirections() const { return \
Qt::Orientations(0); } +Qt::Orientations StatusBarLayout::expandingDirections() const \
{ return Qt::Orientations(); }
void StatusBarLayout::addWidget( QWidget* widget )
{
diff --git a/libs/kasten/gui/shell/statusbarlayout.h \
b/libs/kasten/gui/shell/statusbarlayout.h index 4a1d4217..da9ee4b2 100644
--- a/libs/kasten/gui/shell/statusbarlayout.h
+++ b/libs/kasten/gui/shell/statusbarlayout.h
@@ -38,7 +38,7 @@ class StatusBarLayout : public QLayout
Q_OBJECT
public:
- explicit StatusBarLayout( QWidget* parent = 0 );
+ explicit StatusBarLayout( QWidget* parent = nullptr );
virtual ~StatusBarLayout();
public:
diff --git a/libs/kasten/gui/shell/tabbedviews_p.cpp \
b/libs/kasten/gui/shell/tabbedviews_p.cpp index def53e29..e560c9a2 100644
--- a/libs/kasten/gui/shell/tabbedviews_p.cpp
+++ b/libs/kasten/gui/shell/tabbedviews_p.cpp
@@ -38,7 +38,7 @@ namespace Kasten
TabbedViewsPrivate::TabbedViewsPrivate( TabbedViews* parent )
: AbstractGroupedViewsPrivate( parent ),
- mCurrentView( 0 )
+ mCurrentView( nullptr )
{
}
@@ -163,12 +163,12 @@ void TabbedViewsPrivate::setCurrentToolInlineView( \
AbstractToolInlineView* view ToolInlineViewWidget* currentViewWidget =
qobject_cast<ToolInlineViewWidget*>( mViewAreaBox->bottomWidget() );
AbstractToolInlineView* currentToolInlineView =
- currentViewWidget ? currentViewWidget->view() : 0;
+ currentViewWidget ? currentViewWidget->view() : nullptr;
if( currentToolInlineView != view )
{
ToolInlineViewWidget* toolInlineViewWidget =
- view ? new ToolInlineViewWidget( view/*->widget()*/ ) : 0;
+ view ? new ToolInlineViewWidget( view/*->widget()*/ ) : nullptr;
mViewAreaBox->setBottomWidget( toolInlineViewWidget );
}
@@ -185,12 +185,12 @@ void TabbedViewsPrivate::onCurrentChanged( int index )
Q_Q( TabbedViews );
const ViewBox* viewBox = static_cast<const ViewBox*>( mTabWidget->widget(index) \
);
- AbstractView* view = viewBox ? viewBox->view() : 0;
+ AbstractView* view = viewBox ? viewBox->view() : nullptr;
if( view == mCurrentView )
return;
- mViewAreaBox->setBottomWidget( 0 );
+ mViewAreaBox->setBottomWidget( nullptr );
if( mCurrentView )
mCurrentView->disconnect( q );
diff --git a/libs/kasten/gui/shell/tabbedviews_p.h \
b/libs/kasten/gui/shell/tabbedviews_p.h index eac44d2f..23abeb59 100644
--- a/libs/kasten/gui/shell/tabbedviews_p.h
+++ b/libs/kasten/gui/shell/tabbedviews_p.h
@@ -93,7 +93,7 @@ inline int TabbedViewsPrivate::viewCount() const { return \
mTabWidget->count(); inline AbstractView* TabbedViewsPrivate::viewFocus() const
{
const ViewBox* viewBox = static_cast<const ViewBox*>( \
mTabWidget->currentWidget() );
- return viewBox ? viewBox->view() : 0;
+ return viewBox ? viewBox->view() : nullptr;
}
inline bool TabbedViewsPrivate::hasFocus() const
diff --git a/libs/kasten/gui/shell/toolinlineviewwidget.cpp \
b/libs/kasten/gui/shell/toolinlineviewwidget.cpp index 3eaef942..bdb6d384 100644
--- a/libs/kasten/gui/shell/toolinlineviewwidget.cpp
+++ b/libs/kasten/gui/shell/toolinlineviewwidget.cpp
@@ -57,7 +57,7 @@ ToolInlineViewWidget::~ToolInlineViewWidget()
{
// TODO: crashes on close of the program if view is still open, because the view \
is already deleted layout()->removeWidget( mView->widget() );
- mView->widget()->setParent( 0 );
+ mView->widget()->setParent( nullptr );
}
}
diff --git a/libs/kasten/gui/shell/toolinlineviewwidget.h \
b/libs/kasten/gui/shell/toolinlineviewwidget.h index 9ef796c7..9acd54ab 100644
--- a/libs/kasten/gui/shell/toolinlineviewwidget.h
+++ b/libs/kasten/gui/shell/toolinlineviewwidget.h
@@ -41,7 +41,7 @@ class ToolInlineViewWidget : public QWidget
enum Area { TopArea, BottomArea };
public:
- explicit ToolInlineViewWidget( AbstractToolInlineView* view, QWidget* parent = 0 \
); + explicit ToolInlineViewWidget( AbstractToolInlineView* view, QWidget* parent \
= nullptr ); virtual ~ToolInlineViewWidget();
public:
diff --git a/libs/kasten/gui/shell/viewareabox.cpp \
b/libs/kasten/gui/shell/viewareabox.cpp index bf2b985b..005f8ecd 100644
--- a/libs/kasten/gui/shell/viewareabox.cpp
+++ b/libs/kasten/gui/shell/viewareabox.cpp
@@ -33,7 +33,7 @@ namespace Kasten
ViewAreaBox::ViewAreaBox( QWidget* centralWidget, QWidget* parent )
: QWidget( parent ),
mCentralWidget( centralWidget ),
- mBottomWidget( 0 )
+ mBottomWidget( nullptr )
{
setFocusProxy( mCentralWidget );
@@ -102,19 +102,19 @@ void ViewAreaBox::setBottomWidget( QWidget* bottomWidget )
else
setFocusProxy( mCentralWidget );
- mEscapeShortcut->setEnabled( (bottomWidget != 0) );
+ mEscapeShortcut->setEnabled( (bottomWidget != nullptr) );
}
void ViewAreaBox::onDone()
{
- setBottomWidget( 0 );
+ setBottomWidget( nullptr );
}
ViewAreaBox::~ViewAreaBox()
{
delete mBottomWidget;
if( mCentralWidget )
- mCentralWidget->setParent( 0 );
+ mCentralWidget->setParent( nullptr );
}
}
diff --git a/libs/kasten/gui/shell/viewareabox.h \
b/libs/kasten/gui/shell/viewareabox.h index a38011b6..9ee8e175 100644
--- a/libs/kasten/gui/shell/viewareabox.h
+++ b/libs/kasten/gui/shell/viewareabox.h
@@ -41,7 +41,7 @@ class ViewAreaBox : public QWidget
public:
/// does not take ownership of @p centralWidget, can be 0.
- explicit ViewAreaBox( QWidget* centralWidget, QWidget* parent = 0 );
+ explicit ViewAreaBox( QWidget* centralWidget, QWidget* parent = nullptr );
virtual ~ViewAreaBox();
public:
diff --git a/libs/kasten/gui/shell/viewbox.cpp b/libs/kasten/gui/shell/viewbox.cpp
index c8ae0840..f2d13c48 100644
--- a/libs/kasten/gui/shell/viewbox.cpp
+++ b/libs/kasten/gui/shell/viewbox.cpp
@@ -55,7 +55,7 @@ void ViewBox::add( ViewBox::Area area )
ViewBox::~ViewBox()
{
- mView->widget()->setParent( 0 );
+ mView->widget()->setParent( nullptr );
}
}
diff --git a/libs/kasten/gui/shell/viewbox.h b/libs/kasten/gui/shell/viewbox.h
index 0b8111d4..0c13d937 100644
--- a/libs/kasten/gui/shell/viewbox.h
+++ b/libs/kasten/gui/shell/viewbox.h
@@ -41,7 +41,7 @@ class ViewBox : public QWidget
enum Area { TopArea, BottomArea };
public:
- explicit ViewBox( AbstractView* view, QWidget* parent = 0 );
+ explicit ViewBox( AbstractView* view, QWidget* parent = nullptr );
virtual ~ViewBox();
public:
diff --git a/libs/kasten/gui/system/createdialog.h \
b/libs/kasten/gui/system/createdialog.h index b7d43a00..996ce44f 100644
--- a/libs/kasten/gui/system/createdialog.h
+++ b/libs/kasten/gui/system/createdialog.h
@@ -38,7 +38,7 @@ class CreateDialog : public QDialog
Q_OBJECT
public:
- explicit CreateDialog( AbstractModelDataGeneratorConfigEditor* configEditor, \
QWidget* parent = 0 ); + explicit CreateDialog( \
AbstractModelDataGeneratorConfigEditor* configEditor, QWidget* parent = nullptr );
virtual ~CreateDialog();
diff --git a/libs/kasten/gui/system/dialoghandler.h \
b/libs/kasten/gui/system/dialoghandler.h index 6bb6bc6c..19a12b29 100644
--- a/libs/kasten/gui/system/dialoghandler.h
+++ b/libs/kasten/gui/system/dialoghandler.h
@@ -39,7 +39,7 @@ class KASTENGUI_EXPORT DialogHandler : public \
AbstractOverwriteDialog, public AbstractSaveDiscardDialog
{
public:
- explicit DialogHandler( QWidget* widget = 0 );
+ explicit DialogHandler( QWidget* widget = nullptr );
virtual ~DialogHandler();
diff --git a/libs/kasten/gui/system/modelcodecviewmanager.cpp \
b/libs/kasten/gui/system/modelcodecviewmanager.cpp index f912d46f..5604d326 100644
--- a/libs/kasten/gui/system/modelcodecviewmanager.cpp
+++ b/libs/kasten/gui/system/modelcodecviewmanager.cpp
@@ -67,7 +67,7 @@ void ModelCodecViewManager::setGeneratorConfigEditorFactories( \
const QList<Abstr
AbstractModelStreamEncoderConfigEditor* ModelCodecViewManager::createConfigEditor( \
AbstractModelStreamEncoder* encoder ) const {
- AbstractModelStreamEncoderConfigEditor* result = 0;
+ AbstractModelStreamEncoderConfigEditor* result = nullptr;
foreach( const AbstractModelStreamEncoderConfigEditorFactory* factory, \
mEncoderFactoryList ) {
@@ -81,7 +81,7 @@ AbstractModelStreamEncoderConfigEditor* \
ModelCodecViewManager::createConfigEdito
AbstractModelExporterConfigEditor* ModelCodecViewManager::createConfigEditor( \
AbstractModelExporter* exporter ) const {
- AbstractModelExporterConfigEditor* result = 0;
+ AbstractModelExporterConfigEditor* result = nullptr;
foreach( const AbstractModelExporterConfigEditorFactory* factory, \
mExporterFactoryList ) {
@@ -95,7 +95,7 @@ AbstractModelExporterConfigEditor* \
ModelCodecViewManager::createConfigEditor( Ab
AbstractModelDataGeneratorConfigEditor* ModelCodecViewManager::createConfigEditor( \
AbstractModelDataGenerator* generator ) const {
- AbstractModelDataGeneratorConfigEditor* result = 0;
+ AbstractModelDataGeneratorConfigEditor* result = nullptr;
foreach( const AbstractModelDataGeneratorConfigEditorFactory* factory, \
mGeneratorFactoryList ) {
diff --git a/libs/kasten/gui/system/viewmanager.cpp \
b/libs/kasten/gui/system/viewmanager.cpp index cf125b17..e5e2dbcb 100644
--- a/libs/kasten/gui/system/viewmanager.cpp
+++ b/libs/kasten/gui/system/viewmanager.cpp
@@ -54,7 +54,7 @@ QList<AbstractView*> ViewManager::views() const
AbstractView* ViewManager::viewByWidget( QWidget* widget ) const
{
- AbstractView* result = 0;
+ AbstractView* result = nullptr;
QListIterator<AbstractView*> it( mViewList );
while( it.hasNext() )
diff --git a/libs/kasten/gui/view/abstractview.h \
b/libs/kasten/gui/view/abstractview.h index 5083b989..0cdfb75c 100644
--- a/libs/kasten/gui/view/abstractview.h
+++ b/libs/kasten/gui/view/abstractview.h
@@ -40,7 +40,7 @@ class KASTENGUI_EXPORT AbstractView : public AbstractModel
Q_OBJECT
public:
- explicit AbstractView( AbstractModel* baseModel = 0 );
+ explicit AbstractView( AbstractModel* baseModel = nullptr );
virtual ~AbstractView();
public: // API to be implemented
diff --git a/parts/kpart/part.cpp b/parts/kpart/part.cpp
index 5b46d11c..2c577a95 100644
--- a/parts/kpart/part.cpp
+++ b/parts/kpart/part.cpp
@@ -187,7 +187,7 @@ void OktetaPart::onDocumentLoaded( Kasten::AbstractDocument* \
document ) if( document )
{
foreach( Kasten::AbstractXmlGuiController* controller, mControllers )
- controller->setTargetModel( 0 );
+ controller->setTargetModel( nullptr );
delete mByteArrayView;
delete mDocument;
diff --git a/parts/kpart/tests/oktetaparttest.cpp \
b/parts/kpart/tests/oktetaparttest.cpp index 51232333..edccb60f 100644
--- a/parts/kpart/tests/oktetaparttest.cpp
+++ b/parts/kpart/tests/oktetaparttest.cpp
@@ -32,8 +32,8 @@
void OktetaPartTest::testPartReuseWithAnotherUrl()
{
KPluginFactory *factory = new OktetaPartFactory();
- KParts::ReadOnlyPart* part = factory->create<KParts::ReadOnlyPart>(0, 0);
- QVERIFY(part != 0);
+ KParts::ReadOnlyPart* part = factory->create<KParts::ReadOnlyPart>(nullptr, \
nullptr); + QVERIFY(part != nullptr);
const QUrl url1 = QUrl::fromLocalFile(QStringLiteral(TESTPATH1));
part->openUrl(url1);
diff --git a/program/mainwindow.cpp b/program/mainwindow.cpp
index 7b41e369..d2032d34 100644
--- a/program/mainwindow.cpp
+++ b/program/mainwindow.cpp
@@ -187,7 +187,7 @@ void OktetaMainWindow::setupControllers()
addXmlGuiController( new SwitchViewController(viewArea,this) );
addXmlGuiController( new ViewAreaSplitController(viewManager,viewArea,this) );
addXmlGuiController( new FullScreenController(this) );
- addXmlGuiController( new QuitController(0,this) );
+ addXmlGuiController( new QuitController(nullptr,this) );
addXmlGuiController( new ZoomController(this) );
addXmlGuiController( new SelectController(this) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic