From 45f10c874cfd9dd081b0b0d66f4caac6667b1a72 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:45:50 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- ark/ace.cpp | 4 +- ark/ar.cpp | 10 +- ark/arch.cpp | 28 ++-- ark/archiveformatdlg.cpp | 2 +- ark/archiveformatinfo.cpp | 2 +- ark/arj.cpp | 10 +- ark/ark_part.cpp | 28 ++-- ark/ark_part.h | 2 +- ark/arkfactory.cpp | 6 +- ark/arkfactory.h | 4 +- ark/arkutils.cpp | 4 +- ark/arkviewer.cpp | 6 +- ark/arkviewer.h | 2 +- ark/arkwidget.cpp | 46 +++---- ark/arkwidget.h | 2 +- ark/compressedfile.cpp | 10 +- ark/extractiondialog.cpp | 4 +- ark/extractiondialog.h | 2 +- ark/filelistview.cpp | 4 +- ark/filelistview.h | 2 +- ark/lha.cpp | 8 +- ark/main.cpp | 30 ++-- ark/mainwindow.cpp | 6 +- ark/mainwindow.h | 2 +- ark/rar.cpp | 10 +- ark/searchbar.cpp | 2 +- ark/searchbar.h | 2 +- ark/sevenzip.cpp | 10 +- ark/tar.cpp | 34 ++--- ark/tarlistingthread.cpp | 2 +- ark/zip.cpp | 10 +- ark/zoo.cpp | 8 +- charselectapplet/charselectapplet.cpp | 4 +- charselectapplet/charselectapplet.h | 6 +- kcalc/kcalc.cpp | 42 +++--- kcalc/kcalc.h | 2 +- kcalc/kcalc_button.h | 8 +- kcalc/kcalc_const_button.h | 4 +- kcalc/kcalc_const_menu.h | 2 +- kcalc/kcalc_core.cpp | 2 +- kcalc/kcalcdisplay.cpp | 6 +- kcalc/kcalcdisplay.h | 2 +- kcalc/knumber/knumber_priv.cpp | 2 +- kcharselect/main.cpp | 4 +- kdf/disklist.cpp | 12 +- kdf/disklist.h | 2 +- kdf/disks.h | 4 +- kdf/kcmdf.h | 2 +- kdf/kdf.cpp | 4 +- kdf/kdf.h | 2 +- kdf/kdfconfig.cpp | 6 +- kdf/kdfconfig.h | 2 +- kdf/kdfwidget.cpp | 34 ++--- kdf/kdfwidget.h | 4 +- kdf/kwikdisk.cpp | 16 +-- kdf/listview.cpp | 6 +- kdf/listview.h | 2 +- kdf/mntconfig.cpp | 22 +-- kdf/mntconfig.h | 2 +- kdf/optiondialog.h | 2 +- kedit/kedit.cpp | 26 ++-- kedit/kedit.h | 2 +- kedit/ktextfiledlg.h | 2 +- kfloppy/floppy.cpp | 4 +- kfloppy/floppy.h | 2 +- kfloppy/format.cpp | 36 ++--- kfloppy/format.h | 16 +-- kfloppy/main.cpp | 2 +- kgpg/detailedconsole.h | 4 +- kgpg/keygener.h | 2 +- kgpg/keyinfowidget.h | 2 +- kgpg/keyservers.cpp | 22 +-- kgpg/keyservers.h | 2 +- kgpg/kgpg.cpp | 68 ++++----- kgpg/kgpg.h | 4 +- kgpg/kgpgeditor.cpp | 8 +- kgpg/kgpgeditor.h | 2 +- kgpg/kgpginterface.cpp | 34 ++--- kgpg/kgpginterface.h | 2 +- kgpg/kgpglibrary.cpp | 12 +- kgpg/kgpglibrary.h | 2 +- kgpg/kgpgoptions.cpp | 4 +- kgpg/kgpgoptions.h | 2 +- kgpg/kgpgview.cpp | 14 +- kgpg/kgpgview.h | 4 +- kgpg/listkeys.cpp | 68 ++++----- kgpg/listkeys.h | 8 +- kgpg/main.cpp | 16 +-- kgpg/popuppublic.cpp | 2 +- kgpg/popuppublic.h | 2 +- khexedit/bitswapwidget.h | 4 +- khexedit/chartabledialog.cpp | 8 +- khexedit/chartabledialog.h | 2 +- khexedit/conversion.cpp | 6 +- khexedit/converterdialog.h | 4 +- khexedit/dialog.cpp | 142 +++++++++---------- khexedit/dialog.h | 14 +- khexedit/draglabel.cpp | 4 +- khexedit/exportdialog.cpp | 30 ++-- khexedit/exportdialog.h | 2 +- khexedit/fileinfodialog.cpp | 10 +- khexedit/fileinfodialog.h | 2 +- khexedit/hexbuffer.cpp | 84 ++++++------ khexedit/hexbuffer.h | 2 +- khexedit/hexdrag.cpp | 6 +- khexedit/hexdrag.h | 6 +- khexedit/hexeditorwidget.cpp | 152 ++++++++++----------- khexedit/hexeditorwidget.h | 2 +- khexedit/hexmanagerwidget.cpp | 18 +-- khexedit/hexmanagerwidget.h | 4 +- khexedit/hextoolwidget.h | 2 +- khexedit/hexvalidator.h | 2 +- khexedit/hexviewwidget.cpp | 46 +++---- khexedit/hexviewwidget.h | 4 +- khexedit/lib/codecs/kcharcodec.cpp | 8 +- khexedit/lib/codecs/ktextcharcodec.cpp | 8 +- khexedit/lib/kbigbuffer.cpp | 8 +- khexedit/lib/kbuffercolumn.cpp | 4 +- khexedit/lib/kbufferdrag.cpp | 6 +- khexedit/lib/kbufferdrag.h | 2 +- khexedit/lib/kbufferranges.cpp | 4 +- khexedit/lib/kbytesedit.cpp | 8 +- khexedit/lib/kbytesedit.h | 6 +- khexedit/lib/kcolumnsview.cpp | 2 +- khexedit/lib/kcolumnsview.h | 2 +- khexedit/lib/kdatabuffer.cpp | 2 +- khexedit/lib/khexedit.cpp | 28 ++-- khexedit/lib/khexedit.h | 4 +- khexedit/lib/kplainbuffer.cpp | 4 +- khexedit/lib/kvaluecolumn.cpp | 2 +- khexedit/lib/kwrappingrobuffer.cpp | 2 +- khexedit/listview.h | 2 +- khexedit/main.cpp | 12 +- khexedit/optiondialog.cpp | 2 +- khexedit/optiondialog.h | 4 +- khexedit/parts/kpart/khepart.cpp | 2 +- khexedit/parts/kpart/khepartfactory.cpp | 8 +- khexedit/printdialogpage.cpp | 24 ++-- khexedit/printdialogpage.h | 2 +- khexedit/progress.h | 8 +- khexedit/searchbar.h | 2 +- khexedit/statusbarprogress.cpp | 6 +- khexedit/statusbarprogress.h | 6 +- khexedit/stringdialog.cpp | 4 +- khexedit/stringdialog.h | 2 +- khexedit/toplevel.cpp | 24 ++-- kjots/KJotsMain.cpp | 34 ++--- kjots/KJotsMain.h | 2 +- kjots/kjotsbookmarks.h | 2 +- kjots/kjotsedit.cpp | 2 +- kjots/kjotsedit.h | 2 +- kjots/kjotsentry.cpp | 22 +-- kjots/kjotsentry.h | 6 +- kjots/main.cpp | 6 +- klaptopdaemon/acpi.cpp | 8 +- klaptopdaemon/acpi.h | 2 +- klaptopdaemon/apm.cpp | 12 +- klaptopdaemon/apm.h | 2 +- klaptopdaemon/battery.cpp | 12 +- klaptopdaemon/battery.h | 2 +- klaptopdaemon/buttons.cpp | 54 ++++---- klaptopdaemon/buttons.h | 2 +- klaptopdaemon/daemon_state.cpp | 2 +- klaptopdaemon/daemondock.cpp | 26 ++-- klaptopdaemon/kpcmciainfo.h | 4 +- klaptopdaemon/krichtextlabel.h | 4 +- klaptopdaemon/laptop_check.cpp | 2 +- klaptopdaemon/laptop_daemon.cpp | 46 +++---- klaptopdaemon/main.cpp | 14 +- klaptopdaemon/pcmcia.cpp | 4 +- klaptopdaemon/pcmcia.h | 2 +- klaptopdaemon/portable.cpp | 24 ++-- klaptopdaemon/power.cpp | 64 ++++----- klaptopdaemon/power.h | 2 +- klaptopdaemon/profile.cpp | 24 ++-- klaptopdaemon/profile.h | 2 +- klaptopdaemon/sony.cpp | 4 +- klaptopdaemon/sony.h | 2 +- klaptopdaemon/warning.cpp | 18 +-- klaptopdaemon/warning.h | 2 +- klaptopdaemon/xautolock.cpp | 8 +- kmilo/kmilo_kvaio/kvaio.cpp | 2 +- kmilo/kmilo_kvaio/kvaio.h | 2 +- kmilo/kmilo_kvaio/kvaiodriverinterface.cpp | 2 +- kmilo/kmilo_kvaio/kvaiodriverinterface.h | 2 +- kmilo/kmilod/defaultskin.cpp | 4 +- kmilo/kmilod/kmilod.cpp | 6 +- kregexpeditor/KMultiFormListBox/indexWindow.cpp | 2 +- .../tdemultiformlistbox-multivisible.cpp | 6 +- .../tdemultiformlistbox-multivisible.h | 2 +- .../tdemultiformlistbox-windowed.cpp | 8 +- .../KMultiFormListBox/tdemultiformlistbox.h | 4 +- .../KMultiFormListBox/tdemultiformlistboxentry.h | 4 +- kregexpeditor/KMultiFormListBox/widgetwindow.cpp | 8 +- kregexpeditor/KMultiFormListBox/widgetwindow.h | 2 +- kregexpeditor/altnregexp.cpp | 2 +- kregexpeditor/altnwidget.cpp | 4 +- kregexpeditor/altnwidget.h | 4 +- kregexpeditor/auxbuttons.cpp | 2 +- kregexpeditor/characterswidget.cpp | 14 +- kregexpeditor/characterswidget.h | 14 +- kregexpeditor/charselector.cpp | 2 +- kregexpeditor/charselector.h | 2 +- kregexpeditor/compoundregexp.h | 2 +- kregexpeditor/compoundwidget.cpp | 8 +- kregexpeditor/compoundwidget.h | 6 +- kregexpeditor/concregexp.cpp | 4 +- kregexpeditor/concwidget.cpp | 10 +- kregexpeditor/concwidget.h | 6 +- kregexpeditor/dcbutton.h | 2 +- kregexpeditor/drag.cpp | 2 +- kregexpeditor/dragaccepter.cpp | 12 +- kregexpeditor/dragaccepter.h | 2 +- kregexpeditor/editorwindow.cpp | 10 +- kregexpeditor/editorwindow.h | 2 +- kregexpeditor/emacsregexpconverter.cpp | 4 +- kregexpeditor/errormap.cpp | 6 +- kregexpeditor/gen_qregexplexer.cpp | 10 +- kregexpeditor/gen_qregexpparser.cpp | 4 +- kregexpeditor/kregexpeditorgui.h | 2 +- kregexpeditor/kregexpeditorprivate.cpp | 2 +- kregexpeditor/kregexpeditorprivate.h | 2 +- kregexpeditor/limitedcharlineedit.h | 2 +- kregexpeditor/lookaheadregexp.h | 2 +- kregexpeditor/lookaheadwidget.h | 4 +- kregexpeditor/main.cpp | 2 +- kregexpeditor/multicontainerwidget.cpp | 4 +- kregexpeditor/multicontainerwidget.h | 4 +- kregexpeditor/qt-only/compat.h | 2 +- kregexpeditor/regexp.cpp | 6 +- kregexpeditor/regexpbuttons.h | 2 +- kregexpeditor/regexpconverter.cpp | 4 +- kregexpeditor/regexpwidget.cpp | 4 +- kregexpeditor/regexpwidget.h | 4 +- kregexpeditor/repeatregexp.cpp | 4 +- kregexpeditor/repeatregexp.h | 2 +- kregexpeditor/repeatwidget.cpp | 2 +- kregexpeditor/repeatwidget.h | 6 +- kregexpeditor/scrollededitorwindow.h | 2 +- kregexpeditor/selectablelineedit.h | 2 +- kregexpeditor/singlecontainerwidget.cpp | 2 +- kregexpeditor/singlecontainerwidget.h | 2 +- kregexpeditor/textrangeregexp.cpp | 2 +- kregexpeditor/textregexp.cpp | 2 +- kregexpeditor/textwidget.h | 4 +- kregexpeditor/userdefinedregexps.h | 2 +- kregexpeditor/verifier.cpp | 4 +- kregexpeditor/verifier.h | 2 +- kregexpeditor/verifybuttons.cpp | 4 +- kregexpeditor/widgetfactory.cpp | 24 ++-- kregexpeditor/zerowidgets.h | 12 +- ksim/baselist.h | 4 +- ksim/generalprefs.h | 10 +- ksim/ksimframe.h | 2 +- ksim/ksimpref.cpp | 6 +- ksim/ksimpref.h | 4 +- ksim/ksimsysinfo.cpp | 20 +-- ksim/ksimsysinfo.h | 4 +- ksim/ksimview.cpp | 12 +- ksim/library/chart.cpp | 8 +- ksim/library/chart.h | 4 +- ksim/library/ksimconfig.cpp | 2 +- ksim/library/label.cpp | 4 +- ksim/library/label.h | 6 +- ksim/library/led.h | 6 +- ksim/library/pluginglobal.cpp | 26 ++-- ksim/library/pluginloader.cpp | 12 +- ksim/library/pluginmodule.cpp | 12 +- ksim/library/progress.h | 10 +- ksim/library/themeloader.cpp | 10 +- ksim/library/themetypes.h | 2 +- ksim/monitorprefs.h | 2 +- ksim/monitors/cpu/ksimcpu.cpp | 2 +- ksim/monitors/cpu/ksimcpu.h | 8 +- ksim/monitors/disk/ksimdisk.cpp | 6 +- ksim/monitors/filesystem/filesystemstats.cpp | 2 +- ksim/monitors/filesystem/filesystemwidget.cpp | 12 +- ksim/monitors/lm_sensors/sensorbase.cpp | 6 +- ksim/monitors/net/ksimnet.cpp | 12 +- ksim/monitors/net/netconfig.cpp | 4 +- ksim/monitors/net/netdevices.h | 24 ++-- ksim/monitors/net/netdialog.cpp | 2 +- ksim/monitors/net/netdialog.h | 2 +- ksim/monitors/snmp/monitor.h | 4 +- ksim/monitors/snmp/monitorconfig.h | 2 +- ksim/monitors/snmp/pdu.cpp | 2 +- ksim/monitors/snmp/session.cpp | 4 +- ksim/monitors/snmp/session.h | 10 +- ksim/monitors/snmp/snmp.h | 8 +- ksim/monitors/snmp/walker.cpp | 2 +- ksim/systeminfo.cpp | 4 +- ksim/themeprefs.h | 4 +- ktimer/ktimer.cpp | 2 +- ktimer/ktimer.h | 4 +- ktimer/main.cpp | 2 +- superkaramba/src/cpusensor.cpp | 4 +- superkaramba/src/datesensor.cpp | 10 +- superkaramba/src/disksensor.cpp | 2 +- superkaramba/src/gpusensor.cpp | 2 +- superkaramba/src/imagelabel.cpp | 28 ++-- superkaramba/src/imagelabel_python.cpp | 8 +- superkaramba/src/karamba.cpp | 92 ++++++------- superkaramba/src/karamba_python.cpp | 4 +- superkaramba/src/karambaapp.cpp | 12 +- superkaramba/src/karambainterface.cpp | 8 +- superkaramba/src/karambasessionmanaged.cpp | 2 +- superkaramba/src/kwidgetlistbox.cpp | 2 +- superkaramba/src/kwidgetlistbox.h | 4 +- superkaramba/src/main.cpp | 16 +-- superkaramba/src/memsensor.cpp | 2 +- superkaramba/src/menu_python.cpp | 2 +- superkaramba/src/meter_python.cpp | 2 +- superkaramba/src/misc_python.cpp | 8 +- superkaramba/src/networksensor.cpp | 4 +- superkaramba/src/noatunsensor.cpp | 2 +- superkaramba/src/programsensor.cpp | 6 +- superkaramba/src/richtextlabel.cpp | 26 ++-- superkaramba/src/rsssensor.cpp | 4 +- superkaramba/src/sensor.cpp | 2 +- superkaramba/src/sensorsensor.cpp | 2 +- superkaramba/src/showdesktop.cpp | 2 +- superkaramba/src/systemtray.cpp | 8 +- superkaramba/src/systray_python.cpp | 14 +- superkaramba/src/task_python.cpp | 12 +- superkaramba/src/taskmanager.cpp | 32 ++--- superkaramba/src/taskmanager.h | 6 +- superkaramba/src/textfilesensor.cpp | 6 +- superkaramba/src/themefile.cpp | 14 +- superkaramba/src/themelocale.cpp | 4 +- superkaramba/src/themelocale.h | 2 +- superkaramba/src/themesdlg.cpp | 2 +- superkaramba/src/themesdlg.h | 2 +- superkaramba/src/themewidget.cpp | 2 +- superkaramba/src/themewidget.h | 2 +- superkaramba/src/uptimesensor.cpp | 2 +- superkaramba/src/widget_python.cpp | 4 +- superkaramba/src/xmmssensor.cpp | 12 +- tdefilereplace/kaddstringdlg.cpp | 8 +- tdefilereplace/kaddstringdlg.h | 2 +- tdefilereplace/knewprojectdlg.cpp | 2 +- tdefilereplace/knewprojectdlg.h | 2 +- tdefilereplace/main.cpp | 2 +- tdefilereplace/report.cpp | 8 +- tdefilereplace/report.h | 2 +- tdefilereplace/tdefilereplace.cpp | 2 +- tdefilereplace/tdefilereplacepart.cpp | 32 ++--- tdefilereplace/tdefilereplaceview.cpp | 16 +-- tdelirc/irkick/irkick.cpp | 6 +- tdelirc/irkick/irkick.h | 2 +- tdelirc/irkick/main.cpp | 2 +- tdelirc/irkick/tdelircclient.cpp | 4 +- tdelirc/irkick/tdelircclient.h | 2 +- tdelirc/kcmlirc/addaction.cpp | 8 +- tdelirc/kcmlirc/editaction.h | 2 +- tdelirc/kcmlirc/editmode.h | 2 +- tdelirc/kcmlirc/kcmlirc.cpp | 10 +- tdelirc/kcmlirc/kcmlirc.h | 2 +- tdelirc/kcmlirc/modeslist.h | 2 +- tdelirc/tdelirc/profileserver.cpp | 14 +- tdelirc/tdelirc/remoteserver.cpp | 6 +- tdessh/tdessh.cpp | 16 +-- tdewallet/allyourbase.cpp | 48 +++---- tdewallet/allyourbase.h | 4 +- tdewallet/konfigurator/konfigurator.cpp | 6 +- tdewallet/konfigurator/konfigurator.h | 2 +- tdewallet/kwmapeditor.h | 2 +- tdewallet/main.cpp | 8 +- tdewallet/tdewalleteditor.cpp | 32 ++--- tdewallet/tdewalleteditor.h | 4 +- tdewallet/tdewalletmanager.cpp | 12 +- tdewallet/tdewalletmanager.h | 2 +- tdewallet/tdewalletpopup.cpp | 8 +- tdewallet/tdewalletpopup.h | 2 +- 373 files changed, 1670 insertions(+), 1670 deletions(-) diff --git a/ark/ace.cpp b/ark/ace.cpp index 51a28261..c551c99c 100644 --- a/ark/ace.cpp +++ b/ark/ace.cpp @@ -101,7 +101,7 @@ void AceArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); } } @@ -167,7 +167,7 @@ void AceArch::unarchFileInternal( ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } diff --git a/ark/ar.cpp b/ark/ar.cpp index 433f8e1e..bbed790f 100644 --- a/ark/ar.cpp +++ b/ark/ar.cpp @@ -99,7 +99,7 @@ void ArArch::open() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigOpen(this, false, TQString(), 0 ); } kdDebug(1601) << "-ArArch::open" << endl; @@ -118,7 +118,7 @@ void ArArch::create() if (kp->start(TDEProcess::Block) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigCreate(this, false, m_filename, Arch::Extract | Arch::Delete | Arch::Add | Arch::View); @@ -162,7 +162,7 @@ void ArArch::addFile( const TQStringList &urls ) if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigAdd(false); } @@ -219,7 +219,7 @@ void ArArch::unarchFileInternal() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigExtract(false); } } @@ -252,7 +252,7 @@ void ArArch::remove(TQStringList *list) if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigDelete(false); } diff --git a/ark/arch.cpp b/ark/arch.cpp index 6c0b1962..68e579aa 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -73,7 +73,7 @@ Arch::Arch( ArkWidget *gui, const TQString &filename ) m_header_removed( false ), m_finished( false ), m_numCols( 0 ), m_dateCol( -1 ), m_fixYear( -1 ), m_fixMonth( -1 ), m_fixDay( -1 ), m_fixTime( -1 ), m_repairYear( -1 ), m_repairMonth( -1 ), - m_repairTime( -1 ), m_currentProcess( 0 ) + m_repairTime( -1 ), m_currentProcess( nullptr ) { m_archCols.setAutoDelete( true ); // To check: it still leaky here??? } @@ -114,7 +114,7 @@ void Arch::slotOpenExited( TDEProcess* _kp ) if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to open the file:") ) == KPasswordDialog::Accepted ) { delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; clearShellOutput(); open(); // try to open the file again with a password return; @@ -122,7 +122,7 @@ void Arch::slotOpenExited( TDEProcess* _kp ) m_password = ""; emit sigOpen( this, false, TQString(), 0 ); delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; return; } } @@ -145,7 +145,7 @@ void Arch::slotOpenExited( TDEProcess* _kp ) emit sigOpen( this, false, TQString(), 0 ); delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; } void Arch::slotDeleteExited( TDEProcess *_kp ) @@ -172,7 +172,7 @@ void Arch::slotDeleteExited( TDEProcess *_kp ) emit sigDelete( success ); delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; } void Arch::slotExtractExited( TDEProcess *_kp ) @@ -189,7 +189,7 @@ void Arch::slotExtractExited( TDEProcess *_kp ) if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to extract the file:") ) == KPasswordDialog::Accepted ) { delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; clearShellOutput(); unarchFileInternal(); // try to extract the file again with a password return; @@ -197,7 +197,7 @@ void Arch::slotExtractExited( TDEProcess *_kp ) m_password = ""; emit sigExtract( false ); delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; return; } else if ( m_password.isEmpty() || _kp->exitStatus() > 1 ) @@ -221,7 +221,7 @@ void Arch::slotExtractExited( TDEProcess *_kp ) } m_password = ""; delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; emit sigExtract( success ); } @@ -258,7 +258,7 @@ void Arch::slotAddExited( TDEProcess *_kp ) emit sigAdd( success ); delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; } void Arch::slotReceivedOutput( TDEProcess*, char* data, int length ) @@ -397,7 +397,7 @@ bool Arch::processLine( const TQCString &line ) void Arch::test() { emit sigTest(false); - KMessageBox::information(0, i18n("Not implemented.")); + KMessageBox::information(nullptr, i18n("Not implemented.")); } void Arch::slotTestExited( TDEProcess *_kp ) @@ -414,7 +414,7 @@ void Arch::slotTestExited( TDEProcess *_kp ) if (KPasswordDialog::getPassword( m_password, msg+i18n("You must enter a password to extract the file:") ) == KPasswordDialog::Accepted ) { delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; clearShellOutput(); test(); // try to test the archive again with a password return; @@ -422,7 +422,7 @@ void Arch::slotTestExited( TDEProcess *_kp ) m_password = ""; emit sigTest( false ); delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; return; } else if ( m_password.isEmpty() || _kp->exitStatus() > 1 ) @@ -445,7 +445,7 @@ void Arch::slotTestExited( TDEProcess *_kp ) } } delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; emit sigTest( success ); } @@ -504,7 +504,7 @@ Arch *Arch::archFactory( ArchType aType, case UNKNOWN_FORMAT: default: - return 0; + return nullptr; } } #include "arch.moc" diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp index f64bd459..ef15ccd7 100644 --- a/ark/archiveformatdlg.cpp +++ b/ark/archiveformatdlg.cpp @@ -32,7 +32,7 @@ ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultT :KDialogBase( parent, "archiveformatdialog", true, i18n( "Choose Archive Format" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok), - m_combo( 0 ) + m_combo( nullptr ) { TQString defaultDescription = ArchiveFormatInfo::self()->descriptionForMimeType( defaultType ); TQString text; diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index 6ef5b7cb..73f2c931 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -31,7 +31,7 @@ #include -ArchiveFormatInfo * ArchiveFormatInfo::m_pSelf = 0; +ArchiveFormatInfo * ArchiveFormatInfo::m_pSelf = nullptr; ArchiveFormatInfo::ArchiveFormatInfo() :m_lastExtensionUnknown( false ) diff --git a/ark/arj.cpp b/ark/arj.cpp index 3677b526..5dadd652 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -131,7 +131,7 @@ void ArjArch::addFile( const TQStringList & urls ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); } } @@ -199,7 +199,7 @@ void ArjArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString::null, 0 ); } } @@ -255,7 +255,7 @@ void ArjArch::unarchFileInternal() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } @@ -291,7 +291,7 @@ void ArjArch::remove( TQStringList *list ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); } } @@ -319,7 +319,7 @@ void ArjArch::test() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); } } diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index e1b1bc7a..9c4ba95f 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -49,14 +49,14 @@ TDEAboutData *ArkPart::createAboutData() I18N_NOOP("Ark KParts Component"), TDEAboutData::License_GPL, I18N_NOOP( "(c) 1997-2003, The Various Ark Developers" )); - about->addAuthor("Robert Palmbos",0, "palm9744@kettering.edu"); - about->addAuthor("Francois-Xavier Duranceau",0, "duranceau@kde.org"); - about->addAuthor("Corel Corporation (author: Emily Ezust)",0, + about->addAuthor("Robert Palmbos",nullptr, "palm9744@kettering.edu"); + about->addAuthor("Francois-Xavier Duranceau",nullptr, "duranceau@kde.org"); + about->addAuthor("Corel Corporation (author: Emily Ezust)",nullptr, "emilye@corel.com"); - about->addAuthor("Corel Corporation (author: Michael Jarrett)", 0, + about->addAuthor("Corel Corporation (author: Michael Jarrett)", nullptr, "michaelj@corel.com"); about->addAuthor("Jian Huang"); - about->addAuthor( "Roberto Teixeira", 0, "maragato@kde.org" ); + about->addAuthor( "Roberto Teixeira", nullptr, "maragato@kde.org" ); return about; } @@ -327,7 +327,7 @@ void ArkPart::transferStarted( TDEIO::Job *job ) m_job = job; m_bar->slotSetBusy( i18n( "Downloading %1..." ).arg( m_url.prettyURL() ), - (job != 0), (job != 0) ); + (job != nullptr), (job != nullptr) ); if ( job ) { @@ -345,7 +345,7 @@ void ArkPart::transferCompleted() { disconnect( m_job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), this, TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); - m_job = 0; + m_job = nullptr; } m_bar->slotSetReady(); @@ -353,7 +353,7 @@ void ArkPart::transferCompleted() void ArkPart::transferCanceled( const TQString& errMsg ) { - m_job = 0; + m_job = nullptr; if ( !errMsg.isEmpty() ) { KMessageBox::error( awidget, errMsg ); @@ -391,12 +391,12 @@ void ArkBrowserExtension::slotOpenURLRequested( const KURL & url ) ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * parent ) : KParts::StatusBarExtension( parent ), m_bBusy( false ), - m_pStatusLabelSelect( 0 ), - m_pStatusLabelTotal( 0 ), - m_pBusyText( 0 ), - m_cancelButton( 0 ), - m_pProgressBar( 0 ), - m_pTimer( 0 ) + m_pStatusLabelSelect( nullptr ), + m_pStatusLabelTotal( nullptr ), + m_pBusyText( nullptr ), + m_cancelButton( nullptr ), + m_pProgressBar( nullptr ), + m_pTimer( nullptr ) { } diff --git a/ark/ark_part.h b/ark/ark_part.h index 78ca5a42..2adef7a2 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -48,7 +48,7 @@ class ArkBrowserExtension: public KParts::BrowserExtension TQ_OBJECT public: - ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L ); + ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = nullptr ); public slots: void slotOpenURLRequested( const KURL & url ); }; diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp index a865374f..b6e06333 100644 --- a/ark/arkfactory.cpp +++ b/ark/arkfactory.cpp @@ -25,8 +25,8 @@ #include "ark_part.h" #include "arkfactory.h" -TDEInstance* ArkFactory::s_instance = 0L; -TDEAboutData* ArkFactory::s_about = 0L; +TDEInstance* ArkFactory::s_instance = nullptr; +TDEAboutData* ArkFactory::s_about = nullptr; int ArkFactory::instanceNumber = 0; K_EXPORT_COMPONENT_FACTORY( libarkpart, ArkFactory ) @@ -35,7 +35,7 @@ ArkFactory::~ArkFactory() { delete s_instance; delete s_about; - s_instance = 0L; + s_instance = nullptr; } KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget, diff --git a/ark/arkfactory.h b/ark/arkfactory.h index 5207ac42..70c5fa46 100644 --- a/ark/arkfactory.h +++ b/ark/arkfactory.h @@ -29,8 +29,8 @@ public: ArkFactory() : KParts::Factory() {} virtual ~ArkFactory(); virtual KParts::Part *createPartObject( - TQWidget *parentWidget = 0,const char *widgetName = 0, - TQObject *parent = 0, const char *name = 0, + TQWidget *parentWidget = nullptr,const char *widgetName = nullptr, + TQObject *parent = nullptr, const char *name = nullptr, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); static TDEInstance* instance(); diff --git a/ark/arkutils.cpp b/ark/arkutils.cpp index 4fd64aab..eb2cce20 100644 --- a/ark/arkutils.cpp +++ b/ark/arkutils.cpp @@ -88,7 +88,7 @@ TQString ArkUtils::getTimeStamp(const TQString &_month, kdDebug(1601) << "Month is " << nMonth << ", Day is " << nDay << endl; - time_t t = time(0); + time_t t = time(nullptr); if (t == -1) exit(1); struct tm *now = localtime(&t); @@ -194,7 +194,7 @@ ArkUtils::diskHasSpace(const TQString &dir, TDEIO::filesize_t size) double nAvailable = (double)buf.f_bavail * buf.f_bsize; if ( nAvailable < (double)size ) { - KMessageBox::error(0, i18n("You have run out of disk space.")); + KMessageBox::error(nullptr, i18n("You have run out of disk space.")); return false; } } diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 1c126301..18040b86 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -37,7 +37,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 ) + : KDialogBase( parent, name, false, TQString(), Close ), m_part( nullptr ) { m_widget = new TQVBox( this ); m_widget->layout()->setSpacing( 10 ); @@ -55,7 +55,7 @@ ArkViewer::~ArkViewer() void ArkViewer::slotFinished() { delete m_part; - m_part = 0; + m_part = nullptr; delayedDestruct(); } @@ -86,7 +86,7 @@ bool ArkViewer::view( const KURL& filename ) header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); - m_part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype->name(), TQString(), m_widget, 0, this ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype->name(), TQString(), m_widget, nullptr, this ); if ( m_part ) { diff --git a/ark/arkviewer.h b/ark/arkviewer.h index 88cdbf1a..a7450147 100644 --- a/ark/arkviewer.h +++ b/ark/arkviewer.h @@ -31,7 +31,7 @@ class ArkViewer : public KDialogBase public: - ArkViewer( TQWidget* parent = 0, const char * name = 0 ); + ArkViewer( TQWidget* parent = nullptr, const char * name = nullptr ); ~ArkViewer(); bool view( const KURL& filename ); diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index d9f198ea..f5b7d2ed 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -110,12 +110,12 @@ ArkWidget::ArkWidget( TQWidget *parent, const char *name ) m_bArchivePopupEnabled( false ), m_convert_tmpDir( nullptr ), m_convertSuccess( false ), m_createRealArchTmpDir( nullptr ), m_extractRemoteTmpDir( nullptr ), - m_modified( false ), m_searchToolBar( 0 ), m_searchBar( 0 ), - arch( 0 ), m_archType( UNKNOWN_FORMAT ), m_fileListView( 0 ), + m_modified( false ), m_searchToolBar( nullptr ), m_searchBar( nullptr ), + arch( nullptr ), m_archType( UNKNOWN_FORMAT ), m_fileListView( nullptr ), m_nSizeOfFiles( 0 ), m_nSizeOfSelectedFiles( 0 ), m_nNumFiles( 0 ), m_nNumSelectedFiles( 0 ), m_bIsArchiveOpen( false ), m_bIsSimpleCompressedFile( false ), - m_bDropSourceIsSelf( false ), m_extractList( 0 ) + m_bDropSourceIsSelf( false ), m_extractList( nullptr ) { m_settingsAltered = false; m_tmpDir = new KTempDir( locateLocal( "tmp", "ark" ) ); @@ -131,7 +131,7 @@ ArkWidget::ArkWidget( TQWidget *parent, const char *name ) m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() ); TQLabel * l1 = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "tde toolbar widget" ); - m_searchBar = new SearchBar( m_searchToolBar, 0 ); + m_searchBar = new SearchBar( m_searchToolBar, nullptr ); l1->setBuddy( m_searchBar ); m_searchToolBar->setStretchableWidget( m_searchBar ); @@ -154,7 +154,7 @@ ArkWidget::~ArkWidget() ready(); delete m_pTempAddList; delete m_fileListView; - m_fileListView = 0; + m_fileListView = nullptr; delete arch; if (m_settingsAltered) { ArkSettings::writeConfig(); @@ -177,7 +177,7 @@ void ArkWidget::closeArch() if ( isArchiveOpen() ) { delete arch; - arch = 0; + arch = nullptr; m_bIsArchiveOpen = false; } @@ -301,7 +301,7 @@ ArkWidget::convertTo( const KURL & u ) m_convert_tmpDir->setAutoDelete( true ); connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); m_convert_saveAsURL = u; - arch->unarchFile( 0, m_convert_tmpDir->name() ); + arch->unarchFile( nullptr, m_convert_tmpDir->name() ); } void @@ -431,7 +431,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b { if ( !TDEIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) ) { - KMessageBox::error( 0, i18n( "Could not create the folder %1" ).arg( + KMessageBox::error( nullptr, i18n( "Could not create the folder %1" ).arg( targetDirectory.prettyURL() ) ); emit request_file_quit(); return; @@ -509,7 +509,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) { disableAll(); connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); - arch->unarchFile( 0, extractDir ); + arch->unarchFile( nullptr, extractDir ); } else { @@ -801,7 +801,7 @@ ArkWidget::getCreateFilename(const TQString & _caption, fileExists = TQFile::exists( strFile ); if( fileExists ) { - choice = KMessageBox::warningYesNoCancel(0, + choice = KMessageBox::warningYesNoCancel(nullptr, i18n("Archive already exists. Do you wish to overwrite it?"), i18n("Archive Already Exists"), i18n("Overwrite"), i18n("Do Not Overwrite")); @@ -865,9 +865,9 @@ ArkWidget::slotExtractDone(bool success) this, TQ_SLOT( slotExtractDone(bool) ) ); ready(); - if(m_extractList != 0) + if(m_extractList) delete m_extractList; - m_extractList = 0; + m_extractList = nullptr; if( m_fileListView ) // avoid race condition, don't do updates if application is exiting { @@ -983,7 +983,7 @@ ArkWidget::askToCreateRealArchive() // returns filename if so KURL url; int choice = - KMessageBox::warningYesNo(0, i18n("You are currently working with a simple compressed file.\nWould you like to make it into an archive so that it can contain multiple files?\nIf so, you must choose a name for your new archive."), i18n("Warning"),i18n("Make Into Archive"),i18n("Do Not Make")); + KMessageBox::warningYesNo(nullptr, i18n("You are currently working with a simple compressed file.\nWould you like to make it into an archive so that it can contain multiple files?\nIf so, you must choose a name for your new archive."), i18n("Warning"),i18n("Make Into Archive"),i18n("Do Not Make")); if (choice == KMessageBox::Yes) { url = getCreateFilename( i18n("Create New Archive"), @@ -1441,7 +1441,7 @@ ArkWidget::action_extract() //before we start, make sure the archive is still there if (!TDEIO::NetAccess::exists( fileToExtract.prettyURL(), true, this ) ) { - KMessageBox::error(0, i18n("The archive to extract from no longer exists.")); + KMessageBox::error(nullptr, i18n("The archive to extract from no longer exists.")); return false; } @@ -1470,7 +1470,7 @@ ArkWidget::action_extract() defaultDir = KURL::fromPathOrURL( TQDir::currentDirPath() ); } - ExtractionDialog *dlg = new ExtractionDialog( this, 0, enableSelected, defaultDir, prefix, m_url.fileName() ); + ExtractionDialog *dlg = new ExtractionDialog( this, nullptr, enableSelected, defaultDir, prefix, m_url.fileName() ); bool bRedoExtract = false; @@ -1525,7 +1525,7 @@ ArkWidget::action_extract() disableAll(); busy( i18n( "Extracting..." ) ); connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( slotExtractDone(bool) ) ); - arch->unarchFile(0, extractDir); + arch->unarchFile(nullptr, extractDir); } } } @@ -1623,7 +1623,7 @@ ArkWidget::editStart() this, TQ_SLOT(slotEditFinished(TDEProcess *)) ); if ( kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false ) { - KMessageBox::error(0, i18n("Trouble editing the file...")); + KMessageBox::error(nullptr, i18n("Trouble editing the file...")); } } } @@ -1702,7 +1702,7 @@ ArkWidget::slotTestDone(bool ok) TQ_SLOT( slotTestDone( bool ) ) ); ready(); if( ok ) - KMessageBox::information(0, i18n("Test successful.")); + KMessageBox::information(nullptr, i18n("Test successful.")); } void @@ -2053,7 +2053,7 @@ ArkWidget::createFileListView() Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mimetype ) { - Arch * newArch = 0; + Arch * newArch = nullptr; TQString type = _mimetype.isNull()? KMimeType::findByURL( KURL::fromPathOrURL(_fileName) )->name() : _mimetype; ArchType archtype = ArchiveFormatInfo::self()->archTypeForMimeType(type); @@ -2142,7 +2142,7 @@ ArkWidget::slotCreate(Arch * _newarch, bool _success, const TQString & _filename void ArkWidget::openArchive( const TQString & _filename, const TQString & _password ) { - Arch *newArch = 0; + Arch *newArch = nullptr; ArchType archtype; ArchiveFormatInfo * info = ArchiveFormatInfo::self(); if ( m_openAsMimeType.isNull() ) @@ -2271,10 +2271,10 @@ void ArkWidget::showSettings(){ TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", ArkSettings::self()); - General* genPage = new General(0, "General"); + General* genPage = new General(nullptr, "General"); dialog->addPage(genPage, i18n("General"), "ark", i18n("General Settings")); - dialog->addPage(new Addition(0, "Addition"), i18n("Addition"), "ark_addfile", i18n("File Addition Settings")); - dialog->addPage(new Extraction(0, "Extraction"), i18n("Extraction"), "ark_extract", i18n("Extraction Settings")); + dialog->addPage(new Addition(nullptr, "Addition"), i18n("Addition"), "ark_addfile", i18n("File Addition Settings")); + dialog->addPage(new Extraction(nullptr, "Extraction"), i18n("Extraction"), "ark_extract", i18n("Extraction Settings")); TDETrader::OfferList offers; diff --git a/ark/arkwidget.h b/ark/arkwidget.h index 4767ba88..57369406 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -61,7 +61,7 @@ class ArkWidget : public TQVBox TQ_OBJECT public: - ArkWidget( TQWidget *parent=0, const char *name=0 ); + ArkWidget( TQWidget *parent=nullptr, const char *name=nullptr ); virtual ~ArkWidget(); bool isArchiveOpen() const { return m_bIsArchiveOpen; } diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 466af0af..e565b089 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -69,7 +69,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con if (!TQFile::exists(_fileName)) { - KMessageBox::information(0, + KMessageBox::information(nullptr, i18n("You are creating a simple compressed archive which contains only one input file.\n" "When uncompressed, the file name will be based on the name of the archive file.\n" "If you add more files you will be prompted to convert it to a real archive."), @@ -218,7 +218,7 @@ void CompressedFile::open() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigOpen(this, false, TQString(), 0 ); } @@ -238,7 +238,7 @@ void CompressedFile::slotUncompressDone(TDEProcess *_kp) } delete _kp; - _kp = m_currentProcess = 0; + _kp = m_currentProcess = nullptr; if ( !bSuccess ) { @@ -329,7 +329,7 @@ void CompressedFile::addFile( const TQStringList &urls ) if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); } kdDebug(1601) << "-CompressedFile::addFile" << endl; @@ -344,7 +344,7 @@ void CompressedFile::slotAddInProgress(TDEProcess*, char* _buffer, int _bufflen) size = fwrite(_buffer, 1, _bufflen, fd); if (size != _bufflen) { - KMessageBox::error(0, i18n("Trouble writing to the archive...")); + KMessageBox::error(nullptr, i18n("Trouble writing to the archive...")); exit(99); } } diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index 972c6b13..930366e0 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -57,7 +57,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, const TQString &prefix, const TQString &archiveName ) : KDialogBase( parent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ), - m_selectedButton( 0 ), m_allButton( 0 ), + m_selectedButton( nullptr ), m_allButton( nullptr ), m_selectedOnly( enableSelected ), m_extractionDirectory( defaultExtractionDir ), m_defaultExtractionDir( defaultExtractionDir.prettyURL() ), m_prefix( prefix ) { @@ -167,7 +167,7 @@ void ExtractionDialog::accept() } m_extractionDirectory = p; - m_selectedOnly = m_selectedButton == 0? false : m_selectedButton->isChecked(); + m_selectedOnly = m_selectedButton == nullptr? false : m_selectedButton->isChecked(); // Determine what exactly should be added to the extraction combo list TQString historyURL = p.prettyURL(); diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h index 0b5a229d..9b56e15a 100644 --- a/ark/extractiondialog.h +++ b/ark/extractiondialog.h @@ -46,7 +46,7 @@ class ExtractionDialog : public KDialogBase /** * Constructor. */ - ExtractionDialog( TQWidget *parent = 0, const char *name = 0, + ExtractionDialog( TQWidget *parent = nullptr, const char *name = nullptr, bool enableSelected = true, const KURL &defaultExtractionDir = KURL(), const TQString &prefix = TQString(), diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 4a0786bf..fdd12fb3 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -382,7 +382,7 @@ FileLVI* FileListView::item(const TQString& filename) const { if (filename.isEmpty()) { - return 0; + return nullptr; } TQStringList pathList = TQStringList::split( '/', filename ); @@ -407,7 +407,7 @@ FileListView::item(const TQString& filename) const } } - return 0; + return nullptr; } FileLVI *FileListView::addItem( const TQStringList & entries ) diff --git a/ark/filelistview.h b/ark/filelistview.h index 58ecfcbb..060158a9 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -78,7 +78,7 @@ class FileListView: public TDEListView TQ_OBJECT public: - FileListView( TQWidget *parent = 0, const char* name = 0 ); + FileListView( TQWidget *parent = nullptr, const char* name = nullptr ); FileLVI *currentItem() {return ((FileLVI *) TDEListView::currentItem());} diff --git a/ark/lha.cpp b/ark/lha.cpp index 5b7a7cb3..c7a7a1d0 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -155,7 +155,7 @@ void LhaArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); } } @@ -225,7 +225,7 @@ void LhaArch::addFile( const TQStringList &urls ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); } } @@ -266,7 +266,7 @@ void LhaArch::unarchFileInternal() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } @@ -296,7 +296,7 @@ void LhaArch::remove( TQStringList *list ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); } } diff --git a/ark/main.cpp b/ark/main.cpp index 3fd5e1eb..cf3f73f0 100644 --- a/ark/main.cpp +++ b/ark/main.cpp @@ -47,18 +47,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. static TDECmdLineOptions option[] = { - { "extract", I18N_NOOP( "Open extract dialog, quit when finished" ), 0 }, + { "extract", I18N_NOOP( "Open extract dialog, quit when finished" ), nullptr }, { "extract-to", I18N_NOOP( "Extract 'archive' to 'folder'. Quit when finished.\n" - "'folder' will be created if it does not exist."), 0 }, - { "add", I18N_NOOP( "Ask for the name of the archive to add 'files' to. Quit when finished." ), 0 }, + "'folder' will be created if it does not exist."), nullptr }, + { "add", I18N_NOOP( "Ask for the name of the archive to add 'files' to. Quit when finished." ), nullptr }, { "add-to", I18N_NOOP( "Add 'files' to 'archive'. Quit when finished.\n'archive' " - "will be created if it does not exist." ), 0 }, + "will be created if it does not exist." ), nullptr }, { "guess-name", I18N_NOOP( "Used with '--extract-to'. When specified, 'archive'\n" "will be extracted to a subfolder of 'folder'\n" - "whose name will be the name of 'archive' without the filename extension."), 0 }, - { "+[folder]", I18N_NOOP( "Folder to extract to" ), 0 }, - { "+[files]", I18N_NOOP( "Files to be added" ), 0 }, - { "+[archive]", I18N_NOOP( "Open 'archive'" ), 0 }, + "whose name will be the name of 'archive' without the filename extension."), nullptr }, + { "+[folder]", I18N_NOOP( "Folder to extract to" ), nullptr }, + { "+[files]", I18N_NOOP( "Files to be added" ), nullptr }, + { "+[archive]", I18N_NOOP( "Open 'archive'" ), nullptr }, TDECmdLineLastOption }; @@ -74,28 +74,28 @@ extern "C" TDE_EXPORT int kdemain( int argc, char *argv[] ) I18N_NOOP( "Maintainer" ), "henrique.pinto@kdemail.net" ); aboutData.addAuthor( "Charis Kouzinopoulos", - 0, + nullptr, "kouzinopoulos@gmail.com" ); aboutData.addAuthor( "Helio Chissini de Castro", I18N_NOOP( "Former maintainer" ), "helio@kde.org" ); aboutData.addAuthor( "Georg Robbers", - 0, + nullptr, "Georg.Robbers@urz.uni-hd.de" ); aboutData.addAuthor( "Roberto Selbach Teixeira", - 0, + nullptr, "maragato@kde.org" ); aboutData.addAuthor( "Francois-Xavier Duranceau", - 0, + nullptr, "duranceau@kde.org" ); aboutData.addAuthor( "Emily Ezust (Corel Corporation)", - 0, + nullptr, "emilye@corel.com" ); aboutData.addAuthor( "Michael Jarrett (Corel Corporation)", - 0, + nullptr, "michaelj@corel.com" ); aboutData.addAuthor( "Robert Palmbos", - 0, + nullptr, "palm9744@kettering.edu" ); aboutData.addCredit( "Bryce Corkins", diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index ee233a34..57075f70 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -45,7 +45,7 @@ #include "arkwidget.h" MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) - : KParts::MainWindow(), progressDialog( 0 ) + : KParts::MainWindow(), progressDialog( nullptr ) { setXMLFile( "arkui.rc" ); m_part = KParts::ComponentFactory::createPartInstanceFromLibrary( "libarkpart", this, name, this, "ArkPart"); @@ -102,7 +102,7 @@ MainWindow::~MainWindow() ArkApplication::getInstance()->removeWindow(); delete m_part; delete progressDialog; - progressDialog = 0; + progressDialog = nullptr; } void @@ -220,7 +220,7 @@ MainWindow::arkAlreadyOpen( const KURL & url ) window_close(); // notify the user what's going on - KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").arg(url.prettyURL())); + KMessageBox::information(nullptr, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").arg(url.prettyURL())); return true; } return false; diff --git a/ark/mainwindow.h b/ark/mainwindow.h index d0b7a89d..d14c77e8 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -43,7 +43,7 @@ MainWindow: public KParts::MainWindow TQ_OBJECT public: - MainWindow( TQWidget *parent=0, const char *name=0 ); + MainWindow( TQWidget *parent=nullptr, const char *name=nullptr ); virtual ~MainWindow(); void setExtractOnly ( bool b ); diff --git a/ark/rar.cpp b/ark/rar.cpp index 8ad61eba..14f2b78a 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -222,7 +222,7 @@ void RarArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); } } @@ -306,7 +306,7 @@ void RarArch::addFile( const TQStringList & urls ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); } } @@ -363,7 +363,7 @@ void RarArch::unarchFileInternal() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } @@ -399,7 +399,7 @@ void RarArch::remove( TQStringList *list ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); } } @@ -427,7 +427,7 @@ void RarArch::test() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); } } diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 1ea1d0c4..5e10a372 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -33,7 +33,7 @@ #include SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name ) - : TDEListViewSearchLine( parent, 0, name ) + : TDEListViewSearchLine( parent, nullptr, name ) { TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQ_SLOT( clear() ), aC, "reset_search" ); diff --git a/ark/searchbar.h b/ark/searchbar.h index 7a9a6f9e..69bfd430 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -34,7 +34,7 @@ class SearchBar: public TDEListViewSearchLine TQ_OBJECT public: - SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name = 0 ); + SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name = nullptr ); ~SearchBar(); }; diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 588b7625..c903a371 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -147,7 +147,7 @@ void SevenZipArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); } } @@ -195,7 +195,7 @@ void SevenZipArch::addFile( const TQStringList & urls ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); } } @@ -240,7 +240,7 @@ void SevenZipArch::remove( TQStringList *list ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); } } @@ -294,7 +294,7 @@ void SevenZipArch::unarchFileInternal( ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } @@ -450,7 +450,7 @@ void SevenZipArch::test() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); } } diff --git a/ark/tar.cpp b/ark/tar.cpp index 206c7bff..d1f01a41 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -75,10 +75,10 @@ TarArch::TarArch( ArkWidget *_gui, const TQString & _filename, const TQString & _openAsMimeType) - : Arch( _gui, _filename), m_tmpDir( 0 ), createTmpInProgress(false), - updateInProgress(false), deleteInProgress(false), fd(0), - m_pTmpProc( 0 ), m_pTmpProc2( 0 ), failed( false ), - m_dotslash( false ), m_listingThread( 0 ) + : Arch( _gui, _filename), m_tmpDir( nullptr ), createTmpInProgress(false), + updateInProgress(false), deleteInProgress(false), fd(nullptr), + m_pTmpProc( nullptr ), m_pTmpProc2( nullptr ), failed( false ), + m_dotslash( false ), m_listingThread( nullptr ) { m_filesToAdd = m_filesToRemove = TQStringList(); m_archiver_program = m_unarchiver_program = ArkSettings::tarExe(); @@ -116,13 +116,13 @@ TarArch::TarArch( ArkWidget *_gui, TarArch::~TarArch() { delete m_tmpDir; - m_tmpDir = 0; + m_tmpDir = nullptr; if ( m_listingThread && m_listingThread->finished() != true ) { m_listingThread->wait(); delete m_listingThread; - m_listingThread = 0; + m_listingThread = nullptr; } } @@ -166,7 +166,7 @@ void TarArch::updateArch() if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false) { - KMessageBox::error(0, i18n("Trouble writing to the archive...")); + KMessageBox::error(nullptr, i18n("Trouble writing to the archive...")); emit updateDone(); } } @@ -182,7 +182,7 @@ void TarArch::updateProgress( TDEProcess * _proc, char *_buffer, int _bufflen ) if (size != _bufflen) { _proc->kill(); - KMessageBox::error(0, i18n("Trouble writing to the archive...")); + KMessageBox::error(nullptr, i18n("Trouble writing to the archive...")); kdWarning( 1601 ) << "trouble updating tar archive" << endl; } } @@ -278,7 +278,7 @@ void TarArch::open() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); } // We list afterwards because we want the signals at the end @@ -417,7 +417,7 @@ void TarArch::createTmp() this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, flag ) == false) { - KMessageBox::error(0, i18n("Unable to fork a decompressor")); + KMessageBox::error(nullptr, i18n("Unable to fork a decompressor")); emit sigOpen( this, false, TQString(), 0 ); } } @@ -444,7 +444,7 @@ void TarArch::createTmpProgress( TDEProcess * _proc, char *_buffer, int _bufflen if (size != _bufflen) { _proc->kill(); - KMessageBox::error(0, i18n("Trouble writing to the tempfile...")); + KMessageBox::error(nullptr, i18n("Trouble writing to the tempfile...")); //kdFatal( 1601 ) << "Trouble writing to archive(createTmpProgress)" << endl; kdWarning( 1601 ) << "Trouble writing to archive(createTmpProgress)" << endl; //exit(99); @@ -591,7 +591,7 @@ void TarArch::addFileCreateTempDone() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigAdd(false); } } @@ -670,7 +670,7 @@ void TarArch::unarchFileInternal() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigExtract(false); } @@ -714,7 +714,7 @@ void TarArch::removeCreateTempDone() if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { - KMessageBox::error( 0, i18n("Could not start a subprocess.") ); + KMessageBox::error( nullptr, i18n("Could not start a subprocess.") ); emit sigDelete(false); } } @@ -790,14 +790,14 @@ void TarArch::customEvent( TQCustomEvent *ev ) case ListingEvent::Error: m_listingThread->wait(); delete m_listingThread; - m_listingThread = 0; + m_listingThread = nullptr; emit sigOpen( this, false, TQString(), 0 ); break; case ListingEvent::ListingFinished: m_listingThread->wait(); delete m_listingThread; - m_listingThread = 0; + m_listingThread = nullptr; emit sigOpen( this, true, m_filename, Arch::Extract | Arch::Delete | Arch::Add | Arch::View ); } @@ -834,7 +834,7 @@ void TarArch::test() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); } } diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp index c74a69be..d1cf1104 100644 --- a/ark/tarlistingthread.cpp +++ b/ark/tarlistingthread.cpp @@ -89,7 +89,7 @@ TarListingThread::~TarListingThread() { if (m_archive) { delete m_archive; - m_archive = 0; + m_archive = nullptr; } } diff --git a/ark/zip.cpp b/ark/zip.cpp index 345f772a..439d65ed 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -93,7 +93,7 @@ void ZipArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); } } @@ -171,7 +171,7 @@ void ZipArch::addFile( const TQStringList &urls ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); } } @@ -230,7 +230,7 @@ void ZipArch::unarchFileInternal() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } @@ -267,7 +267,7 @@ void ZipArch::remove( TQStringList *list ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); } } @@ -295,7 +295,7 @@ void ZipArch::test() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigTest( false ); } } diff --git a/ark/zoo.cpp b/ark/zoo.cpp index cc3f3773..48adbe83 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -119,7 +119,7 @@ void ZooArch::open() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigOpen( this, false, TQString(), 0 ); } } @@ -186,7 +186,7 @@ void ZooArch::addFile( const TQStringList &urls ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigAdd( false ); } } @@ -245,7 +245,7 @@ void ZooArch::unarchFileInternal() if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigExtract( false ); } } @@ -276,7 +276,7 @@ void ZooArch::remove( TQStringList *list ) if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { - KMessageBox::error( 0, i18n( "Could not start a subprocess." ) ); + KMessageBox::error( nullptr, i18n( "Could not start a subprocess." ) ); emit sigDelete( false ); } } diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index f2504289..ed20e8a5 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -57,7 +57,7 @@ static int char_count = 0; CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name), - _aboutData(0), _configDialog(0) + _aboutData(nullptr), _configDialog(nullptr) { // read configuration TDEConfig *c = config(); @@ -144,7 +144,7 @@ void CharSelectApplet::about() "Used to copy single characters to the X11 clipboard.\n" "You can paste them to an application with the middle mouse button."), TDEAboutData::License_BSD, "(c) 2001, Matthias Elter"); - _aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org"); + _aboutData->addAuthor("Matthias Elter", nullptr, "elter@kde.org"); } TDEAboutApplication dialog(_aboutData); diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h index d2dcc57e..a5653f3b 100644 --- a/charselectapplet/charselectapplet.h +++ b/charselectapplet/charselectapplet.h @@ -39,7 +39,7 @@ class ConfigDialog : public KDialogBase public: - ConfigDialog(TQWidget* parent = 0, const char* name = 0); + ConfigDialog(TQWidget* parent = nullptr, const char* name = nullptr); void setCharacters(const TQString& s) { _characterInput->setText(s); } void setCellWidth(int w) { _widthSpinBox->setValue(w); } @@ -61,7 +61,7 @@ class CharTable : public TQFrame public: - CharTable(TQWidget* parent = 0, const char* name = 0); + CharTable(TQWidget* parent = nullptr, const char* name = nullptr); void setRowsAndColumns(int, int); @@ -101,7 +101,7 @@ class CharSelectApplet : public KPanelApplet public: CharSelectApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); int widthForHeight(int height) const; int heightForWidth(int width) const; diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index af58e0bd..b02f299e 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -480,7 +480,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) KCalcButton *tmp_pb; - NumButtonGroup = new TQButtonGroup(0, "Num-Button-Group"); + NumButtonGroup = new TQButtonGroup(nullptr, "Num-Button-Group"); connect(NumButtonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotNumberclicked(int))); @@ -563,7 +563,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) connect(this, TQ_SIGNAL(switchShowAccels(bool)), pbX, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Pressed '*'", i18n("Pressed Multiplication-Button"), - 0, Key_Asterisk, pbX, TQ_SLOT(animateClick())); + nullptr, Key_Asterisk, pbX, TQ_SLOT(animateClick())); connect(pbX, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXclicked(void))); pbDivision = new KCalcButton("/", thisPage, "Division-Button", i18n("Division")); @@ -589,9 +589,9 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) connect(this, TQ_SIGNAL(switchShowAccels(bool)), pbPeriod, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Decimal Point (Period)", i18n("Pressed Decimal Point"), - 0, Key_Period, pbPeriod, TQ_SLOT(animateClick())); + nullptr, Key_Period, pbPeriod, TQ_SLOT(animateClick())); accel()->insert("Decimal Point (Comma)", i18n("Pressed Decimal Point"), - 0, Key_Comma, pbPeriod, TQ_SLOT(animateClick())); + nullptr, Key_Comma, pbPeriod, TQ_SLOT(animateClick())); connect(pbPeriod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPeriodclicked(void))); pbEqual = new KCalcButton("=", thisPage, "Equal-Button", i18n("Result")); @@ -599,9 +599,9 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) connect(this, TQ_SIGNAL(switchShowAccels(bool)), pbEqual, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered Equal", i18n("Pressed Equal-Button"), - 0, Key_Equal, pbEqual, TQ_SLOT(animateClick())); + nullptr, Key_Equal, pbEqual, TQ_SLOT(animateClick())); accel()->insert("Entered Return", i18n("Pressed Equal-Button"), - 0, Key_Return, pbEqual, TQ_SLOT(animateClick())); + nullptr, Key_Return, pbEqual, TQ_SLOT(animateClick())); connect(pbEqual, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEqualclicked(void))); @@ -673,7 +673,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) pbClear->setAccel(Key_Prior); connect(this, TQ_SIGNAL(switchShowAccels(bool)), pbClear, TQ_SLOT(slotSetAccelDisplayMode(bool))); - accel()->insert("Entered 'ESC'", i18n("Pressed ESC-Button"), 0, + accel()->insert("Entered 'ESC'", i18n("Pressed ESC-Button"), nullptr, Key_Escape, pbClear, TQ_SLOT(animateClick())); connect(pbClear, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotClearclicked(void))); @@ -953,7 +953,7 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) { TQ_CHECK_PTR(parent); - ConstButtonGroup = new TQButtonGroup(0, "Const-Button-Group"); + ConstButtonGroup = new TQButtonGroup(nullptr, "Const-Button-Group"); connect(ConstButtonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotConstclicked(int))); @@ -1818,12 +1818,12 @@ void KCalculator::showSettings() // Add the general page. Store the settings in the General group and // use the icon package_settings. - General *general = new General(0, "General"); + General *general = new General(nullptr, "General"); int maxprec = 1000; general->kcfg_Precision->setMaxValue(maxprec); dialog->addPage(general, i18n("General"), "package_settings", i18n("General Settings")); - TQWidget *fontWidget = new TQWidget(0,"Font"); + TQWidget *fontWidget = new TQWidget(nullptr,"Font"); TQVBoxLayout *fontLayout = new TQVBoxLayout(fontWidget); TDEFontChooser *mFontChooser = new TDEFontChooser(fontWidget, "kcfg_Font", false, TQStringList(), false, 6); @@ -1833,13 +1833,13 @@ void KCalculator::showSettings() // color settings - Colors *color = new Colors(0, "Color"); + Colors *color = new Colors(nullptr, "Color"); dialog->addPage(color, i18n("Colors"), "colors", i18n("Button & Display Colors")); // constant settings - Constants *constant = new Constants(0, "Constant" ); + Constants *constant = new Constants(nullptr, "Constant" ); tmp_const = constant; KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); @@ -2094,7 +2094,7 @@ void KCalculator::updateSettings() set_precision(); // Show the result in the app's caption in taskbar (wishlist - bug #52858) disconnect(calc_display, TQ_SIGNAL(changedText(const TQString &)), - this, 0); + this, nullptr); if (KCalcSettings::captionResult()) { connect(calc_display, @@ -2276,15 +2276,15 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) "(c) 2000-2005, The KDE Team")); /* Klaus Niederkrueger */ - aboutData.addAuthor("Klaus Niederkr" "\xc3\xbc" "ger", 0, "kniederk@math.uni-koeln.de"); - aboutData.addAuthor("Bernd Johannes Wuebben", 0, "wuebben@kde.org"); - aboutData.addAuthor("Evan Teran", 0, "eteran@alum.rit.edu"); - aboutData.addAuthor("Espen Sand", 0, "espen@kde.org"); - aboutData.addAuthor("Chris Howells", 0, "howells@kde.org"); - aboutData.addAuthor("Aaron J. Seigo", 0, "aseigo@olympusproject.org"); - aboutData.addAuthor("Charles Samuels", 0, "charles@altair.dhs.org"); + aboutData.addAuthor("Klaus Niederkr" "\xc3\xbc" "ger", nullptr, "kniederk@math.uni-koeln.de"); + aboutData.addAuthor("Bernd Johannes Wuebben", nullptr, "wuebben@kde.org"); + aboutData.addAuthor("Evan Teran", nullptr, "eteran@alum.rit.edu"); + aboutData.addAuthor("Espen Sand", nullptr, "espen@kde.org"); + aboutData.addAuthor("Chris Howells", nullptr, "howells@kde.org"); + aboutData.addAuthor("Aaron J. Seigo", nullptr, "aseigo@olympusproject.org"); + aboutData.addAuthor("Charles Samuels", nullptr, "charles@altair.dhs.org"); /* Rene Merou */ - aboutData.addAuthor("Ren" "\xc3\xa9" " M" "\xc3\xa9" "rou", 0, "ochominutosdearco@yahoo.es"); + aboutData.addAuthor("Ren" "\xc3\xa9" " M" "\xc3\xa9" "rou", nullptr, "ochominutosdearco@yahoo.es"); TDECmdLineArgs::init(argc, argv, &aboutData); TDEApplication app; diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h index ab857db4..a7219aa9 100644 --- a/kcalc/kcalc.h +++ b/kcalc/kcalc.h @@ -64,7 +64,7 @@ class KCalculator : public TDEMainWindow public: - KCalculator(TQWidget *parent = 0, const char *name = 0); + KCalculator(TQWidget *parent = nullptr, const char *name = nullptr); ~KCalculator(); signals: diff --git a/kcalc/kcalc_button.h b/kcalc/kcalc_button.h index ac7aa0f2..154dceee 100644 --- a/kcalc/kcalc_button.h +++ b/kcalc/kcalc_button.h @@ -64,8 +64,8 @@ TQ_OBJECT public: - KCalcButton(TQWidget *parent, const char * name = 0); - KCalcButton(const TQString &label, TQWidget *parent, const char * name = 0, + KCalcButton(TQWidget *parent, const char * name = nullptr); + KCalcButton(const TQString &label, TQWidget *parent, const char * name = nullptr, const TQString &tooltip = TQString()); void addMode(ButtonModeFlags mode, TQString label, TQString tooltip, bool is_label_richtext = false); @@ -93,9 +93,9 @@ TQ_OBJECT public: - KSquareButton(TQWidget *parent, const char * name = 0) + KSquareButton(TQWidget *parent, const char * name = nullptr) : KCalcButton(parent, name) { }; - KSquareButton(const TQString &label, TQWidget *parent, const char * name = 0, + KSquareButton(const TQString &label, TQWidget *parent, const char * name = nullptr, const TQString &tooltip = TQString()) : KCalcButton(label, parent, name, tooltip) { }; diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h index 88e73e12..2a39d97d 100644 --- a/kcalc/kcalc_const_button.h +++ b/kcalc/kcalc_const_button.h @@ -35,9 +35,9 @@ TQ_OBJECT public: - KCalcConstButton(TQWidget *parent, int but_num, const char * name = 0); + KCalcConstButton(TQWidget *parent, int but_num, const char * name = nullptr); - KCalcConstButton(const TQString &label, TQWidget *parent, int but_num, const char * name = 0, + KCalcConstButton(const TQString &label, TQWidget *parent, int but_num, const char * name = nullptr, const TQString &tooltip = TQString()); TQString constant(void) const; diff --git a/kcalc/kcalc_const_menu.h b/kcalc/kcalc_const_menu.h index 1cb6ba3e..d64a8d88 100644 --- a/kcalc/kcalc_const_menu.h +++ b/kcalc/kcalc_const_menu.h @@ -42,7 +42,7 @@ class KCalcConstMenu : public TQPopupMenu public: - KCalcConstMenu(TQWidget * parent = 0, const char * name = 0); + KCalcConstMenu(TQWidget * parent = nullptr, const char * name = nullptr); static const struct science_constant Constants[]; diff --git a/kcalc/kcalc_core.cpp b/kcalc/kcalc_core.cpp index 3d55a07f..8d87aa4a 100644 --- a/kcalc/kcalc_core.cpp +++ b/kcalc/kcalc_core.cpp @@ -958,7 +958,7 @@ void CalcEngine::enterOperation(KNumber number, Operation func) bool CalcEngine::evalStack(void) { // this should never happen - if (_stack.isEmpty()) KMessageBox::error(0L, i18n("Stack processing error - empty stack")); + if (_stack.isEmpty()) KMessageBox::error(nullptr, i18n("Stack processing error - empty stack")); _node tmp_node = _stack.pop(); diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index ecb0827a..30b0a43f 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -342,7 +342,7 @@ bool KCalcDisplay::updateDisplay(void) case NB_BINARY: Q_ASSERT(_period == false && _eestate == false); setText(tmp_string); - _display_amount = static_cast(STRTOUL(_str_int.latin1(), 0, 2)); + _display_amount = static_cast(STRTOUL(_str_int.latin1(), nullptr, 2)); if (_neg_sign) _display_amount = -_display_amount; //str_size = cvb(_str_int, boh_work, DSP_SIZE); @@ -351,7 +351,7 @@ bool KCalcDisplay::updateDisplay(void) case NB_OCTAL: Q_ASSERT(_period == false && _eestate == false); setText(tmp_string); - _display_amount = static_cast(STRTOUL(_str_int.latin1(), 0, 8)); + _display_amount = static_cast(STRTOUL(_str_int.latin1(), nullptr, 8)); if (_neg_sign) _display_amount = -_display_amount; break; @@ -359,7 +359,7 @@ bool KCalcDisplay::updateDisplay(void) case NB_HEX: Q_ASSERT(_period == false && _eestate == false); setText(tmp_string); - _display_amount = static_cast(STRTOUL(_str_int.latin1(), 0, 16)); + _display_amount = static_cast(STRTOUL(_str_int.latin1(), nullptr, 16)); if (_neg_sign) _display_amount = -_display_amount; break; diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h index 99e3abd4..d38b6c67 100644 --- a/kcalc/kcalcdisplay.h +++ b/kcalc/kcalcdisplay.h @@ -82,7 +82,7 @@ TQ_OBJECT public: - KCalcDisplay(TQWidget *parent=0, const char *name=0); + KCalcDisplay(TQWidget *parent=nullptr, const char *name=nullptr); ~KCalcDisplay(); protected: diff --git a/kcalc/knumber/knumber_priv.cpp b/kcalc/knumber/knumber_priv.cpp index 419293b8..ec99a096 100644 --- a/kcalc/knumber/knumber_priv.cpp +++ b/kcalc/knumber/knumber_priv.cpp @@ -209,7 +209,7 @@ TQString const _knuminteger::ascii(int prec) const TQString const _knumfraction::ascii(int prec) const { static_cast(prec); - char *tmp_ptr = mpq_get_str(0, 10, _mpq); + char *tmp_ptr = mpq_get_str(nullptr, 10, _mpq); TQString ret_str = tmp_ptr; free(tmp_ptr); diff --git a/kcharselect/main.cpp b/kcharselect/main.cpp index a863e5e5..1412bb87 100644 --- a/kcharselect/main.cpp +++ b/kcharselect/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) TDEAboutData aboutData( "kcharselect", I18N_NOOP("KCharSelect"), version, description, TDEAboutData::License_GPL, "(c) 1999, Reginald Stadlbauer"); - aboutData.addAuthor("Reginald Stadlbauer",0, "reggie@kde.org"); + aboutData.addAuthor("Reginald Stadlbauer",nullptr, "reggie@kde.org"); aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "GUI cleanup and fixes" ), "nhasan@kde.org" ); aboutData.addCredit( "Ryan Cumming", I18N_NOOP( "GUI cleanup and fixes" ), @@ -39,7 +39,7 @@ int main(int argc, char **argv) int tn = config->readNumEntry("table",0); bool direction = config->readNumEntry("entryDirection",0); - KCharSelectDia *dia = new KCharSelectDia(0L,"",c,font,tn,direction); + KCharSelectDia *dia = new KCharSelectDia(nullptr,"",c,font,tn,direction); app.setMainWidget(dia); dia->show(); diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 7607ad4a..bcc58b10 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -91,7 +91,7 @@ void DiskList::applySettings() config->setGroup("DiskList"); TQString key; DiskEntry *disk; - for (disk=disks->first();disk!=0;disk=disks->next()) { + for (disk=disks->first();disk;disk=disks->next()) { key.sprintf("Mount%s%s%s%s",SEPARATOR,disk->deviceName().latin1() ,SEPARATOR,disk->mountPoint().latin1()); config->writePathEntry(key,disk->mountCommand()); @@ -119,7 +119,7 @@ void DiskList::loadSettings() config->setGroup("DiskList"); TQString key; DiskEntry *disk; - for (disk=disks->first();disk!=0;disk=disks->next()) { + for (disk=disks->first();disk;disk=disks->next()) { key.sprintf("Mount%s%s%s%s",SEPARATOR,disk->deviceName().latin1() ,SEPARATOR,disk->mountPoint().latin1()); disk->setMountCommand(config->readPathEntry(key)); @@ -146,7 +146,7 @@ TQString rc; rc += '\\'; break; case '0': // octal 0nn - rc += static_cast(s.mid(i,3).toInt(0, 8)); + rc += static_cast(s.mid(i,3).toInt(nullptr, 8)); i += 2; break; default: @@ -279,7 +279,7 @@ void DiskList::dfDone() config->setGroup(oldgroup); readingDFStdErrOut=true; - for ( DiskEntry *disk=disks->first(); disk != 0; disk=disks->next() ) + for ( DiskEntry *disk=disks->first(); disk; disk=disks->next() ) disk->setMounted(false); // set all devs unmounted TQTextStream t (dfStringErrOut, IO_ReadOnly); @@ -429,7 +429,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk) if ((disk->fsType() == "?") || (disk->fsType() == "cachefs")) { //search for fitting cachefs-entry in static /etc/vfstab-data DiskEntry* olddisk = disks->first(); - while (olddisk != 0) { + while (olddisk) { int p; // cachefs deviceNames have no / behind the host-column // eg. /cache/cache/.cfs_mnt_points/srv:_home_jesus @@ -449,7 +449,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk) { pos = disks->at(); //store the actual position disk->setDeviceName(olddisk->deviceName()); - olddisk=0; + olddisk=nullptr; } else olddisk=disks->next(); }// while diff --git a/kdf/disklist.h b/kdf/disklist.h index e125b345..984de0dc 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -97,7 +97,7 @@ class DiskList : public TQObject { TQ_OBJECT public: - DiskList( TQObject *parent=0, const char *name=0 ); + DiskList( TQObject *parent=nullptr, const char *name=nullptr ); ~DiskList(); int readFSTAB(); int readDF(); diff --git a/kdf/disks.h b/kdf/disks.h index 59084eaf..c4393d40 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -42,8 +42,8 @@ class DiskEntry : public TQObject TQ_OBJECT public: - DiskEntry(TQObject *parent=0, const char *name=0); - DiskEntry(const TQString & deviceName, TQObject *parent=0, const char *name=0); + DiskEntry(TQObject *parent=nullptr, const char *name=nullptr); + DiskEntry(const TQString & deviceName, TQObject *parent=nullptr, const char *name=nullptr); ~DiskEntry(); TQString lastSysError() {return sysStringErrOut; } TQString deviceName() const { return device; } diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h index 6cb56a8a..5f1a679a 100644 --- a/kdf/kcmdf.h +++ b/kdf/kcmdf.h @@ -36,7 +36,7 @@ class KDiskFreeWidget : public TDECModule public: - KDiskFreeWidget( TQWidget *parent=0, const char *name=0 ); + KDiskFreeWidget( TQWidget *parent=nullptr, const char *name=nullptr ); ~KDiskFreeWidget(); TQString quickHelp() const; diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index 04e2c56e..477d3a81 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -37,7 +37,7 @@ static const char version[] = "v0.5"; /***************************************************************/ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name) - : TDEMainWindow(0, name) + : TDEMainWindow(nullptr, name) { kdf = new KDFWidget(this,"kdf",false); TQ_CHECK_PTR(kdf); @@ -67,7 +67,7 @@ int main(int argc, char **argv) TDEAboutData aboutData( "kdf", I18N_NOOP("KDiskFree"), version, description, TDEAboutData::License_GPL, "(c) 1998-2001, Michael Kropfberger"); - aboutData.addAuthor("Michael Kropfberger",0, "michael.kropfberger@gmx.net"); + aboutData.addAuthor("Michael Kropfberger",nullptr, "michael.kropfberger@gmx.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/kdf/kdf.h b/kdf/kdf.h index 7097306e..6330aa33 100644 --- a/kdf/kdf.h +++ b/kdf/kdf.h @@ -34,7 +34,7 @@ class KDFTopLevel : public TDEMainWindow public: - KDFTopLevel(TQWidget *parent=0, const char *name=0); + KDFTopLevel(TQWidget *parent=nullptr, const char *name=nullptr); ~KDFTopLevel() { }; protected slots: diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index 9e24ef7a..1103f894 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -184,7 +184,7 @@ void KDFConfigWidget::applySettings( void ) mStd.writeConfiguration(); TQListViewItem *item = mList->firstChild(); - if( item != 0 ) + if( item ) { for( int i=mList->header()->count(); i>0; i-- ) { @@ -217,7 +217,7 @@ void KDFConfigWidget::loadSettings( void ) mFileManagerEdit->setText( mStd.fileManager() ); TQListViewItem *item = mList->firstChild(); - if( item != 0 ) + if( item ) { for( int i=mList->header()->count(); i>0; i-- ) { @@ -242,7 +242,7 @@ void KDFConfigWidget::defaultsBtnClicked( void ) mFileManagerEdit->setText( mStd.fileManager() ); TQListViewItem *item = mList->firstChild(); - if( item != 0 ) + if( item ) { for( int i=mList->header()->count(); i>0; i-- ) { diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h index 522f0af1..6220630e 100644 --- a/kdf/kdfconfig.h +++ b/kdf/kdfconfig.h @@ -60,7 +60,7 @@ class KDFConfigWidget : public TQWidget }; public: - KDFConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false); + KDFConfigWidget( TQWidget *parent=nullptr, const char *name=nullptr, bool init=false); ~KDFConfigWidget(); public slots: diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 7fdf5238..b9a0dd9a 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -93,7 +93,7 @@ void CListViewItem::setKeys (TDEIO::filesize_t kb_size, TDEIO::filesize_t kb_ava /**************************************************************/ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) - : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0) + : TQWidget(parent, name), mOptionDialog(nullptr), mPopup(nullptr), mTimer(nullptr) { connect(&mDiskList , TQ_SIGNAL(readDFDone() ), this, TQ_SLOT (updateDFDone()) ); @@ -262,10 +262,10 @@ void KDFWidget::settingsBtnClicked( void ) { if( mIsTopLevel == true ) { - if( mOptionDialog == 0 ) + if( !mOptionDialog ) { mOptionDialog = new COptionDialog( this, "options", false ); - if( mOptionDialog == 0 ) { return; } + if( !mOptionDialog ) { return; } connect( mOptionDialog, TQ_SIGNAL(valueChanged()), this, TQ_SLOT(settingsChanged()) ); } @@ -307,7 +307,7 @@ void KDFWidget::updateDF( void ) // // We can only do this if the popupmenu is not present // - if( mPopup == 0 ) + if( !mPopup ) { readingDF = true; mDiskList.readFSTAB(); @@ -325,8 +325,8 @@ void KDFWidget::updateDFDone( void ){ mList->clear(); int i=0; - CListViewItem *item = 0; - for( DiskEntry *disk=mDiskList.first(); disk!=0; disk=mDiskList.next() ) + CListViewItem *item = nullptr; + for( DiskEntry *disk=mDiskList.first(); disk; disk=mDiskList.next() ) { i++; TQString size, percent; @@ -388,13 +388,13 @@ void KDFWidget::criticallyFull( DiskEntry *disk ) **/ DiskEntry *KDFWidget::selectedDisk( TQListViewItem *item ) { - if( item == 0 ) + if( !item ) { item = mList->selectedItem(); } - if( item == 0 ) + if( !item ) { - return(0); + return(nullptr); } DiskEntry disk(item->text(deviceCol)); @@ -459,12 +459,12 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p ) mDiskList.setUpdatesDisabled(true); DiskEntry *disk = selectedDisk( item ); - if( disk == 0 ) + if( !disk ) { return; } - mPopup = new TDEPopupMenu( 0 ); + mPopup = new TDEPopupMenu( nullptr ); mPopup->insertTitle( disk->mountPoint() ); mPopup->insertItem( i18n("Mount Device"), 0 ); mPopup->insertItem( i18n("Unmount Device"), 1 ); @@ -481,7 +481,7 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p ) if( position == -1 ) { mDiskList.setUpdatesDisabled(false); - delete mPopup; mPopup = 0; + delete mPopup; mPopup = nullptr; return; } else if( position == 0 || position == 1 ) @@ -530,7 +530,7 @@ void KDFWidget::popupMenu( TQListViewItem *item, const TQPoint &p ) //Update only here as showing of error message triggers event loop. mDiskList.setUpdatesDisabled(false); - delete mPopup; mPopup = 0; + delete mPopup; mPopup = nullptr; if( position != 2 ) // No need to update when just opening the fm. { @@ -567,7 +567,7 @@ void KDFWidget::updateDiskBarPixmaps( void ) } int i=0; - for(TQListViewItem *it=mList->firstChild(); it!=0;it=it->nextSibling(),i++ ) + for(TQListViewItem *it=mList->firstChild(); it;it=it->nextSibling(),i++ ) { // I can't get find() to work. The Disks::compareItems(..) is // never called. @@ -594,7 +594,7 @@ void KDFWidget::updateDiskBarPixmaps( void ) DiskEntry *disk = mDiskList.at(pos); - if( disk == 0 ) { continue; } + if( !disk ) { continue; } if( disk->mounted() == true && disk->percentFull() != -1 ) { @@ -602,7 +602,7 @@ void KDFWidget::updateDiskBarPixmaps( void ) if( w <= 0 ) { continue; } TQPixmap *pix = new TQPixmap( w, h ); - if( pix == 0 ) { continue; } + if( !pix ) { continue; } pix->fill(white); TQPainter p(pix); @@ -629,7 +629,7 @@ void KDFWidget::updateDiskBarPixmaps( void ) void KDFWidget::columnSizeChanged( int, int, int ) { - if( mTimer == 0 ) + if( !mTimer ) { mTimer = new TQTimer( this ); connect( mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDiskBarPixmaps()) ); diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h index c63cde67..7a1f2758 100644 --- a/kdf/kdfwidget.h +++ b/kdf/kdfwidget.h @@ -108,7 +108,7 @@ class KDFWidget : public TQWidget }; public: - KDFWidget( TQWidget *parent=0, const char *name=0, bool init=false); + KDFWidget( TQWidget *parent=nullptr, const char *name=nullptr, bool init=false); ~KDFWidget( void ); public slots: @@ -136,7 +136,7 @@ class KDFWidget : public TQWidget private: void makeColumns( void ); - DiskEntry *selectedDisk( TQListViewItem *item=0 ); + DiskEntry *selectedDisk( TQListViewItem *item=nullptr ); private: bool readingDF; diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index a2b50247..df9e2a2e 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -62,7 +62,7 @@ KwikDisk::KwikDisk() , m_dirty(true) , m_menuVisible(false) , m_inside(false) - , m_optionDialog(0) + , m_optionDialog(nullptr) { kdDebug() << k_funcinfo << endl; @@ -172,7 +172,7 @@ void KwikDisk::updateDFDone() contextMenu()->insertTitle(KSystemTray::loadIcon("kdf"), i18n("KwikDisk")); int itemNo = 0; - for( DiskEntry *disk = m_diskList.first(); disk != 0; disk = m_diskList.next() ) + for( DiskEntry *disk = m_diskList.first(); disk; disk = m_diskList.next() ) { // FIXME: tool tips are unused atm TQString toolTipText = i18n("%1 (%2) %3 on %4") @@ -199,10 +199,10 @@ void KwikDisk::updateDFDone() // Careful here: If the mask has not been defined we can // not use TQPixmap::mask() because it returns 0 => segfault // - if( pix->mask() != 0 ) + if( pix->mask() ) { TQBitmap *bm = new TQBitmap(*(pix->mask())); - if( bm != 0 ) + if( bm ) { TQPainter qp( bm ); qp.setPen(TQPen(white,1)); @@ -248,7 +248,7 @@ void KwikDisk::toggleMount(int item) kdDebug() << k_funcinfo << endl; DiskEntry *disk = m_diskList.at(item); - if( disk == 0 ) + if( !disk ) { return; } @@ -293,7 +293,7 @@ void KwikDisk::criticallyFull(DiskEntry *disk) void KwikDisk::changeSettings() { - if( m_optionDialog == 0 ) + if( !m_optionDialog ) { m_optionDialog = new COptionDialog(this, "options", false); if( !m_optionDialog ) return; @@ -323,7 +323,7 @@ int main(int argc, char **argv) TDEAboutData about("kwikdisk", I18N_NOOP("KwikDisk"), version, description, TDEAboutData::License_GPL, "(C) 2004 Stanislav Karchebny", - 0, 0, "Stanislav.Karchebny@kdemail.net"); + nullptr, nullptr, "Stanislav.Karchebny@kdemail.net"); about.addAuthor( "Michael Kropfberger", I18N_NOOP("Original author"), "michael.kropfberger@gmx.net" ); about.addAuthor( "Espen Sand", I18N_NOOP("TDE 2 changes"), "" ); @@ -332,7 +332,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app; - KwikDisk *mainWin = 0; + KwikDisk *mainWin = nullptr; mainWin = new KwikDisk; TQObject::connect(mainWin, TQ_SIGNAL(quitSelected()), &app, TQ_SLOT(quit())); diff --git a/kdf/listview.cpp b/kdf/listview.cpp index ab688db3..12738f9c 100644 --- a/kdf/listview.cpp +++ b/kdf/listview.cpp @@ -68,7 +68,7 @@ TQSize CListView::sizeHint( void ) const const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder ) { TQPixmap *pix = mPixDict[ iconName ]; - if( pix == 0 ) + if( !pix ) { pix = new TQPixmap( SmallIcon( iconName ) ); @@ -79,10 +79,10 @@ const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder ) // Careful here: If the mask has not been defined we can // not use TQPixmap::mask() because it returns 0 => segfault // - if( pix->mask() != 0 ) + if( pix->mask() ) { TQBitmap *bm = new TQBitmap(*(pix->mask())); - if( bm != 0 ) + if( bm ) { TQPainter qp(bm); qp.setPen(TQPen(white,1)); diff --git a/kdf/listview.h b/kdf/listview.h index d1001314..29eb58e9 100644 --- a/kdf/listview.h +++ b/kdf/listview.h @@ -31,7 +31,7 @@ class CListView : public TDEListView public: - CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); + CListView( TQWidget *parent=nullptr, const char *name=nullptr, int visibleItem=10 ); void setVisibleItem( int visibleItem, bool updateSize=true ); virtual TQSize sizeHint( void ) const; diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 732cba80..8a2a0ff2 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -87,7 +87,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) topLayout->addWidget(mGroupBox); TQGridLayout *gl = new TQGridLayout(mGroupBox, 3, 4, KDialog::spacingHint()); - if( gl == 0 ) { return; } + if( !gl ) { return; } gl->addRowSpacing( 0, fontMetrics().lineSpacing() ); mIconLineEdit = new TQLineEdit(mGroupBox); @@ -161,8 +161,8 @@ void MntConfigWidget::readDFDone( void ) mDiskLookup.resize(mDiskList.count()); int i=0; - TQListViewItem *item = 0; - for( DiskEntry *disk=mDiskList.first(); disk!=0; disk=mDiskList.next(),++i ) + TQListViewItem *item = nullptr; + for( DiskEntry *disk=mDiskList.first(); disk; disk=mDiskList.next(),++i ) { item = new TQListViewItem( mList, item, TQString(), disk->deviceName(), disk->mountPoint(), disk->mountCommand(), disk->umountCommand() ); @@ -204,7 +204,7 @@ void MntConfigWidget::loadSettings( void ) } TQListViewItem *item = mList->selectedItem(); - if( item != 0 ) + if( item ) { clicked( item ); } @@ -223,7 +223,7 @@ void MntConfigWidget::clicked( TQListViewItem *item ) const TQPixmap *pix = item->pixmap(ICONCOL); - if( pix != 0 ) + if( pix ) { mIconButton->setPixmap( *pix ); } @@ -233,7 +233,7 @@ void MntConfigWidget::clicked( TQListViewItem *item ) if (mDiskLookup[i] == item) { DiskEntry *disk = mDiskList.at(i); - if( disk != 0 ) + if( disk ) { mIconLineEdit->setText( disk->iconName() ); } @@ -269,7 +269,7 @@ void MntConfigWidget::iconChanged(const TQString &iconName) if (mDiskLookup[i] == item) { DiskEntry *disk = mDiskList.at(i); - if( disk != 0 ) + if( disk ) { disk->setIconName(iconName); mIconLineEdit->setText(iconName); @@ -291,7 +291,7 @@ void MntConfigWidget::selectMntFile() if( !url.isLocalFile() ) { - KMessageBox::sorry( 0L, i18n( "Only local files supported." ) ); + KMessageBox::sorry( nullptr, i18n( "Only local files supported." ) ); return; } @@ -307,7 +307,7 @@ void MntConfigWidget::selectUmntFile() if( !url.isLocalFile() ) { - KMessageBox::sorry( 0L, i18n( "Only local files are currently supported." ) ); + KMessageBox::sorry( nullptr, i18n( "Only local files are currently supported." ) ); return; } @@ -322,7 +322,7 @@ void MntConfigWidget::mntCmdChanged( const TQString &data ) if (mDiskLookup[i] == item) { DiskEntry *disk = mDiskList.at(i); - if( disk != 0 ) + if( disk ) { disk->setMountCommand(data); item->setText( MNTCMDCOL, data ); @@ -341,7 +341,7 @@ void MntConfigWidget::umntCmdChanged( const TQString &data ) if (mDiskLookup[i] == item) { DiskEntry *disk = mDiskList.at(i); - if( disk != 0 ) + if( disk ) { disk->setUmountCommand(data); item->setText( UMNTCMDCOL, data ); diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h index d247012e..312672e9 100644 --- a/kdf/mntconfig.h +++ b/kdf/mntconfig.h @@ -59,7 +59,7 @@ class MntConfigWidget : public TQWidget }; public: - MntConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false ); + MntConfigWidget( TQWidget *parent=nullptr, const char *name=nullptr, bool init=false ); ~MntConfigWidget(); public slots: diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h index 77efa05a..22e6d3e4 100644 --- a/kdf/optiondialog.h +++ b/kdf/optiondialog.h @@ -31,7 +31,7 @@ class COptionDialog : public KDialogBase public: - COptionDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); + COptionDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=true ); ~COptionDialog( void ); protected slots: diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index 1e3de439..19329f42 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -56,13 +56,13 @@ #include -TQPtrList *TopLevel::windowList = 0; +TQPtrList *TopLevel::windowList = nullptr; int default_open = TopLevel::OPEN_READWRITE; TopLevel::TopLevel (TQWidget *, const char *name) - : TDEMainWindow ( 0,name ), tdespellconfigOptions(0), - eframe(0), newWindow(false), tdespell(0) + : TDEMainWindow ( nullptr,name ), tdespellconfigOptions(nullptr), + eframe(nullptr), newWindow(false), tdespell(nullptr) { if (!windowList) { @@ -456,7 +456,7 @@ void TopLevel::spell_finished( ) KSpell::spellStatus status = tdespell->status(); int client = tdespellconfigOptions->client(); delete tdespell; - tdespell = 0; + tdespell = nullptr; if (status == KSpell::Error) { KMessageBox::sorry(this, replaceISpell(i18n("ISpell could not be started.\n" @@ -502,7 +502,7 @@ void TopLevel::file_open( void ) if( !m_url.isEmpty() || eframe->isModified() ) { toplevel = new TopLevel(); - if( toplevel == 0 ) + if( !toplevel ) { return; } @@ -643,7 +643,7 @@ void TopLevel::openRecent(const KURL& url) { if (!m_url.isEmpty() || eframe->isModified()) { - TopLevel *t = new TopLevel (0,0); + TopLevel *t = new TopLevel (nullptr,nullptr); t->show(); t->openRecent(url); return; @@ -838,7 +838,7 @@ void TopLevel::showSettings() void TopLevel::initSpellConfig() { if (!tdespellconfigOptions) - tdespellconfigOptions = new KSpellConfig(0 , "SpellingSettings", 0, false ); + tdespellconfigOptions = new KSpellConfig(nullptr , "SpellingSettings", nullptr, false ); } void TopLevel::search_again() @@ -1252,8 +1252,8 @@ static const char description[] = I18N_NOOP("TDE text editor"); static const TDECmdLineOptions options[] = { - { "encoding ", I18N_NOOP("Encoding to use for the following documents"), 0 }, - { "+file", I18N_NOOP("File or URL to open"), 0 }, + { "encoding ", I18N_NOOP("Encoding to use for the following documents"), nullptr }, + { "+file", I18N_NOOP("File or URL to open"), nullptr }, TDECmdLineLastOption }; @@ -1264,7 +1264,7 @@ extern "C" TDE_EXPORT int kdemain (int argc, char **argv) TDEAboutData aboutData( "kedit", I18N_NOOP("KEdit"), KEDITVERSION, description, TDEAboutData::License_GPL, "(c) 1997-2000, Bernd Johannes Wuebben"); - aboutData.addAuthor("Bernd Johannes Wuebben",0, "wuebben@kde.org"); + aboutData.addAuthor("Bernd Johannes Wuebben",nullptr, "wuebben@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); @@ -1320,14 +1320,14 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele spellConfig(_spellConfig), spellConfigChanged(false) { // Font - TQWidget *font = new TQWidget(0, "FontSetting"); + TQWidget *font = new TQWidget(nullptr, "FontSetting"); TQVBoxLayout *topLayout = new TQVBoxLayout(font, 0, KDialog::spacingHint()); TDEFontChooser *mFontChooser = new TDEFontChooser(font, "kcfg_Font", false, TQStringList(), false, 6); topLayout->addWidget(mFontChooser); addPage(font, i18n("Font"), "fonts", i18n("Editor Font")); // Color - Color *color = new Color(0, "ColorSettings"); + Color *color = new Color(nullptr, "ColorSettings"); addPage(color, i18n("Color"), "colorize", i18n("Text Color in Editor Area")); // Spelling @@ -1336,7 +1336,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele connect(spellConfig, TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotSpellConfigChanged())); // Miscellaneous - Misc *miscOptions = new Misc(0, "MiscSettings"); + Misc *miscOptions = new Misc(nullptr, "MiscSettings"); addPage(miscOptions, i18n("Miscellaneous"), "misc"); } diff --git a/kedit/kedit.h b/kedit/kedit.h index 93a0d021..9f217cac 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -62,7 +62,7 @@ public: OPEN_INSERT = 4, OPEN_NEW = 8 }; - TopLevel( TQWidget *parent=0, const char *name=0 ); + TopLevel( TQWidget *parent=nullptr, const char *name=nullptr ); ~TopLevel(); /** diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h index 8c1968ef..4cc20640 100644 --- a/kedit/ktextfiledlg.h +++ b/kedit/ktextfiledlg.h @@ -49,7 +49,7 @@ class KTextFileDialog : public KFileDialog static KURL getOpenURLwithEncoding( const TQString& startDir = TQString(), const TQString& filter= TQString(), - TQWidget *parent= 0, + TQWidget *parent= nullptr, const TQString& caption = TQString(), const TQString& encoding = TQString(), const TQString& buttonText = TQString()); diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index b5356cc6..91bb4592 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -50,7 +50,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) : KDialog( parent, name ), - formatActions(0L), m_canLowLevel(false), m_canZeroOut( false ) + formatActions(nullptr), m_canLowLevel(false), m_canZeroOut( false ) { formating = false; @@ -463,7 +463,7 @@ void FloppyData::reset() { formatActions->quit(); delete formatActions; - formatActions = 0L; + formatActions = nullptr; } progress->setValue(0); diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h index 901494f4..8f34c31d 100644 --- a/kfloppy/floppy.h +++ b/kfloppy/floppy.h @@ -47,7 +47,7 @@ class FloppyData : public KDialog public: - FloppyData(TQWidget* parent = 0, const char * name = 0); + FloppyData(TQWidget* parent = nullptr, const char * name = nullptr); virtual ~FloppyData(); /// Need to overload normal show() in order to mangle caption diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 31be4518..522bee59 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -105,7 +105,7 @@ void KFActionQueue::queue(KFAction *p) { DEBUGSETUP; - actionDone(0L,true); + actionDone(nullptr,true); } /* slot */ void KFActionQueue::actionDone(KFAction *p,bool success) @@ -165,18 +165,18 @@ void KFActionQueue::queue(KFAction *p) // #ifdef ANY_LINUX -const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", "/dev/fd0", 0L } ; -const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", "/dev/fd0", 0L }; -const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", "/dev/fd0", 0L }; -const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", 0L }; +const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", "/dev/fd0", nullptr } ; +const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", "/dev/fd0", nullptr }; +const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", "/dev/fd0", nullptr }; +const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", nullptr }; -const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", "/dev/fd1", 0L } ; -const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", "/dev/fd1", 0L }; -const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", "/dev/fd1", 0L }; -const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", 0L }; +const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", "/dev/fd1", nullptr } ; +const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", "/dev/fd1", nullptr }; +const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", "/dev/fd1", nullptr }; +const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", nullptr }; -const char *fd0auto[] = { "/dev/fd0", 0L }; -const char *fd1auto[] = { "/dev/fd1", 0L }; +const char *fd0auto[] = { "/dev/fd0", nullptr }; +const char *fd1auto[] = { "/dev/fd1", nullptr }; #endif @@ -228,14 +228,14 @@ fdinfo fdtable[] = { fd0, 0, 360, 40, 0}, { fd1, 1, 360, 40, 0}, #endif - { 0L, 0, 0, 0, 0 } + { nullptr, 0, 0, 0, 0 } } ; FloppyAction::FloppyAction(TQObject *p) : KFAction(p), - deviceInfo(0L), - theProcess(0L) + deviceInfo(nullptr), + theProcess(nullptr) { DEBUGSETUP; } @@ -244,14 +244,14 @@ void FloppyAction::quit() { DEBUGSETUP; delete theProcess; - theProcess=0L; + theProcess=nullptr; KFAction::quit(); } bool FloppyAction::configureDevice( const TQString& newDeviceName ) { - deviceInfo = 0; // We have not any idea what the device is + deviceInfo = nullptr; // We have not any idea what the device is deviceName = newDeviceName; return true; // No problem! } @@ -259,9 +259,9 @@ bool FloppyAction::configureDevice( const TQString& newDeviceName ) bool FloppyAction::configureDevice(int drive,int density) { DEBUGSETUP; - const char *devicename = 0L; + const char *devicename = nullptr; - deviceInfo=0L; + deviceInfo=nullptr; deviceName = TQString(); if ((drive<0) || (drive>1)) diff --git a/kfloppy/format.h b/kfloppy/format.h index c0caa15a..cfa34bd0 100644 --- a/kfloppy/format.h +++ b/kfloppy/format.h @@ -69,7 +69,7 @@ TQ_OBJECT public: - KFAction(TQObject *parent = 0L); + KFAction(TQObject *parent = nullptr); virtual ~KFAction(); public slots: @@ -119,7 +119,7 @@ TQ_OBJECT public: - KFActionQueue(TQObject *parent = 0L); + KFActionQueue(TQObject *parent = nullptr); virtual ~KFActionQueue(); /** @@ -179,7 +179,7 @@ TQ_OBJECT public: - FloppyAction(TQObject *parent = 0L); + FloppyAction(TQObject *parent = nullptr); /** * Kills the running process, if one exists. @@ -252,7 +252,7 @@ protected: class FDFormat : public FloppyAction { public: - FDFormat(TQObject *parent = 0L); + FDFormat(TQObject *parent = nullptr); virtual void exec(); @@ -288,7 +288,7 @@ protected: class DDZeroOut : public FloppyAction { public: - DDZeroOut(TQObject *parent = 0L); + DDZeroOut(TQObject *parent = nullptr); virtual void exec(); @@ -318,7 +318,7 @@ protected: class FATFilesystem : public FloppyAction { public: - FATFilesystem(TQObject *parent = 0L); + FATFilesystem(TQObject *parent = nullptr); virtual void exec(); @@ -349,7 +349,7 @@ protected: class Ext2Filesystem : public FloppyAction { public: - Ext2Filesystem(TQObject *parent = 0L); + Ext2Filesystem(TQObject *parent = nullptr); virtual void exec(); @@ -399,7 +399,7 @@ protected: class MinixFilesystem : public FloppyAction { public: - MinixFilesystem(TQObject *parent = 0L); + MinixFilesystem(TQObject *parent = nullptr); virtual void exec(); diff --git a/kfloppy/main.cpp b/kfloppy/main.cpp index 3158419c..5ca8bf94 100644 --- a/kfloppy/main.cpp +++ b/kfloppy/main.cpp @@ -34,7 +34,7 @@ static const char description[] = static const TDECmdLineOptions options[] = { - { "+[device]", I18N_NOOP("Default device"), 0 }, + { "+[device]", I18N_NOOP("Default device"), nullptr }, TDECmdLineLastOption }; diff --git a/kgpg/detailedconsole.h b/kgpg/detailedconsole.h index 22350934..bfb7f4dd 100644 --- a/kgpg/detailedconsole.h +++ b/kgpg/detailedconsole.h @@ -24,7 +24,7 @@ class KDetailedConsole : public KDialogBase { public: - KDetailedConsole(TQWidget *parent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString()); + KDetailedConsole(TQWidget *parent=nullptr, const char *name=nullptr,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString()); ~KDetailedConsole(); }; @@ -34,7 +34,7 @@ class KDetailedInfo : public KDialogBase { public: - KDetailedInfo(TQWidget *parent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString(),TQStringList keysList=TQStringList()); + KDetailedInfo(TQWidget *parent=nullptr, const char *name=nullptr,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString(),TQStringList keysList=TQStringList()); ~KDetailedInfo(); }; diff --git a/kgpg/keygener.h b/kgpg/keygener.h index 0645a6a2..2321aa40 100644 --- a/kgpg/keygener.h +++ b/kgpg/keygener.h @@ -27,7 +27,7 @@ class keyGenerate : public KDialogBase TQ_OBJECT public: - keyGenerate(TQWidget *parent=0, const char *name=0); + keyGenerate(TQWidget *parent=nullptr, const char *name=nullptr); KComboBox *keykind,*keysize,*keyexp; KLineEdit *numb,*comment,*kname,*mail; diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h index 6ebc352f..71943bd7 100644 --- a/kgpg/keyinfowidget.h +++ b/kgpg/keyinfowidget.h @@ -37,7 +37,7 @@ class KgpgKeyInfo : public KDialogBase public: - KgpgKeyInfo( TQWidget *parent = 0, const char *name = 0,TQString sigkey=0); + KgpgKeyInfo( TQWidget *parent = nullptr, const char *name = nullptr,TQString sigkey=nullptr); ~KgpgKeyInfo(); KeyProperties *prop; diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 7a80f8fa..60d1e48a 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -227,7 +227,7 @@ void keyServer::slotSearch() count=0; readmessage=TQString(); - dialogServer=new KDialogBase(KDialogBase::Swallow, i18n("Import Key From Keyserver"), KDialogBase::Ok | KDialogBase::Close,KDialogBase::Ok,this,0,true); + dialogServer=new KDialogBase(KDialogBase::Swallow, i18n("Import Key From Keyserver"), KDialogBase::Ok | KDialogBase::Close,KDialogBase::Ok,this,nullptr,true); dialogServer->setButtonText(KDialogBase::Ok,i18n("&Import")); dialogServer->enableButtonOK(false); @@ -280,7 +280,7 @@ void keyServer::handleQuit() { TQApplication::restoreOverrideCursor(); searchproc->closePty(); - disconnect(searchproc,0,0,0); + disconnect(searchproc,nullptr,nullptr,nullptr); searchproc->kill(); } dialogServer->close(); @@ -292,7 +292,7 @@ void keyServer::abortSearch() // kdDebug(2100) << k_funcinfo << endl; if (dialogServer) { delete dialogServer; - dialogServer=0L; + dialogServer=nullptr; } } @@ -478,7 +478,7 @@ void keyServer::slotsearchresult(TDEProcess *) keymail=TQString(); keyname=keyString[1]; } - if (kitem != 0 ) { + if (kitem ) { kitem->setText(0,keyname); //if ( kitem->getText(1).isEmpty() ) kitem->setText(1,keymail); TDEListViewItem *subk = new TDEListViewItem(kitem,keyname,keymail,created,TQString()); @@ -536,7 +536,7 @@ void keyServer::slotExport(TQStringList keyIds) TQObject::connect(exportproc, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotimportread(TDEProcIO *))); exportproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); - importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); + importpop = new TQDialog( this,nullptr,true,TQt::WDestructiveClose); TQVBoxLayout *vbox=new TQVBoxLayout(importpop,3); TQLabel *tex=new TQLabel(importpop); tex->setText(i18n("Connecting to the server...")); @@ -556,7 +556,7 @@ void keyServer::abortExport() TQApplication::restoreOverrideCursor(); if (exportproc->isRunning()) { - disconnect(exportproc,0,0,0); + disconnect(exportproc,nullptr,nullptr,nullptr); exportproc->kill(); } } @@ -565,7 +565,7 @@ void keyServer::slotexportresult(TDEProcess*) { // kdDebug(2100) << k_funcinfo << endl; TQApplication::restoreOverrideCursor(); - KMessageBox::information(0,readmessage); + KMessageBox::information(nullptr,readmessage); if (importpop) delete importpop; } @@ -638,7 +638,7 @@ void keyServer::slotImport() searchproc->start(TDEProcess::Block,true); if (searchproc->isRunning()) { searchproc->closePty(); - disconnect(searchproc,0,0,0); + disconnect(searchproc,nullptr,nullptr,nullptr); searchproc->kill(); } } @@ -669,7 +669,7 @@ void keyServer::slotImport() importproc->start(TDEProcess::NotifyOnExit,true); importproc->closeWhenDone(); - importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); + importpop = new TQDialog( this,nullptr,true,TQt::WDestructiveClose); TQVBoxLayout *vbox=new TQVBoxLayout(importpop,3); TQLabel *tex=new TQLabel(importpop); tex->setText(i18n("Connecting to the server...")); @@ -689,7 +689,7 @@ void keyServer::abortImport() TQApplication::restoreOverrideCursor(); if (importproc->isRunning()) { - disconnect(importproc,0,0,0); + disconnect(importproc,nullptr,nullptr,nullptr); importproc->kill(); emit importFinished(TQString()); } @@ -824,7 +824,7 @@ void keyServer::slotimportresult(TDEProcess*) if (importpop) importpop->hide(); - (void) new KDetailedInfo(0,"import_result",resultMessage,readmessage,importedKeys); + (void) new KDetailedInfo(nullptr,"import_result",resultMessage,readmessage,importedKeys); if (importpop) delete importpop; diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h index b45fc252..3bf3e8ad 100644 --- a/kgpg/keyservers.h +++ b/kgpg/keyservers.h @@ -33,7 +33,7 @@ class keyServer : public KDialogBase TQ_OBJECT public: - keyServer(TQWidget *parent=0, const char *name=0,bool modal=false,bool autoClose=false); + keyServer(TQWidget *parent=nullptr, const char *name=nullptr,bool modal=false,bool autoClose=false); ~keyServer(); keyServerWidget *page; diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 1585bf08..60a3d6e3 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -108,15 +108,15 @@ MyView::~MyView() { delete droppopup; - droppopup = 0; + droppopup = nullptr; delete udroppopup; - udroppopup = 0; + udroppopup = nullptr; } void MyView::clipEncrypt() { - popupPublic *dialoguec=new popupPublic(0, "public_keys", 0,false,goDefaultKey); + popupPublic *dialoguec=new popupPublic(nullptr, "public_keys", nullptr,false,goDefaultKey); connect(dialoguec,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); dialoguec->exec(); delete dialoguec; @@ -132,7 +132,7 @@ void MyView::clipSign(bool openEditor) { TQString clippie=tdeApp->clipboard()->text(clipboardMode).stripWhiteSpace(); if (!clippie.isEmpty()) { - KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); + KgpgApp *kgpgtxtedit = new KgpgApp(nullptr, "editor",WDestructiveClose,goDefaultKey); connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); if (!openEditor) @@ -150,10 +150,10 @@ void MyView::encryptDroppedFolder() compressionScheme=0; kgpgfoldertmp=new KTempFile(TQString()); kgpgfoldertmp->setAutoDelete(true); - if (KMessageBox::warningContinueCancel(0,i18n("KGpg will now create a temporary archive file:
%1 to process the encryption. The file will be deleted after the encryption is finished.").arg(kgpgfoldertmp->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpFile")==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(nullptr,i18n("KGpg will now create a temporary archive file:
%1 to process the encryption. The file will be deleted after the encryption is finished.").arg(kgpgfoldertmp->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpFile")==KMessageBox::Cancel) return; - dialogue=new popupPublic(0,"Public keys",droppedUrls.first().fileName(),true,goDefaultKey); + dialogue=new popupPublic(nullptr,"Public keys",droppedUrls.first().fileName(),true,goDefaultKey); TQHButtonGroup *bGroup = new TQHButtonGroup(dialogue->plainPage()); (void) new TQLabel(i18n("Compression method for archive:"),bGroup); @@ -167,7 +167,7 @@ void MyView::encryptDroppedFolder() connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); dialogue->CBshred->setEnabled(false); dialogue->exec(); - dialogue=0L; + dialogue=nullptr; } void MyView::slotSetCompression(int cp) @@ -197,7 +197,7 @@ KURL encryptedFile(droppedUrls.first().path()+extension); TQFile encryptedFolder(droppedUrls.first().path()+extension); if (encryptedFolder.exists()) { dialogue->hide(); - TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),encryptedFile.path(),TDEIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(nullptr,i18n("File Already Exists"),TQString(),encryptedFile.path(),TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; @@ -214,7 +214,7 @@ pop = new KPassivePopup(); pop->show(); tdeApp->processEvents(); dialogue->slotAccept(); - dialogue=0L; + dialogue=nullptr; KArchive *arch; if (compressionScheme==0) @@ -225,7 +225,7 @@ pop = new KPassivePopup(); arch=new KTar(kgpgfoldertmp->name(), "application/x-bzip2"); if (!arch->open( IO_WriteOnly )) { - KMessageBox::sorry(0,i18n("Unable to create temporary file")); + KMessageBox::sorry(nullptr,i18n("Unable to create temporary file")); delete arch; return; } @@ -249,7 +249,7 @@ void MyView::slotFolderFinishedError(TQString errmsge) { delete pop; delete kgpgfoldertmp; - KMessageBox::sorry(0,errmsge); + KMessageBox::sorry(nullptr,errmsge); } void MyView::busyMessage(TQString mssge,bool reset) @@ -352,7 +352,7 @@ void MyView::slotVerifyFile() void MyView::importSignature(TQString ID) { - keyServer *kser=new keyServer(0,"server_dialog",false); + keyServer *kser=new keyServer(nullptr,"server_dialog",false); kser->page->kLEimportid->setText(ID); kser->slotImport(); } @@ -365,7 +365,7 @@ void MyView::signDroppedFile() TQString signKeyID; ////////////////// select a private key to sign file --> listkeys.cpp - KgpgSelKey *opts=new KgpgSelKey(0,"select_secret"); + KgpgSelKey *opts=new KgpgSelKey(nullptr,"select_secret"); if (opts->exec()==TQDialog::Accepted) signKeyID=opts->getkeyID(); else { @@ -409,7 +409,7 @@ void MyView::decryptDroppedFile() swapname=KURL(droppedUrls.first().directory(0,0)+oldname); TQFile fgpg(swapname.path()); if (fgpg.exists()) { - TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),swapname.path(),TDEIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(nullptr,i18n("File Already Exists"),TQString(),swapname.path(),TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; @@ -442,12 +442,12 @@ void MyView::unArchive() { KTar compressedFolder(kgpgFolderExtract->name(),"application/x-gzip"); if (!compressedFolder.open( IO_ReadOnly )) { - KMessageBox::sorry(0,i18n("Unable to read temporary archive file")); + KMessageBox::sorry(nullptr,i18n("Unable to read temporary archive file")); return; } const KArchiveDirectory *archiveDirectory=compressedFolder.directory(); //KURL savePath=KURL::getURL(droppedUrl,this,i18n("")); - KURLRequesterDlg *savePath=new KURLRequesterDlg(droppedUrl.directory(false),i18n("Extract to: "),0,"extract"); + KURLRequesterDlg *savePath=new KURLRequesterDlg(droppedUrl.directory(false),i18n("Extract to: "),nullptr,"extract"); savePath->fileDialog()->setMode(KFile::Directory); if (!savePath->exec()==TQDialog::Accepted) { delete kgpgFolderExtract; @@ -463,7 +463,7 @@ void MyView::unArchive() void MyView::showDroppedFile() { kdDebug(2100)<<"------Show dropped file"<view->editor->slotDroppedFile(droppedUrls.first()); connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); @@ -521,7 +521,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) { if (inputText.startsWith("-----BEGIN PGP MESSAGE")) { - KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); + KgpgApp *kgpgtxtedit = new KgpgApp(nullptr, "editor",WDestructiveClose,goDefaultKey); connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); kgpgtxtedit->view->editor->setText(inputText); @@ -530,7 +530,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) return; } if (inputText.startsWith("-----BEGIN PGP PUBLIC KEY")) { - int result=KMessageBox::warningContinueCancel(0,i18n("

The dropped text is a public key.
Do you want to import it ?

"),i18n("Warning")); + int result=KMessageBox::warningContinueCancel(nullptr,i18n("

The dropped text is a public key.
Do you want to import it ?

"),i18n("Warning")); if (result==KMessageBox::Cancel) return; else { @@ -580,7 +580,7 @@ void MyView::readOptions() } else { TQString path = KGpgSettings::gpgConfigPath(); if (path.isEmpty()) { - if (KMessageBox::questionYesNo(0,i18n("You have not set a path to your GnuPG config file.
This may cause some surprising results in KGpg's execution.
Would you like to start KGpg's Wizard to fix this problem?"),TQString(),i18n("Start Wizard"),i18n("Do Not Start"))==KMessageBox::Yes) + if (KMessageBox::questionYesNo(nullptr,i18n("You have not set a path to your GnuPG config file.
This may cause some surprising results in KGpg's execution.
Would you like to start KGpg's Wizard to fix this problem?"),TQString(),i18n("Start Wizard"),i18n("Do Not Start"))==KMessageBox::Yes) startWizard(); } else { TQStringList groups=KgpgInterface::getGpgGroupNames(path); @@ -618,7 +618,7 @@ static TQString getGpgHome() void MyView::startWizard() { kdDebug(2100)<<"Starting Wizard"<invokeHelp(0,"kgpg"); + tdeApp->invokeHelp(nullptr,"kgpg"); } kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) @@ -838,7 +838,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) w->show(); TDEPopupMenu *conf_menu=contextMenu(); KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,w, TQ_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); - KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,w, TQ_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); + KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), nullptr, 0,w, TQ_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,w, TQ_SLOT(clipSign()),actionCollection(),"clip_sign"); TDEAction *KgpgOpenEditor; if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager) @@ -904,7 +904,7 @@ kdDebug(2100) <<"there was some error using DCOP."<The use of GnuPG Agent is enabled in GnuPG's configuration file (%1).
" + KMessageBox::sorry(nullptr,i18n("The use of GnuPG Agent is enabled in GnuPG's configuration file (%1).
" "However, the agent does not seem to be running. This could result in problems with signing/decryption.
" "Please disable GnuPG Agent from KGpg settings, or fix the agent.").arg(gpgPath)); } @@ -1021,7 +1021,7 @@ int KgpgAppletApp::newInstance() } if ((directoryInside) && (lst.count()>1)) { - KMessageBox::sorry(0,i18n("Unable to perform requested operation.\nPlease select only one folder, or several files, but do not mix files and folders.")); + KMessageBox::sorry(nullptr,i18n("Unable to perform requested operation.\nPlease select only one folder, or several files, but do not mix files and folders.")); return 0; } @@ -1036,22 +1036,22 @@ int KgpgAppletApp::newInstance() if (!directoryInside) kgpg_applet->w->shredDroppedFile(); else - KMessageBox::sorry(0,i18n("Cannot shred folder.")); + KMessageBox::sorry(nullptr,i18n("Cannot shred folder.")); } else if (args->isSet("s")!=0) { if (!directoryInside) kgpg_applet->w->showDroppedFile(); else - KMessageBox::sorry(0,i18n("Cannot decrypt and show folder.")); + KMessageBox::sorry(nullptr,i18n("Cannot decrypt and show folder.")); } else if (args->isSet("S")!=0) { if (!directoryInside) kgpg_applet->w->signDroppedFile(); else - KMessageBox::sorry(0,i18n("Cannot sign folder.")); + KMessageBox::sorry(nullptr,i18n("Cannot sign folder.")); } else if (args->isSet("V")!=0) { if (!directoryInside) kgpg_applet->w->slotVerifyFile(); else - KMessageBox::sorry(0,i18n("Cannot verify folder.")); + KMessageBox::sorry(nullptr,i18n("Cannot verify folder.")); } else if (kgpg_applet->w->droppedUrl.fileName().endsWith(".sig")) kgpg_applet->w->slotVerifyFile(); else diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index 2ce60082..836291db 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -47,7 +47,7 @@ class MyView : public TQLabel public: - MyView( TQWidget *parent = 0, const char *name = 0); + MyView( TQWidget *parent = nullptr, const char *name = nullptr); ~MyView(); KURL droppedUrl; @@ -125,7 +125,7 @@ class kgpgapplet : public KSystemTray//TDEUniqueApplication public: - kgpgapplet( TQWidget *parent = 0, const char *name = 0); + kgpgapplet( TQWidget *parent = nullptr, const char *name = nullptr); /** destructor */ ~kgpgapplet(); MyView *w; diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index 1c7aa8d7..0a59c127 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -179,7 +179,7 @@ void KgpgApp::initView() // create the main widget here that is managed by KTMainWindow's view-region and // connect the widget to your document to display document contents. - view = new KgpgView(this,0); + view = new KgpgView(this,nullptr); // doc->addView(view); connect(view,TQ_SIGNAL(resetEncoding(bool)),this,TQ_SLOT(slotResetEncoding(bool))); setCentralWidget(view); @@ -265,7 +265,7 @@ void KgpgApp::slotFilePreDec() if (!newname.isEmpty()) { TQFile fgpg(newname); if (fgpg.exists()) { - TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),newname,TDEIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(nullptr,i18n("File Already Exists"),TQString(),newname,TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; @@ -467,7 +467,7 @@ void KgpgApp::slotCheckMd5() i18n("*|All Files"), this, i18n("Open File to Verify")); if (!url.isEmpty()) { - Md5Widget *mdwidget=new Md5Widget(this,0,url); + Md5Widget *mdwidget=new Md5Widget(this,nullptr,url); mdwidget->exec(); delete mdwidget; // KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+checkfile.hexDigest().data())); @@ -540,7 +540,7 @@ void KgpgApp::slotVerifyFile(KURL url) void KgpgApp::importSignatureKey(TQString ID) { - keyServer *kser=new keyServer(0,"server_dialog",false); + keyServer *kser=new keyServer(nullptr,"server_dialog",false); kser->page->kLEimportid->setText(ID); kser->slotImport(); } diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h index 4b6d2c35..3718bad4 100644 --- a/kgpg/kgpgeditor.h +++ b/kgpg/kgpgeditor.h @@ -43,7 +43,7 @@ class KgpgApp : public TDEMainWindow public: /** construtor of KgpgApp, calls all init functions to create the application. */ - KgpgApp(TQWidget *parent=0, const char *name=0,WFlags f = 0,TDEShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false); + KgpgApp(TQWidget *parent=nullptr, const char *name=nullptr,WFlags f = 0,TDEShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false); ~KgpgApp(); /** opens a file specified by commandline option */ diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index dae46cbf..48cb885b 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -367,7 +367,7 @@ emit txtdecryptionfinished(message); else if (badmdc) { -KMessageBox::sorry(0,i18n("Bad MDC detected. The encrypted text has been manipulated.")); +KMessageBox::sorry(nullptr,i18n("Bad MDC detected. The encrypted text has been manipulated.")); emit txtdecryptionfailed(log); } else @@ -673,7 +673,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p MyDialogLayout->addWidget( KRestrictedLine1, 1, 0 ); - TQHBoxLayout *Layout4 = new TQHBoxLayout( 0, 0, 6, "Layout4"); + TQHBoxLayout *Layout4 = new TQHBoxLayout( nullptr, 0, 6, "Layout4"); KLed1=new KLed(TQColor(80,80,80),KLed::Off,KLed::Sunken,KLed::Circular,page,"KLed1"); KLed1->off(); @@ -715,7 +715,7 @@ void Md5Widget::slotApply() KLed1->on(); }//KMessageBox::sorry(0,"OK"); else if (text.length()!=mdSum.length()) - KMessageBox::sorry(0,i18n("Clipboard content is not a MD5 sum.")); + KMessageBox::sorry(nullptr,i18n("Clipboard content is not a MD5 sum.")); else { TextLabel1_2->setText(i18n("Wrong checksum, FILE CORRUPTED")); KLed1->setColor(TQColor(255,0,0)); @@ -754,11 +754,11 @@ void KgpgInterface::signfin(TDEProcess *) { // kdDebug(2100) << k_funcinfo << endl; if (message.find("SIG_CREATED")!=-1) - KMessageBox::information(0,i18n("The signature file %1 was successfully created.").arg(file.fileName())); + KMessageBox::information(nullptr,i18n("The signature file %1 was successfully created.").arg(file.fileName())); else if (message.find("BAD_PASSPHRASE")!=-1) - KMessageBox::sorry(0,i18n("Bad passphrase, signature was not created.")); + KMessageBox::sorry(nullptr,i18n("Bad passphrase, signature was not created.")); else - KMessageBox::sorry(0,message); + KMessageBox::sorry(nullptr,message); emit signfinished(); } @@ -866,10 +866,10 @@ void KgpgInterface::verifyfin(TDEProcess *) // kdDebug(2100) << k_funcinfo << endl; if (!signmiss) { if (signID.isEmpty()) signID=i18n("No signature found."); - (void) new KDetailedInfo(0,"verify_result",signID,message); + (void) new KDetailedInfo(nullptr,"verify_result",signID,message); } else { - if (KMessageBox::questionYesNo(0,i18n("Missing signature:
Key id: %1

" + if (KMessageBox::questionYesNo(nullptr,i18n("Missing signature:
Key id: %1

" "Do you want to import this key from a keyserver?").arg(signID),file.fileName(),TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) emit verifyquerykey(signID); } @@ -1088,7 +1088,7 @@ void KgpgInterface::signover(TDEProcess *) if (signSuccess>1) emit signatureFinished(signSuccess); //// signature successful or bad passphrase else { - KDetailedConsole *q=new KDetailedConsole(0,"sign_error",i18n("Signing key %1 with key %2 failed.
" + KDetailedConsole *q=new KDetailedConsole(nullptr,"sign_error",i18n("Signing key %1 with key %2 failed.
" "Do you want to try signing the key in console mode?").arg(konsKeyID).arg(konsSignKey),output); if (q->exec()==TQDialog::Accepted) openSignConsole(); @@ -1122,7 +1122,7 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID) { // kdDebug(2100) << k_funcinfo << endl; if (checkuid(keyID)>0) { - KMessageBox::sorry(0,i18n("This key has more than one user ID.\nEdit the key manually to delete signature.")); + KMessageBox::sorry(nullptr,i18n("This key has more than one user ID.\nEdit the key manually to delete signature.")); return; } @@ -1315,10 +1315,10 @@ void KgpgInterface::expover(TDEProcess *) if ((expSuccess==3) || (expSuccess==2)) emit expirationFinished(expSuccess); //// signature successful or bad passphrase else { - KDetailedConsole *q=new KDetailedConsole(0,"sign_error",i18n("Changing expiration failed.
" + KDetailedConsole *q=new KDetailedConsole(nullptr,"sign_error",i18n("Changing expiration failed.
" "Do you want to try changing the key expiration in console mode?"),output); if (q->exec()==TQDialog::Accepted) - KMessageBox::sorry(0,"work in progress..."); + KMessageBox::sorry(nullptr,"work in progress..."); //openSignConsole(); else emit expirationFinished(0); @@ -1527,7 +1527,7 @@ void KgpgInterface::importKeyURL(KURL url) ///////////// import a key // kdDebug(2100) << k_funcinfo << endl; - if( TDEIO::NetAccess::download( url, tempKeyFile,0) ) { + if( TDEIO::NetAccess::download( url, tempKeyFile,nullptr) ) { message=TQString(); TDEProcIO *conprocess=new TDEProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; @@ -1615,7 +1615,7 @@ kdDebug(2100)<<"Importing is over"<writeStdin(TQString("Yes")); else { @@ -1952,7 +1952,7 @@ void KgpgInterface::revokeover(TDEProcess *) { // kdDebug(2100) << k_funcinfo << endl; if (!revokeSuccess) - KMessageBox::detailedSorry(0,i18n("Creation of the revocation certificate failed..."),output); + KMessageBox::detailedSorry(nullptr,i18n("Creation of the revocation certificate failed..."),output); else { output=output.section("-----BEGIN",1); output.prepend("-----BEGIN"); @@ -2357,7 +2357,7 @@ TQString KgpgInterface::checkForUtf8(TQString txt) // if (!strchr (txt.ascii(), 0xc3) || (txt.find("\\x")!=-1)) { for ( int idx = 0 ; (idx = txt.find( "\\x", idx )) >= 0 ; ++idx ) { char str[2] = "x"; - str[0] = (char) TQString( txt.mid( idx + 2, 2 ) ).toShort( 0, 16 ); + str[0] = (char) TQString( txt.mid( idx + 2, 2 ) ).toShort( nullptr, 16 ); txt.replace( idx, 4, str ); } if (!strchr (txt.ascii(), 0xc3)) diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h index df00e45e..980cecca 100644 --- a/kgpg/kgpginterface.h +++ b/kgpg/kgpginterface.h @@ -392,7 +392,7 @@ class Md5Widget :public KDialogBase TQ_OBJECT public: - Md5Widget(TQWidget *parent=0, const char *name=0,KURL url=KURL()); + Md5Widget(TQWidget *parent=nullptr, const char *name=nullptr,KURL url=KURL()); ~Md5Widget(); public slots: void slotApply(); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index dbac0d48..5ef360bb 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -53,7 +53,7 @@ void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList def if (defaultKey.isEmpty()) { TQString fileNames=urls.first().fileName(); if (urls.count()>1) fileNames+=",..."; - popupPublic *dialogue=new popupPublic(0,"Public keys",fileNames,true,goDefaultKey); + popupPublic *dialogue=new popupPublic(nullptr,"Public keys",fileNames,true,goDefaultKey); connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startencode(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; @@ -79,7 +79,7 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e { ////////////////// encode from file if ((selec.isEmpty()) && (!symetric)) { - KMessageBox::sorry(0,i18n("You have not chosen an encryption key.")); + KMessageBox::sorry(nullptr,i18n("You have not chosen an encryption key.")); return; } urlselected=fileToCrypt; @@ -92,7 +92,7 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e TQFile fgpg(dest.path()); if (fgpg.exists()) { - TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),dest.path(),TDEIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(nullptr,i18n("File Already Exists"),TQString(),dest.path(),TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; @@ -222,7 +222,7 @@ void KgpgLibrary::processdecerror(TQString mssge) qfile.close(); ////////////// if pgp data found, decode it if (result.startsWith("-----BEGIN PGP PUBLIC KEY BLOCK")) {////// dropped file is a public key, ask for import - int result=KMessageBox::warningContinueCancel(0,i18n("

The file %1 is a public key.
Do you want to import it ?

").arg(urlselected.path()),i18n("Warning")); + int result=KMessageBox::warningContinueCancel(nullptr,i18n("

The file %1 is a public key.
Do you want to import it ?

").arg(urlselected.path()),i18n("Warning")); if (result==KMessageBox::Cancel) return; else { @@ -233,11 +233,11 @@ void KgpgLibrary::processdecerror(TQString mssge) } } else if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {////// dropped file is a public key, ask for import qfile.close(); - KMessageBox::information(0,i18n("

The file %1 is a private key block. Please use KGpg key manager to import it.

").arg(urlselected.path())); + KMessageBox::information(nullptr,i18n("

The file %1 is a private key block. Please use KGpg key manager to import it.

").arg(urlselected.path())); return; } } - KMessageBox::detailedSorry(0,i18n("Decryption failed."),mssge); + KMessageBox::detailedSorry(nullptr,i18n("Decryption failed."),mssge); } diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index 965201ca..64085673 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -37,7 +37,7 @@ public: /** * Initialize the class */ - KgpgLibrary(TQWidget *parent=0,bool pgpExtension=false); + KgpgLibrary(TQWidget *parent=nullptr,bool pgpExtension=false); ~KgpgLibrary(); KURL::List urlselecteds; diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index e1daa271..1d18b52a 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -164,7 +164,7 @@ void kgpgOptions::insertFileKey() { TQString signKeyID; ///// open key selection dialog - KgpgSelKey *opts=new KgpgSelKey(this,0,true,page1->kcfg_FileKey->text()); + KgpgSelKey *opts=new KgpgSelKey(this,nullptr,true,page1->kcfg_FileKey->text()); if (opts->exec()==TQDialog::Accepted) { page1->kcfg_FileKey->setText(opts->getkeyID()); @@ -179,7 +179,7 @@ void kgpgOptions::insertAlwaysKey() { TQString signKeyID; ///// open key selection dialog - KgpgSelKey *opts=new KgpgSelKey(this,0,true,page1->alwaysKey->text()); + KgpgSelKey *opts=new KgpgSelKey(this,nullptr,true,page1->alwaysKey->text()); if (opts->exec()==TQDialog::Accepted) { page1->alwaysKey->setText(opts->getkeyID()); diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h index 2f3259ba..f7016daf 100644 --- a/kgpg/kgpgoptions.h +++ b/kgpg/kgpgoptions.h @@ -41,7 +41,7 @@ class kgpgOptions : public TDEConfigDialog TQ_OBJECT public: - kgpgOptions(TQWidget *parent=0, const char *name=0); + kgpgOptions(TQWidget *parent=nullptr, const char *name=nullptr); ~kgpgOptions(); TQStringList names,ids; Encryption *page1; diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 44d2f707..544f9951 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -94,7 +94,7 @@ void MyEditor::slotDroppedFile(KURL url) if (url.isLocalFile()) tempFile = url.path(); else { - if (KMessageBox::warningContinueCancel(0,i18n("Remote file dropped.
The remote file will now be copied to a temporary file to process requested operation. This temporary file will be deleted after operation."),0,KStdGuiItem::cont(),"RemoteFileWarning")!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(nullptr,i18n("Remote file dropped.
The remote file will now be copied to a temporary file to process requested operation. This temporary file will be deleted after operation."),nullptr,KStdGuiItem::cont(),"RemoteFileWarning")!=KMessageBox::Continue) return; if (!TDEIO::NetAccess::download (url, tempFile,this)) { KMessageBox::sorry(this,i18n("Could not download file.")); @@ -140,7 +140,7 @@ TQFile qfile(fileToCheck); } else { if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) { qfile.close(); - KMessageBox::information(0,i18n("This file is a private key.\nPlease use kgpg key management to import it.")); + KMessageBox::information(nullptr,i18n("This file is a private key.\nPlease use kgpg key management to import it.")); TDEIO::NetAccess::removeTempFile(fileToCheck); return true; } @@ -238,9 +238,9 @@ void KgpgView::modified() void KgpgView::slotAskForImport(TQString ID) { -if (KMessageBox::questionYesNo(0,i18n("Missing signature:
Key id: %1

" +if (KMessageBox::questionYesNo(nullptr,i18n("Missing signature:
Key id: %1

" "Do you want to import this key from a keyserver?").arg(ID),i18n("Missing Key"), TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) { - keyServer *kser=new keyServer(0,"server_dialog",false,true); + keyServer *kser=new keyServer(nullptr,"server_dialog",false,true); kser->page->kLEimportid->setText(ID); kser->slotImport(); windowAutoClose=false; @@ -252,7 +252,7 @@ void KgpgView::slotVerifyResult(TQString mssge,TQString log) { emit verifyFinished(); //KMessageBox::information(0,mssge); -(void) new KDetailedInfo(0,"verify_result",mssge,log); +(void) new KDetailedInfo(nullptr,"verify_result",mssge,log); } void KgpgView::clearSign() @@ -269,7 +269,7 @@ void KgpgView::clearSign() ///// Sign the text in Editor TQString signKeyID; ///// open key selection dialog - KgpgSelKey *opts=new KgpgSelKey(this,0); + KgpgSelKey *opts=new KgpgSelKey(this,nullptr); if (opts->exec()==TQDialog::Accepted) { signKeyID=opts->getkeyID(); @@ -311,7 +311,7 @@ void KgpgView::popuppublic() ///// popup dialog to select public key for encryption //////// open dialog --> popuppublic.cpp - popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) parent())->goDefaultKey); + popupPublic *dialogue=new popupPublic(this, "public_keys", nullptr,false,((KgpgApp *) parent())->goDefaultKey); connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; diff --git a/kgpg/kgpgview.h b/kgpg/kgpgview.h index 54fbcb57..03bc1494 100644 --- a/kgpg/kgpgview.h +++ b/kgpg/kgpgview.h @@ -44,7 +44,7 @@ class MyEditor : public KTextEdit public: - MyEditor( TQWidget *parent = 0, const char *name = 0); + MyEditor( TQWidget *parent = nullptr, const char *name = nullptr); private: TQString message,messages,tempFile; public slots: @@ -73,7 +73,7 @@ class KgpgView : public TQWidget friend class MyEditor; public: /** Constructor for the main view */ - KgpgView(TQWidget *parent = 0, const char *name=0); + KgpgView(TQWidget *parent = nullptr, const char *name=nullptr); /** Destructor for the main view */ ~KgpgView(); diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 25bdd24c..8c2d822f 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -108,7 +108,7 @@ class UpdateViewItem : public TDEListViewItem { public: UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired); - UpdateViewItem(TQListViewItem *parent=0, TQString name=TQString(),TQString email=TQString(), TQString tr=TQString(), TQString val=TQString(), TQString size=TQString(), TQString creat=TQString(), TQString id=TQString()); + UpdateViewItem(TQListViewItem *parent=nullptr, TQString name=TQString(),TQString email=TQString(), TQString tr=TQString(), TQString val=TQString(), TQString size=TQString(), TQString creat=TQString(), TQString id=TQString()); virtual void paintCell(TQPainter *p, const TQColorGroup &cg,int col, int width, int align); virtual int compare( TQListViewItem * item, int c, bool ascending ) const; virtual TQString key( int column, bool ) const; @@ -580,14 +580,14 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,this, TQ_SLOT(delsignkey()),actionCollection(),"key_delsign"); TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,this, TQ_SLOT(listsigns()),actionCollection(),"key_info"); TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),this, TQ_SLOT(slotPreImportKey()),actionCollection(),"key_import"); - TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,this, TQ_SLOT(slotSetDefKey()),actionCollection(),"key_default"); + TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),nullptr, 0,this, TQ_SLOT(slotSetDefKey()),actionCollection(),"key_default"); importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,this, TQ_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,this, TQ_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,this, TQ_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); - TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,this, TQ_SLOT(createNewGroup()),actionCollection(),"create_group"); - TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,this, TQ_SLOT(deleteGroup()),actionCollection(),"delete_group"); - TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,this, TQ_SLOT(editGroup()),actionCollection(),"edit_group"); + TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), nullptr, 0,this, TQ_SLOT(createNewGroup()),actionCollection(),"create_group"); + TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), nullptr, 0,this, TQ_SLOT(deleteGroup()),actionCollection(),"delete_group"); + TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), nullptr, 0,this, TQ_SLOT(editGroup()),actionCollection(),"edit_group"); TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,this, TQ_SLOT(addToKAB()),actionCollection(),"add_kab"); (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,this, TQ_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); @@ -598,19 +598,19 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),this, TQ_SLOT(refreshkey()),actionCollection(),"key_refresh"); TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,this, TQ_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,this, TQ_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); - TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,this, TQ_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); + TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), nullptr, 0,this, TQ_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); - TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,this, TQ_SLOT(slotAddUid()),actionCollection(),"add_uid"); - TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,this, TQ_SLOT(slotDelUid()),actionCollection(),"del_uid"); + TDEAction *addUid= new TDEAction(i18n("&Add User Id"), nullptr, 0,this, TQ_SLOT(slotAddUid()),actionCollection(),"add_uid"); + TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), nullptr, 0,this, TQ_SLOT(slotDelUid()),actionCollection(),"del_uid"); TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),this, TQ_SLOT(slotedit()),actionCollection(),"key_edit"); - TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,this, TQ_SLOT(slotexportsec()),actionCollection(),"key_sexport"); - TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,this, TQ_SLOT(revokeWidget()),actionCollection(),"key_revoke"); + TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), nullptr, 0,this, TQ_SLOT(slotexportsec()),actionCollection(),"key_sexport"); + TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), nullptr, 0,this, TQ_SLOT(revokeWidget()),actionCollection(),"key_revoke"); - TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,this, TQ_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); + TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), nullptr, 0,this, TQ_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),this, TQ_SLOT(slotgenkey()),actionCollection(),"key_gener"); - TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,this, TQ_SLOT(slotregenerate()),actionCollection(),"key_regener"); + TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), nullptr, 0,this, TQ_SLOT(slotregenerate()),actionCollection(),"key_regener"); (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(showKeyServer()),actionCollection(),"key_server"); KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection(),"options_configure"); @@ -620,13 +620,13 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,this, TQ_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); keysList2->displayOnlySecret=false; - (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,this, TQ_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); + (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),nullptr, 0,this, TQ_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); keysList2->displayDisabled=true; - sTrust=new TDEToggleAction(i18n("Trust"),0, 0,this, TQ_SLOT(slotShowTrust()),actionCollection(),"show_trust"); - sSize=new TDEToggleAction(i18n("Size"),0, 0,this, TQ_SLOT(slotShowSize()),actionCollection(),"show_size"); - sCreat=new TDEToggleAction(i18n("Creation"),0, 0,this, TQ_SLOT(slotShowCreat()),actionCollection(),"show_creat"); - sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,this, TQ_SLOT(slotShowExpi()),actionCollection(),"show_expi"); + sTrust=new TDEToggleAction(i18n("Trust"),nullptr, 0,this, TQ_SLOT(slotShowTrust()),actionCollection(),"show_trust"); + sSize=new TDEToggleAction(i18n("Size"),nullptr, 0,this, TQ_SLOT(slotShowSize()),actionCollection(),"show_size"); + sCreat=new TDEToggleAction(i18n("Creation"),nullptr, 0,this, TQ_SLOT(slotShowCreat()),actionCollection(),"show_creat"); + sExpi=new TDEToggleAction(i18n("Expiration"),nullptr, 0,this, TQ_SLOT(slotShowExpi()),actionCollection(),"show_expi"); photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings"); @@ -908,7 +908,7 @@ void listKeys::refreshKeyFromServer() KMessageBox::sorry(this,i18n("You can only refresh primary keys. Please check your selection.")); return; } - kServer=new keyServer(0,"server_dialog",false); + kServer=new keyServer(nullptr,"server_dialog",false); kServer->page->kLEimportid->setText(keyIDS); kServer->slotImport(); connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT(refreshFinished())); @@ -919,7 +919,7 @@ void listKeys::refreshFinished() { // kdDebug(2100) << k_funcinfo << endl; if (kServer) - kServer=0L; + kServer=nullptr; for ( uint i = 0; i < keysList.count(); ++i ) if (keysList.at(i)) @@ -964,7 +964,7 @@ void listKeys::slotregenerate() void listKeys::slotAddUid() { - addUidWidget=new KDialogBase(KDialogBase::Swallow, i18n("Add New User Id"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true); + addUidWidget=new KDialogBase(KDialogBase::Swallow, i18n("Add New User Id"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,nullptr,true); addUidWidget->enableButtonOK(false); AddUid *keyUid=new AddUid(); addUidWidget->setMainWidget(keyUid); @@ -1230,7 +1230,7 @@ void listKeys::allToKAB() void listKeys::slotManpage() { - tdeApp->startServiceByDesktopName("khelpcenter", TQString("man:/gpg"), 0, 0, 0, "", true); + tdeApp->startServiceByDesktopName("khelpcenter", TQString("man:/gpg"), nullptr, nullptr, nullptr, "", true); } void listKeys::slotTip() @@ -1459,7 +1459,7 @@ void listKeys::slotrevoke(TQString keyID,TQString revokeUrl,int reason,TQString void listKeys::revokeWidget() { - KDialogBase *keyRevokeWidget=new KDialogBase(KDialogBase::Swallow, i18n("Create Revocation Certificate"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true); + KDialogBase *keyRevokeWidget=new KDialogBase(KDialogBase::Swallow, i18n("Create Revocation Certificate"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,nullptr,true); KgpgRevokeWidget *keyRevoke=new KgpgRevokeWidget(); @@ -1578,7 +1578,7 @@ void listKeys::slotexport() TQString expname; bool exportAttr=page->exportAttributes->isChecked(); if (page->checkServer->isChecked()) { - keyServer *expServer=new keyServer(0,"server_export",false); + keyServer *expServer=new keyServer(nullptr,"server_export",false); expServer->page->exportAttributes->setChecked(exportAttr); TQStringList exportKeysList; for ( uint i = 0; i < exportList.count(); ++i ) @@ -1785,7 +1785,7 @@ void listKeys::createNewGroup() KMessageBox::sorry(this,i18n("You cannot create a group containing signatures, subkeys or other groups.")); return; } - TQString groupName=KInputDialog::getText(i18n("Create New Group"),i18n("Enter new group name:"),TQString(),0,this); + TQString groupName=KInputDialog::getText(i18n("Create New Group"),i18n("Enter new group name:"),TQString(),nullptr,this); if (groupName.isEmpty()) return; if (!keysGroup.isEmpty()) { @@ -1842,7 +1842,7 @@ void listKeys::editGroup() return; TQStringList keysGroup; //KDialogBase *dialogGroupEdit=new KDialogBase( this, "edit_group", true,i18n("Group Properties"),KDialogBase::Ok | KDialogBase::Cancel); - KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true); + KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,nullptr,true); gEdit=new groupEdit(); gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-down",TDEIcon::Small,20)); @@ -2082,7 +2082,7 @@ void listKeys::preimportsignkey() bool listKeys::importRemoteKey(TQString keyID) { // kdDebug(2100) << k_funcinfo << endl; - kServer=new keyServer(0,"server_dialog",false,true); + kServer=new keyServer(nullptr,"server_dialog",false,true); kServer->page->kLEimportid->setText(keyID); kServer->page->Buttonimport->setDefault(true); kServer->page->tabWidget2->setTabEnabled(kServer->page->tabWidget2->page(1),false); @@ -2099,7 +2099,7 @@ void listKeys::dcopImportFinished() { // kdDebug(2100) << k_funcinfo << endl; if (kServer) - kServer=0L; + kServer=nullptr; TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << true; @@ -2111,7 +2111,7 @@ void listKeys::importsignkey(TQString importKeyId) { // kdDebug(2100) << k_funcinfo << endl; /////////////// sign a key - kServer=new keyServer(0,"server_dialog",false); + kServer=new keyServer(nullptr,"server_dialog",false); kServer->page->kLEimportid->setText(importKeyId); //kServer->Buttonimport->setDefault(true); kServer->slotImport(); @@ -2125,7 +2125,7 @@ void listKeys::importfinished() { // kdDebug(2100) << k_funcinfo << endl; if (kServer) - kServer=0L; + kServer=nullptr; refreshkey(); } @@ -2174,7 +2174,7 @@ void listKeys::delsignatureResult(bool success) TQListViewItem *top=keysList2->currentItem(); while (top->depth()!=0) top=top->parent(); - while (top->firstChild()!=0) + while (top->firstChild()) delete top->firstChild(); keysList2->refreshcurrentkey(top); } else @@ -2208,7 +2208,7 @@ void listKeys::slotgenkey() { // kdDebug(2100) << k_funcinfo << endl; ////////// generate key - keyGenerate *genkey=new keyGenerate(this,0); + keyGenerate *genkey=new keyGenerate(this,nullptr); if (genkey->exec()==TQDialog::Accepted) { if (!genkey->getmode()) /// normal mode { @@ -2969,7 +2969,7 @@ void KeyView::refreshkeylist() } // kdDebug(2100)<<"Finished Groups"<text(6).isEmpty()) @@ -2979,7 +2979,7 @@ void KeyView::refreshkeylist() delete current; } - if (newPos != 0L) { + if (newPos) { setCurrentItem(newPos); setSelected(newPos, true); ensureItemVisible(newPos); @@ -3225,7 +3225,7 @@ void KeyView::slotReloadOrphaned() TQStringList::Iterator it; for ( it = issec.begin(); it != issec.end(); ++it ) { - if (findItem(*it,6)==0) { + if (!findItem(*it,6)) { insertOrphan(*it); orphanList+=*it+","; } diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index a65abe6e..435e9183 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -71,7 +71,7 @@ class KgpgSelKey : public KDialogBase public: - KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString()); + KgpgSelKey( TQWidget *parent = nullptr, const char *name = nullptr,bool allowMultipleSelection=false, TQString preselected=TQString()); TDEListView *keysListpr; TQPixmap keyPair; TQCheckBox *local; @@ -95,7 +95,7 @@ class KeyView : public TDEListView friend class listKeys; public: - KeyView( TQWidget *parent = 0, const char *name = 0); + KeyView( TQWidget *parent = nullptr, const char *name = nullptr); bool displayPhoto,displayOnlySecret,displayDisabled; int previewSize; TQString secretList; @@ -146,7 +146,7 @@ class mySearchLine: public TDEListViewSearchLine TQ_OBJECT public: - mySearchLine(TQWidget *parent = 0, KeyView *listView = 0, const char *name = 0); + mySearchLine(TQWidget *parent = nullptr, KeyView *listView = nullptr, const char *name = nullptr); virtual ~mySearchLine(); private: KeyView *searchListView; @@ -165,7 +165,7 @@ class listKeys : public TDEMainWindow, virtual public KeyInterface public: - listKeys(TQWidget *parent=0, const char *name=0); + listKeys(TQWidget *parent=nullptr, const char *name=nullptr); ~listKeys(); TQLabel *keyPhoto; KeyView *keysList2; diff --git a/kgpg/main.cpp b/kgpg/main.cpp index 7ef747bc..3b285e5b 100644 --- a/kgpg/main.cpp +++ b/kgpg/main.cpp @@ -35,13 +35,13 @@ static const char version[] = "1.3.0"; static TDECmdLineOptions options[] = { - { "e", I18N_NOOP("Encrypt file"), 0 }, - { "k", I18N_NOOP("Open key manager"), 0 }, - { "s", I18N_NOOP("Show encrypted file"), 0 }, - { "S", I18N_NOOP("Sign file"), 0 }, - { "V", I18N_NOOP("Verify signature"), 0 }, - { "X", I18N_NOOP("Shred file"), 0 }, - { "+[File]", I18N_NOOP("File to open"), 0 }, + { "e", I18N_NOOP("Encrypt file"), nullptr }, + { "k", I18N_NOOP("Open key manager"), nullptr }, + { "s", I18N_NOOP("Show encrypted file"), nullptr }, + { "S", I18N_NOOP("Sign file"), nullptr }, + { "V", I18N_NOOP("Verify signature"), nullptr }, + { "X", I18N_NOOP("Shred file"), nullptr }, + { "+[File]", I18N_NOOP("File to open"), nullptr }, TDECmdLineLastOption // INSERT YOUR COMMANDLINE OPTIONS HERE }; @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) TDEAboutData about("kgpg", I18N_NOOP("KGpg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle"); - about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" ); + about.addAuthor( "Jean-Baptiste Mardelle", nullptr, "bj@altern.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); TDEUniqueApplication::addCmdLineOptions(); diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 6b5ac09d..92e55be3 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -140,7 +140,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keysList->setColumnWidth(0,210); keysList->setColumnWidth(1,210); - boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0); + boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,nullptr); TDEActionCollection *actcol=new TDEActionCollection(this); (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQ_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index 120dc17f..9cbafb0d 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -35,7 +35,7 @@ class popupPublic : public KDialogBase //TQDialog public: - popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); + popupPublic(TQWidget *parent=nullptr, const char *name=nullptr,TQString sfile="",bool filemode=false,TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); ~popupPublic(); TDEListView *keysList; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h index 7d5c4097..873b8eb5 100644 --- a/khexedit/bitswapwidget.h +++ b/khexedit/bitswapwidget.h @@ -32,7 +32,7 @@ class CDigitLabel : public TQLabel public: - CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 ); + CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=nullptr ); ~CDigitLabel( void ); virtual TQSize sizeHint() const; @@ -74,7 +74,7 @@ class CByteWidget : public TQWidget public: - CByteWidget( TQWidget *parent, const char *name=0 ); + CByteWidget( TQWidget *parent, const char *name=nullptr ); ~CByteWidget( void ); bool flag( TQByteArray &buf ); diff --git a/khexedit/chartabledialog.cpp b/khexedit/chartabledialog.cpp index be77c2ba..b3e7b893 100644 --- a/khexedit/chartabledialog.cpp +++ b/khexedit/chartabledialog.cpp @@ -42,7 +42,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } mCharacterList = new CListView( plainPage(), "characterList" ); mCharacterList->setFont( TDEGlobalSettings::fixedFont() ); @@ -64,7 +64,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, topLayout->addWidget( mCharacterList, 10 ); TQHBoxLayout *hbox = new TQHBoxLayout(); - if( hbox == 0 ) { return; } + if( !hbox ) { return; } topLayout->addLayout( hbox ); text = i18n("Insert this number of characters:"); @@ -107,7 +107,7 @@ const char *printBinary( uint val ) void CCharTableDialog::createListData( void ) { TQString d, h, o, b, c; - TQListViewItem *item = 0; + TQListViewItem *item = nullptr; char buf[10]; memset( buf, 0, sizeof( buf ) ); @@ -141,7 +141,7 @@ void CCharTableDialog::createListData( void ) void CCharTableDialog::slotUser1( void ) // Insert { TQListViewItem *item = mCharacterList->selectedItem(); - if( item != 0 ) + if( item ) { startAssign( item ); } diff --git a/khexedit/chartabledialog.h b/khexedit/chartabledialog.h index 11206a9c..6279a149 100644 --- a/khexedit/chartabledialog.h +++ b/khexedit/chartabledialog.h @@ -38,7 +38,7 @@ class CCharTableDialog : public KDialogBase public: - CCharTableDialog( TQWidget *parent=0, const char *name=0,bool modal=false ); + CCharTableDialog( TQWidget *parent=nullptr, const char *name=nullptr,bool modal=false ); ~CCharTableDialog( void ); signals: diff --git a/khexedit/conversion.cpp b/khexedit/conversion.cpp index a0b6195b..1478f5dc 100644 --- a/khexedit/conversion.cpp +++ b/khexedit/conversion.cpp @@ -151,7 +151,7 @@ const unsigned char *CConversion::tables( EMode cnvMode ) } else { - return( 0 ); + return( nullptr ); } } @@ -159,7 +159,7 @@ const unsigned char *CConversion::tables( EMode cnvMode ) void CConversion::setMode( EMode cnvMode ) { const unsigned char *table = tables( cnvMode ); - if( table == 0 ) + if( !table ) { cnvMode = cnvDefault; table = tables( cnvMode ); @@ -174,7 +174,7 @@ void CConversion::setMode( EMode cnvMode ) bool CConversion::lossless( EMode cnvMode ) { const unsigned char *table = tables( cnvMode ); - if( table == 0 ) + if( !table ) { return( false ); } diff --git a/khexedit/converterdialog.h b/khexedit/converterdialog.h index 1ee1287d..0676025e 100644 --- a/khexedit/converterdialog.h +++ b/khexedit/converterdialog.h @@ -33,7 +33,7 @@ class CValidateLineEdit : public TQLineEdit public: - CValidateLineEdit( TQWidget *parent, int validateType, const char *name=0 ); + CValidateLineEdit( TQWidget *parent, int validateType, const char *name=nullptr ); ~CValidateLineEdit( void ); public slots: @@ -57,7 +57,7 @@ class CConverterDialog : public KDialogBase public: - CConverterDialog( TQWidget *parent, const char *name=0, bool modal=true ); + CConverterDialog( TQWidget *parent, const char *name=nullptr, bool modal=true ); ~CConverterDialog( void ); protected: diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp index a26ed0ea..4e1dbc7c 100644 --- a/khexedit/dialog.cpp +++ b/khexedit/dialog.cpp @@ -45,30 +45,30 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) modal ) { TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQVBoxLayout *vbox = new TQVBoxLayout(); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } topLayout->addLayout( vbox ); mComboBox = new TQComboBox( true, plainPage() ); - if( mComboBox == 0 ) { return; } + if( !mComboBox ) { return; } mComboBox->setMaxCount( 10 ); mComboBox->setInsertionPolicy( TQComboBox::AtTop ); mComboBox->setMinimumWidth( fontMetrics().maxWidth()*17 ); TQLabel *label = new TQLabel( mComboBox, i18n("O&ffset:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mComboBox ); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); - if( group == 0 ) { return; } + if( !group ) { return; } topLayout->addWidget( group, 10 ); TQGridLayout *gbox = new TQGridLayout( group, 4, 2, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); @@ -160,7 +160,7 @@ void CGotoDialog::slotOk( void ) bit = 7; p = strpbrk( p, ":,. " ); - if( p != 0 ) + if( p ) { match = sscanf( p+1, "%u", &bit ); if( match == 0 ) @@ -179,45 +179,45 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) { TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQVBoxLayout *vbox = new TQVBoxLayout(); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } topLayout->addLayout( vbox ); mSelector = new TQComboBox( false, plainPage() ); - if( mSelector == 0 ) { return; } + if( !mSelector ) { return; } mSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSelector->insertStringList( formatStrings() ); connect( mSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQLabel *label = new TQLabel( mSelector, i18n("Fo&rmat:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mSelector ); mInput = new TQLineEdit( plainPage() ); - if( mInput == 0 ) { return; } + if( !mInput ) { return; } mInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); connect( mInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(inputChanged(const TQString&)) ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); - if( mFindValidator == 0 ) { return; } + if( !mFindValidator ) { return; } mInput->setValidator( mFindValidator ); label = new TQLabel( mInput, i18n("F&ind:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mInput ); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); - if( group == 0 ) { return; } + if( !group ) { return; } topLayout->addWidget( group, 10 ); TQGridLayout *gbox = new TQGridLayout( group, 5, 2, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); @@ -351,12 +351,12 @@ CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *parent, const char *name, { TQString text; TQBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } topLayout->addSpacing( spacingHint() ); // A little bit extra space TQHBoxLayout *hbox = new TQHBoxLayout(); - if( hbox == 0 ) { return; } + if( !hbox ) { return; } topLayout->addLayout( hbox ); text = i18n("Searching for:"); @@ -487,15 +487,15 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) { TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQVBoxLayout *vbox = new TQVBoxLayout(); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } topLayout->addLayout( vbox ); mFindSelector = new TQComboBox( false, plainPage() ); - if( mFindSelector == 0 ) { return; } + if( !mFindSelector ) { return; } mFindSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindSelector->insertStringList( formatStrings() ); connect( mFindSelector, TQ_SIGNAL(activated(int)), @@ -503,28 +503,28 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) text = i18n("Fo&rmat (find):"); TQLabel *label = new TQLabel( mFindSelector, text, plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mFindSelector ); mFindInput = new TQLineEdit( plainPage() ); - if( mFindInput == 0 ) { return; } + if( !mFindInput ) { return; } mFindInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); - if( mFindValidator == 0 ) { return; } + if( !mFindValidator ) { return; } mFindInput->setValidator( mFindValidator ); connect( mFindInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(findInputChanged(const TQString&)) ); label = new TQLabel( mFindInput, i18n("F&ind:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mFindInput ); mReplaceSelector = new TQComboBox( false, plainPage() ); - if( mReplaceSelector == 0 ) { return; } + if( !mReplaceSelector ) { return; } mReplaceSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceSelector->insertStringList( formatStrings() ); connect( mReplaceSelector, TQ_SIGNAL(activated(int)), @@ -532,34 +532,34 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) text = i18n("For&mat (replace):"); label = new TQLabel( mReplaceSelector, text, plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); vbox->addWidget( mReplaceSelector ); mReplaceInput = new TQLineEdit( plainPage() ); - if( mReplaceInput == 0 ) { return; } + if( !mReplaceInput ) { return; } mReplaceInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceValidator = new CHexValidator( this, CHexValidator::regularText ); - if( mReplaceValidator == 0 ) { return; } + if( !mReplaceValidator ) { return; } mReplaceInput->setValidator( mReplaceValidator ); connect( mReplaceInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(replaceInputChanged(const TQString&)) ); label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); vbox->addWidget( mReplaceInput ); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); - if( group == 0 ) { return; } + if( !group ) { return; } topLayout->addWidget( group, 10 ); TQGridLayout *gbox = new TQGridLayout( group, 5, 2, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); @@ -684,7 +684,7 @@ CReplacePromptDialog::CReplacePromptDialog( TQWidget *parent, const char *name, { TQString text; TQBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } topLayout->addSpacing( spacingHint() ); // A little bit extra space @@ -763,15 +763,15 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) { TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQVBoxLayout *vbox = new TQVBoxLayout(); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } topLayout->addLayout( vbox ); mOperationSelector = new TQComboBox( false, plainPage() ); - if( mOperationSelector == 0 ) { return; } + if( !mOperationSelector ) { return; } mOperationSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mOperationSelector->insertStringList( operationStrings() ); connect( mOperationSelector, TQ_SIGNAL(activated(int)), @@ -779,7 +779,7 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) text = i18n("O&peration:"); TQLabel *label = new TQLabel( mOperationSelector, text, plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mOperationSelector ); @@ -790,7 +790,7 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) mWidgetStack = new TQWidgetStack( plainPage(), "pagestack" ); - if( mWidgetStack == 0 ) { return; } + if( !mWidgetStack ) { return; } vbox->addWidget( mWidgetStack ); makeEmptyLayout(); @@ -801,11 +801,11 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); - if( group == 0 ) { return; } + if( !group ) { return; } topLayout->addWidget( group, 10 ); TQGridLayout *gbox = new TQGridLayout( group, 4, 2, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); @@ -828,7 +828,7 @@ CFilterDialog::~CFilterDialog( void ) void CFilterDialog::makeEmptyLayout( void ) { TQFrame *page = new TQFrame( plainPage() ); - if( page == 0 ) { return; } + if( !page ) { return; } mWidgetStack->addWidget( page, EmptyPage ); } @@ -838,14 +838,14 @@ void CFilterDialog::makeOperandLayout( void ) TQString text; TQFrame *page = new TQFrame( plainPage() ); - if( page == 0 ) { return; } + if( !page ) { return; } mWidgetStack->addWidget( page, OperandPage ); TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } mOperandSelector = new TQComboBox( false, page ); - if( mOperandSelector == 0 ) { return; } + if( !mOperandSelector ) { return; } mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height()); mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 ); mOperandSelector->insertStringList( formatStrings() ); @@ -854,22 +854,22 @@ void CFilterDialog::makeOperandLayout( void ) text = i18n("Fo&rmat (operand):"); mOperandFormatLabel = new TQLabel( mOperandSelector, text, page ); - if( mOperandFormatLabel == 0 ) { return; } + if( !mOperandFormatLabel ) { return; } vbox->addWidget( mOperandFormatLabel ); vbox->addWidget( mOperandSelector ); mOperandInput = new TQLineEdit( page ); - if( mOperandInput == 0 ) { return; } + if( !mOperandInput ) { return; } mOperandInput->setMinimumWidth( fontMetrics().width("M") * 20 ); mOperandValidator = new CHexValidator( this, CHexValidator::regularText ); - if( mOperandValidator == 0 ) { return; } + if( !mOperandValidator ) { return; } mOperandInput->setValidator( mOperandValidator ); connect( mOperandInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(operandInputChanged(const TQString&)) ); mOperandInputLabel = new TQLabel( mOperandInput, i18n("O&perand:"), page ); - if( mOperandInputLabel == 0 ) { return; } + if( !mOperandInputLabel ) { return; } vbox->addWidget( mOperandInputLabel ); vbox->addWidget( mOperandInput ); @@ -882,15 +882,15 @@ void CFilterDialog::makeBitSwapLayout( void ) TQString text; TQFrame *page = new TQFrame( plainPage() ); - if( page == 0 ) { return; } + if( !page ) { return; } mWidgetStack->addWidget( page, BitSwapPage ); TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } text = i18n("Swap rule"); TQLabel *label = new TQLabel( text, page ); - if( label == 0 ) { return; } + if( !label ) { return; } label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); @@ -915,32 +915,32 @@ void CFilterDialog::makeRotateLayout( void ) TQString text; TQFrame *page = new TQFrame( plainPage() ); - if( page == 0 ) { return; } + if( !page ) { return; } mWidgetStack->addWidget( page, RotatePage ); TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } mGroupSpin = new TQSpinBox( page ); - if( mGroupSpin == 0 ) { return; } + if( !mGroupSpin ) { return; } mGroupSpin->setMinimumWidth( fontMetrics().width("M")*20 ); mGroupSpin->setRange(1, INT_MAX ); text = i18n("&Group size [bytes]"); TQLabel *label = new TQLabel( mGroupSpin, text, page ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mGroupSpin ); mBitSpin = new TQSpinBox( page ); - if( mBitSpin == 0 ) { return; } + if( !mBitSpin ) { return; } mBitSpin->setMinimumWidth( fontMetrics().width("M")*20 ); mBitSpin->setRange(INT_MIN, INT_MAX); text = i18n("S&hift size [bits]"); label = new TQLabel( mBitSpin, text, page ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mBitSpin ); @@ -1074,26 +1074,26 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQVBoxLayout *vbox = new TQVBoxLayout(); - if( vbox == 0 ) { return; } + if( !vbox ) { return; } topLayout->addLayout( vbox ); mSizeBox = new TQSpinBox( plainPage() ); - if( mSizeBox == 0 ) { return; } + if( !mSizeBox ) { return; } mSizeBox->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSizeBox->setRange( 1, INT_MAX ); mSizeBox->setValue( 1 ); TQLabel *label = new TQLabel( mSizeBox, i18n("&Size:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mSizeBox ); mPatternSelector = new TQComboBox( false, plainPage() ); - if( mPatternSelector == 0 ) { return; } + if( !mPatternSelector ) { return; } mPatternSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternSelector->insertStringList( formatStrings() ); connect( mPatternSelector, TQ_SIGNAL(activated(int)), @@ -1101,22 +1101,22 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) text = i18n("Fo&rmat (pattern):"); label = new TQLabel( mPatternSelector, text, plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mPatternSelector ); mPatternInput = new TQLineEdit( plainPage() ); - if( mPatternInput == 0 ) { return; } + if( !mPatternInput ) { return; } mPatternInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternValidator = new CHexValidator( this, CHexValidator::regularText ); - if( mPatternValidator == 0 ) { return; } + if( !mPatternValidator ) { return; } mPatternInput->setValidator( mPatternValidator ); connect( mPatternInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(patternInputChanged(const TQString&)) ); label = new TQLabel( mPatternInput, i18n("&Pattern:"), plainPage() ); - if( label == 0 ) { return; } + if( !label ) { return; } vbox->addWidget( label ); vbox->addWidget( mPatternInput ); @@ -1125,18 +1125,18 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) mOffsetInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mOffsetLabel = new TQLabel( mOffsetInput, i18n("&Offset:"), plainPage() ); - if( mOffsetLabel == 0 ) { return; } + if( !mOffsetLabel ) { return; } vbox->addWidget( mOffsetLabel ); vbox->addWidget( mOffsetInput ); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); - if( group == 0 ) { return; } + if( !group ) { return; } topLayout->addWidget( group, 10 ); TQGridLayout *gbox = new TQGridLayout( group, 4, 2, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); mCheckPattern = new TQCheckBox( i18n("R&epeat pattern"), group ); @@ -1231,7 +1231,7 @@ void CInsertDialog::cursorCheck( void ) void centerDialog( TQWidget *widget, TQWidget *centerParent ) { - if( centerParent == 0 || widget == 0 ) + if( !centerParent || !widget ) { return; } @@ -1247,7 +1247,7 @@ void centerDialog( TQWidget *widget, TQWidget *centerParent ) void centerDialogBottom( TQWidget *widget, TQWidget *centerParent ) { - if( centerParent == 0 || widget == 0 ) + if( !centerParent || !widget ) { return; } diff --git a/khexedit/dialog.h b/khexedit/dialog.h index 6322c2da..6d609602 100644 --- a/khexedit/dialog.h +++ b/khexedit/dialog.h @@ -67,7 +67,7 @@ class CGotoDialog : public KDialogBase public: - CGotoDialog( TQWidget *parent, const char *name = 0, bool modal = false ); + CGotoDialog( TQWidget *parent, const char *name = nullptr, bool modal = false ); ~CGotoDialog( void ); protected: @@ -102,7 +102,7 @@ class CFindDialog : public KDialogBase }; public: - CFindDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); + CFindDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false ); ~CFindDialog( void ); bool isEmpty( void ); @@ -142,7 +142,7 @@ class CFindNavigatorDialog : public KDialogBase public: - CFindNavigatorDialog( TQWidget *parent=0, const char *name=0, + CFindNavigatorDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false ); ~CFindNavigatorDialog( void ); void defineData( SSearchControl &sc ); @@ -172,7 +172,7 @@ class CReplaceDialog : public KDialogBase public: - CReplaceDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); + CReplaceDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false ); ~CReplaceDialog( void ); protected: @@ -216,7 +216,7 @@ class CReplacePromptDialog : public KDialogBase public: - CReplacePromptDialog( TQWidget *parent=0, const char *name=0, + CReplacePromptDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false ); ~CReplacePromptDialog( void ); void defineData( SSearchControl &sc ); @@ -255,7 +255,7 @@ class CFilterDialog : public KDialogBase }; public: - CFilterDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); + CFilterDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false ); ~CFilterDialog( void ); protected: @@ -306,7 +306,7 @@ class CInsertDialog : public KDialogBase public: - CInsertDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); + CInsertDialog( TQWidget *parent=nullptr, const char *name=nullptr, bool modal=false ); ~CInsertDialog( void ); protected: diff --git a/khexedit/draglabel.cpp b/khexedit/draglabel.cpp index 340e4712..c30aecb8 100644 --- a/khexedit/draglabel.cpp +++ b/khexedit/draglabel.cpp @@ -69,7 +69,7 @@ void CDragLabel::mouseMoveEvent( TQMouseEvent *e ) KURL::List uris; uris.append(KURL(mUrl)); KURLDrag *uriDrag = new KURLDrag( uris, this ); - if( uriDrag == 0 ) { return; } + if( !uriDrag ) { return; } prepPixmap( *uriDrag ); grabKeyboard(); uriDrag->drag(); @@ -98,7 +98,7 @@ void CDragLabel::setDragMask( const TQPixmap pix ) void CDragLabel::prepPixmap( KURLDrag &uriDrag ) { - if( pixmap() == 0 ) + if( !pixmap() ) { return; } diff --git a/khexedit/exportdialog.cpp b/khexedit/exportdialog.cpp index df95f5ff..5603e2a0 100644 --- a/khexedit/exportdialog.cpp +++ b/khexedit/exportdialog.cpp @@ -43,7 +43,7 @@ CExportDialog::CExportDialog( TQWidget *parent, char *name, bool modal ) setupDestinationPage(); setupOptionPage(); - mConfig = 0; + mConfig = nullptr; readConfiguration(); TQString path = mDestination.fileInput->text(); @@ -55,7 +55,7 @@ CExportDialog::CExportDialog( TQWidget *parent, char *name, bool modal ) CExportDialog::~CExportDialog( void ) { writeConfiguration(); - delete mConfig; mConfig = 0; + delete mConfig; mConfig = nullptr; } @@ -69,10 +69,10 @@ void CExportDialog::showEvent( TQShowEvent *e ) void CExportDialog::readConfiguration( void ) { - if( mConfig != 0 ) { return; } + if( mConfig ) { return; } mConfig = new TDESimpleConfig( TQString("hexexport") ); - if( mConfig == 0 ) { return; } + if( !mConfig ) { return; } mConfig->setGroup( "Destination" ); @@ -119,7 +119,7 @@ void CExportDialog::readConfiguration( void ) void CExportDialog::writeConfiguration( void ) { - if( mConfig == 0 ) + if( !mConfig ) { return; } @@ -152,7 +152,7 @@ void CExportDialog::setupDestinationPage( void ) TQFrame *page = mFrame[ page_destination ]; TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQStringList formatList; formatList.append( i18n("Plain Text") ); @@ -252,10 +252,10 @@ void CExportDialog::setupOptionPage( void ) { TQFrame *page = mFrame[ page_option ]; TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } mOptionStack = new TQWidgetStack( page, "stack" ); - if( mOptionStack == 0 ) { return; } + if( !mOptionStack ) { return; } topLayout->addWidget( mOptionStack ); makeTextOption(); @@ -273,7 +273,7 @@ void CExportDialog::setupOptionPage( void ) void CExportDialog::makeTextOption( void ) { TQFrame *page = new TQFrame( mFrame[ page_option ] ); - if( page == 0 ) { return; } + if( !page ) { return; } mOptionStack->addWidget( page, option_text ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); @@ -286,12 +286,12 @@ void CExportDialog::makeTextOption( void ) void CExportDialog::makeHtmlOption( void ) { TQFrame *page = new TQFrame( mFrame[ page_option ] ); - if( page == 0 ) { return; } + if( !page ) { return; } mOptionStack->addWidget( page, option_html ); TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } text = i18n("HTML Options (one table per page)"); TQLabel *label = new TQLabel( text, page ); @@ -302,11 +302,11 @@ void CExportDialog::makeHtmlOption( void ) topLayout->addWidget( hline ); TQFrame *frame = new TQFrame( page ); - if( frame == 0 ) { return; } + if( !frame ) { return; } topLayout->addWidget( frame ); TQGridLayout *gbox = new TQGridLayout( frame, 4, 2, 0, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->setColStretch( 1, 10 ); mHtml.lineSpin = new TQSpinBox( frame ); @@ -367,7 +367,7 @@ void CExportDialog::makeHtmlOption( void ) void CExportDialog::makeRtfOption( void ) { TQFrame *page = new TQFrame( mFrame[ page_option ] ); - if( page == 0 ) { return; } + if( !page ) { return; } mOptionStack->addWidget( page, option_rtf ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); @@ -592,7 +592,7 @@ void CExportDialog::slotOk( void ) bool CExportDialog::collectRange( uint &mode, uint &start, uint &stop ) { TQButton *b = mDestination.rangeBox->selected(); - if( b == 0 ) + if( !b ) { return( false ); } diff --git a/khexedit/exportdialog.h b/khexedit/exportdialog.h index 7adcea3f..885e2390 100644 --- a/khexedit/exportdialog.h +++ b/khexedit/exportdialog.h @@ -58,7 +58,7 @@ class CExportDialog : public KDialogBase option_max }; - CExportDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); + CExportDialog( TQWidget *parent = nullptr, char *name = nullptr, bool modal = false ); ~CExportDialog( void ); void writeConfiguration( void ); diff --git a/khexedit/fileinfodialog.cpp b/khexedit/fileinfodialog.cpp index 9d240e08..d09d1c7e 100644 --- a/khexedit/fileinfodialog.cpp +++ b/khexedit/fileinfodialog.cpp @@ -78,11 +78,11 @@ CFileInfoDialog::CFileInfoDialog( TQWidget *parent,const char *name,bool modal) TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } TQGridLayout *gbox = new TQGridLayout( 2, 2, spacingHint() ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } topLayout->addLayout( gbox ); gbox->setColStretch( 1, 10 ); @@ -140,7 +140,7 @@ void CFileInfoDialog::slotUser1( void ) // Update return; SStatisticControl *sc = new SStatisticControl; - if( sc == 0 ) { return; } + if( !sc ) { return; } mBusy = true; emit collectStatistic( *sc ); @@ -191,7 +191,7 @@ void CFileInfoDialog::setStatistics() // Default static const TQString u("?"); TQString d, h, o, b, c; - TQListViewItem *item = 0; + TQListViewItem *item = nullptr; char buf[10]; memset( buf, 0, sizeof( buf ) ); @@ -222,7 +222,7 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc ) mFileSizeLabel->setText( TDEGlobal::locale()->formatNumber(sc.documentSize, 0) ); TQString d, h, o, b, c, n, p; - TQListViewItem *item = 0; + TQListViewItem *item = nullptr; uint size, pre, i; // find width of occurrence diff --git a/khexedit/fileinfodialog.h b/khexedit/fileinfodialog.h index b94a83ee..fa761377 100644 --- a/khexedit/fileinfodialog.h +++ b/khexedit/fileinfodialog.h @@ -39,7 +39,7 @@ class CFileInfoDialog : public KDialogBase public: - CFileInfoDialog( TQWidget *parent=0, const char *name=0,bool modal=false ); + CFileInfoDialog( TQWidget *parent=nullptr, const char *name=nullptr,bool modal=false ); ~CFileInfoDialog( void ); void setStatistics( void ); diff --git a/khexedit/hexbuffer.cpp b/khexedit/hexbuffer.cpp index 76142561..27279a7f 100644 --- a/khexedit/hexbuffer.cpp +++ b/khexedit/hexbuffer.cpp @@ -51,9 +51,9 @@ CHexAction::CHexAction( HexAction action, uint offset ) mAction = action; mOffset = offset; mSize = 0; - mData = 0; + mData = nullptr; mDataSize = 0; - mNext = 0; + mNext = nullptr; } CHexAction::~CHexAction( void ) @@ -64,10 +64,10 @@ CHexAction::~CHexAction( void ) void CHexAction::setData( uint size, char *data, uint dataSize ) { - if( data != 0 && dataSize > 0 ) + if( data && dataSize > 0 ) { mData = new char[ dataSize ]; - if( mData == 0 ) + if( !mData ) { return; } @@ -77,7 +77,7 @@ void CHexAction::setData( uint size, char *data, uint dataSize ) else { mDataSize = 0; - mData = 0; + mData = nullptr; } mSize = size; } @@ -87,13 +87,13 @@ CHexActionGroup::CHexActionGroup( uint startOffset, uint startBit ) { mStartOffset = startOffset; mStartBit = startBit; - mHexAction = 0; + mHexAction = nullptr; } CHexActionGroup::~CHexActionGroup( void ) { CHexAction *ptr = mHexAction; - while( ptr != 0 ) + while( ptr ) { CHexAction *next = ptr->mNext; delete ptr; @@ -512,8 +512,8 @@ SFileState CHexBuffer::mFileState; CHexBuffer::CHexBuffer( void ) :TQByteArray() { - mColorIndex = 0; - mPrintBuf = 0; + mColorIndex = nullptr; + mPrintBuf = nullptr; mLoadingData = false; mEditMode = EditReplace; mActiveEditor = edit_primary; @@ -597,11 +597,11 @@ int CHexBuffer::setLayout( SDisplayLayout &layout ) computeLineWidth(); cursorCompute(); - delete [] mColorIndex; mColorIndex = 0; - delete [] mPrintBuf; mPrintBuf = 0; + delete [] mColorIndex; mColorIndex = nullptr; + delete [] mPrintBuf; mPrintBuf = nullptr; mColorIndex = new unsigned char[ mLayout.lineSize ]; - if( mColorIndex == 0 ) + if( !mColorIndex ) { return( Err_NoMemory ); } @@ -613,9 +613,9 @@ int CHexBuffer::setLayout( SDisplayLayout &layout ) // is the number of bytes in one single display line. // mPrintBuf = new char[ mLayout.lineSize < 12 ? 12 : mLayout.lineSize ]; - if( mPrintBuf == 0 ) + if( !mPrintBuf ) { - delete [] mColorIndex; mColorIndex = 0; + delete [] mColorIndex; mColorIndex = nullptr; return( Err_NoMemory ); } @@ -640,7 +640,7 @@ void CHexBuffer::setColor( SDisplayColor &color ) mColor.gridFg = mColor.textBg; */ - if( mColorIndex != 0 ) + if( mColorIndex ) { uint columnSize = mLayout.columnSize == 0 ? 1 : mLayout.columnSize; for( uint i = 0, entry = 0; i < mLayout.lineSize; i++ ) @@ -1431,7 +1431,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int sx, int x1, int x2 ) return; } dataSize = 0; - fileData = 0; + fileData = nullptr; } else { @@ -1481,7 +1481,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int sx, int x1, int x2 ) } } - if( x1 < offset + s0 && x2 >= offset && fileData != 0 ) + if( x1 < offset + s0 && x2 >= offset && fileData ) { paint.setPen( mColor.offsetFg ); THIS_FPTR(printOffset)( mPrintBuf, fileOffset ); @@ -1646,7 +1646,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int sx, int x1, int x2 ) } } - if( x1 < offset + s0 && x2 >= offset && fileData != 0 ) + if( x1 < offset + s0 && x2 >= offset && fileData ) { paint.setPen( mShowBookmarkInOffsetColumn && bookmarkPosition & BookmarkOnLine ? @@ -1737,7 +1737,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int x1, int x2, int y, return; } dataSize = 0; - fileData = 0; + fileData = nullptr; } else { @@ -1751,7 +1751,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int x1, int x2, int y, if( mLayout.offsetVisible == true ) { int s1 = mOffsetSize * mUnitWidth; - if( fileData != 0 ) + if( fileData ) { paint.setPen( useBlackWhite == true ? TQt::black : mColor.offsetFg ); THIS_FPTR(printOffset)( mPrintBuf, fileOffset ); @@ -1974,7 +1974,7 @@ int CHexBuffer::drawBookmarks( TQPainter &paint, uint line, int startx ) int bookmarkPosition = 0; - for( SCursorOffset *c=mBookmarkList.first(); c!=0; c=mBookmarkList.next() ) + for( SCursorOffset *c=mBookmarkList.first(); c; c=mBookmarkList.next() ) { if( c->offset >= start && c->offset < stop ) { @@ -2647,7 +2647,7 @@ bool CHexBuffer::removeAtCursor( bool beforeCursor ) recordStart( mCursor ); cursorLeft( false ); - recordReplace( mCursor, 1, 0, 0 ); + recordReplace( mCursor, 1, nullptr, 0 ); recordEnd( mCursor ); computeNumLines(); @@ -2661,7 +2661,7 @@ bool CHexBuffer::removeAtCursor( bool beforeCursor ) } recordStart( mCursor ); - recordReplace( mCursor, 1, 0, 0 ); + recordReplace( mCursor, 1, nullptr, 0 ); recordEnd( mCursor ); computeNumLines(); @@ -3117,7 +3117,7 @@ int CHexBuffer::print( CHexPrinter &printer, CProgress &p ) #endif - SPagePosition pageData( time(0), remaining, linePerPage ); + SPagePosition pageData( time(nullptr), remaining, linePerPage ); while( remaining > 0 ) { uint lineInPage = remaining > linePerPage ? linePerPage : remaining; @@ -3195,7 +3195,7 @@ uint CHexBuffer::printLine( char *dst, uint line ) uint dataSize; if( offset >= documentSize() ) { - src = 0; + src = nullptr; dataSize = 0; } else @@ -3252,7 +3252,7 @@ uint CHexBuffer::printLine( char *dst, uint line, int columnSegment ) uint dataSize; if( offset >= documentSize() ) { - src = 0; + src = nullptr; dataSize = 0; } else @@ -3330,7 +3330,7 @@ bool CHexBuffer::cutSelection( void ) recordStart( mCursor ); cursorGoto( mSelect.start(), 0 ); - recordReplace( mCursor, mSelect.size(), 0, 0 ); + recordReplace( mCursor, mSelect.size(), nullptr, 0 ); recordEnd( mCursor ); mSelect.reset(); @@ -3351,7 +3351,7 @@ bool CHexBuffer::undo( void ) } CHexActionGroup *group = mUndoList.at( mUndoIndex-1 ); - if( group == 0 ) + if( !group ) { return( false ); } @@ -3375,7 +3375,7 @@ bool CHexBuffer::redo( void ) } CHexActionGroup *group = mUndoList.at( mUndoIndex ); - if( group == 0 ) + if( !group ) { return( false ); } @@ -3402,7 +3402,7 @@ int CHexBuffer::addBookmark( int position ) } SCursorOffset *co = new SCursorOffset; - if( co == 0 ) + if( !co ) { fatalSound(); return( Err_NoMemory ); @@ -3459,7 +3459,7 @@ void CHexBuffer::updateBookmarkMap( bool resize ) mBookmarkMap.fill(0); int bookmarkMapSize = mBookmarkMap.size(); - for( SCursorOffset *c=mBookmarkList.first(); c!=0; c=mBookmarkList.next() ) + for( SCursorOffset *c=mBookmarkList.first(); c; c=mBookmarkList.next() ) { int bookmarkOffset = c->offset / 200; if( bookmarkOffset < bookmarkMapSize ) @@ -4338,15 +4338,15 @@ int CHexBuffer::collectStatistic( SStatisticControl &sc, CProgress &p ) void CHexBuffer::doActionGroup( CHexActionGroup *group ) { - if( group == 0 ) + if( !group ) { return; } CHexAction *action = group->mHexAction; - group->mHexAction = 0; + group->mHexAction = nullptr; - while( action != 0 ) + while( action ) { doAction( action ); CHexAction *next = action->mNext; @@ -4393,7 +4393,7 @@ void CHexBuffer::recordStart( SCursor &cursor ) CHexActionGroup *group = new CHexActionGroup( cursor.curr.offset, cursor.bit() ); - if( group == 0 ) + if( !group ) { return; } @@ -4408,7 +4408,7 @@ void CHexBuffer::recordReplace( SCursor &cursor, uint size, char *data1, { CHexAction *hexAction = new CHexAction( CHexAction::replace, cursor.curr.offset ); - if( hexAction == 0 ) + if( !hexAction ) { return; } @@ -4728,9 +4728,9 @@ int CHexBuffer::printHtmlDataPage( const TQString &tocName, } TQTextStream os( &file ); - const TQString *next = index+1 >= fileNames.count() ? 0 : &fileNames[index+1]; - const TQString *prev = index == 0 ? 0 : &fileNames[index-1]; - const TQString *toc = tocName.length() == 0 ? 0 : &tocName; + const TQString *next = index+1 >= fileNames.count() ? nullptr : &fileNames[index+1]; + const TQString *prev = index == 0 ? nullptr : &fileNames[index-1]; + const TQString *toc = tocName.length() == 0 ? nullptr : &tocName; printHtmlHeader( os, true ); if( ex.navigator == true ) @@ -4848,7 +4848,7 @@ void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next, os << "" << endl; os << "" << endl; os << "
" << endl; - if( next == 0 ) + if( !next ) { os << i18n("Next") << " "; } @@ -4858,7 +4858,7 @@ void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next, os << "" << i18n("Next") << "" << " "; } - if( prev == 0 ) + if( !prev ) { os << i18n("Previous") << " "; } @@ -4868,7 +4868,7 @@ void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next, os << "" << i18n("Previous") << "" << " "; } - if( toc == 0 ) + if( !toc ) { os << i18n("Contents") << " "; } diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h index 938309df..c3a0dfc8 100644 --- a/khexedit/hexbuffer.h +++ b/khexedit/hexbuffer.h @@ -236,7 +236,7 @@ class CStringCollectControl int add( uint offset, const TQByteArray &a ) { TQString *s = new TQString(); - if( s == 0 ) + if( !s ) { return( Err_NoMemory ); } diff --git a/khexedit/hexdrag.cpp b/khexedit/hexdrag.cpp index eff7c937..060eb26e 100644 --- a/khexedit/hexdrag.cpp +++ b/khexedit/hexdrag.cpp @@ -69,15 +69,15 @@ const char *CHexDrag::format( int i ) const } else { - return( 0 ); + return( nullptr ); } - return( i == 0 ? mediaString : 0 ); + return( i == 0 ? mediaString : nullptr ); } TQByteArray CHexDrag::encodedData( const char *fmt ) const { - if( fmt != 0 ) + if( fmt ) { if( strcmp( fmt, mediaString) == 0 ) { diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h index 0f265830..705342f4 100644 --- a/khexedit/hexdrag.h +++ b/khexedit/hexdrag.h @@ -31,9 +31,9 @@ class CHexDrag : public TQDragObject public: - CHexDrag( const TQByteArray &data, TQWidget *dragSource = 0, - const char *name = 0 ); - CHexDrag( TQWidget *dragSource = 0, const char *name = 0 ); + CHexDrag( const TQByteArray &data, TQWidget *dragSource = nullptr, + const char *name = nullptr ); + CHexDrag( TQWidget *dragSource = nullptr, const char *name = nullptr ); void setData( const TQByteArray &data ); const char* format ( int i ) const; diff --git a/khexedit/hexeditorwidget.cpp b/khexedit/hexeditorwidget.cpp index 71c7ad75..a66848ab 100644 --- a/khexedit/hexeditorwidget.cpp +++ b/khexedit/hexeditorwidget.cpp @@ -51,14 +51,14 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { CHexBuffer *hexBuffer = new CHexBuffer; - if( hexBuffer == 0 ) { return; } + if( !hexBuffer ) { return; } mDocumentList.setAutoDelete( true ); mDocumentList.append( hexBuffer ); mUntitledCount = 1; mHexView = new CHexViewWidget( this, "hexview", hexBuffer ); - if( mHexView == 0 || mHexView->widgetValid() == false ) { return; } + if( !mHexView || mHexView->widgetValid() == false ) { return; } connect( mHexView, TQ_SIGNAL(pleaseOpenNewFile()), TQ_SLOT( newFile()) ); connect( mHexView, TQ_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), @@ -75,19 +75,19 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) setBackgroundColor( palette().active().base() ); mProgressBusy = false; - mGotoDialog = 0; - mFindDialog = 0; - mReplaceDialog = 0; - mInsertDialog = 0; - mFilterDialog = 0; - mOptionDialog = 0; - mStringDialog = 0; - mCharTableDialog = 0; - mFileInfoDialog = 0; - mExportDialog = 0; - mConverterDialog = 0; - mFindNavigatorDialog = 0; - mReplacePromptDialog = 0; + mGotoDialog = nullptr; + mFindDialog = nullptr; + mReplaceDialog = nullptr; + mInsertDialog = nullptr; + mFilterDialog = nullptr; + mOptionDialog = nullptr; + mStringDialog = nullptr; + mCharTableDialog = nullptr; + mFileInfoDialog = nullptr; + mExportDialog = nullptr; + mConverterDialog = nullptr; + mFindNavigatorDialog = nullptr; + mReplacePromptDialog = nullptr; } CHexEditorWidget::~CHexEditorWidget( void ) @@ -213,7 +213,7 @@ void CHexEditorWidget::writeConfiguration( TDEConfig &config ) config.writeEntry( "ShowBookmarkInOffsetColumn", misc.bookmarkOffsetColumn ); config.writeEntry( "ShowBookmarkInEditor", misc.bookmarkEditor ); - if( mExportDialog != 0 ) + if( mExportDialog ) { mExportDialog->writeConfiguration(); } @@ -715,7 +715,7 @@ void CHexEditorWidget::stepFile( bool next ) next = next == true ? false : true; CHexBuffer *hexBuffer = documentItem( mHexView->url(), next ); - if( hexBuffer == 0 ) + if( !hexBuffer ) { return; } @@ -730,7 +730,7 @@ void CHexEditorWidget::stepFile( bool next ) bool CHexEditorWidget::isOpen( const TQString &url, uint &offset ) { CHexBuffer *hexBuffer = documentItem( url ); - if( hexBuffer == 0 ) + if( !hexBuffer ) { return( false ); } @@ -743,7 +743,7 @@ bool CHexEditorWidget::selectDocument( const TQString &url, bool reloadWhenChanged ) { CHexBuffer *hexBuffer = documentItem( url ); - if( hexBuffer == 0 ) + if( !hexBuffer ) { return( false ); } @@ -764,7 +764,7 @@ bool CHexEditorWidget::selectDocument( const TQString &url, void CHexEditorWidget::insertFile( void ) { - KFileDialog fdlg(mWorkDir, TQString(), topLevelWidget(), 0, true); + KFileDialog fdlg(mWorkDir, TQString(), topLevelWidget(), nullptr, true); fdlg.setOperationMode( KFileDialog::Opening ); fdlg.okButton()->setGuiItem( KStdGuiItem::insert() ); fdlg.setCaption(i18n("Insert File")); @@ -828,7 +828,7 @@ bool CHexEditorWidget::closeAll( void ) while( mDocumentList.count() > 0 ) { CHexBuffer *buf; - for( buf = mDocumentList.first(); buf != 0; buf = mDocumentList.next() ) + for( buf = mDocumentList.first(); buf; buf = mDocumentList.next() ) { // // We select the buffer we are about to close because it will @@ -1163,10 +1163,10 @@ bool CHexEditorWidget::confirmPrintPageNumber( CHexPrinter &printer ) void CHexEditorWidget::exportDialog( void ) { - if( mExportDialog == 0 ) + if( !mExportDialog ) { - mExportDialog = new CExportDialog( topLevelWidget(), 0, false ); - if( mExportDialog == 0 ) { return; } + mExportDialog = new CExportDialog( topLevelWidget(), nullptr, false ); + if( !mExportDialog ) { return; } connect( mExportDialog, TQ_SIGNAL( exportText(const SExportText &)), this, TQ_SLOT( exportText( const SExportText &)) ); connect( mExportDialog, TQ_SIGNAL( exportHtml(const SExportHtml &)), @@ -1445,10 +1445,10 @@ void CHexEditorWidget::gotoPrevBookmark( void ) void CHexEditorWidget::gotoOffset( void ) { - if( mGotoDialog == 0 ) + if( !mGotoDialog ) { - mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false ); - if( mGotoDialog == 0 ) { return; } + mGotoDialog = new CGotoDialog( topLevelWidget(), nullptr, false ); + if( !mGotoDialog ) { return; } connect( mGotoDialog, TQ_SIGNAL(gotoOffset( uint, uint, bool, bool )), mHexView, TQ_SLOT(gotoOffset( uint, uint, bool, bool )) ); } @@ -1458,15 +1458,15 @@ void CHexEditorWidget::gotoOffset( void ) void CHexEditorWidget::find( void ) { - if( mFindNavigatorDialog != 0 ) + if( mFindNavigatorDialog ) { mFindNavigatorDialog->hide(); } - if( mFindDialog == 0 ) + if( !mFindDialog ) { - mFindDialog = new CFindDialog( topLevelWidget(), 0, false ); - if( mFindDialog == 0 ) { return; } + mFindDialog = new CFindDialog( topLevelWidget(), nullptr, false ); + if( !mFindDialog ) { return; } connect( mFindDialog, TQ_SIGNAL(findData(SSearchControl &, uint, bool)), TQ_SLOT(findData(SSearchControl &, uint, bool)) ); @@ -1587,7 +1587,7 @@ bool CHexEditorWidget::askWrap( bool fwd, const TQString &header ) bool CHexEditorWidget::canFind( bool showError ) { - if( mFindDialog == 0 || mFindDialog->isEmpty() == true ) + if( !mFindDialog || mFindDialog->isEmpty() == true ) { if( showError == true ) { @@ -1611,10 +1611,10 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) return; } - if( mFindNavigatorDialog == 0 ) + if( !mFindNavigatorDialog ) { - mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); - if( mFindNavigatorDialog == 0 ) { return; } + mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),nullptr,false); + if( !mFindNavigatorDialog ) { return; } connect( mFindNavigatorDialog, TQ_SIGNAL(findData(SSearchControl &, uint, bool)), TQ_SLOT(findData(SSearchControl &, uint, bool)) ); @@ -1634,10 +1634,10 @@ void CHexEditorWidget::replace( void ) { hideReplacePrompt(); - if( mReplaceDialog == 0 ) + if( !mReplaceDialog ) { - mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false ); - if( mReplaceDialog == 0 ) { return; } + mReplaceDialog = new CReplaceDialog( topLevelWidget(), nullptr, false ); + if( !mReplaceDialog ) { return; } connect( mReplaceDialog, TQ_SIGNAL( replaceData( SSearchControl &, uint)), TQ_SLOT( replaceData( SSearchControl &, uint))); @@ -1724,10 +1724,10 @@ void CHexEditorWidget::replaceData( SSearchControl &sc, uint mode ) void CHexEditorWidget::replacePrompt( SSearchControl &sc ) { - if( mReplacePromptDialog == 0 ) + if( !mReplacePromptDialog ) { - mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false); - if( mReplacePromptDialog == 0 ) { return; } + mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), nullptr,false); + if( !mReplacePromptDialog ) { return; } connect( mReplacePromptDialog, TQ_SIGNAL( replaceData( SSearchControl &, uint)), TQ_SLOT( replaceData( SSearchControl &, uint))); @@ -1742,7 +1742,7 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc ) void CHexEditorWidget::hideReplacePrompt( void ) { - if( mReplacePromptDialog != 0 ) + if( mReplacePromptDialog ) { mReplacePromptDialog->hide(); } @@ -1779,10 +1779,10 @@ void CHexEditorWidget::replaceResult( SSearchControl &sc ) void CHexEditorWidget::insertPattern( void ) { - if( mInsertDialog == 0 ) + if( !mInsertDialog ) { - mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); - if( mInsertDialog == 0 ) { return; } + mInsertDialog = new CInsertDialog( topLevelWidget(), nullptr, false ); + if( !mInsertDialog ) { return; } connect( mInsertDialog, TQ_SIGNAL(execute( SInsertData & )), mHexView, TQ_SLOT(insert( SInsertData & )) ); } @@ -1801,10 +1801,10 @@ void CHexEditorWidget::encoding( void ) void CHexEditorWidget::strings( void ) { - if( mStringDialog == 0 ) + if( !mStringDialog ) { - mStringDialog = new CStringDialog( topLevelWidget(), 0, false ); - if( mStringDialog == 0 ) { return; } + mStringDialog = new CStringDialog( topLevelWidget(), nullptr, false ); + if( !mStringDialog ) { return; } connect( mStringDialog, TQ_SIGNAL(markText( uint, uint, bool )), mHexView, TQ_SLOT(setMark( uint, uint, bool )) ); connect( mStringDialog, TQ_SIGNAL(collect()), TQ_SLOT(collectStrings()) ); @@ -1847,10 +1847,10 @@ void CHexEditorWidget::recordView( void ) void CHexEditorWidget::filter( void ) { - if( mFilterDialog == 0 ) + if( !mFilterDialog ) { - mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); - if( mFilterDialog == 0 ) { return; } + mFilterDialog = new CFilterDialog( topLevelWidget(), nullptr, false ); + if( !mFilterDialog ) { return; } connect( mFilterDialog, TQ_SIGNAL(filterData( SFilterControl & )), mHexView, TQ_SLOT(filter( SFilterControl & )) ); } @@ -1860,10 +1860,10 @@ void CHexEditorWidget::filter( void ) void CHexEditorWidget::chart( void ) { - if( mCharTableDialog == 0 ) + if( !mCharTableDialog ) { - mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false ); - if( mCharTableDialog == 0 ) { return; } + mCharTableDialog = new CCharTableDialog( topLevelWidget(), nullptr, false ); + if( !mCharTableDialog ) { return; } connect( mCharTableDialog, TQ_SIGNAL(assign( const TQByteArray & )), mHexView, TQ_SLOT(insert( const TQByteArray & )) ); } @@ -1873,7 +1873,7 @@ void CHexEditorWidget::chart( void ) void CHexEditorWidget::converter( void ) { - if( mConverterDialog == 0 ) + if( !mConverterDialog ) { mConverterDialog = new CConverterDialog( this, "converter", false ); connect( mConverterDialog, TQ_SIGNAL(probeCursorValue(TQByteArray &, uint)), @@ -1885,10 +1885,10 @@ void CHexEditorWidget::converter( void ) void CHexEditorWidget::statistics( void ) { - if( mFileInfoDialog == 0 ) + if( !mFileInfoDialog ) { - mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false ); - if( mFileInfoDialog == 0 ) { return; } + mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), nullptr, false ); + if( !mFileInfoDialog ) { return; } connect( mFileInfoDialog, TQ_SIGNAL(collectStatistic(SStatisticControl &)), TQ_SLOT(collectStatistics(SStatisticControl &))); connect( mHexView, TQ_SIGNAL(dataChanged()), @@ -1925,10 +1925,10 @@ void CHexEditorWidget::collectStatistics( SStatisticControl &sc ) void CHexEditorWidget::options( void ) { - if( mOptionDialog == 0 ) + if( !mOptionDialog ) { - mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); - if( mOptionDialog == 0 ) { return; } + mOptionDialog = new COptionDialog( topLevelWidget(), nullptr, false ); + if( !mOptionDialog ) { return; } connect( mOptionDialog, TQ_SIGNAL(lineSizeChoice(const SDisplayLine &)), TQ_SLOT(setLineSize(const SDisplayLine &)) ); @@ -2162,7 +2162,7 @@ CHexBuffer *CHexEditorWidget::documentItem( const TQString &url ) TQString symbolicName( url ); // KURL::decode( symbolicName ); - for( CHexBuffer *hexBuffer = mDocumentList.first(); hexBuffer != 0; + for( CHexBuffer *hexBuffer = mDocumentList.first(); hexBuffer != nullptr; hexBuffer = mDocumentList.next() ) { if( hexBuffer->url() == symbolicName ) @@ -2171,7 +2171,7 @@ CHexBuffer *CHexEditorWidget::documentItem( const TQString &url ) } } - return( 0 ); + return( nullptr ); } @@ -2179,7 +2179,7 @@ CHexBuffer *CHexEditorWidget::documentItem( const TQString &url, bool next ) { if( mDocumentList.count() <= 1 ) { - return( 0 ); + return( nullptr ); } TQString symbolicName( url ); @@ -2188,29 +2188,29 @@ CHexBuffer *CHexEditorWidget::documentItem( const TQString &url, bool next ) if( next == true ) { CHexBuffer *hexBuffer = mDocumentList.first(); - for( ; hexBuffer != 0; hexBuffer = mDocumentList.next() ) + for( ; hexBuffer; hexBuffer = mDocumentList.next() ) { if( hexBuffer->url() == symbolicName ) { hexBuffer = mDocumentList.next(); - return( hexBuffer == 0 ? mDocumentList.first() : hexBuffer ); + return( hexBuffer == nullptr ? mDocumentList.first() : hexBuffer ); } } } else { CHexBuffer *hexBuffer = mDocumentList.last(); - for( ; hexBuffer != 0; hexBuffer = mDocumentList.prev() ) + for( ; hexBuffer; hexBuffer = mDocumentList.prev() ) { if( hexBuffer->url() == symbolicName ) { hexBuffer = mDocumentList.prev(); - return( hexBuffer == 0 ? mDocumentList.last() : hexBuffer ); + return( hexBuffer == nullptr ? mDocumentList.last() : hexBuffer ); } } } - return( 0 ); + return( nullptr ); } @@ -2227,7 +2227,7 @@ bool CHexEditorWidget::createBuffer( void ) } CHexBuffer *hexBuffer = new CHexBuffer; - if( hexBuffer == 0 ) + if( !hexBuffer ) { TQString msg = i18n( "Can not create text buffer.\n" ); msg += hexError( Err_NoMemory ); @@ -2248,14 +2248,14 @@ void CHexEditorWidget::removeBuffer( void ) if( mDocumentList.count() > 1 ) { - CHexBuffer *prev = 0; + CHexBuffer *prev = nullptr; CHexBuffer *curr = mDocumentList.first(); - for( ; curr != 0; curr = mDocumentList.next() ) + for( ; curr; curr = mDocumentList.next() ) { if( curr == mHexView->hexBuffer() ) { - CHexBuffer *ptr = prev != 0 ? prev : mDocumentList.next(); - if( ptr != 0 ) + CHexBuffer *ptr = prev != nullptr ? prev : mDocumentList.next(); + if( ptr ) { mHexView->setBuffer( ptr ); mDocumentList.remove( curr ); @@ -2271,7 +2271,7 @@ void CHexEditorWidget::removeBuffer( void ) bool CHexEditorWidget::modified( void ) { - for( CHexBuffer *hexBuffer = mDocumentList.first(); hexBuffer != 0; + for( CHexBuffer *hexBuffer = mDocumentList.first(); hexBuffer != nullptr; hexBuffer = mDocumentList.next() ) { if( hexBuffer->modified() == true ) @@ -2326,7 +2326,7 @@ int CHexEditorWidget::prepareProgressData( EProgressMode mode ) int CHexEditorWidget::progressReceiver( void *clientData, SProgressData &pd ) { - if( clientData != 0 ) + if( clientData ) { int errCode = ((CHexEditorWidget*)clientData)->progressParse( pd ); return( errCode ); diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index b95b4aaa..5a9e22a8 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -71,7 +71,7 @@ class CHexEditorWidget : public TQWidget }; public: - CHexEditorWidget( TQWidget *parent = 0, const char *name = 0 ); + CHexEditorWidget( TQWidget *parent = nullptr, const char *name = nullptr ); ~CHexEditorWidget( void ); void initialize( void ); diff --git a/khexedit/hexmanagerwidget.cpp b/khexedit/hexmanagerwidget.cpp index 361c8c8d..31e374de 100644 --- a/khexedit/hexmanagerwidget.cpp +++ b/khexedit/hexmanagerwidget.cpp @@ -34,7 +34,7 @@ CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name, mEditor = new CHexEditorWidget( this ); mTabBar = new CTabBar( this ); mTabBar->hide(); - mSearchBar = 0; + mSearchBar = nullptr; mConverter = new CHexToolWidget( this ); @@ -132,7 +132,7 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position ) p.setX(point.x() + rect.width()/2 - mConverter->minimumSize().width()/2); p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2); mConverter->resize( mConverter->minimumSize() ); - mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true ); + mConverter->reparent( nullptr, WStyle_Customize | WStyle_DialogBorder, p, true ); mConverter->setCaption(tdeApp->makeStdCaption(i18n("Conversion"))); } else @@ -176,7 +176,7 @@ void CHexManagerWidget::setSearchBarPosition( EPosition position ) mSearchBarPosition = position; if( position != HideItem ) { - if( mSearchBar == 0 ) + if( !mSearchBar ) { mSearchBar = new CSearchBar( this ); connect( mSearchBar, TQ_SIGNAL(hidden()), this, TQ_SLOT(searchBarHidden()) ); @@ -189,7 +189,7 @@ void CHexManagerWidget::setSearchBarPosition( EPosition position ) } else { - if( mSearchBar != 0 ) + if( mSearchBar ) { mSearchBar->hide(); } @@ -270,7 +270,7 @@ void CTabBar::addName( const TQString &name ) TQString n( name.right(name.length()-name.findRev('/')-1) ); TQTab *t = find( n ); - if( t == 0 ) + if( !t ) { t = new TQTab(); t->setText( n); @@ -285,7 +285,7 @@ void CTabBar::removeName( const TQString &name ) { TQString n( name.right(name.length()-name.findRev('/')-1) ); TQTab *t = find(n); - if( t == 0 ) + if( !t ) { return; } @@ -308,7 +308,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName ) { TQString n( curName.right(curName.length()-curName.findRev('/')-1) ); TQTab *t = find(n); - if( t == 0 ) + if( !t ) { return; } @@ -334,7 +334,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName ) TQTab *CTabBar::find( const TQString &name ) { TQPtrList &list = *tabList(); - for( TQTab *t = list.first(); t != 0; t = list.next() ) + for( TQTab *t = list.first(); t; t = list.next() ) { if( t->text() == name ) { @@ -342,7 +342,7 @@ TQTab *CTabBar::find( const TQString &name ) } } - return( 0 ); + return( nullptr ); } diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h index 8c23bd8b..ec1c9eb9 100644 --- a/khexedit/hexmanagerwidget.h +++ b/khexedit/hexmanagerwidget.h @@ -78,7 +78,7 @@ class CTabBar : public TQTabBar public: - CTabBar( TQWidget *parent=0, char *name=0 ); + CTabBar( TQWidget *parent=nullptr, char *name=nullptr ); void addName( const TQString &name ); void removeName( const TQString &name ); void changeName( const TQString &curName, const TQString &newName ); @@ -119,7 +119,7 @@ class CHexManagerWidget : public TQWidget }; public: - CHexManagerWidget( TQWidget *parent = 0, const char *name = 0, + CHexManagerWidget( TQWidget *parent = nullptr, const char *name = nullptr, EConversionPosition state = Embed, EPosition tabBarPosition = HideItem, EPosition searchBarPosition = HideItem ); diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h index f04699bb..e6f0a4c8 100644 --- a/khexedit/hextoolwidget.h +++ b/khexedit/hextoolwidget.h @@ -37,7 +37,7 @@ class CHexToolWidget : public TQFrame public: - CHexToolWidget( TQWidget *parent = 0, const char *name = 0 ); + CHexToolWidget( TQWidget *parent = nullptr, const char *name = nullptr ); ~CHexToolWidget( void ); void writeConfiguration( TDEConfig &config ); diff --git a/khexedit/hexvalidator.h b/khexedit/hexvalidator.h index 396c2e7d..e56a8845 100644 --- a/khexedit/hexvalidator.h +++ b/khexedit/hexvalidator.h @@ -39,7 +39,7 @@ class CHexValidator: public TQValidator }; public: - CHexValidator( TQWidget *parent, EState state, const char *name = 0 ); + CHexValidator( TQWidget *parent, EState state, const char *name = nullptr ); ~CHexValidator( void ); TQValidator::State validate( TQString &string, int &pos ) const; void setState( EState state ); diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp index bcdca2f2..7ee04dac 100644 --- a/khexedit/hexviewwidget.cpp +++ b/khexedit/hexviewwidget.cpp @@ -177,7 +177,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, #endif ), mScrollBarSize( 16 ) { - if( parent == 0 || hexBuffer == 0 ) { return; } + if( !parent || !hexBuffer ) { return; } // // TQt 2.0: @@ -194,11 +194,11 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, // mVertScroll = new CScrollBar( TQt::Vertical, this ); - if( mVertScroll == 0 ) { return; } + if( !mVertScroll ) { return; } mHorzScroll = new CScrollBar( TQt::Horizontal, this ); - if( mHorzScroll == 0 ) { return; } + if( !mHorzScroll ) { return; } mCorner = new TQWidget( this ); - if( mCorner == 0 ) { return; } + if( !mCorner ) { return; } connect( mHorzScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeXPos(int)) ); connect( mVertScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeYPos(int)) ); connect( mHorzScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) ); @@ -207,7 +207,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, mVertScroll->hide(); mDragManager = new CDragManager(); - if( mDragManager == 0 ) { return; } + if( !mDragManager ) { return; } #ifdef USE_DRAG_MOVEMENT mDragManager->setActivateMode( CDragManager::Movement ); #else @@ -226,7 +226,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, mShowCursor = false; mCursorTimerId = 0; - mDocumentMenu = 0; + mDocumentMenu = nullptr; setTextBufferSize(); // Make sure there is a pixmap buffer setStartX(0); @@ -327,7 +327,7 @@ void CHexViewWidget::initFile( void ) setBackgroundMode( NoBackground ); updateView( true, false ); - resizeEvent( 0 ); + resizeEvent( nullptr ); emit dataChanged(); emit cursorChanged( mHexBuffer->cursorState() ); @@ -340,7 +340,7 @@ void CHexViewWidget::initFile( void ) void CHexViewWidget::setBuffer( CHexBuffer *hexBuffer ) { - if( hexBuffer == 0 || mHexBuffer == hexBuffer ) + if( !hexBuffer || mHexBuffer == hexBuffer ) { return; } @@ -1000,7 +1000,7 @@ void CHexViewWidget::copyText( int columnSegment ) void CHexViewWidget::paste( void ) { TQMimeSource *data = TQApplication::clipboard()->data(); - if( data != 0 ) + if( data ) { TQByteArray buf; if( CHexDrag::decode( data, buf ) == true ) @@ -1091,12 +1091,12 @@ int CHexViewWidget::bookmarkMenu( const TQString &title ) } TQString text; - TDEPopupMenu *popup = new TDEPopupMenu( 0 ); + TDEPopupMenu *popup = new TDEPopupMenu( nullptr ); popup->insertTitle( title ); for( uint i=0; i < list.count(); i++ ) { const SCursorOffset *p = list.at( i ); - if( p == 0 ) { continue; } + if( !p ) { continue; } text.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); text.prepend( TQString("[%1] %2: ").arg(i+1).arg(i18n("Offset")) ); @@ -1173,7 +1173,7 @@ void CHexViewWidget::gotoBookmark( uint position ) } SCursorOffset *p = list.at( position ); - if( p == 0 ) + if( !p ) { return; } @@ -1190,14 +1190,14 @@ void CHexViewWidget::gotoNextBookmark( bool next ) uint offset = mHexBuffer->cursorOffset(); uint diff = ~0; - SCursorOffset *match = 0; + SCursorOffset *match = nullptr; // // Note: the list is unsorted. // if( next == true ) { - for( SCursorOffset *co = list.first(); co != 0; co = list.next() ) + for( SCursorOffset *co = list.first(); co; co = list.next() ) { if( co->offset > offset ) { @@ -1211,7 +1211,7 @@ void CHexViewWidget::gotoNextBookmark( bool next ) } else { - for( SCursorOffset *co = list.first(); co != 0; co = list.next() ) + for( SCursorOffset *co = list.first(); co; co = list.next() ) { if( co->offset < offset ) { @@ -1225,13 +1225,13 @@ void CHexViewWidget::gotoNextBookmark( bool next ) } - if( match == 0 ) + if( !match ) { if( next == true ) { // Wrap: Locate entry with smallest offset. offset = ~0; - for( SCursorOffset *co = list.first(); co != 0; co = list.next() ) + for( SCursorOffset *co = list.first(); co; co = list.next() ) { if( co->offset < offset ) { @@ -1244,7 +1244,7 @@ void CHexViewWidget::gotoNextBookmark( bool next ) { // Wrap: Locate entry with largest offset. offset=0; - for( SCursorOffset *co = list.first(); co != 0; co = list.next() ) + for( SCursorOffset *co = list.first(); co; co = list.next() ) { if( co->offset > offset ) { @@ -1255,7 +1255,7 @@ void CHexViewWidget::gotoNextBookmark( bool next ) } } - if( match != 0 ) + if( match ) { mHexBuffer->cursorGoto( match->offset, match->bit ); updateWindow(); @@ -1277,12 +1277,12 @@ void CHexViewWidget::benchmark( void ) struct timeval t1, t2; uint loop = 10; - gettimeofday( &t1, 0 ); + gettimeofday( &t1, nullptr ); for( uint i=0; i< loop; i++ ) { paintText( contentsRect(), false ); } - gettimeofday( &t2, 0 ); + gettimeofday( &t2, nullptr ); uint area = width() * height(); @@ -1539,7 +1539,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e ) if( e->state() & ControlButton ) { if( KContextMenuManager::showOnButtonPress() == true - && mDocumentMenu != 0 ) + && mDocumentMenu != nullptr ) { mDocumentMenu->popup( e->globalPos() ); } @@ -1580,7 +1580,7 @@ void CHexViewWidget::mouseReleaseEvent( TQMouseEvent *e ) if( e->state() & ControlButton ) { if( KContextMenuManager::showOnButtonPress() == false - && mDocumentMenu != 0 ) + && mDocumentMenu != nullptr ) { mDocumentMenu->popup( e->globalPos() ); } diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h index 99db8cf1..c413e664 100644 --- a/khexedit/hexviewwidget.h +++ b/khexedit/hexviewwidget.h @@ -43,7 +43,7 @@ class CScrollBar : public TQScrollBar public: - CScrollBar( TQt::Orientation o, TQWidget *parent, const char *name = 0 ) + CScrollBar( TQt::Orientation o, TQWidget *parent, const char *name = nullptr ) : TQScrollBar( o, parent, name ) { } @@ -319,7 +319,7 @@ inline bool CHexViewWidget::shiftButtonState( void ) inline bool CHexViewWidget::widgetValid( void ) { - if( mVertScroll == 0 || mHorzScroll == 0 || mHexBuffer == 0 ) + if( !mVertScroll || !mHorzScroll || !mHexBuffer ) { return( false ); } diff --git a/khexedit/lib/codecs/kcharcodec.cpp b/khexedit/lib/codecs/kcharcodec.cpp index 1aab79b7..37bdf67f 100644 --- a/khexedit/lib/codecs/kcharcodec.cpp +++ b/khexedit/lib/codecs/kcharcodec.cpp @@ -40,7 +40,7 @@ const TQStringList &KCharCodec::codecNames() KCharCodec *KCharCodec::createCodec( const TQString &Name ) { - KCharCodec *Codec = 0; + KCharCodec *Codec = nullptr; if( KTextCharCodec::codecNames().findIndex(Name) != -1 ) Codec = KTextCharCodec::createCodec( Name ); @@ -48,7 +48,7 @@ KCharCodec *KCharCodec::createCodec( const TQString &Name ) Codec = KEBCDIC1047CharCodec::create(); // ensure at least a codec - if( Codec == 0 ) + if( !Codec ) Codec = KTextCharCodec::createLocalCodec(); return Codec; @@ -64,10 +64,10 @@ KCharCodec *KCharCodec::createCodec( KEncoding C ) Codec = KTextCharCodec::createCodec( "ISO 8859-1" ); // LocalEncoding else - Codec = 0; + Codec = nullptr; // ensure at least a codec - if( Codec == 0 ) + if( !Codec ) Codec = KTextCharCodec::createLocalCodec(); return Codec; diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp index 22c065dc..90409559 100644 --- a/khexedit/lib/codecs/ktextcharcodec.cpp +++ b/khexedit/lib/codecs/ktextcharcodec.cpp @@ -136,9 +136,9 @@ const TQStringList &KTextCharCodec::codecNames() TQString KTextCharCodec::nameOfEncoding( KEncoding C ) { - KTextCharCodec *Codec = 0; + KTextCharCodec *Codec = nullptr; - const char* N = 0; + const char* N = nullptr; for( unsigned int i=0; icodecForName( CodeName, Ok ); if( Ok ) Ok = is8Bit( Codec ); - return Ok ? new KTextCharCodec( Codec ) : 0; + return Ok ? new KTextCharCodec( Codec ) : nullptr; } diff --git a/khexedit/lib/kbigbuffer.cpp b/khexedit/lib/kbigbuffer.cpp index b3be8a97..e2ffd8be 100644 --- a/khexedit/lib/kbigbuffer.cpp +++ b/khexedit/lib/kbigbuffer.cpp @@ -52,7 +52,7 @@ bool KBigBuffer::prepareRange( KSection /*Range*/ ) const const char *KBigBuffer::dataSet( KSection /*Section*/ ) const { - return 0; + return nullptr; } @@ -123,7 +123,7 @@ bool KBigBuffer::open( const TQString& FileName ) // initialize Page pointers Data.resize( NoOfPages ); for( KPageOfChar::iterator D=Data.begin(); D!=Data.end(); ++D ) - *D = 0; + *D = nullptr; FirstPage = LastPage = 0; @@ -159,7 +159,7 @@ bool KBigBuffer::ensurePageLoaded( unsigned int PageIndex ) const if( !isOpen() ) return false; // page loaded? - if( Data[PageIndex] != 0 ) + if(Data[PageIndex]) { ActualPage = Data[PageIndex]; OffsetOfActualPage = PageIndex * PageSize; @@ -210,7 +210,7 @@ bool KBigBuffer::freePage( unsigned int PageIndex ) const return false; // std::cout << "freeing page " << PageIndex << std::endl; delete [] Data[PageIndex]; - Data[PageIndex] = 0; + Data[PageIndex] = nullptr; ++NoOfFreePages; return true; } diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp index dc2046ef..696121b5 100644 --- a/khexedit/lib/kbuffercolumn.cpp +++ b/khexedit/lib/kbuffercolumn.cpp @@ -51,8 +51,8 @@ TDEBufferColumn::TDEBufferColumn( KColumnsView *CV, KDataBuffer *B, TDEBufferLay ByteSpacingWidth( DefaultByteSpacingWidth ), GroupSpacingWidth( DefaultGroupSpacingWidth ), NoOfGroupedBytes( DefaultNoOfGroupedBytes ), - PosX( 0L ), - PosRightX( 0L ), + PosX( nullptr ), + PosRightX( nullptr ), LastPos( 0 ) { } diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index 1d7cec96..5b208927 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -131,13 +131,13 @@ const char *TDEBufferDrag::format( int i ) const i == 1 ? TextPlainUTF8 : i == 2 ? TextPlain : i == 3 ? localTextPlain() : - 0 ); + nullptr ); } TQByteArray TDEBufferDrag::encodedData( const char *Format ) const { - if( Format != 0 ) + if( Format ) { // octet stream wanted? if( qstrcmp(Format,OctetStream) == 0 ) @@ -148,7 +148,7 @@ TQByteArray TDEBufferDrag::encodedData( const char *Format ) const { TQCString Output; TQTextCodec *TextCodec = codecForCharset( TQCString(Format).lower() ); - if( TextCodec == 0 ) + if( !TextCodec ) return Output; TQString Text; diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h index 8aea0221..98c453e5 100644 --- a/khexedit/lib/kbufferdrag.h +++ b/khexedit/lib/kbufferdrag.h @@ -47,7 +47,7 @@ class TDEBufferDrag : public TQDragObject TDEBufferDrag( const TQByteArray &, KCoordRange Range, const KOffsetColumn *OC, const KValueColumn *HC, const KCharColumn *TC, TQChar SC, TQChar UC, const TQString &CN, - TQWidget *Source = 0, const char *Name = 0 ); + TQWidget *Source = nullptr, const char *Name = nullptr ); ~TDEBufferDrag(); public: // TQDragObject API diff --git a/khexedit/lib/kbufferranges.cpp b/khexedit/lib/kbufferranges.cpp index d1871d5c..d87a0aaf 100644 --- a/khexedit/lib/kbufferranges.cpp +++ b/khexedit/lib/kbufferranges.cpp @@ -186,7 +186,7 @@ const KSection *TDEBufferRanges::firstOverlappingSelection( KSection Range ) con if( Selection.overlaps(Range) ) return &Selection; - return 0L; + return nullptr; } @@ -195,7 +195,7 @@ const KSection *TDEBufferRanges::overlappingMarking( KSection Range ) const if( Marking.overlaps(Range) ) return &Marking; - return 0L; + return nullptr; } /* diff --git a/khexedit/lib/kbytesedit.cpp b/khexedit/lib/kbytesedit.cpp index 3eb49bde..1bfedf82 100644 --- a/khexedit/lib/kbytesedit.cpp +++ b/khexedit/lib/kbytesedit.cpp @@ -25,14 +25,14 @@ using namespace KHE; KBytesEdit::KBytesEdit( char *D, int DS_, int RS_, bool KM, TQWidget *Parent, const char *Name, WFlags F ) - : KHexEdit( 0L, Parent, Name, F ), + : KHexEdit( nullptr, Parent, Name, F ), AutoDelete( false ) { setData( D, DS_, RS_, KM ); } KBytesEdit::KBytesEdit( char *D, int DS_, TQWidget *Parent, const char *Name, WFlags F ) - : KHexEdit( 0L, Parent, Name, F ), + : KHexEdit( nullptr, Parent, Name, F ), AutoDelete( false ) { setData( D, DS_ ); @@ -40,7 +40,7 @@ KBytesEdit::KBytesEdit( char *D, int DS_, TQWidget *Parent, const char *Name, WF KBytesEdit::KBytesEdit( TQWidget *Parent, const char *Name, WFlags F ) - : KHexEdit( 0L, Parent, Name, F ), + : KHexEdit( nullptr, Parent, Name, F ), AutoDelete( false ) { setDataBuffer( new KPlainBuffer() ); @@ -69,7 +69,7 @@ void KBytesEdit::setAutoDelete( bool AD ) char *KBytesEdit::data() const { KPlainBuffer *Buffer = dynamic_cast(DataBuffer); - return Buffer ? Buffer->data() : 0L; + return Buffer ? Buffer->data() : nullptr; } diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index de9cd7dd..52550972 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -74,7 +74,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param Name name for this widget * @param F flags */ - KBytesEdit( char *D, int DS_, int RS_, bool KM, TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KBytesEdit( char *D, int DS_, int RS_, bool KM, TQWidget *Parent = nullptr, const char *Name = nullptr, WFlags F = 0 ); /** hands over to the editor a new byte array. * If there exists an old one and autodelete is set the old one gets deleted. * @param D pointer to memory @@ -82,7 +82,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param RS_ real size of the memory * @param KM keep the memory on resize (RS_ is the maximum size) */ - KBytesEdit( char *D, int DS_, TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KBytesEdit( char *D, int DS_, TQWidget *Parent = nullptr, const char *Name = nullptr, WFlags F = 0 ); /** hands over to the editor a new byte array. * If there exists an old one and autodelete is set the old one gets deleted. * @param D pointer to memory @@ -90,7 +90,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param RS_ real size of the memory * @param KM keep the memory on resize (RS_ is the maximum size) */ - KBytesEdit( TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KBytesEdit( TQWidget *Parent = nullptr, const char *Name = nullptr, WFlags F = 0 ); virtual ~KBytesEdit(); diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp index c50385bd..3edc1bbf 100644 --- a/khexedit/lib/kcolumnsview.cpp +++ b/khexedit/lib/kcolumnsview.cpp @@ -35,7 +35,7 @@ KColumnsView::KColumnsView( /*bool R,*/ TQWidget *Parent, const char *Name, WFla TotalWidth( 0 ), HorizontalGrid( DefaultHorizontalGrid ), // Reversed( R ), - d( 0 ) + d( nullptr ) { viewport()->setBackgroundMode( PaletteBase ); setBackgroundMode( PaletteBackground, PaletteBase ); diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h index f728d446..0062a2f5 100644 --- a/khexedit/lib/kcolumnsview.h +++ b/khexedit/lib/kcolumnsview.h @@ -47,7 +47,7 @@ class KColumnsView : public TQScrollView friend class KColumn; public: - KColumnsView( /*bool R = false,*/ TQWidget *parent=0, const char *name=0, WFlags Flags=0 ); + KColumnsView( /*bool R = false,*/ TQWidget *parent=nullptr, const char *name=nullptr, WFlags Flags=0 ); virtual ~KColumnsView(); public: // drawing diff --git a/khexedit/lib/kdatabuffer.cpp b/khexedit/lib/kdatabuffer.cpp index 054d792e..1a776b7b 100644 --- a/khexedit/lib/kdatabuffer.cpp +++ b/khexedit/lib/kdatabuffer.cpp @@ -31,7 +31,7 @@ int KDataBuffer::insert( int Pos, const char* D, int Length ) int KDataBuffer::remove( KSection Remove ) { - replace( Remove, 0, 0 ); + replace( Remove, nullptr, 0 ); return Remove.width(); // TODO: check if this is true } diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index ed73311f..97f4212d 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -77,7 +77,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl DragStartTimer( new TQTimer(this) ), TrippleClickTimer( new TQTimer(this) ), CursorPixmaps( new KCursor() ), - Codec( 0 ), + Codec( nullptr ), ClipboardMode( TQClipboard::Clipboard ), ResizeStyle( DefaultResizeStyle ), Encoding( MaxEncodingId ), // forces update @@ -92,7 +92,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl CursorPaused( false ), BlinkCursorVisible( false ), InZooming( false ), - d( 0 ) + d( nullptr ) { // initalize layout if( DataBuffer ) @@ -116,7 +116,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl charColumn().setCodec( Codec ); Encoding = DefaultEncoding; - TabController = new KTabController( this, 0 ); + TabController = new KTabController( this, nullptr ); Navigator = new KNavigator( this, TabController ); ValueEditor = new KValueEditor( ValueColumn, BufferCursor, this, Navigator ); CharEditor = new KCharEditor( CharColumn, BufferCursor, this, Navigator ); @@ -381,7 +381,7 @@ void KHexEdit::setEncoding( KEncoding C ) return; KCharCodec *NC = KCharCodec::createCodec( (KHE::KEncoding)C ); - if( NC == 0 ) + if( !NC ) return; valueColumn().setCodec( NC ); @@ -404,7 +404,7 @@ void KHexEdit::setEncoding( const TQString& EncodingName ) return; KCharCodec *NC = KCharCodec::createCodec( EncodingName ); - if( NC == 0 ) + if( !NC ) return; valueColumn().setCodec( NC ); @@ -813,7 +813,7 @@ TQByteArray KHexEdit::selectedData() const TDEBufferDrag *KHexEdit::dragObject( TQWidget *Parent ) const { if( !BufferRanges->hasSelection() ) - return 0; + return nullptr; const KOffsetColumn *OC; const KValueColumn *HC; @@ -822,15 +822,15 @@ TDEBufferDrag *KHexEdit::dragObject( TQWidget *Parent ) const if( static_cast( ActiveColumn ) == &charColumn() ) { - OC = 0; - HC = 0; - TC = 0; + OC = nullptr; + HC = nullptr; + TC = nullptr; } else { - OC = OffsetColumn->isVisible() ? OffsetColumn : 0; - HC = valueColumn().isVisible() ? &valueColumn() : 0; - TC = charColumn().isVisible() ? &charColumn() : 0; + OC = OffsetColumn->isVisible() ? OffsetColumn : nullptr; + HC = valueColumn().isVisible() ? &valueColumn() : nullptr; + TC = charColumn().isVisible() ? &charColumn() : nullptr; KSection S = BufferRanges->selection(); Range.set( BufferLayout->coordOfIndex(S.start()),BufferLayout->coordOfIndex(S.end()) ); } @@ -1042,7 +1042,7 @@ void KHexEdit::updateLength() void KHexEdit::clipboardChanged() { // don't listen to selection changes - disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0 ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, nullptr ); selectAll( false ); } @@ -1674,7 +1674,7 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, nullptr); copy(); diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h index 7b25536a..4a57ce64 100644 --- a/khexedit/lib/khexedit.h +++ b/khexedit/lib/khexedit.h @@ -118,7 +118,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView public: - KHexEdit( KDataBuffer *Buffer = 0, TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KHexEdit( KDataBuffer *Buffer = nullptr, TQWidget *Parent = nullptr, const char *Name = nullptr, WFlags F = 0 ); virtual ~KHexEdit(); @@ -412,7 +412,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView protected: // partial operations void handleMouseMove( const TQPoint& Point ); - TDEBufferDrag *dragObject( TQWidget *Parent = 0 ) const; + TDEBufferDrag *dragObject( TQWidget *Parent = nullptr ) const; void pasteFromSource( TQMimeSource *Source ); /** removes the section from the databuffer and updates all affected values */ KSection removeData( KSection Indizes ); diff --git a/khexedit/lib/kplainbuffer.cpp b/khexedit/lib/kplainbuffer.cpp index 02b9d704..19156d7c 100644 --- a/khexedit/lib/kplainbuffer.cpp +++ b/khexedit/lib/kplainbuffer.cpp @@ -51,7 +51,7 @@ KPlainBuffer::KPlainBuffer( const char *D, unsigned int S ) } KPlainBuffer::KPlainBuffer( int S, int MS ) - : Data( S?new char[S]:0 ), + : Data( S?new char[S]:nullptr ), Size( S ), RawSize( S ), MaxSize( MS ), @@ -142,7 +142,7 @@ unsigned int KPlainBuffer::replace( KSection Remove, const char* D, unsigned int { // create new buffer char *NewData = new char[NewSize]; - if( NewData == 0 ) + if( !NewData ) return 0; // move old data to its (new) places diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp index 58833c90..1ca01d8f 100644 --- a/khexedit/lib/kvaluecolumn.cpp +++ b/khexedit/lib/kvaluecolumn.cpp @@ -36,7 +36,7 @@ static const int DefaultBinaryGapWidth = 1; KValueColumn::KValueColumn( KColumnsView *CV, KDataBuffer *B, TDEBufferLayout *L, TDEBufferRanges *R ) : TDEBufferColumn( CV, B, L, R ), Coding( NotDefaultCoding ), - ByteCodec( 0 ), + ByteCodec( nullptr ), BinaryGapWidth( DefaultBinaryGapWidth ) { setCoding( DefaultCoding ); diff --git a/khexedit/lib/kwrappingrobuffer.cpp b/khexedit/lib/kwrappingrobuffer.cpp index b913c1aa..590835b0 100644 --- a/khexedit/lib/kwrappingrobuffer.cpp +++ b/khexedit/lib/kwrappingrobuffer.cpp @@ -27,7 +27,7 @@ KWrappingROBuffer::KWrappingROBuffer( const char* D, int L ) KWrappingROBuffer::KWrappingROBuffer() { - Data = 0L; + Data = nullptr; Size = 0; } diff --git a/khexedit/listview.h b/khexedit/listview.h index 7a40e3c3..e411ac2d 100644 --- a/khexedit/listview.h +++ b/khexedit/listview.h @@ -29,7 +29,7 @@ class CListView : public TDEListView public: - CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); + CListView( TQWidget *parent=nullptr, const char *name=nullptr, int visibleItem=10 ); void setVisibleItem( int visibleItem, bool updateSize=true ); virtual TQSize sizeHint( void ) const; diff --git a/khexedit/main.cpp b/khexedit/main.cpp index 4fecab6a..71e48a39 100644 --- a/khexedit/main.cpp +++ b/khexedit/main.cpp @@ -37,8 +37,8 @@ static const char version[] = APP_VERSION_STRING; static TDECmdLineOptions option[] = { - { "offset ", I18N_NOOP("Jump to 'offset'"), 0 }, - { "+[file(s)]", I18N_NOOP("File(s) to open"), 0 }, + { "offset ", I18N_NOOP("Jump to 'offset'"), nullptr }, + { "+[file(s)]", I18N_NOOP("File(s) to open"), nullptr }, TDECmdLineLastOption }; @@ -49,7 +49,7 @@ int main( int argc, char **argv ) TDEAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"), version, description, TDEAboutData::License_GPL_V2, "(c) 1999-2000, Espen Sand"); - aboutData.addAuthor("Espen Sand",0, "espensa@online.no", + aboutData.addAuthor("Espen Sand",nullptr, "espensa@online.no", "http://home.online.no/~espensa/khexedit/" ); aboutData.addCredit("",I18N_NOOP("\n" "This program uses modified code and techniques from other TDE programs,\n" @@ -79,7 +79,7 @@ int main( int argc, char **argv ) else { KHexEdit *hexEdit = new KHexEdit; - if( hexEdit == 0 ) + if( !hexEdit ) { std::cerr << "Unable to start - Memory exhausted" << std::endl; return( 1 ); @@ -110,10 +110,10 @@ int main( int argc, char **argv ) static uint parseDecimalOrHexadecimal( char *buf ) { - if( buf == 0 ) { return( 0 ); } + if( !buf ) { return( 0 ); } long int value; - char *end = 0; + char *end = nullptr; value = strtol( buf, &end, 10 ); if( *end != 0 ) diff --git a/khexedit/optiondialog.cpp b/khexedit/optiondialog.cpp index 6db0334b..98df614d 100644 --- a/khexedit/optiondialog.cpp +++ b/khexedit/optiondialog.cpp @@ -1147,7 +1147,7 @@ void CColorListBox::dragMoveEvent( TQDragMoveEvent *e ) if( KColorDrag::canDecode(e) && isEnabled() ) { CColorListItem *item = (CColorListItem*)itemAt( e->pos() ); - if( item != 0 ) + if( item ) { setCurrentItem ( item ); } diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index 8f0b8316..32d63d93 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -46,7 +46,7 @@ class CColorListBox : public TDEListBox public: - CColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); + CColorListBox( TQWidget *parent=nullptr, const char * name=nullptr, WFlags f=0 ); void setColor( uint index, const TQColor &color ); const TQColor color( uint index ); @@ -107,7 +107,7 @@ class COptionDialog : public KDialogBase page_max }; - COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); + COptionDialog( TQWidget *parent = nullptr, char *name = nullptr, bool modal = false ); ~COptionDialog( void ); void setLayout( SDisplayLayout &layout, SDisplayLine &line ); diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index 9a4adfb4..82610af8 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -83,7 +83,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) { TDEActionCollection *AC = actionCollection(); // create our actions - CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQ_SLOT(copy()), AC ); + CopyAction = BrowserViewWanted ? nullptr : KStdAction::copy( HexEdit, TQ_SLOT(copy()), AC ); KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), AC ); KStdAction::deselect( this, TQ_SLOT(slotUnselect()), AC ); diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp index 748fbd10..2a6e7d0a 100644 --- a/khexedit/parts/kpart/khepartfactory.cpp +++ b/khexedit/parts/kpart/khepartfactory.cpp @@ -38,8 +38,8 @@ static const char FWHKEmailAddress[] = "Friedrich.W.H@Kossebau.de"; // static const char FWHKWebAddress[] = "http://www.kossebau.de"; -TDEInstance* KHexEditPartFactory::s_instance = 0L; -TDEAboutData* KHexEditPartFactory::s_about = 0L; +TDEInstance* KHexEditPartFactory::s_instance = nullptr; +TDEAboutData* KHexEditPartFactory::s_about = nullptr; KHexEditPartFactory::KHexEditPartFactory() @@ -53,7 +53,7 @@ KHexEditPartFactory::~KHexEditPartFactory() delete s_instance; delete s_about; - s_instance = 0; + s_instance = nullptr; } @@ -77,7 +77,7 @@ TDEInstance* KHexEditPartFactory::instance() if( !s_instance ) { s_about = new TDEAboutData( PartId, PartName, PartVersion, PartDescription, - TDEAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress ); + TDEAboutData::License_GPL_V2, PartCopyright, nullptr, nullptr, FWHKEmailAddress ); s_about->addAuthor( FWHKName, FWHKTask, FWHKEmailAddress ); s_instance = new TDEInstance( s_about ); } diff --git a/khexedit/printdialogpage.cpp b/khexedit/printdialogpage.cpp index ad58759b..d4096d2e 100644 --- a/khexedit/printdialogpage.cpp +++ b/khexedit/printdialogpage.cpp @@ -34,7 +34,7 @@ LayoutDialogPage::LayoutDialogPage( TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) { - mConfig = 0; + mConfig = nullptr; setTitle( i18n( "Page Layout" ) ); setupLayoutPage(); @@ -46,7 +46,7 @@ LayoutDialogPage::~LayoutDialogPage( void ) { writeConfiguration(); - delete mConfig; mConfig = 0; + delete mConfig; mConfig = nullptr; } @@ -54,15 +54,15 @@ void LayoutDialogPage::setupLayoutPage( void ) { TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, 6 /*KDialog::mSpacingSize*/ ); - if( topLayout == 0 ) { return; } + if( !topLayout ) { return; } text = i18n("Margins [millimeter]"); TQButtonGroup *group = new TQButtonGroup( text, this ); - if( group == 0 ) { return; } + if( !group ) { return; } topLayout->addWidget( group ); TQGridLayout *gbox = new TQGridLayout( group, 3, 6, 6 /*KDialog::mSpacingSize*/ ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } gbox->addRowSpacing( 0, group->fontMetrics().height() ); gbox->setColStretch( 5, 10 ); @@ -107,7 +107,7 @@ void LayoutDialogPage::setupLayoutPage( void ) topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } topLayout->addLayout( gbox ); gbox->setColStretch ( 5, 10 ); @@ -169,7 +169,7 @@ void LayoutDialogPage::setupLayoutPage( void ) topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); - if( gbox == 0 ) { return; } + if( !gbox ) { return; } topLayout->addLayout( gbox ); gbox->setColStretch ( 5, 10 ); @@ -221,10 +221,10 @@ void LayoutDialogPage::setupLayoutPage( void ) void LayoutDialogPage::readConfiguration( void ) { - if( mConfig != 0 ) { return; } + if( mConfig ) { return; } mConfig = new TDESimpleConfig( TQString("hexprinter") ); - if( mConfig == 0 ) { return; } + if( !mConfig ) { return; } mConfig->setGroup( "PageLayout" ); int val = mConfig->readNumEntry( "MarginTop", 15 ); @@ -265,7 +265,7 @@ void LayoutDialogPage::readConfiguration( void ) void LayoutDialogPage::writeConfiguration( void ) { - if( mConfig == 0 ) + if( !mConfig ) { return; } @@ -310,7 +310,7 @@ TQString LayoutDialogPage::headerText( uint index ) int LayoutDialogPage::headerTextIndex( const TQString & headerText ) { static const TQString text[4] = {"None","DateTime","PageNumber","FileName"}; - if( headerText != 0 ) + if( !headerText.isEmpty() ) { for( int i=0; i<4; i++ ) { @@ -331,7 +331,7 @@ TQString LayoutDialogPage::headerLine( uint index ) int LayoutDialogPage::headerLineIndex( const TQString & headerLine ) { static const TQString text[3] = {"None","SingleLine","Rectangle"}; - if( headerLine != 0 ) + if( !headerLine.isEmpty() ) { for( int i=0; i<3; i++ ) { diff --git a/khexedit/printdialogpage.h b/khexedit/printdialogpage.h index 6eb47410..fbf87f8a 100644 --- a/khexedit/printdialogpage.h +++ b/khexedit/printdialogpage.h @@ -36,7 +36,7 @@ class LayoutDialogPage : public KPrintDialogPage public: - LayoutDialogPage( TQWidget *parent = 0, const char *name = 0 ); + LayoutDialogPage( TQWidget *parent = nullptr, const char *name = nullptr ); ~LayoutDialogPage( void ); void getOptions( TQMap& opts, bool incldef = false ); diff --git a/khexedit/progress.h b/khexedit/progress.h index 421637fe..43dd70dd 100644 --- a/khexedit/progress.h +++ b/khexedit/progress.h @@ -62,7 +62,7 @@ class CProgress public: CProgress( void ) { - define( 0, 0 ); + define( nullptr, nullptr ); mInterruptTimer.start(); } @@ -80,7 +80,7 @@ class CProgress void finish( void ) const { - if( mProgressFunc == 0 ) + if( !mProgressFunc ) { return; } @@ -97,7 +97,7 @@ class CProgress { mInterruptTimer.start(); - if( mProgressFunc == 0 ) + if( !mProgressFunc ) { return( Err_Success ); } @@ -110,7 +110,7 @@ class CProgress { mInterruptTimer.start(); - if( mProgressFunc == 0 ) + if( !mProgressFunc ) { return( Err_Success ); } diff --git a/khexedit/searchbar.h b/khexedit/searchbar.h index 087f0f6b..71056040 100644 --- a/khexedit/searchbar.h +++ b/khexedit/searchbar.h @@ -36,7 +36,7 @@ class CSearchBar : public TQFrame public: - CSearchBar( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + CSearchBar( TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0 ); virtual bool eventFilter( TQObject *o, TQEvent *e ); public slots: diff --git a/khexedit/statusbarprogress.cpp b/khexedit/statusbarprogress.cpp index e60a7ea4..227c6938 100644 --- a/khexedit/statusbarprogress.cpp +++ b/khexedit/statusbarprogress.cpp @@ -64,7 +64,7 @@ void CStatusBarProgress::advance( int offset ) void CStatusBarProgress::initialize( void ) { - mBarPixmap = 0; + mBarPixmap = nullptr; mBarStyle = Solid; mBarColor = palette().active().highlight(); @@ -96,7 +96,7 @@ void CStatusBarProgress::setBarColor( const TQColor &color ) { mBarColor = color; delete mBarPixmap; - mBarPixmap = 0; + mBarPixmap = nullptr; } void CStatusBarProgress::setBarStyle( BarStyle style ) @@ -286,7 +286,7 @@ void CStatusBarProgress::drawContents(TQPainter *p) fr = cr; TQBrush fb(mBarColor), eb(backgroundColor() ); - if( mBarPixmap != 0 ) + if( mBarPixmap ) { fb.setPixmap( *mBarPixmap ); } diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h index 89e1eedd..e16858b7 100644 --- a/khexedit/statusbarprogress.h +++ b/khexedit/statusbarprogress.h @@ -47,18 +47,18 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl /** * Construct a default progress bar. Orientation is horizontal. */ - CStatusBarProgress(TQWidget *parent=0, const char *name=0); + CStatusBarProgress(TQWidget *parent=nullptr, const char *name=nullptr); /** * Construct a KProgress bar with an orientation. */ - CStatusBarProgress(Orientation, TQWidget *parent=0, const char *name=0); + CStatusBarProgress(Orientation, TQWidget *parent=nullptr, const char *name=nullptr); /** * Construct a KProgress bar with minimum, maximum and initial value. */ CStatusBarProgress(int minValue, int maxValue, int value, Orientation, - TQWidget *parent=0, const char *name=0); + TQWidget *parent=nullptr, const char *name=nullptr); /** * Destructor diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp index aa7ef6b5..a8ea132c 100644 --- a/khexedit/stringdialog.cpp +++ b/khexedit/stringdialog.cpp @@ -280,7 +280,7 @@ void CStringDialog::timerEvent( TQTimerEvent * ) this->killTimers(); TQListViewItem *item = mStringList->currentItem(); - if( item == 0 ) + if( !item ) { slotUser1(); return; @@ -304,7 +304,7 @@ int CStringDialog::updateList( CProgress &p ) int offsetLen = stringData().offsetLen(); TQPtrList &list = stringData().list(); - for( const TQString *str = list.first(); str != 0; str = list.next() ) + for( const TQString *str = list.first(); str; str = list.next() ) { appendListItem( *str, offsetLen ); mMaxLength = TQMAX( mMaxLength, str->length() ); diff --git a/khexedit/stringdialog.h b/khexedit/stringdialog.h index 51d1fb2c..e4c7371a 100644 --- a/khexedit/stringdialog.h +++ b/khexedit/stringdialog.h @@ -44,7 +44,7 @@ class CStringDialog : public KDialogBase public: - CStringDialog( TQWidget *parent=0, const char *name = 0, bool modal=false ); + CStringDialog( TQWidget *parent=nullptr, const char *name = nullptr, bool modal=false ); ~CStringDialog( void ); int updateList( CProgress &p ); diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp index 8f3650a6..db84de8b 100644 --- a/khexedit/toplevel.cpp +++ b/khexedit/toplevel.cpp @@ -43,7 +43,7 @@ TQPtrList KHexEdit::mWindowList; KHexEdit::KHexEdit( void ) - : TDEMainWindow(0, "toplevel"), mStartupOffset(0), + : TDEMainWindow(nullptr, "toplevel"), mStartupOffset(0), mIsModified(0) { mWindowList.append( this ); @@ -296,11 +296,11 @@ actionCollection()); hexView()->setPopupMenu( popup ); int id = 100; - toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQ_SIGNAL(clicked()), + toolBar(nullptr)->insertButton( MainBarIcon("system-lock-screen"), id, TQ_SIGNAL(clicked()), editor(), TQ_SLOT(toggleWriteProtection()), true, i18n("Toggle write protection") ); - toolBar(0)->alignItemRight( id ); - mWriteProtectButton = toolBar(0)->getButton(id); + toolBar(nullptr)->alignItemRight( id ); + mWriteProtectButton = toolBar(nullptr)->getButton(id); TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); hexView()->setDocumentMenu(documentMenu); @@ -459,7 +459,7 @@ void KHexEdit::open( TQStringList &fileList, TQStringList &offsetList ) { if( i <= offsetList.count() ) { - offset = (*offsetList.at(i-1)).toUInt(0,16); + offset = (*offsetList.at(i-1)).toUInt(nullptr,16); } else { @@ -538,12 +538,12 @@ void KHexEdit::slotFileOpenRecent( const KURL& url ) KHexEdit *KHexEdit::newWindow( void ) { KHexEdit *hexEdit = new KHexEdit; - if( hexEdit == 0 ) + if( !hexEdit ) { TQString msg = i18n( "Can not create new window.\n" ); msg += hexError( Err_NoMemory ); KMessageBox::error( topLevelWidget(), msg ); - return(0); + return(nullptr); } hexEdit->show(); return(hexEdit); @@ -554,7 +554,7 @@ KHexEdit *KHexEdit::newWindow( void ) void KHexEdit::pasteNewWindow( void ) { KHexEdit *app = newWindow(); - if( app != 0 ) + if( app ) { app->editor()->pasteNewFile(); } @@ -572,7 +572,7 @@ void KHexEdit::closeProgram( void ) { if( mWindowList.count() > 1 ) { - for( KHexEdit *w = mWindowList.first(); w != 0; w = mWindowList.next() ) + for( KHexEdit *w = mWindowList.first(); w; w = mWindowList.next() ) { if( w->editor()->modified() == true ) { @@ -916,7 +916,7 @@ void KHexEdit::bookmarkChanged( TQPtrList &list ) TQString text, offset; int i=0; - for( SCursorOffset *p=list.first(); p!=0; p=list.next(), i++ ) + for( SCursorOffset *p=list.first(); p; p=list.next(), i++ ) { offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); text = i18n("Offset: %1").arg(offset); @@ -1344,7 +1344,7 @@ int KHexEdit::acceleratorNumKey( uint index ) void KHexEdit::resizeTest() { struct timeval t1, t2; - gettimeofday( &t1, 0 ); + gettimeofday( &t1, nullptr ); int loop=400; @@ -1354,7 +1354,7 @@ void KHexEdit::resizeTest() //tdeApp->processOneEvent(); } - gettimeofday( &t2, 0 ); + gettimeofday( &t2, nullptr ); uint last = (t2.tv_sec-t1.tv_sec) * 1000000 + (t2.tv_usec - t1.tv_usec); kdDebug(1501) << "Duration: " << (float)last/ 1000000.0 << endl; diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 9d3ca5ce..984869fc 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -56,8 +56,8 @@ extern TDEIconLoader* global_pix_loader; // KJOTSMAIN //---------------------------------------------------------------------- KJotsMain::KJotsMain(const char* name) - : TDEMainWindow(0,name), - currentEntry(0), + : TDEMainWindow(nullptr,name), + currentEntry(nullptr), invalidMoveFlag(false) { // @@ -138,7 +138,7 @@ KJotsMain::KJotsMain(const char* name) actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, this, TQ_SLOT(deleteBook()), actionCollection(), "del_folder"); - actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(), + actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), nullptr, TDEStdAccel::save(), this, TQ_SLOT(autoSave()), actionCollection(), "manual_save"); actions[ACTION_PRINT] = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); actions[ACTION_QUIT] = KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); @@ -258,7 +258,7 @@ void KJotsMain::loadBooks() continue; } - KJotsBook* book = new KJotsBook(subjectList, 0); + KJotsBook* book = new KJotsBook(subjectList, nullptr); book->openBook(filepath); } @@ -288,7 +288,7 @@ bool KJotsMain::createNewBook() if (!ok) return false; - KJotsBook* book = new KJotsBook(subjectList, 0); + KJotsBook* book = new KJotsBook(subjectList, nullptr); book->setSubject(name); book->openBook(""); book->setOpen(true); @@ -323,7 +323,7 @@ void KJotsMain::deleteBook() KJotsBook* nxt=dynamic_cast(b->nextSibling()); b->deleteBook(); - currentEntry = 0L; + currentEntry = nullptr; delete b; if (!nxt) @@ -368,9 +368,9 @@ void KJotsMain::deleteEntry() KJotsBook* bk = cur->parentBook(); KJotsPage* nxt = dynamic_cast(cur->nextSibling()); - me_text->setEntry(0); + me_text->setEntry(nullptr); delete cur; - currentEntry = 0; + currentEntry = nullptr; if (!nxt) nxt = dynamic_cast(bk->firstChild()); @@ -392,10 +392,10 @@ void KJotsMain::configure() TDEConfigDialog* dialog = new TDEConfigDialog(this, "settings", KJotsSettings::self()); - confPageFont* cpFont = new confPageFont(0, "Font"); + confPageFont* cpFont = new confPageFont(nullptr, "Font"); dialog->addPage(cpFont, i18n("Font"), "fonts"); - confPageMisc* cpMisc = new confPageMisc(0, "Autosave"); + confPageMisc* cpMisc = new confPageMisc(nullptr, "Autosave"); dialog->addPage(cpMisc, i18n("Autosave"), "misc"); connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateConfiguration())); @@ -983,14 +983,14 @@ void KJotsMain::jumpToEntry(TQListViewItem* entry, bool force) if (currentEntry == entry && !force) return; - if (entry == 0) + if (!entry) { - me_text->setEntry(0); - currentEntry = 0; + me_text->setEntry(nullptr); + currentEntry = nullptr; } else if (dynamic_cast(entry)) { - me_text->setEntry(0); //clear any old data + me_text->setEntry(nullptr); //clear any old data KJotsBook* book = static_cast(entry); TQString html = book->generateHtml(book, false); @@ -998,7 +998,7 @@ void KJotsMain::jumpToEntry(TQListViewItem* entry, bool force) roTextView->setText(html); roTextView->setCursorPosition(0, 0); textStack->raiseWidget(roTextView); - currentEntry = 0; + currentEntry = nullptr; } else { @@ -1063,7 +1063,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, if ( afterFirst && afterFirst->parent() != entry->parentBook() ) { TQListViewItemIterator it ( afterFirst ); - afterFirst = 0; + afterFirst = nullptr; //Rewind backwards up the tree... while ( it.current() ) @@ -1155,7 +1155,7 @@ KJotsBook* KJotsMain::currentBook() e = dynamic_cast(e->TDEListViewItem::parent()); } - return 0; + return nullptr; } /*! diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h index ea38f083..6b5f18a3 100644 --- a/kjots/KJotsMain.h +++ b/kjots/KJotsMain.h @@ -86,7 +86,7 @@ class KJotsMain : public TDEMainWindow public: - KJotsMain( const char* name = 0 ); + KJotsMain( const char* name = nullptr ); TQString currentBookmarkTitle(); TQString currentBookmarkURL(); diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h index c71c15fb..deaaaa4a 100644 --- a/kjots/kjotsbookmarks.h +++ b/kjots/kjotsbookmarks.h @@ -33,7 +33,7 @@ class KJotsBookmarks : public TQObject, public KBookmarkOwner public: - KJotsBookmarks(KJotsMain* parent = 0, const char* name = 0); + KJotsBookmarks(KJotsMain* parent = nullptr, const char* name = nullptr); ~KJotsBookmarks(); virtual void openBookmarkURL(const TQString& url); diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index b2ffe89e..e692a8ea 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -571,7 +571,7 @@ void KJotsEdit::setEntry (KJotsPage *entry) //tell the old entry to take a hike if ( m_entry ) { - m_entry->setEditor(0); + m_entry->setEditor(nullptr); } //load up the new entry (assuming there is one) diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h index 75012f8b..2524f6e0 100644 --- a/kjots/kjotsedit.h +++ b/kjots/kjotsedit.h @@ -37,7 +37,7 @@ class KJotsEdit : public KTextEdit TQ_OBJECT public: - KJotsEdit (TQWidget* parent=0, const char* name=0); + KJotsEdit (TQWidget* parent=nullptr, const char* name=nullptr); ~KJotsEdit (); void print(TQString title = TQString()); diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index c947f94c..e9bc1488 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -69,15 +69,15 @@ TQString htmlFooter() // KJotsEntryBase // -KJotsEntryBase::KJotsEntryBase(TDEListView* parent, TQListViewItem* after=0) +KJotsEntryBase::KJotsEntryBase(TDEListView* parent, TQListViewItem* after=nullptr) :TDEListViewItem(parent,after) { m_id = 0; m_saveInProgress = m_dirty = false; - m_parent = 0; + m_parent = nullptr; } -KJotsEntryBase::KJotsEntryBase(TDEListViewItem* parent, TQListViewItem* after=0) +KJotsEntryBase::KJotsEntryBase(TDEListViewItem* parent, TQListViewItem* after=nullptr) :TDEListViewItem(parent,after) { m_id = 0; @@ -243,7 +243,7 @@ void KJotsBook::init() { m_isBook = true; m_open = false; - m_saveProgressDialog = 0; + m_saveProgressDialog = nullptr; setExpandable(true); setPixmap(0, tdeApp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small)); } @@ -398,7 +398,7 @@ bool KJotsBook::loadOldBook(TQFile &file) return false; } - KJotsPage *entry = 0; + KJotsPage *entry = nullptr; TQString body; bool quit=false; @@ -579,7 +579,7 @@ void KJotsBook::slotSaveResult(TDEIO::Job *) { m_saveInProgress = false; delete m_saveProgressDialog; - m_saveProgressDialog = 0; + m_saveProgressDialog = nullptr; /* if (job->error() != 0) {} */ } @@ -588,7 +588,7 @@ void KJotsBook::slotSaveResult(TDEIO::Job *) */ KJotsPage* KJotsBook::addPage() { - TQListViewItem *after = 0; + TQListViewItem *after = nullptr; // append new pages TQListViewItem* tmp = firstChild(); @@ -706,7 +706,7 @@ void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &parent ) */ void KJotsBook::parseXml( TQDomElement &me ) { - KJotsEntryBase *lastEntry = 0; //keep track of the last entry inserted for speed + KJotsEntryBase *lastEntry = nullptr; //keep track of the last entry inserted for speed if ( me.tagName() == "KJotsBook" ) { @@ -845,7 +845,7 @@ TQString KJotsBook::generateText( void ) KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after) : KJotsEntryBase(parent,after), - m_editor(0) + m_editor(nullptr) { m_isBook = false; m_paraPos = m_indexPos = 0; @@ -860,8 +860,8 @@ KJotsPage::~KJotsPage() //still thinks we're here. Set ourselves to 0 (IMPORTANT!!) and //then clear the editor. KJotsEdit *temp = m_editor; - m_editor=0; - temp->setEntry(0); + m_editor=nullptr; + temp->setEntry(nullptr); } } diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h index 1f1adc50..f1fc513e 100644 --- a/kjots/kjotsentry.h +++ b/kjots/kjotsentry.h @@ -101,8 +101,8 @@ class KJotsBook : public KJotsEntryBase TQ_OBJECT public: - KJotsBook(TDEListView*, TQListViewItem* after = 0); - KJotsBook(TDEListViewItem*, TQListViewItem* after = 0); + KJotsBook(TDEListView*, TQListViewItem* after = nullptr); + KJotsBook(TDEListViewItem*, TQListViewItem* after = nullptr); ~KJotsBook(); static bool isBookFile(const TQString& book); @@ -145,7 +145,7 @@ class KJotsPage : public KJotsEntryBase TQ_OBJECT public: - KJotsPage(KJotsBook* parent, TQListViewItem* after = 0); + KJotsPage(KJotsBook* parent, TQListViewItem* after = nullptr); ~KJotsPage(); public: diff --git a/kjots/main.cpp b/kjots/main.cpp index 343675a6..9a7d3c6d 100644 --- a/kjots/main.cpp +++ b/kjots/main.cpp @@ -43,9 +43,9 @@ int main( int argc, char **argv ) version, description, TDEAboutData::License_GPL, "(c) 1997-2002, Christoph Neerfeld"); aboutData.addAuthor("Pradeepto K. Bhattacharya", I18N_NOOP("Current maintainer"), "pradeepto@kde.org"); - aboutData.addAuthor("Jaison Lee", 0, "lee.jaison@gmail.com"); - aboutData.addAuthor("Aaron J. Seigo", 0, "aseigo@kde.org"); - aboutData.addAuthor("Stanislav Kljuhhin", 0, "crz@starman.ee"); + aboutData.addAuthor("Jaison Lee", nullptr, "lee.jaison@gmail.com"); + aboutData.addAuthor("Aaron J. Seigo", nullptr, "aseigo@kde.org"); + aboutData.addAuthor("Stanislav Kljuhhin", nullptr, "crz@starman.ee"); aboutData.addAuthor("Christoph Neerfeld", I18N_NOOP("Original author"), "chris@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutData); TDEUniqueApplication::addCmdLineOptions(); diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 41919371..f5a1931e 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -108,7 +108,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); } else { - enableSoftwareSuspendHibernate = 0; + enableSoftwareSuspendHibernate = nullptr; } ll->addStretch(10); @@ -170,7 +170,7 @@ void AcpiConfig::setupHelper() TQString str(i18n("The %1 application does not seem to have " "the same size or checksum as when it was compiled we do NOT recommend " "you proceed with making it setuid-root without further investigation").arg(helper)); - int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); + int rc = KMessageBox::warningContinueCancel(nullptr, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); if (rc != KMessageBox::Continue) { return; @@ -179,7 +179,7 @@ void AcpiConfig::setupHelper() TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { - int rc = KMessageBox::warningContinueCancel(0, + int rc = KMessageBox::warningContinueCancel(nullptr, i18n("You will need to supply a root password " "to allow the privileges of the klaptop_acpi_helper to change."), i18n("KLaptopDaemon"), KStdGuiItem::cont(), @@ -193,7 +193,7 @@ void AcpiConfig::setupHelper() proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results } } else { - KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(nullptr, i18n("The ACPI helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h index 0fa3c9c2..020e63ca 100644 --- a/klaptopdaemon/acpi.h +++ b/klaptopdaemon/acpi.h @@ -42,7 +42,7 @@ class AcpiConfig : public TDECModule TQ_OBJECT public: - AcpiConfig( TQWidget *parent=0, const char* name=0); + AcpiConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~AcpiConfig( ); void save( void ); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 60159de6..b1a1c786 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -136,7 +136,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) ll->addWidget(setupSSButton); ll->addStretch(8); } else { - enableSoftwareSuspendHibernate = 0; + enableSoftwareSuspendHibernate = nullptr; } @@ -156,7 +156,7 @@ void ApmConfig::setupHelper() { TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { - int rc = KMessageBox::warningContinueCancel(0, + int rc = KMessageBox::warningContinueCancel(nullptr, i18n("You will need to supply a root password " "to allow the privileges of the %1 application to change.").arg(apm_name), "KLaptopDaemon", KStdGuiItem::cont(), @@ -170,7 +170,7 @@ void ApmConfig::setupHelper() proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results } } else { - KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").arg(TQString(apm_name)), + KMessageBox::sorry(nullptr, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").arg(TQString(apm_name)), i18n("KLaptopDaemon")); } laptop_portable::apm_set_mask(enablestandby, enablesuspend); @@ -192,7 +192,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend TQString str(i18n("The %1 application does not seem to have " "the same size or checksum as when it was compiled we do NOT recommend " "you proceed with making it setuid-root without further investigation").arg(helper)); - int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); + int rc = KMessageBox::warningContinueCancel(nullptr, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); if (rc != KMessageBox::Continue) { return; @@ -201,7 +201,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { - int rc = KMessageBox::warningContinueCancel(0, + int rc = KMessageBox::warningContinueCancel(nullptr, i18n("You will need to supply a root password " "to allow the privileges of the klaptop_acpi_helper to change."), i18n("KLaptopDaemon"), KStdGuiItem::cont(), @@ -215,7 +215,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results } } else { - KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(nullptr, i18n("The Software Suspend helper cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } laptop_portable::software_suspend_set_mask(enablesoftwaresuspend); diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h index 829f4e5a..da4f0af3 100644 --- a/klaptopdaemon/apm.h +++ b/klaptopdaemon/apm.h @@ -42,7 +42,7 @@ class ApmConfig : public TDECModule TQ_OBJECT public: - ApmConfig( TQWidget *parent=0, const char* name=0); + ApmConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~ApmConfig( ); void save( void ); diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index dcd03da4..4fd7f8d8 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -53,11 +53,11 @@ extern void wake_laptop_daemon(); BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) : TDECModule(parent, name), - editPoll(0), - iconloader(0), - buttonNoBattery(0), - buttonNoCharge(0), - buttonCharge(0) + editPoll(nullptr), + iconloader(nullptr), + buttonNoBattery(nullptr), + buttonNoCharge(nullptr), + buttonCharge(nullptr) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages @@ -283,7 +283,7 @@ void BatteryConfig::slotStartMonitor() { wake_laptop_daemon(); if (!enablemonitor) { - KMessageBox::information(0, i18n("The battery monitor has been started, but the tray icon is currently disabled. You can make it appear by selecting the Show battery monitor entry on this page and applying your changes."), TQString(), "howToEnableMonitor"); + KMessageBox::information(nullptr, i18n("The battery monitor has been started, but the tray icon is currently disabled. You can make it appear by selecting the Show battery monitor entry on this page and applying your changes."), TQString(), "howToEnableMonitor"); } } diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h index 84f8d105..851921df 100644 --- a/klaptopdaemon/battery.h +++ b/klaptopdaemon/battery.h @@ -47,7 +47,7 @@ class BatteryConfig : public TDECModule TQ_OBJECT public: - BatteryConfig( TQWidget *parent=0, const char* name=0); + BatteryConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~BatteryConfig( ); void save( void ); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index 1aabb604..bcc3acd8 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -46,33 +46,33 @@ extern void wake_laptop_daemon(); ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) : TDECModule(parent, name), - lidBox(0), - lidStandby(0), - lidSuspend(0), - lidOff(0), - lidHibernate(0), - lidShutdown(0), - lidLogout(0), - lidBrightness(0), - lidValBrightness(0), - lidThrottle(0), - lidValThrottle(0), - lidPerformance(0), - lidValPerformance(0), - - powerBox(0), - powerStandby(0), - powerSuspend(0), - powerOff(0), - powerHibernate(0), - powerShutdown(0), - powerLogout(0), - powerBrightness(0), - powerValBrightness(0), - powerThrottle(0), - powerValThrottle(0), - powerPerformance(0), - powerValPerformance(0) + lidBox(nullptr), + lidStandby(nullptr), + lidSuspend(nullptr), + lidOff(nullptr), + lidHibernate(nullptr), + lidShutdown(nullptr), + lidLogout(nullptr), + lidBrightness(nullptr), + lidValBrightness(nullptr), + lidThrottle(nullptr), + lidValThrottle(nullptr), + lidPerformance(nullptr), + lidValPerformance(nullptr), + + powerBox(nullptr), + powerStandby(nullptr), + powerSuspend(nullptr), + powerOff(nullptr), + powerHibernate(nullptr), + powerShutdown(nullptr), + powerLogout(nullptr), + powerBrightness(nullptr), + powerValBrightness(nullptr), + powerThrottle(nullptr), + powerValThrottle(nullptr), + powerPerformance(nullptr), + powerValPerformance(nullptr) { int can_shutdown = 1; // fix me int can_logout = 1; // fix me diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h index 96ca27bd..e028244c 100644 --- a/klaptopdaemon/buttons.h +++ b/klaptopdaemon/buttons.h @@ -42,7 +42,7 @@ class ButtonsConfig : public TDECModule TQ_OBJECT public: - ButtonsConfig( TQWidget *parent=0, const char* name=0); + ButtonsConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~ButtonsConfig(); void save( void ); void load(); diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp index 477b0fa4..47f879b8 100644 --- a/klaptopdaemon/daemon_state.cpp +++ b/klaptopdaemon/daemon_state.cpp @@ -70,7 +70,7 @@ void daemon_state::load() { TDEConfig *config = new TDEConfig("kcmlaptoprc"); - if (config == 0) { + if (!config) { ::fprintf(stderr, "laptop_daemon: can't open kcmlaptop config files\n"); ::exit(2); } diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 57efd005..5f6a39a3 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -56,7 +56,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent ) _pcmcia = nullptr; pdaemon = parent; current_code = -1; - brightness_widget = 0; + brightness_widget = nullptr; instance = new TDEInstance("klaptopdaemon"); // popup menu for right mouse button rightPopup = contextMenu(); @@ -85,22 +85,22 @@ laptop_dock::SetupPopup() if (has_brightness) rightPopup->insertItem(i18n("Screen Brightness..."), this, TQ_SLOT(invokeBrightness())); if (has_performance) { - performance_popup = new TQPopupMenu(0, "performance"); + performance_popup = new TQPopupMenu(nullptr, "performance"); performance_popup->setCheckable(1); rightPopup->insertItem(i18n("Performance Profile..."), performance_popup); connect( performance_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_performance( int ) ) ); connect( performance_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_performance() ) ); } else { - performance_popup = 0; + performance_popup = nullptr; } if (has_throttle) { - throttle_popup = new TQPopupMenu(0, "throttle"); + throttle_popup = new TQPopupMenu(nullptr, "throttle"); throttle_popup->setCheckable(1); rightPopup->insertItem(i18n("CPU Throttling..."), throttle_popup); connect( throttle_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_throttle( int ) ) ); connect( throttle_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_throttle() ) ); } else { - throttle_popup = 0; + throttle_popup = nullptr; } if (can_standby || can_suspend || can_hibernate) { @@ -194,11 +194,11 @@ laptop_dock::invokeBrightness() if (brightness < 0) brightness = 255; - if (brightness_widget == 0) { - brightness_widget = new TQVBox(0L, "Brightness", WStyle_Customize | WType_Popup); + if (!brightness_widget) { + brightness_widget = new TQVBox(nullptr, "Brightness", WStyle_Customize | WType_Popup); brightness_widget->setFrameStyle(TQFrame::PopupPanel); brightness_widget->setMargin(KDialog::marginHint()); - brightness_slider = new TQSlider(0, 255, 16, 255-brightness, TQt::Vertical, brightness_widget, 0); + brightness_slider = new TQSlider(0, 255, 16, 255-brightness, TQt::Vertical, brightness_widget, nullptr); brightness_slider->setMinimumHeight(40); brightness_slider->setMinimumWidth(15); connect(brightness_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(invokeBrightnessSlider(int))); @@ -261,14 +261,14 @@ void laptop_dock::slotGoRoot(int /*id*/) { i18n("KLaptopDaemon")); } #else - KMessageBox::sorry(0, i18n("PCMCIA cannot be enabled just now."), + KMessageBox::sorry(nullptr, i18n("PCMCIA cannot be enabled just now."), i18n("KLaptopDaemon")); #endif } void laptop_dock::slotHide() { - int confirm = KMessageBox::questionYesNo(0, i18n("Are you sure you want to hide the battery monitor? Your battery will still be monitored in the background."), TQString(), i18n("Hide Monitor"), i18n("Do Not Hide"), "hideConfirm"); + int confirm = KMessageBox::questionYesNo(nullptr, i18n("Are you sure you want to hide the battery monitor? Your battery will still be monitored in the background."), TQString(), i18n("Hide Monitor"), i18n("Do Not Hide"), "hideConfirm"); if (confirm != KMessageBox::Yes) return; @@ -286,12 +286,12 @@ void laptop_dock::slotHide() { void laptop_dock::slotQuit() { - int confirm = KMessageBox::questionYesNo(0, i18n("Are you sure you want to quit the battery monitor?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel(), "quitConfirm"); + int confirm = KMessageBox::questionYesNo(nullptr, i18n("Are you sure you want to quit the battery monitor?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel(), "quitConfirm"); if (confirm != KMessageBox::Yes) return; - confirm = KMessageBox::questionYesNo(0, i18n("Do you wish to disable the battery monitor from starting in the future?"), TQString(), i18n("Disable"), i18n("Keep Enabled"), "restartMonitor"); + confirm = KMessageBox::questionYesNo(nullptr, i18n("Do you wish to disable the battery monitor from starting in the future?"), TQString(), i18n("Disable"), i18n("Keep Enabled"), "restartMonitor"); if (confirm == KMessageBox::Yes) { // just tell ourselves to hide the battery @@ -363,7 +363,7 @@ KPCMCIAInfo *f = new KPCMCIAInfo(_pcmcia); void laptop_dock::mousePressEvent( TQMouseEvent *event ) { if(event->button() == TQt::LeftButton) { - TQPopupMenu *popup = new TQPopupMenu(0, "popup"); + TQPopupMenu *popup = new TQPopupMenu(nullptr, "popup"); if (!pdaemon->exists()) { popup->insertItem(i18n("Power Manager Not Found")); diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h index 631e6ae1..fdfb6b6a 100644 --- a/klaptopdaemon/kpcmciainfo.h +++ b/klaptopdaemon/kpcmciainfo.h @@ -42,7 +42,7 @@ TQ_OBJECT public: - KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = nullptr, const char *name = 0); + KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = nullptr, const char *name = nullptr); virtual ~KPCMCIAInfo(); void showTab(int num); @@ -80,7 +80,7 @@ class KPCMCIAInfoPage : public TQFrame { TQ_OBJECT public: - KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = nullptr, const char *name = 0); + KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = nullptr, const char *name = nullptr); virtual ~KPCMCIAInfoPage(); public slots: diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h index a01e6095..6601957c 100644 --- a/klaptopdaemon/krichtextlabel.h +++ b/klaptopdaemon/krichtextlabel.h @@ -40,8 +40,8 @@ public: /** * Default constructor. */ - KRichTextLabel( TQWidget *parent, const char *name = 0 ); - KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); + KRichTextLabel( TQWidget *parent, const char *name = nullptr ); + KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = nullptr ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp index 676a26bd..487c76f2 100644 --- a/klaptopdaemon/laptop_check.cpp +++ b/klaptopdaemon/laptop_check.cpp @@ -41,7 +41,7 @@ main(int argc, char **argv) TDEAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"), version, description, TDEAboutData::License_GPL, "(c) 2003, Paul Campbell"); - aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com"); + aboutData.addAuthor("Paul Campbell",nullptr, "paul@taniwha.com"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index e9ba6c78..3157af41 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -59,7 +59,7 @@ extern "C" class XWidget: public TQWidget { public: - XWidget(laptop_daemon *p):TQWidget(0) { pd = p; } + XWidget(laptop_daemon *p):TQWidget(nullptr) { pd = p; } private: bool x11Event(XEvent *event); laptop_daemon *pd; @@ -73,12 +73,12 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) tdeApp->installX11EventFilter(xwidget); mLavEnabled = false; - backoffTimer = 0; + backoffTimer = nullptr; need_wait = 0; saved_brightness = 0; saved_throttle = 0; saved_performance = 0; - wake_timer = 0; + wake_timer = nullptr; button_bright_saved=0; button_bright_val=0; button_saved_performance = 0; @@ -94,12 +94,12 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) triggered[0] = 0; triggered[1] = 0; timer = 0; - dock_widget = 0; + dock_widget = nullptr; oldTimer = 0; sony_fd = -1; - sony_notifier = 0; + sony_notifier = nullptr; knownFullyCharged = 0; - sony_disp = 0; + sony_disp = nullptr; connect(this, TQ_SIGNAL(signal_checkBattery()), TQ_SLOT(checkBatteryNow())); //hasAudio = (audioServer.serverStatus() == 0) ? true : false; @@ -159,9 +159,9 @@ void laptop_daemon::restart() if (sony_fd < 0) sony_fd = ::open("/dev/sonypi", O_RDONLY|O_NONBLOCK); if (s.sony_enablescrollbar||s.sony_middleemulation) { - if (sony_disp == 0 && sony_fd >= 0) + if (!sony_disp && sony_fd >= 0) sony_disp = XOpenDisplay(nullptr); - if (sony_fd < 0 || sony_disp == 0) { + if (sony_fd < 0 || !sony_disp) { s.sony_enablescrollbar = 0; s.sony_middleemulation = 0; } @@ -180,7 +180,7 @@ void laptop_daemon::restart() } else { if (dock_widget) { delete dock_widget; - dock_widget = 0; + dock_widget = nullptr; } } @@ -294,7 +294,7 @@ void laptop_daemon::restart() // sony support if (s.sony_enablescrollbar||s.sony_middleemulation) { - if (sony_notifier == 0) { + if (!sony_notifier) { sony_notifier = new TQSocketNotifier( sony_fd, TQSocketNotifier::Read, this ); if (sony_notifier) TQObject::connect( sony_notifier, TQ_SIGNAL(activated(int)), @@ -303,7 +303,7 @@ void laptop_daemon::restart() } else { if (sony_notifier) { delete sony_notifier; - sony_notifier = 0; + sony_notifier = nullptr; } } } @@ -404,7 +404,7 @@ void laptop_daemon::BackoffRestart() { delete backoffTimer; - backoffTimer = 0; + backoffTimer = nullptr; if (!timer) { timer = 1; autoLock.start(); @@ -419,13 +419,13 @@ laptop_daemon::WakeCheck() if (!need_wait) { wake_timer->stop(); delete wake_timer; - wake_timer = 0; + wake_timer = nullptr; return; } if (wakepos.x() != TQCursor::pos().x() || wakepos.y() != TQCursor::pos().y()) { wake_timer->stop(); delete wake_timer; - wake_timer = 0; + wake_timer = nullptr; WakeUpAuto(); } } @@ -472,7 +472,7 @@ void laptop_daemon::dock_quit() { if (dock_widget) delete dock_widget; - dock_widget = 0; + dock_widget = nullptr; } @@ -539,13 +539,13 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type) KPassivePopup::message(i18n("Battery power is running out."), i18n("%1 % charge left.").arg(num), BarIcon("laptop_battery"), dock_widget, - 0, 20000); + nullptr, 20000); } else { // Will this ever be reached? KPassivePopup::message(i18n("Battery power is running out."), i18n("%1 % charge left.").arg(num), BarIcon("laptop_battery"), dock_widget, - 0, 20000); + nullptr, 20000); } } else { @@ -553,13 +553,13 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type) KPassivePopup::message(i18n("Battery power is running out."), i18n("1 minute left.","%n minutes left.", num), BarIcon("laptop_battery"), dock_widget, - 0, 20000); + nullptr, 20000); } else { KPassivePopup::message(i18n("Battery power is running out."), /* xgettext:no-c-format */ i18n("1% left.", "%n percent left.", num), BarIcon("laptop_battery"), dock_widget, - 0, 20000); + nullptr, 20000); } } } @@ -668,7 +668,7 @@ void laptop_daemon::checkBatteryNow() if (left==-1) // Let's try to calculate the expected battery time left { timeval tv; - gettimeofday(&tv, 0); + gettimeofday(&tv, nullptr); left=calcBatteryTime(((powered)?100-val:val), tv.tv_sec, oldpowered!=powered ); } @@ -689,7 +689,7 @@ void laptop_daemon::checkBatteryNow() knownFullyCharged = 1; } else if (s.notifyMeWhenFull && oldval != val && val == 100) - KMessageBox::queuedMessageBox(0, KMessageBox::Information, i18n("Your battery is now fully charged."), i18n("Laptop Battery")); + KMessageBox::queuedMessageBox(nullptr, KMessageBox::Information, i18n("Your battery is now fully charged."), i18n("Laptop Battery")); changed = oldpowered != powered||oldexists != s.exists||oldval != val || oldleft!=left; oldpowered = powered; oldexists = s.exists; @@ -823,14 +823,14 @@ void laptop_daemon::invokeLogout() { bool rc = tdeApp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeNone, TDEApplication::ShutdownModeForceNow); if (!rc) - KMessageBox::sorry(0, i18n("Logout failed.")); + KMessageBox::sorry(nullptr, i18n("Logout failed.")); } void laptop_daemon::invokeShutdown() { bool rc = tdeApp->requestShutDown(TDEApplication::ShutdownConfirmNo, TDEApplication::ShutdownTypeHalt, TDEApplication::ShutdownModeForceNow); if (!rc) - KMessageBox::sorry(0, i18n("Shutdown failed.")); + KMessageBox::sorry(nullptr, i18n("Shutdown failed.")); } /* diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 323ab46e..47c3a0d5 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -179,28 +179,28 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) tab->addTab(profile, i18n("Default Power Profiles")); connect(profile, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { - profile = 0; + profile = nullptr; } if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) { buttons = new ButtonsConfig(parent, "kcmlaptop"); tab->addTab(buttons, i18n("Button Actions")); connect(buttons, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { - buttons = 0; + buttons = nullptr; } if (laptop_portable::has_acpi()) { acpi = new AcpiConfig(parent, "kcmlaptop"); tab->addTab(acpi, i18n("&ACPI Config")); connect(acpi, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { - acpi = 0; + acpi = nullptr; } if (laptop_portable::has_apm()) { apm = new ApmConfig(parent, "kcmlaptop"); tab->addTab(apm, i18n("&APM Config")); connect(apm, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { - apm = 0; + apm = nullptr; } if (::access("/dev/sonypi", F_OK) == 0) { bool do_sony = 1; @@ -217,17 +217,17 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) tab->addTab(sony, i18n("&Sony Laptop Config")); connect(sony, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { - sony = 0; + sony = nullptr; } } else { - sony = 0; + sony = nullptr; } TDEAboutData* about = new TDEAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION, I18N_NOOP("Battery Control Panel Module"), TDEAboutData::License_GPL, - I18N_NOOP("(c) 1999 Paul Campbell"), 0, 0); + I18N_NOOP("(c) 1999 Paul Campbell"), nullptr, nullptr); //about->addAuthor("NAME", 0, "e-mail addy"); setAboutData( about ); } diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp index cc662172..e4714163 100644 --- a/klaptopdaemon/pcmcia.cpp +++ b/klaptopdaemon/pcmcia.cpp @@ -43,9 +43,9 @@ PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name) TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmlaptop"), I18N_NOOP("TDE Panel System Information Control Module"), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999 - 2002 Paul Campbell")); - about->addAuthor("Paul Campbell", 0, "paul@taniwha.com"); + about->addAuthor("Paul Campbell", nullptr, "paul@taniwha.com"); setAboutData( about ); TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h index 5a081cf0..3777cd7c 100644 --- a/klaptopdaemon/pcmcia.h +++ b/klaptopdaemon/pcmcia.h @@ -43,7 +43,7 @@ class PcmciaConfig : public TDECModule TQ_OBJECT public: - PcmciaConfig( TQWidget *parent=0, const char* name=0); + PcmciaConfig( TQWidget *parent=nullptr, const char* name=nullptr); void save( void ); void load(); diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 8aa9b37e..59f0f09e 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -118,7 +118,7 @@ typedef struct apm_info { static int apm_read(apm_info *ap) { - FILE *f = 0; + FILE *f = nullptr; char tmp2[10]; int tmp, s; unsigned int utmp; @@ -279,7 +279,7 @@ acpi_ac_status() if (dfd) { for (;;) { dp = readdir(dfd); - if (dp == 0) + if (!dp) break; if (strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0) @@ -453,12 +453,12 @@ acpi_read(apm_info *ap) if (last_remaining != 0 && last_time != 0) { - int diff_time = time(0) - last_time; + int diff_time = time(nullptr) - last_time; if (diff_time > 0) rate = (last_remaining - part) * 3600 / diff_time; } last_remaining = part; - last_time = time(0); + last_time = time(nullptr); if (rate < 0) rate = 0; } @@ -645,7 +645,7 @@ has_acpi_power() if(battdir[i] == "." || battdir[i] == "..") continue; bool ok = 0; - acpi_battery_info bat = {0,0,0,0,0,0,0,0,0}; + acpi_battery_info bat = {0,0,0,0,0,0,nullptr,nullptr,nullptr}; TQString base = battdir.path() + "/" + battdir[i] + "/"; TQString name(base + "state"); TQFileInfo f(name); @@ -1066,9 +1066,9 @@ void laptop_portable::invoke_standby() last_seed++; // make it look for battery removal/return if (::has_acpi()) { if (::has_acpi_sleep(1)) { // people seem to argue as to which is 'standby' the S1 people are winning - ::invoke_acpi_helper("--standby", 0, 0); + ::invoke_acpi_helper("--standby", nullptr, nullptr); } else { - ::invoke_acpi_helper("--standby2", 0, 0); + ::invoke_acpi_helper("--standby2", nullptr, nullptr); } return; } @@ -1108,7 +1108,7 @@ void laptop_portable::invoke_suspend() } if (::has_acpi()) { - ::invoke_acpi_helper("--suspend", 0, 0); + ::invoke_acpi_helper("--suspend", nullptr, nullptr); return; } if (::has_ibm()) { @@ -1138,11 +1138,11 @@ void laptop_portable::invoke_hibernation() { last_seed++; // make it look for battery removal/return if (::has_software_suspend(1)) { // must be before acpi - ::invoke_acpi_helper("--software-suspend", 0, 0); + ::invoke_acpi_helper("--software-suspend", nullptr, nullptr); return; } if (::has_acpi()) { - ::invoke_acpi_helper("--hibernate", 0, 0); + ::invoke_acpi_helper("--hibernate", nullptr, nullptr); return; } if (::has_ibm()) { @@ -1489,7 +1489,7 @@ laptop_portable::set_brightness(bool blank, int val) // val = 0-255 255 brightes if (val == 0 && !blank) val = 1; snprintf(tmp, sizeof(tmp), "%d", val&7); - ::invoke_acpi_helper("--toshibalcd", tmp, 0); + ::invoke_acpi_helper("--toshibalcd", tmp, nullptr); return; } // INSERT HERE @@ -1854,7 +1854,7 @@ laptop_portable::set_system_performance(TQString val) // val = string given by g return; case CPUFREQ_25: tmp = cpufreq_minmax_frequency[0] + ":" + cpufreq_minmax_frequency[1] + ":" + val; - invoke_acpi_helper("--cpufreq-25", tmp.latin1(), 0); + invoke_acpi_helper("--cpufreq-25", tmp.latin1(), nullptr); return; case CPUFREQ_24: int target = performance_list.findIndex(val); diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index 80724b06..7f695017 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -47,37 +47,37 @@ extern void wake_laptop_daemon(); PowerConfig::PowerConfig (TQWidget * parent, const char *name) : TDECModule(parent, name), - nopowerBox(0), - nopowerStandby(0), - nopowerSuspend(0), - nopowerOff(0), - nopowerHibernate(0), - nopowerBrightness(0), - nopowerValBrightness(0), - nopowerThrottle(0), - nopowerValThrottle(0), - nopowerPerformance(0), - nopowerValPerformance(0), - - powerBox(0), - powerStandby(0), - powerSuspend(0), - powerOff(0), - powerHibernate(0), - powerBrightness(0), - powerValBrightness(0), - powerThrottle(0), - powerValThrottle(0), - powerPerformance(0), - powerValPerformance(0), - - - noeditwait(0), - editwait(0), - enablelav(0), - noenablelav(0), - noeditlav(0), - editlav(0) + nopowerBox(nullptr), + nopowerStandby(nullptr), + nopowerSuspend(nullptr), + nopowerOff(nullptr), + nopowerHibernate(nullptr), + nopowerBrightness(nullptr), + nopowerValBrightness(nullptr), + nopowerThrottle(nullptr), + nopowerValThrottle(nullptr), + nopowerPerformance(nullptr), + nopowerValPerformance(nullptr), + + powerBox(nullptr), + powerStandby(nullptr), + powerSuspend(nullptr), + powerOff(nullptr), + powerHibernate(nullptr), + powerBrightness(nullptr), + powerValBrightness(nullptr), + powerThrottle(nullptr), + powerValThrottle(nullptr), + powerPerformance(nullptr), + powerValPerformance(nullptr), + + + noeditwait(nullptr), + editwait(nullptr), + enablelav(nullptr), + noenablelav(nullptr), + noeditlav(nullptr), + editlav(nullptr) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages @@ -525,7 +525,7 @@ int PowerConfig::getPower() void PowerConfig::setPower(int p, int np) { - if (!apm || nopowerOff == 0) + if (!apm || !nopowerOff) return; if (nopowerSuspend) { nopowerSuspend->setChecked(false); diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h index 645e1bd8..92f562ef 100644 --- a/klaptopdaemon/power.h +++ b/klaptopdaemon/power.h @@ -43,7 +43,7 @@ class PowerConfig : public TDECModule TQ_OBJECT public: - PowerConfig( TQWidget *parent=0, const char* name=0); + PowerConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~PowerConfig(); void save( void ); void load(); diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index 24f6228e..8d9647c9 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -92,8 +92,8 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); } else { - poff = 0; - soff = 0; + poff = nullptr; + soff = nullptr; } if (has_performance) { @@ -112,8 +112,8 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) xl->addWidget(performance_val_off); xl->addStretch(1); } else { - performance_off = 0; - performance_val_off = 0; + performance_off = nullptr; + performance_val_off = nullptr; } if (has_throttle) { TQWidget *wp = new TQWidget(gb); @@ -131,8 +131,8 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) xl->addWidget(throttle_val_off); xl->addStretch(1); } else { - throttle_off = 0; - throttle_val_off = 0; + throttle_off = nullptr; + throttle_val_off = nullptr; } ll->addWidget(gb); @@ -156,8 +156,8 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); } else { - pon = 0; - son = 0; + pon = nullptr; + son = nullptr; } if (has_performance) { TQWidget *wp = new TQWidget(gb); @@ -175,8 +175,8 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) xl->addWidget(performance_val_on); xl->addStretch(1); } else { - performance_on = 0; - performance_val_on = 0; + performance_on = nullptr; + performance_val_on = nullptr; } if (has_throttle) { TQWidget *wp = new TQWidget(gb); @@ -194,8 +194,8 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) xl->addWidget(throttle_val_on); xl->addStretch(1); } else { - throttle_on = 0; - throttle_val_on = 0; + throttle_on = nullptr; + throttle_val_on = nullptr; } ll->addWidget(gb); diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h index df48e2c6..ecba85d1 100644 --- a/klaptopdaemon/profile.h +++ b/klaptopdaemon/profile.h @@ -44,7 +44,7 @@ class ProfileConfig : public TDECModule TQ_OBJECT public: - ProfileConfig( TQWidget *parent=0, const char* name=0); + ProfileConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~ProfileConfig( ); void save( void ); diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index 5fa13015..0751410c 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -109,7 +109,7 @@ void SonyConfig::setupHelper() { TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { - int rc = KMessageBox::warningContinueCancel(0, + int rc = KMessageBox::warningContinueCancel(nullptr, i18n("You will need to supply a root password " "to allow the protections of /dev/sonypi to be changed."), i18n("KLaptopDaemon"), KStdGuiItem::cont(), @@ -123,7 +123,7 @@ void SonyConfig::setupHelper() proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results } } else { - KMessageBox::sorry(0, i18n("The /dev/sonypi protections cannot be changed because tdesu cannot be found. Please make sure that it is installed correctly."), + KMessageBox::sorry(nullptr, i18n("The /dev/sonypi protections cannot be changed because tdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } bool enable = ::access("/dev/sonypi", R_OK) == 0; diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h index 88baaf96..2787d637 100644 --- a/klaptopdaemon/sony.h +++ b/klaptopdaemon/sony.h @@ -43,7 +43,7 @@ class SonyConfig : public TDECModule TQ_OBJECT public: - SonyConfig( TQWidget *parent=0, const char* name=0); + SonyConfig( TQWidget *parent=nullptr, const char* name=nullptr); ~SonyConfig( ); void save( void ); diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 990ffe4b..aba433d2 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -46,9 +46,9 @@ extern void wake_laptop_daemon(); WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) : TDECModule(parent, name), - checkSuspend(0), - checkStandby(0), - checkHibernate(0) + checkSuspend(nullptr), + checkStandby(nullptr), + checkHibernate(nullptr) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages @@ -181,8 +181,8 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) connect(valueBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); ++curRow; } else { - checkBrightness = 0; - valueBrightness = 0; + checkBrightness = nullptr; + valueBrightness = nullptr; } TQStringList performance_list; int current_performance; @@ -205,8 +205,8 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addLayout(v, curRow, 1); ++curRow; } else { - performance = 0; - performance_val = 0; + performance = nullptr; + performance_val = nullptr; } TQStringList throttle_list; int current_throttle; @@ -228,8 +228,8 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addLayout(v, curRow, 1); ++curRow; } else { - throttle = 0; - throttle_val = 0; + throttle = nullptr; + throttle_val = nullptr; } diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h index cadcef96..6c0b0ce1 100644 --- a/klaptopdaemon/warning.h +++ b/klaptopdaemon/warning.h @@ -43,7 +43,7 @@ class WarningConfig : public TDECModule TQ_OBJECT public: - WarningConfig(int x, TQWidget *parent=0, const char* name=0); + WarningConfig(int x, TQWidget *parent=nullptr, const char* name=nullptr); ~WarningConfig(); void save( void ); void load(); diff --git a/klaptopdaemon/xautolock.cpp b/klaptopdaemon/xautolock.cpp index 16424dbf..32749fa4 100644 --- a/klaptopdaemon/xautolock.cpp +++ b/klaptopdaemon/xautolock.cpp @@ -139,7 +139,7 @@ void XAutoLock::stop() // void XAutoLock::resetTrigger() { - mTrigger = time(0) + mTimeout; + mTrigger = time(nullptr) + mTimeout; } //--------------------------------------------------------------------------- @@ -148,7 +148,7 @@ void XAutoLock::resetTrigger() // void XAutoLock::postpone() { - mTrigger = time(0) + 60; // delay by 60sec + mTrigger = time(nullptr) + 60; // delay by 60sec } //--------------------------------------------------------------------------- @@ -181,7 +181,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev) xautolock_processQueue(); - time_t now = time(0); + time_t now = time(nullptr); if ((now > mLastTimeout && now - mLastTimeout > TIME_CHANGE_LIMIT) || (mLastTimeout > now && mLastTimeout - now > TIME_CHANGE_LIMIT+1)) { @@ -227,7 +227,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev) #endif #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; + static XScreenSaverInfo* mitInfo = nullptr; if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); if (XScreenSaverQueryInfo (tqt_xdisplay(), DefaultRootWindow (tqt_xdisplay()), mitInfo)) { //kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 7f3bd77f..18ceb3dc 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -113,7 +113,7 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) KVaio::~KVaio() { kdDebug() << "KVaio dtor: shutting down." << endl; - if(mDriver!=0) + if(mDriver) { mDriver->disconnectFromDriver(); } diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index 0ee3a5c1..c7538afd 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -58,7 +58,7 @@ class KVaio : public TQObject public: // KVaio(TQObject *parent = 0, const char *name =0); - KVaio(KMiloKVaio *parent = 0, const char *name =0); + KVaio(KMiloKVaio *parent = nullptr, const char *name =nullptr); virtual ~KVaio(); const KVaioDriverInterface *driver(); diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index e8e85410..c7c8d04b 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -105,7 +105,7 @@ bool KVaioDriverInterface::connectToDriver(bool listen) void KVaioDriverInterface::disconnectFromDriver() { delete mNotifier; - mNotifier = 0; + mNotifier = nullptr; if(mFd!=0) { diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h index 3e41ac60..2c182542 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -36,7 +36,7 @@ class KVaioDriverInterface : public TQObject TQ_OBJECT public: - KVaioDriverInterface(TQObject *parent=0); + KVaioDriverInterface(TQObject *parent=nullptr); bool connectToDriver(bool listen = true); void disconnectFromDriver(); /** Return the current display brightness, a value between 0 and diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index 01cc35c8..1f98c312 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -39,7 +39,7 @@ DefaultSkin::DefaultSkin() { connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); - _widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM); + _widget = new DefaultWidget(nullptr, "Screen Indicator", TQt::WX11BypassWM); _widget->setFocusPolicy(TQWidget::NoFocus); KWin::setOnAllDesktops(_widget->winId(), true); @@ -56,7 +56,7 @@ DefaultSkin::DefaultSkin() { DefaultSkin::~DefaultSkin() { delete _widget; - _widget = 0; + _widget = nullptr; } void DefaultSkin::reconfigure( TDEConfig *config ) { diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index 1598bb50..0ebc058e 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -63,7 +63,7 @@ KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100) for (KService::List::ConstIterator it = plugs.begin(); it != plugs.end(); ++it) { KService::Ptr service = *it; - KMilo::Monitor *m = KParts::ComponentFactory::createInstanceFromService(service, 0, service->desktopEntryName().latin1()); + KMilo::Monitor *m = KParts::ComponentFactory::createInstanceFromService(service, nullptr, service->desktopEntryName().latin1()); if (m) { m->setInterface(_miface); if (m->init()) { @@ -95,10 +95,10 @@ KMiloD::~KMiloD() _monitors.clear(); delete _display; - _display = 0L; + _display = nullptr; delete _miface; - _miface = 0L; + _miface = nullptr; } diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp index 020ecf5e..3ea12014 100644 --- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp +++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp @@ -26,7 +26,7 @@ #include #include -indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup) +indexWindow::indexWindow() : TQWidget(nullptr,"", WStyle_Customize | WType_Popup) { lb = new TQListBox(this); connect(lb,TQ_SIGNAL(selected(int)), this, TQ_SLOT(lbSelected(int))); diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp index a394c581..e405e41b 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp @@ -137,7 +137,7 @@ void KMultiFormListBoxMultiVisible::updateClipperContent() void KMultiFormListBoxMultiVisible::addElement() { - addElement(0); + addElement(nullptr); } void KMultiFormListBoxMultiVisible::addElement(KMultiFormListBoxEntry *after) @@ -149,7 +149,7 @@ void KMultiFormListBoxMultiVisible::addElement(KMultiFormListBoxEntry *after) void KMultiFormListBoxMultiVisible::append(KMultiFormListBoxEntry *elm) { elm->reparent(viewport(), 0, TQPoint(0,0), false); - insertElmIntoWidget(elm, 0); + insertElmIntoWidget(elm, nullptr); } void KMultiFormListBoxMultiVisible::delElement(TQWidget *elm) @@ -195,7 +195,7 @@ void KMultiFormListBoxMultiVisible::insertElmIntoWidget(KMultiFormListBoxEntry * addChild(elm,0,0); // updateClipperContent will place the child correctly. TQWidget *sep = factory->separator(viewport()); - if (sep != 0) { + if (sep) { sep->setName("seperator"); sep->show(); addChild(sep,0,0); // updateClipperContent will place the child correctly. diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h index f9cab74d..992dcec8 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h @@ -45,7 +45,7 @@ private: class which is repeated in the KMultiFormListBox @param parent A pointer to the parent widget */ - KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *factory, TQWidget *parent = 0, const char *name = 0); + KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *factory, TQWidget *parent = nullptr, const char *name = nullptr); /** @return The elements in the KMultiFormListBox diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp index a366ad15..1bc5a2e2 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp @@ -150,7 +150,7 @@ void KMultiFormListBoxWindowed::slotDeleteEntry() WindowListboxItem *item = selected(); if (item) { int answer = - KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del()); + KMessageBox::warningContinueCancel(nullptr, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del()); if (answer == KMessageBox::Continue) { delete item; slotUpdateButtonState(); @@ -170,7 +170,7 @@ WindowListboxItem *KMultiFormListBoxWindowed::selected() { int i = _listbox->currentItem(); if (i == -1) { - return 0; + return nullptr; } else { return (WindowListboxItem *) _listbox->item(i); } @@ -179,7 +179,7 @@ WindowListboxItem *KMultiFormListBoxWindowed::selected() void KMultiFormListBoxWindowed::slotMoveItemUp() { WindowListboxItem *item = selected(); - if (item == 0) + if (!item) return; int index = _listbox->index(item); @@ -193,7 +193,7 @@ void KMultiFormListBoxWindowed::slotMoveItemUp() void KMultiFormListBoxWindowed::slotMoveItemDown() { WindowListboxItem *item = selected(); - if (item == 0) + if (!item) return; unsigned int index = _listbox->index(item); diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h index f9917d02..7ea66ca3 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h @@ -76,9 +76,9 @@ public: **/ KMultiFormListBox(KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp=Windowed, - TQWidget *parent = 0, bool showUpDownButtons = true, + TQWidget *parent = nullptr, bool showUpDownButtons = true, bool showHelpButton = true, TQString addButtonText = i18n("Add"), - const char *name = 0); + const char *name = nullptr); /** @return The elements in the KMultiFormListBox. diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h index a5b29747..2c9cdef1 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h @@ -53,8 +53,8 @@ class KMultiFormListBoxEntry : public TQWidget public: KMultiFormListBoxEntry(TQWidget *parent, const char *name) : TQWidget(parent,name) {} - virtual TQPushButton *indexButton() { return 0; } - virtual TQWidget *valueWidget() { return 0; } + virtual TQPushButton *indexButton() { return nullptr; } + virtual TQWidget *valueWidget() { return nullptr; } virtual void indexWindowPos(TQPoint *start, int *width); // both variables are return values. diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp index 6d101a03..9a01cec9 100644 --- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp +++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp @@ -20,13 +20,13 @@ #include WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, TDEListBox *lb) - :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false) + :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, nullptr, "ConfigWindow", false) { init(factory, lb); } WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KMultiFormListBoxEntry *widget, TDEListBox *lb) - :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false) + :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, nullptr, "ConfigWindow", false) { init(factory, lb, widget); } @@ -39,7 +39,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMult TQFrame *frame = plainPage(); TQHBoxLayout *lay = new TQHBoxLayout(frame,0,-1,"WidgetWindow::init::lay"); - if (widget != 0) { + if (widget) { myWidget = widget; widget->reparent(frame, 0, TQPoint(0,0)); } @@ -51,7 +51,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMult lay->addWidget(myWidget); - if (widget != 0) { + if (widget) { initialShow = false; myListboxItem = new WindowListboxItem(listbox,myWidget->idxString(), this); } diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.h b/kregexpeditor/KMultiFormListBox/widgetwindow.h index 5fc68f95..916c765e 100644 --- a/kregexpeditor/KMultiFormListBox/widgetwindow.h +++ b/kregexpeditor/KMultiFormListBox/widgetwindow.h @@ -38,7 +38,7 @@ class WidgetWindow :public KDialogBase WidgetWindow(KMultiFormListBoxFactory *, TDEListBox *); WidgetWindow(KMultiFormListBoxFactory *, KMultiFormListBoxEntry *widget, TDEListBox *); - void init(KMultiFormListBoxFactory *, TDEListBox *, KMultiFormListBoxEntry *widget = 0); + void init(KMultiFormListBoxFactory *, TDEListBox *, KMultiFormListBoxEntry *widget = nullptr); void display(); KMultiFormListBoxEntry *entry(); WidgetWindow *clone(); diff --git a/kregexpeditor/altnregexp.cpp b/kregexpeditor/altnregexp.cpp index ef8b8de8..85a7ec9e 100644 --- a/kregexpeditor/altnregexp.cpp +++ b/kregexpeditor/altnregexp.cpp @@ -61,7 +61,7 @@ bool AltnRegExp::load( TQDomElement top, const TQString& version ) continue; // User might have added a comment. RegExp* regexp = WidgetFactory::createRegExp( child.toElement(), version ); - if ( regexp == 0 ) + if ( !regexp ) return false; addRegExp( regexp ); } diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp index 31962881..1230d3bc 100644 --- a/kregexpeditor/altnwidget.cpp +++ b/kregexpeditor/altnwidget.cpp @@ -30,7 +30,7 @@ AltnWidget::AltnWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - :MultiContainerWidget(editorWindow, parent, name == 0 ? "AltnWidget" : name) + :MultiContainerWidget(editorWindow, parent, name == nullptr ? "AltnWidget" : name) { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments @@ -206,7 +206,7 @@ RegExp* AltnWidget::selection() const } } tqFatal("Selection not found"); - return 0; // compiler shut up. + return nullptr; // compiler shut up. } bool AltnWidget::validateSelection() const diff --git a/kregexpeditor/altnwidget.h b/kregexpeditor/altnwidget.h index 589726da..3bfec8c5 100644 --- a/kregexpeditor/altnwidget.h +++ b/kregexpeditor/altnwidget.h @@ -30,9 +30,9 @@ class AltnWidget :public MultiContainerWidget { public: AltnWidget( RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *label = 0); + const char *label = nullptr); AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = nullptr); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); virtual TQSize sizeHint() const; virtual RegExp* regExp() const; diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index 0bcd10d1..91fe4879 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -32,7 +32,7 @@ #include #include "util.h" -AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) +AuxButtons::AuxButtons( TQWidget* parent, const char* name = nullptr) :TQDockWindow( TQDockWindow::InDock, parent, name) { TQBoxLayout* layout = boxLayout(); diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index cae60e8f..9346e0ea 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -37,7 +37,7 @@ #include #include -CharacterEdits* CharactersWidget::_configWindow = 0; +CharacterEdits* CharactersWidget::_configWindow = nullptr; CharactersWidget::CharactersWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) @@ -174,15 +174,15 @@ RegExpWidget* CharactersWidget::findWidgetToEdit( TQPoint globalPos ) if ( TQRect(mapToGlobal(TQPoint(0,0)), size()).contains( globalPos ) ) return this; else - return 0; + return nullptr; } int CharactersWidget::edit() { - if ( _configWindow == 0 ) { + if ( !_configWindow ) { TQApplication::setOverrideCursor( WaitCursor ); // No parent here, as this window should continue to exists. - _configWindow = new CharacterEdits( 0, "CharactersWidget::_configWindow" ); + _configWindow = new CharacterEdits( nullptr, "CharactersWidget::_configWindow" ); TQApplication::restoreOverrideCursor(); } @@ -190,7 +190,7 @@ int CharactersWidget::edit() _configWindow->sizeHint().height()/2)); int ret = _configWindow->exec(_regexp ); if ( ret == TQDialog::Accepted ) { - _editorWindow->updateContent( 0 ); + _editorWindow->updateContent( nullptr ); update(); } return ret; @@ -277,13 +277,13 @@ int CharacterEdits::exec( TextRangeRegExp* regexp ) } int res = KDialogBase::exec(); - _regexp = 0; + _regexp = nullptr; return res; } CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) - : KDialogBase( parent, name == 0 ? "CharacterEdits" : name, true, + : KDialogBase( parent, name == nullptr ? "CharacterEdits" : name, true, i18n("Specify Characters"), KDialogBase::Ok | KDialogBase::Cancel) { diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h index af0faf9a..d53960e1 100644 --- a/kregexpeditor/characterswidget.h +++ b/kregexpeditor/characterswidget.h @@ -42,9 +42,9 @@ class CharactersWidget :public RegExpWidget { public: CharactersWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *label = 0); + const char *label = nullptr); CharactersWidget( TextRangeRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* parent, const char* name = 0 ); + TQWidget* parent, const char* name = nullptr ); ~CharactersWidget(); virtual TQSize sizeHint() const; virtual RegExp* regExp() const; @@ -72,7 +72,7 @@ private: class SingleEntry :public KMultiFormListBoxEntry { public: - SingleEntry(TQWidget* parent, const char* name = 0 ); + SingleEntry(TQWidget* parent, const char* name = nullptr ); TQString text() const; void setText( TQString text ); bool isEmpty() const; @@ -87,7 +87,7 @@ private: class RangeEntry :public KMultiFormListBoxEntry { public: - RangeEntry(TQWidget* parent, const char* name = 0 ); + RangeEntry(TQWidget* parent, const char* name = nullptr ); TQString fromText() const; TQString toText() const; void setFrom( TQString text ); @@ -104,7 +104,7 @@ class SingleFactory :public KMultiFormListBoxFactory { public: KMultiFormListBoxEntry *create(TQWidget *parent) { return new SingleEntry( parent ); } - TQWidget *separator( TQWidget* ) { return 0; } + TQWidget *separator( TQWidget* ) { return nullptr; } }; /** @@ -114,7 +114,7 @@ class RangeFactory :public KMultiFormListBoxFactory { public: KMultiFormListBoxEntry *create(TQWidget *parent) { return new RangeEntry( parent ); } - TQWidget *separator( TQWidget* ) { return 0; } + TQWidget *separator( TQWidget* ) { return nullptr; } }; /** @@ -125,7 +125,7 @@ class CharacterEdits : public KDialogBase TQ_OBJECT public: - CharacterEdits(TQWidget *parent = 0, const char *name = 0); + CharacterEdits(TQWidget *parent = nullptr, const char *name = nullptr); public slots: int exec( TextRangeRegExp* regexp ); diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index 5a3406f9..2725f384 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -73,7 +73,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) _stack = new TQWidgetStack( this, "_stack" ); layout->addWidget( _stack ); - _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" ); + _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, nullptr, "_normal" ); _stack->addWidget( new StackContainer( _normal, _stack ), 0 ); _hex = new LimitedCharLineEdit( LimitedCharLineEdit::HEX, _stack, "_hex" ); diff --git a/kregexpeditor/charselector.h b/kregexpeditor/charselector.h index 70a2bbcb..a0ba28f9 100644 --- a/kregexpeditor/charselector.h +++ b/kregexpeditor/charselector.h @@ -30,7 +30,7 @@ class CharSelector :public TQWidget public: - CharSelector( TQWidget* parent, const char* name = 0 ); + CharSelector( TQWidget* parent, const char* name = nullptr ); TQString text() const; void setText( TQString text ); bool isEmpty() const; diff --git a/kregexpeditor/compoundregexp.h b/kregexpeditor/compoundregexp.h index a1038ab6..59a1f914 100644 --- a/kregexpeditor/compoundregexp.h +++ b/kregexpeditor/compoundregexp.h @@ -28,7 +28,7 @@ class CompoundRegExp :public RegExp public: CompoundRegExp( bool selected, const TQString& title = TQString(), const TQString& description = TQString(), - bool hidden = false, bool allowReplace = false, RegExp* child = 0); + bool hidden = false, bool allowReplace = false, RegExp* child = nullptr); virtual bool check( ErrorMap&, bool first, bool last ); virtual int precedence() const { return _child->precedence();} diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index 0c13bd6c..dfa72732 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -95,7 +95,7 @@ void CompoundDetailWindow::setAllowReplace( bool b ) CompoundWidget::CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, const char* name ) - :SingleContainerWidget( editorWindow, parent, name == 0 ? "CompoundWidget" : name ) + :SingleContainerWidget( editorWindow, parent, name == nullptr ? "CompoundWidget" : name ) { _child = new ConcWidget( editorWindow, this ); init(); @@ -103,7 +103,7 @@ CompoundWidget::CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* pare CompoundWidget::CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, TQWidget* parent, const char* name ) - : SingleContainerWidget( editorWindow, parent, name == 0 ? "CompoundWidget" : name ) + : SingleContainerWidget( editorWindow, parent, name == nullptr ? "CompoundWidget" : name ) { init(); _content->setTitle( regexp->title() ); @@ -238,7 +238,7 @@ void CompoundWidget::paintEvent( TQPaintEvent *e ) void CompoundWidget::slotConfigWindowClosed() { - _editorWindow->updateContent( 0 ); + _editorWindow->updateContent( nullptr ); update(); } @@ -272,7 +272,7 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event) if ( event->button() == TQt::LeftButton && TQRect( _pixmapPos, _pixmapSize ).contains( event->pos() ) ) { _hidden = !_hidden; - _editorWindow->updateContent( 0 ); + _editorWindow->updateContent( nullptr ); repaint(); // is this necesary? _editorWindow->emitChange(); } diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h index 3be5e73a..4ffbeeca 100644 --- a/kregexpeditor/compoundwidget.h +++ b/kregexpeditor/compoundwidget.h @@ -32,7 +32,7 @@ class TQCheckBox; class CompoundDetailWindow :public TQWidget { public: - CompoundDetailWindow(TQWidget* parent, const char* name = 0); + CompoundDetailWindow(TQWidget* parent, const char* name = nullptr); TQString title() const; TQString description() const; bool allowReplace() const; @@ -64,9 +64,9 @@ TQ_OBJECT public: CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, - const char* name = 0); + const char* name = nullptr); CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = nullptr); virtual bool updateSelection( bool parentSelected ); virtual TQSize sizeHint() const; diff --git a/kregexpeditor/concregexp.cpp b/kregexpeditor/concregexp.cpp index cefbac47..bd10ded5 100644 --- a/kregexpeditor/concregexp.cpp +++ b/kregexpeditor/concregexp.cpp @@ -50,7 +50,7 @@ bool ConcRegExp::check( ErrorMap& map, bool first, bool last) RegExp* ConcRegExp::lastRegExp() { if ( list.count() == 0) - return 0; + return nullptr; else return list.at( list.count()-1); } @@ -73,7 +73,7 @@ bool ConcRegExp::load( TQDomElement top, const TQString& version ) continue; // User might have added a comment. RegExp* regexp = WidgetFactory::createRegExp( child.toElement(), version ); - if ( regexp == 0 ) + if ( !regexp ) return false; addRegExp( regexp ); } diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index 47753d4d..1b2ef42a 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -23,7 +23,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - :MultiContainerWidget(editorWindow, parent, name == 0 ? "concwidget" : name) + :MultiContainerWidget(editorWindow, parent, name == nullptr ? "concwidget" : name) { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); @@ -34,7 +34,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, TQWidget *parent, const char *name) - :MultiContainerWidget(editorWindow, parent, name == 0 ? "concwidget" : name) + :MultiContainerWidget(editorWindow, parent, name == nullptr ? "concwidget" : name) { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); @@ -45,7 +45,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, ConcWidget::ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, unsigned int start, unsigned int end) - :MultiContainerWidget(editorWindow, 0, "Splitted ConcWidget") + :MultiContainerWidget(editorWindow, nullptr, "Splitted ConcWidget") { init(); _children.prepend( new DragAccepter(editorWindow, this) ); @@ -59,7 +59,7 @@ ConcWidget::ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, ConcWidget::ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, TQWidget* parent, const char* name ) - :MultiContainerWidget( editorWindow, parent, name == 0 ? "concwidget" : name ) + :MultiContainerWidget( editorWindow, parent, name == nullptr ? "concwidget" : name ) { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); @@ -334,7 +334,7 @@ RegExp* ConcWidget::selection() const bool foundAny = false; bool foundMoreThanOne = false; - RegExp* regexp = 0; + RegExp* regexp = nullptr; TQPtrListIterator it(_children); ++it; // Skip past the first DragAccepter diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h index 9a4820c5..25996dc0 100644 --- a/kregexpeditor/concwidget.h +++ b/kregexpeditor/concwidget.h @@ -31,13 +31,13 @@ class ConcWidget :public MultiContainerWidget { public: ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, - TQWidget *parent, const char *name=0); + TQWidget *parent, const char *name=nullptr); ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, unsigned int start, unsigned int end); ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = nullptr); void init(); virtual TQSize sizeHint() const; diff --git a/kregexpeditor/dcbutton.h b/kregexpeditor/dcbutton.h index daec6053..e9e3d139 100644 --- a/kregexpeditor/dcbutton.h +++ b/kregexpeditor/dcbutton.h @@ -31,7 +31,7 @@ TQ_OBJECT public: - DoubleClickButton( TQPixmap pix, TQWidget* parent, const char* name = 0); + DoubleClickButton( TQPixmap pix, TQWidget* parent, const char* name = nullptr); protected: virtual void mouseDoubleClickEvent ( TQMouseEvent * ); diff --git a/kregexpeditor/drag.cpp b/kregexpeditor/drag.cpp index cfc11bbe..5d542541 100644 --- a/kregexpeditor/drag.cpp +++ b/kregexpeditor/drag.cpp @@ -55,7 +55,7 @@ const char * RegExpWidgetDrag::format ( int i ) const else if ( i == 1 ) return "text/plain"; else - return 0; + return nullptr; } TQByteArray RegExpWidgetDrag::encodedData ( const char* format ) const diff --git a/kregexpeditor/dragaccepter.cpp b/kregexpeditor/dragaccepter.cpp index b216e75f..fb4214a0 100644 --- a/kregexpeditor/dragaccepter.cpp +++ b/kregexpeditor/dragaccepter.cpp @@ -22,7 +22,7 @@ DragAccepter::DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *parent, const char *name) - : RegExpWidget(editorWindow, parent, name == 0 ? "dragaccepter" : name ), + : RegExpWidget(editorWindow, parent, name == nullptr ? "dragaccepter" : name ), _drawLine( false ) { setAcceptDrops(true); @@ -59,11 +59,11 @@ void DragAccepter::mouseReleaseEvent( TQMouseEvent* event ) if ( _editorWindow->isPasteing() && event->button() == TQt::LeftButton ) { RegExp* regexp = _editorWindow->pasteData(); - RegExpWidget *newElm = WidgetFactory::createWidget( regexp, _editorWindow, 0 ); + RegExpWidget *newElm = WidgetFactory::createWidget( regexp, _editorWindow, nullptr ); if ( newElm ) { ConcWidget* elm; if (! (elm = dynamic_cast( newElm ) ) ) { - elm = new ConcWidget( _editorWindow, newElm, 0 ); + elm = new ConcWidget( _editorWindow, newElm, nullptr ); } Q_ASSERT( elm ); @@ -108,10 +108,10 @@ void DragAccepter::dropEvent(TQDropEvent *event) { // The widget will be reparent afterward or part of it will, so no need to give // it a parent here. - RegExpWidget *newElm = RegExpWidgetDrag::decode( event, _editorWindow, 0 ); + RegExpWidget *newElm = RegExpWidgetDrag::decode( event, _editorWindow, nullptr ); ConcWidget* elm; if ( !(elm = dynamic_cast( newElm ) ) ) { - elm = new ConcWidget( _editorWindow, newElm, 0 ); + elm = new ConcWidget( _editorWindow, newElm, nullptr ); } Q_ASSERT( elm ); @@ -135,5 +135,5 @@ void DragAccepter::dropEvent(TQDropEvent *event) RegExp* DragAccepter::regExp() const { - return 0; + return nullptr; } diff --git a/kregexpeditor/dragaccepter.h b/kregexpeditor/dragaccepter.h index c9c6fd82..d8ee4684 100644 --- a/kregexpeditor/dragaccepter.h +++ b/kregexpeditor/dragaccepter.h @@ -31,7 +31,7 @@ class DragAccepter :public RegExpWidget public: DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *parent, - const char *name = 0); + const char *name = nullptr); TQSize sizeHint() const; virtual RegExp* regExp() const; virtual RegExpType type() const { return DRAGACCEPTER; } diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 0ab7a261..ea3eb3da 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -49,10 +49,10 @@ RegExpEditorWindow::RegExpEditorWindow( TQWidget *parent, const char *name) _layout->addWidget(_top); _top->setToplevel(); _undrawSelection = false; - _menu = 0; + _menu = nullptr; _insertInAction = false; _pasteInAction = false; - _pasteData = 0; + _pasteData = nullptr; TQAccel* accel = new TQAccel( this ); accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQ_SLOT( slotCopy() ) ); @@ -74,7 +74,7 @@ RegExp* RegExpEditorWindow::regExp() const void RegExpEditorWindow::mousePressEvent ( TQMouseEvent* event ) { setFocus(); - updateContent( 0 ); + updateContent( nullptr ); _start = event->pos(); _lastPoint = TQPoint(0,0); @@ -223,7 +223,7 @@ void RegExpEditorWindow::slotDeleteSelection() else { _top->deleteSelection(); } - updateContent( 0 ); + updateContent( nullptr ); } void RegExpEditorWindow::updateContent( TQWidget* focusChild) @@ -318,7 +318,7 @@ void RegExpEditorWindow::showRMBMenu( bool enableCutCopy ) enum CHOICES { CUT, COPY, PASTE, SAVE, EDIT }; if ( !_menu ) { - _menu = new TQPopupMenu( 0 ); + _menu = new TQPopupMenu( nullptr ); _menu->insertItem(getIcon(TQString::fromLocal8Bit("edit-cut")), i18n("C&ut"), CUT); _menu->insertItem(getIcon(TQString::fromLocal8Bit("edit-copy")), diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h index e249b6a3..c1749cb9 100644 --- a/kregexpeditor/editorwindow.h +++ b/kregexpeditor/editorwindow.h @@ -49,7 +49,7 @@ class RegExpEditorWindow :public TQWidget public: - RegExpEditorWindow(TQWidget *parent, const char *name = 0); + RegExpEditorWindow(TQWidget *parent, const char *name = nullptr); /** Returns an object which represent the regular expression "drawn" in diff --git a/kregexpeditor/emacsregexpconverter.cpp b/kregexpeditor/emacsregexpconverter.cpp index 316cf7cc..7cbb8020 100644 --- a/kregexpeditor/emacsregexpconverter.cpp +++ b/kregexpeditor/emacsregexpconverter.cpp @@ -76,7 +76,7 @@ TQString EmacsRegExpConverter::toString( LookAheadRegExp* /*regexp*/, bool /*mar { static bool haveWarned = false; if ( ! haveWarned ) { - KMessageBox::sorry( 0, i18n("Look ahead regular expressions not supported in Emacs style") ); + KMessageBox::sorry( nullptr, i18n("Look ahead regular expressions not supported in Emacs style") ); haveWarned = true; } @@ -179,7 +179,7 @@ TQString EmacsRegExpConverter::toString( PositionRegExp* regexp, bool /*markSele case PositionRegExp::WORDBOUNDARY: case PositionRegExp::NONWORDBOUNDARY: if ( ! haveWarned ) { - KMessageBox::sorry( 0, i18n( "Word boundary and non word boundary is not supported in Emacs syntax" ) ); + KMessageBox::sorry( nullptr, i18n( "Word boundary and non word boundary is not supported in Emacs syntax" ) ); haveWarned = true; return TQString::fromLatin1(""); } diff --git a/kregexpeditor/errormap.cpp b/kregexpeditor/errormap.cpp index 68b8de9d..2c44d120 100644 --- a/kregexpeditor/errormap.cpp +++ b/kregexpeditor/errormap.cpp @@ -46,7 +46,7 @@ void ErrorMap::end() void ErrorMap::lineStartError() { if ( ! _prevLineStartError ) { - KMessageBox::information( 0, i18n("Your regular expression is invalid, due to something preceding a 'line start'."), + KMessageBox::information( nullptr, i18n("Your regular expression is invalid, due to something preceding a 'line start'."), i18n("Regular Expression Error"), TQString::fromLatin1("KRegExpEditorLineStartError") ); } _lineStartError = true; @@ -55,7 +55,7 @@ void ErrorMap::lineStartError() void ErrorMap::lineEndError() { if ( !_prevLineEndError ) { - KMessageBox::information( 0, i18n("Your regular expression is invalid, due to something following a 'line end'."), + KMessageBox::information( nullptr, i18n("Your regular expression is invalid, due to something following a 'line end'."), i18n("Regular Expression Error"), TQString::fromLatin1("KRegExpEditorLineEndError") ); } _lineEndError = true; @@ -65,7 +65,7 @@ void ErrorMap::lineEndError() void ErrorMap::lookAheadError() { if ( !_prevLookAHeadError ) { - KMessageBox::information( 0, i18n("Your regular expression is invalid. 'Look Ahead' regular expression must be the last sub expression."), + KMessageBox::information( nullptr, i18n("Your regular expression is invalid. 'Look Ahead' regular expression must be the last sub expression."), i18n("Regular Expression Error"), TQString::fromLatin1("KRegExpEditorLookAHeadError") ); } _lookAHeadError = true; diff --git a/kregexpeditor/gen_qregexplexer.cpp b/kregexpeditor/gen_qregexplexer.cpp index e0f2d7dc..60acbbf2 100644 --- a/kregexpeditor/gen_qregexplexer.cpp +++ b/kregexpeditor/gen_qregexplexer.cpp @@ -206,7 +206,7 @@ struct yy_buffer_state #define YY_BUFFER_EOF_PENDING 2 }; -static YY_BUFFER_STATE yy_current_buffer = 0; +static YY_BUFFER_STATE yy_current_buffer = nullptr; /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -487,7 +487,7 @@ static int input YY_PROTO(( void )); #ifdef YY_STACK_USED static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; +static int *yy_start_stack = nullptr; #ifndef YY_NO_PUSH_STATE static void yy_push_state YY_PROTO(( int new_state )); #endif @@ -1096,7 +1096,7 @@ static int yy_get_next_buffer() } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = nullptr; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1518,7 +1518,7 @@ yy_size_t size; base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return nullptr; b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) @@ -1527,7 +1527,7 @@ yy_size_t size; b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = nullptr; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; diff --git a/kregexpeditor/gen_qregexpparser.cpp b/kregexpeditor/gen_qregexpparser.cpp index 3d3a4323..327ba46b 100644 --- a/kregexpeditor/gen_qregexpparser.cpp +++ b/kregexpeditor/gen_qregexpparser.cpp @@ -1268,7 +1268,7 @@ yyerrlab: yysize += yystrlen ("parse error, unexpected ") + 1; yysize += yystrlen (yytname[yytype]); yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) + if (yymsg) { char *yyp = yystpcpy (yymsg, "parse error, unexpected "); yyp = yystpcpy (yyp, yytname[yytype]); @@ -1429,7 +1429,7 @@ yyreturn: RegExp* parseTQtRegExp( TQString qstr, bool* ok ) { _index = 0; - parseResult = 0; + parseResult = nullptr; setParseData( qstr ); yyparse(); *ok = ( yynerrs == 0 ); diff --git a/kregexpeditor/kregexpeditorgui.h b/kregexpeditor/kregexpeditorgui.h index 8de9fdb4..af1c458c 100644 --- a/kregexpeditor/kregexpeditorgui.h +++ b/kregexpeditor/kregexpeditorgui.h @@ -40,7 +40,7 @@ class TDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterfa TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp ) public: - KRegExpEditorGUI( TQWidget *parent, const char *name = 0, + KRegExpEditorGUI( TQWidget *parent, const char *name = nullptr, const TQStringList & = TQStringList() ); virtual TQString regExp() const; diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index bcaf2661..bc41bff3 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -371,7 +371,7 @@ void KRegExpEditorPrivate::setVerifyText( const TQString& fileName ) _autoVerify = false; TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - KMessageBox::sorry(0, i18n("Could not open file '%1' for reading").arg( fileName ) ); + KMessageBox::sorry(nullptr, i18n("Could not open file '%1' for reading").arg( fileName ) ); } else { TQTextStream s( &file ); diff --git a/kregexpeditor/kregexpeditorprivate.h b/kregexpeditor/kregexpeditorprivate.h index 9e1eabb0..f98d408b 100644 --- a/kregexpeditor/kregexpeditorprivate.h +++ b/kregexpeditor/kregexpeditorprivate.h @@ -49,7 +49,7 @@ class KRegExpEditorPrivate :public TQWidget public: - KRegExpEditorPrivate( TQWidget *parent, const char *name = 0 ); + KRegExpEditorPrivate( TQWidget *parent, const char *name = nullptr ); TQString regexp(); void setMinimal( bool ); void setCaseSensitive( bool ); diff --git a/kregexpeditor/limitedcharlineedit.h b/kregexpeditor/limitedcharlineedit.h index 98359a20..0aaeb738 100644 --- a/kregexpeditor/limitedcharlineedit.h +++ b/kregexpeditor/limitedcharlineedit.h @@ -29,7 +29,7 @@ class LimitedCharLineEdit :public TQLineEdit public: enum Mode { NORMAL = 0, HEX = 1, OCT = 2 }; - LimitedCharLineEdit(Mode mode, TQWidget* parent, const char *name = 0); + LimitedCharLineEdit(Mode mode, TQWidget* parent, const char *name = nullptr); protected: virtual void keyPressEvent ( TQKeyEvent * ); diff --git a/kregexpeditor/lookaheadregexp.h b/kregexpeditor/lookaheadregexp.h index f2c111a9..00fb7993 100644 --- a/kregexpeditor/lookaheadregexp.h +++ b/kregexpeditor/lookaheadregexp.h @@ -29,7 +29,7 @@ class LookAheadRegExp :public RegExp public: enum TYPE { POSITIVE, NEGATIVE }; - LookAheadRegExp( bool selected, TYPE tp, RegExp* child = 0); + LookAheadRegExp( bool selected, TYPE tp, RegExp* child = nullptr); virtual bool check( ErrorMap&, bool first, bool last ); virtual int precedence() const { return 4;} diff --git a/kregexpeditor/lookaheadwidget.h b/kregexpeditor/lookaheadwidget.h index 5c51d81f..53ba0875 100644 --- a/kregexpeditor/lookaheadwidget.h +++ b/kregexpeditor/lookaheadwidget.h @@ -26,9 +26,9 @@ class LookAheadWidget :public SingleContainerWidget TQ_OBJECT public: - LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* parent, const char* name = 0 ); + LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* parent, const char* name = nullptr ); LookAheadWidget( LookAheadRegExp* regexp, RegExpEditorWindow* editorWindow, RegExpType tp, - TQWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = nullptr); virtual RegExp* regExp() const; virtual RegExpType type() const { return _tp; } diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 0bc79901..f16117cb 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -43,7 +43,7 @@ int main( int argc, char* argv[] ) TDEApplication myapp; #endif - TQDialog* top = new TQDialog( 0 ); + TQDialog* top = new TQDialog( nullptr ); TQVBoxLayout* lay = new TQVBoxLayout( top, 6 ); KRegExpEditorGUI* iface = new KRegExpEditorGUI( top, "_editor", TQStringList() ); diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index 6c7102d7..28a1ea58 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -222,7 +222,7 @@ RegExpWidget* MultiContainerWidget::widgetUnderPoint( TQPoint globalPos, bool ju return wid; } if ( justVisibleWidgets ) - return 0; + return nullptr; else { return RegExpWidget::widgetUnderPoint( globalPos, justVisibleWidgets ); } @@ -235,7 +235,7 @@ RegExpWidget* MultiContainerWidget::findWidgetToEdit( TQPoint globalPos ) if ( wid ) return wid; } - return 0; + return nullptr; } void MultiContainerWidget::selectWidget( bool sel ) diff --git a/kregexpeditor/multicontainerwidget.h b/kregexpeditor/multicontainerwidget.h index 4dd6a58b..f1019547 100644 --- a/kregexpeditor/multicontainerwidget.h +++ b/kregexpeditor/multicontainerwidget.h @@ -27,8 +27,8 @@ class MultiContainerWidget :public RegExpWidget { public: - MultiContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* parent = 0, - const char* name = 0); + MultiContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* parent = nullptr, + const char* name = nullptr); virtual bool hasSelection() const; virtual void clearSelection(); virtual void deleteSelection(); diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h index 16d72632..655f2a54 100644 --- a/kregexpeditor/qt-only/compat.h +++ b/kregexpeditor/qt-only/compat.h @@ -45,7 +45,7 @@ public: KDialogBase ( int dialogFace, const TQString &caption, int buttonMask, ButtonCode defaultButton, - TQWidget *parent=0, const char *name=0, bool modal=true ); + TQWidget *parent=nullptr, const char *name=nullptr, bool modal=true ); KDialogBase( TQWidget* parent, const char* name = 0, bool modal = true, const TQString& caption = TQString(), diff --git a/kregexpeditor/regexp.cpp b/kregexpeditor/regexp.cpp index 0b583d78..0b0bface 100644 --- a/kregexpeditor/regexp.cpp +++ b/kregexpeditor/regexp.cpp @@ -20,7 +20,7 @@ #include "kregexpeditorgui.h" #include "errormap.h" -RegExp::RegExp( bool selected ) : _parent(0), _destructing( false ), _selected( selected ) +RegExp::RegExp( bool selected ) : _parent(nullptr), _destructing( false ), _selected( selected ) { // Nothing to do } @@ -33,7 +33,7 @@ RegExp::~RegExp() } if ( _parent ) _parent->removeChild( this ); - _parent = 0; + _parent = nullptr; } void RegExp::addChild( RegExp* child ) @@ -62,7 +62,7 @@ RegExp* RegExp::readRegExp( TQDomElement top, const TQString& version ) RegExp* regexp = WidgetFactory::createRegExp(node.toElement(), version ); return regexp; } - return 0; + return nullptr; } TQString RegExp::toXmlString() const diff --git a/kregexpeditor/regexpbuttons.h b/kregexpeditor/regexpbuttons.h index 7778bcb8..7589003b 100644 --- a/kregexpeditor/regexpbuttons.h +++ b/kregexpeditor/regexpbuttons.h @@ -32,7 +32,7 @@ class RegExpButtons :public TQDockWindow public: - RegExpButtons( TQWidget *parent, const char *name = 0 ); + RegExpButtons( TQWidget *parent, const char *name = nullptr ); void setFeatures( int features ); protected: diff --git a/kregexpeditor/regexpconverter.cpp b/kregexpeditor/regexpconverter.cpp index 94b21e0f..3241abe5 100644 --- a/kregexpeditor/regexpconverter.cpp +++ b/kregexpeditor/regexpconverter.cpp @@ -30,7 +30,7 @@ #include #include "regexphighlighter.h" -RegExpConverter* RegExpConverter::_current = 0; +RegExpConverter* RegExpConverter::_current = nullptr; RegExp* RegExpConverter::parse( const TQString&, bool* ok ) { if(ok) { @@ -80,7 +80,7 @@ TQString RegExpConverter::escape( TQString text, TQValueList chars, TQCh */ RegexpHighlighter* RegExpConverter::highlighter( TQTextEdit* ) { - return 0; + return nullptr; } RegExpConverter* RegExpConverter::current() diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index d52fc170..cd8e7ecf 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -122,7 +122,7 @@ void RegExpWidget::mousePressEvent ( TQMouseEvent* event ) if ( event->button() == TQt::LeftButton ) { if ( ! _editorWindow->pointSelected( TQCursor::pos() ) ) { _editorWindow->clearSelection( true ); - if ( dynamic_cast(this) == 0 && dynamic_cast(this) == 0 ) { + if ( dynamic_cast(this) == nullptr && dynamic_cast(this) == nullptr ) { selectWidget( true ); } } @@ -210,7 +210,7 @@ RegExpWidget* RegExpWidget::widgetUnderPoint( TQPoint globalPos, bool ) if ( TQRect(mapToGlobal( TQPoint(0,0) ), size() ).contains( globalPos ) ) return this; else - return 0; + return nullptr; } void RegExpWidget::selectWidget( bool sel) diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index 30f63bd3..0a84ab5e 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -36,7 +36,7 @@ TQ_OBJECT public: RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *label = 0); + const char *label = nullptr); /*====================================================================== Construction, child management @@ -162,7 +162,7 @@ public: Returns the widget under point which can be edited. That is the "innermost" widget editable. */ - virtual RegExpWidget* findWidgetToEdit( TQPoint /* globalPos */) { return 0; } + virtual RegExpWidget* findWidgetToEdit( TQPoint /* globalPos */) { return nullptr; } /** Edits the current widget. That is, bring up the dialog, which is diff --git a/kregexpeditor/repeatregexp.cpp b/kregexpeditor/repeatregexp.cpp index 931b61ff..adf46821 100644 --- a/kregexpeditor/repeatregexp.cpp +++ b/kregexpeditor/repeatregexp.cpp @@ -56,7 +56,7 @@ bool RepeatRegExp::load( TQDomElement top, const TQString& version ) bool ok; _lower = lower.toInt( &ok ); if ( !ok ) { - KMessageBox::sorry( 0, i18n("

Value for attribute %1 was not an integer for element " + KMessageBox::sorry( nullptr, i18n("

Value for attribute %1 was not an integer for element " "%2

It contained the value %3

") .arg(TQString::fromLatin1("lower")).arg(TQString::fromLatin1("Repeat")).arg(lower), i18n("Error While Loading From XML File") ) ; @@ -64,7 +64,7 @@ bool RepeatRegExp::load( TQDomElement top, const TQString& version ) } _upper = upper.toInt( &ok ); if ( !ok ) { - KMessageBox::sorry( 0, i18n("

Value for attribute %1 was not an integer for element " + KMessageBox::sorry( nullptr, i18n("

Value for attribute %1 was not an integer for element " "%2

It contained the value %3

") .arg(TQString::fromLatin1("upper")).arg(TQString::fromLatin1("Repeat")).arg(upper), i18n("Error While Loading From XML File") ) ; diff --git a/kregexpeditor/repeatregexp.h b/kregexpeditor/repeatregexp.h index e6fd8c87..8e55601b 100644 --- a/kregexpeditor/repeatregexp.h +++ b/kregexpeditor/repeatregexp.h @@ -27,7 +27,7 @@ class RepeatRegExp :public RegExp { public: - RepeatRegExp( bool selected, int lower = 0, int upper = 0, RegExp* child = 0); + RepeatRegExp( bool selected, int lower = 0, int upper = 0, RegExp* child = nullptr); virtual bool check( ErrorMap&, bool first, bool last ); virtual int precedence() const { return 3;} diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index 9a87eb6d..fb621c11 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -143,7 +143,7 @@ RegExp* RepeatWidget::regExp() const void RepeatWidget::slotConfigWindowClosed() { - _editorWindow->updateContent( 0 ); + _editorWindow->updateContent( nullptr ); update(); } diff --git a/kregexpeditor/repeatwidget.h b/kregexpeditor/repeatwidget.h index ba6e38c9..a0d3d3a0 100644 --- a/kregexpeditor/repeatwidget.h +++ b/kregexpeditor/repeatwidget.h @@ -38,7 +38,7 @@ TQ_OBJECT public: enum REPEATTYPE {ANY, ATLEAST, ATMOST, EXACTLY, MINMAX}; - RepeatRangeWindow( TQWidget* parent, const char* name = 0 ); + RepeatRangeWindow( TQWidget* parent, const char* name = nullptr ); TQString text(); int min(); int max(); @@ -76,9 +76,9 @@ TQ_OBJECT public: RepeatWidget( RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); RepeatWidget( RepeatRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = nullptr); void init(); virtual TQSize sizeHint() const; virtual RegExp* regExp() const; diff --git a/kregexpeditor/scrollededitorwindow.h b/kregexpeditor/scrollededitorwindow.h index 9ea04456..ccb1b613 100644 --- a/kregexpeditor/scrollededitorwindow.h +++ b/kregexpeditor/scrollededitorwindow.h @@ -32,7 +32,7 @@ class RegExpScrolledEditorWindow :public TQWidget TQ_OBJECT public: - RegExpScrolledEditorWindow( TQWidget *parent = 0, const char* name = 0); + RegExpScrolledEditorWindow( TQWidget *parent = nullptr, const char* name = nullptr); RegExp* regExp(); private: diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h index 9f26869d..d64df83b 100644 --- a/kregexpeditor/selectablelineedit.h +++ b/kregexpeditor/selectablelineedit.h @@ -37,7 +37,7 @@ TQ_OBJECT public: - SelectableLineEdit( RegExpWidget* owner, TQWidget* parent = 0, const char* name = 0); + SelectableLineEdit( RegExpWidget* owner, TQWidget* parent = nullptr, const char* name = nullptr); void setSelected( bool selected ); virtual TQSize sizeHint() const; diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp index 52ee1fe6..85a18092 100644 --- a/kregexpeditor/singlecontainerwidget.cpp +++ b/kregexpeditor/singlecontainerwidget.cpp @@ -101,7 +101,7 @@ RegExpWidget* SingleContainerWidget::findWidgetToEdit( TQPoint globalPos ) else if ( TQRect(mapToGlobal(TQPoint(0,0)), size()).contains( globalPos ) ) return this; else - return 0; + return nullptr; } void SingleContainerWidget::setConcChild( ConcWidget* conc ) diff --git a/kregexpeditor/singlecontainerwidget.h b/kregexpeditor/singlecontainerwidget.h index 7218db47..d076aa27 100644 --- a/kregexpeditor/singlecontainerwidget.h +++ b/kregexpeditor/singlecontainerwidget.h @@ -29,7 +29,7 @@ TQ_OBJECT public: SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, - const char* name = 0); + const char* name = nullptr); virtual bool updateSelection( bool parentSelected ); virtual bool hasSelection() const; diff --git a/kregexpeditor/textrangeregexp.cpp b/kregexpeditor/textrangeregexp.cpp index fe572cc5..bbc26fef 100644 --- a/kregexpeditor/textrangeregexp.cpp +++ b/kregexpeditor/textrangeregexp.cpp @@ -127,7 +127,7 @@ bool TextRangeRegExp::load( TQDomElement top, const TQString& /*version*/ ) addRange( from, to ); } else { - KMessageBox::sorry( 0, i18n("

Invalid sub element to element TextRange. Tag was %1

").arg(child.tagName()), + KMessageBox::sorry( nullptr, i18n("

Invalid sub element to element TextRange. Tag was %1

").arg(child.tagName()), i18n("Error While Loading From XML File") ) ; return false; } diff --git a/kregexpeditor/textregexp.cpp b/kregexpeditor/textregexp.cpp index ffcc14b8..3f5ae830 100644 --- a/kregexpeditor/textregexp.cpp +++ b/kregexpeditor/textregexp.cpp @@ -54,7 +54,7 @@ bool TextRegExp::load( TQDomElement top, const TQString& /*version*/) if ( top.hasChildNodes() ) { TQDomNode child = top.firstChild(); if ( ! child.isText() ) { - KMessageBox::sorry( 0, i18n("

Element Text did not contain any textual data.

"), + KMessageBox::sorry( nullptr, i18n("

Element Text did not contain any textual data.

"), i18n("Error While Loading From XML File") ) ; return false; } diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h index 2b0639fd..ec8fdcb3 100644 --- a/kregexpeditor/textwidget.h +++ b/kregexpeditor/textwidget.h @@ -34,9 +34,9 @@ class TextWidget : public RegExpWidget public: TextWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); TextWidget( TextRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* parent, const char* name = 0); + TQWidget* parent, const char* name = nullptr); virtual TQSize sizeHint() const; virtual RegExp* regExp() const; virtual RegExpType type() const { return TEXT; } diff --git a/kregexpeditor/userdefinedregexps.h b/kregexpeditor/userdefinedregexps.h index 0ec1be95..a88ac4f1 100644 --- a/kregexpeditor/userdefinedregexps.h +++ b/kregexpeditor/userdefinedregexps.h @@ -31,7 +31,7 @@ TQ_OBJECT public: - UserDefinedRegExps( TQWidget *parent, const char *name = 0 ); + UserDefinedRegExps( TQWidget *parent, const char *name = nullptr ); const TQPtrList regExps() const; public slots: diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp index 81e7ffe7..7e3b4f9b 100644 --- a/kregexpeditor/verifier.cpp +++ b/kregexpeditor/verifier.cpp @@ -27,7 +27,7 @@ Verifier::Verifier( TQWidget* parent, const char* name ) : TQTextEdit( parent, name ) /* TQT_ANCHOR_DO_NOT_WORK: ,_current( 0 ) */ { - _highlighter = 0; + _highlighter = nullptr; setMinimumSize(1,1); } @@ -110,7 +110,7 @@ void Verifier::setHighlighter( RegexpHighlighter* highlighter ) { delete _highlighter; _highlighter = highlighter; - setEnabled( _highlighter != 0 ); + setEnabled( _highlighter != nullptr ); } diff --git a/kregexpeditor/verifier.h b/kregexpeditor/verifier.h index 952e2162..3de2a30c 100644 --- a/kregexpeditor/verifier.h +++ b/kregexpeditor/verifier.h @@ -28,7 +28,7 @@ class Verifier :public TQTextEdit TQ_OBJECT public: - Verifier( TQWidget* parent, const char* name = 0 ); + Verifier( TQWidget* parent, const char* name = nullptr ); void setHighlighter( RegexpHighlighter* ); public slots: diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index d7950dbd..19ea4633 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -40,7 +40,7 @@ #include VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) - :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 ) + :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( nullptr ) { TQBoxLayout* layout = boxLayout(); @@ -200,7 +200,7 @@ RegExpConverter* VerifyButtons::setSyntax( const TQString& which) } } tqWarning( "No such converter: '%s'", which.latin1() ); - return 0; + return nullptr; } void VerifyButtons::configure() diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp index d42e7fee..80abe0d0 100644 --- a/kregexpeditor/widgetfactory.cpp +++ b/kregexpeditor/widgetfactory.cpp @@ -49,7 +49,7 @@ bool WidgetFactory::isContainer( RegExpType tp ) RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* parent, RegExpType type ) { - RegExpWidget* widget = 0; + RegExpWidget* widget = nullptr; switch (type) { case TEXT: @@ -77,12 +77,12 @@ RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* pa widget = new CompoundWidget( win, parent ); break; default: tqFatal("It should not be possible to get here!"); - return 0; + return nullptr; } if ( widget->edit() == TQDialog::Rejected ) { delete widget; - return 0; + return nullptr; } return widget; } @@ -90,7 +90,7 @@ RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* pa RegExpWidget* WidgetFactory::createWidget( RegExp* regexp, RegExpEditorWindow* editorWindow, TQWidget* parent ) { - if ( regexp == 0 ) { + if ( !regexp ) { tqFatal("%s:%d Regexp is 0", __FILE__, __LINE__ ); } else if ( TextRegExp* reg = dynamic_cast( regexp ) ) @@ -128,7 +128,7 @@ RegExpWidget* WidgetFactory::createWidget( RegExp* regexp, RegExpEditorWindow* e else { tqFatal("%s:%d Internal Error: Unknown RegExp type", __FILE__, __LINE__); } - return 0; + return nullptr; } RegExp* WidgetFactory::createRegExp( TQDomElement node, const TQString& version ) @@ -162,10 +162,10 @@ RegExp* WidgetFactory::createRegExp( TQDomElement node, const TQString& version else if ( tag == TQString::fromLocal8Bit( "Repeat" ) ) regexp = new RepeatRegExp( false ); else { - KMessageBox::sorry( 0, i18n("

Unknown tag while reading XML. Tag was %1

").arg(tag), + KMessageBox::sorry( nullptr, i18n("

Unknown tag while reading XML. Tag was %1

").arg(tag), i18n("Error While Loading From XML File") ) ; - return 0; + return nullptr; } bool ok = regexp->load( node, version ); @@ -173,9 +173,9 @@ RegExp* WidgetFactory::createRegExp( TQDomElement node, const TQString& version return regexp; else { delete regexp; - return 0; + return nullptr; } - return 0; + return nullptr; } RegExp* WidgetFactory::createRegExp( TQString str ) @@ -183,7 +183,7 @@ RegExp* WidgetFactory::createRegExp( TQString str ) TQDomDocument doc; bool ok = doc.setContent( str ); if ( !ok ) { - KMessageBox::sorry( 0, i18n("Error while loading regular expression from XML. Most probably the regular expression had unmatched tags."), + KMessageBox::sorry( nullptr, i18n("Error while loading regular expression from XML. Most probably the regular expression had unmatched tags."), i18n("Error While Loading Regular Expression From XML") ) ; } @@ -191,13 +191,13 @@ RegExp* WidgetFactory::createRegExp( TQString str ) // Read the RegularExpression element, and extract the version. TQDomElement top = doc.documentElement(); if (! (top.tagName() == TQString::fromLocal8Bit("RegularExpression")) ) { - KMessageBox::sorry( 0, i18n("

XML file did not contain a %1 tag.

").arg(TQString::fromLatin1("RegularExpression")), + KMessageBox::sorry( nullptr, i18n("

XML file did not contain a %1 tag.

").arg(TQString::fromLatin1("RegularExpression")), i18n("Error While Loading From XML File") ) ; } TQString version = top.attribute( TQString::fromLocal8Bit("version"), KRegExpEditorGUI::version ); TQDomNode child = top.firstChild(); if ( ! child.isElement() ) { - KMessageBox::sorry( 0, i18n("

Error while reading XML file. The element just below the tag " + KMessageBox::sorry( nullptr, i18n("

Error while reading XML file. The element just below the tag " "%1 was not an element.

").arg(TQString::fromLatin1("RegularExpression")), i18n("Error While Loading From XML File") ) ; } diff --git a/kregexpeditor/zerowidgets.h b/kregexpeditor/zerowidgets.h index 04dd5c77..812515dd 100644 --- a/kregexpeditor/zerowidgets.h +++ b/kregexpeditor/zerowidgets.h @@ -28,7 +28,7 @@ class ZeroWidget :public RegExpWidget { public: ZeroWidget(TQString text, RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); virtual TQSize sizeHint() const; @@ -52,7 +52,7 @@ class AnyCharWidget :public ZeroWidget { public: AnyCharWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *label = 0); + const char *label = nullptr); virtual RegExp* regExp() const; virtual RegExpType type() const { return DOT; } @@ -69,7 +69,7 @@ class BegLineWidget : public ZeroWidget { public: BegLineWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); virtual RegExp* regExp() const; virtual RegExpType type() const { return BEGLINE; } }; @@ -85,7 +85,7 @@ class EndLineWidget : public ZeroWidget { public: EndLineWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); virtual RegExp* regExp() const; virtual RegExpType type() const { return ENDLINE; } }; @@ -100,7 +100,7 @@ class WordBoundaryWidget : public ZeroWidget { public: WordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); virtual RegExp* regExp() const; virtual RegExpType type() const { return WORDBOUNDARY; } }; @@ -116,7 +116,7 @@ class NonWordBoundaryWidget : public ZeroWidget { public: NonWordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, - const char *name = 0); + const char *name = nullptr); virtual RegExp* regExp() const; virtual RegExpType type() const { return NONWORDBOUNDARY; } }; diff --git a/ksim/baselist.h b/ksim/baselist.h index b8389e66..1daab5ff 100644 --- a/ksim/baselist.h +++ b/ksim/baselist.h @@ -86,12 +86,12 @@ namespace KSim return; delete m_baseList; - m_baseList = 0L; + m_baseList = nullptr; } static TQPtrList *m_baseList; }; - TQPtrList *BaseList::m_baseList = 0L; + TQPtrList *BaseList::m_baseList = nullptr; } #endif // BASELIST_H diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h index e945c26d..471dfb9b 100644 --- a/ksim/generalprefs.h +++ b/ksim/generalprefs.h @@ -45,7 +45,7 @@ namespace KSim TQ_OBJECT public: - GeneralPrefs(TQWidget *parent, const char *name=0); + GeneralPrefs(TQWidget *parent, const char *name=nullptr); ~GeneralPrefs(); public slots: @@ -68,7 +68,7 @@ namespace KSim TQ_OBJECT public: - ClockPrefs(TQWidget *parent, const char *name=0); + ClockPrefs(TQWidget *parent, const char *name=nullptr); ~ClockPrefs(); public slots: @@ -86,7 +86,7 @@ namespace KSim TQ_OBJECT public: - UptimePrefs(TQWidget *parent, const char *name=0); + UptimePrefs(TQWidget *parent, const char *name=nullptr); ~UptimePrefs(); public slots: @@ -121,7 +121,7 @@ namespace KSim TQ_OBJECT public: - MemoryPrefs(TQWidget *parent, const char *name=0); + MemoryPrefs(TQWidget *parent, const char *name=nullptr); ~MemoryPrefs(); public slots: @@ -158,7 +158,7 @@ namespace KSim TQ_OBJECT public: - SwapPrefs(TQWidget *parent, const char *name=0); + SwapPrefs(TQWidget *parent, const char *name=nullptr); ~SwapPrefs(); public slots: diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h index 58a2b6b3..f8fd7b30 100644 --- a/ksim/ksimframe.h +++ b/ksim/ksimframe.h @@ -36,7 +36,7 @@ namespace KSim TQ_OBJECT public: - Frame(int type, TQWidget *parent, const char *name = 0); + Frame(int type, TQWidget *parent, const char *name = nullptr); ~Frame(); const TQPixmap *const background() const { return &m_background; } diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 9a27429a..46a3e8ef 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -122,7 +122,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name) { const KSim::Plugin &plugin = KSim::PluginLoader::self().find(name); if (plugin.isNull() || !plugin.configPage()) { - KMessageBox::sorry(0, i18n("Failed to remove %1's config page due to the " + KMessageBox::sorry(nullptr, i18n("Failed to remove %1's config page due to the " "plugin not being loaded or the config page has not been created").arg(name.data())); return; } @@ -131,7 +131,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name) // reparent the widget if the parent is not null if (frame) { plugin.configPage()->hide(); - plugin.configPage()->reparent(0, TQPoint(0, 0), false); + plugin.configPage()->reparent(nullptr, TQPoint(0, 0), false); // delete the frame so it removes the page from the config dialog delete frame; kdDebug(2003) << "removing " << name << " from KSimPref" << endl; @@ -147,7 +147,7 @@ void KSim::ConfigDialog::createPage(const TQCString &name) void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) { if (plugin.isNull() || !plugin.configPage()) { - KMessageBox::sorry(0, i18n("Failed to add %1's config page due to the plugin" + KMessageBox::sorry(nullptr, i18n("Failed to add %1's config page due to the plugin" " not being loaded or the config page has not been created") .arg(plugin.libName().data())); return; diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 502e71ac..d2f6f299 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -40,7 +40,7 @@ namespace KSim class ChangedPlugin { public: - ChangedPlugin() : m_name(0) {} + ChangedPlugin() : m_name(nullptr) {} ChangedPlugin(bool enabled, const TQCString &libname, const TQString &name, const TQString &file) : m_enabled(enabled), m_libname(libname), m_name(name), m_file(file) {} @@ -75,7 +75,7 @@ namespace KSim TQ_OBJECT public: - ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0); + ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = nullptr); ~ConfigDialog(); public slots: diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index e6b58e80..443c0cb2 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -47,11 +47,11 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config, m_config = config; m_layout = new TQVBoxLayout(this); - m_timeLabel = 0L; - m_dateLabel = 0L; - m_uptimeLabel = 0L; - m_memLabel = 0L; - m_swapLabel = 0L; + m_timeLabel = nullptr; + m_dateLabel = nullptr; + m_uptimeLabel = nullptr; + m_memLabel = nullptr; + m_swapLabel = nullptr; //m_procsLabel = 0L; m_timer = new TQTimer(this); @@ -200,7 +200,7 @@ void KSim::Sysinfo::createView() else { offset++; delete m_timeLabel; - m_timeLabel = 0L; + m_timeLabel = nullptr; } if (m_config->showDate()) { @@ -214,7 +214,7 @@ void KSim::Sysinfo::createView() else { offset++; delete m_dateLabel; - m_dateLabel = 0L; + m_dateLabel = nullptr; } kdDebug(2003) << m_dateLabel << endl; @@ -230,7 +230,7 @@ void KSim::Sysinfo::createView() else { offset++; delete m_uptimeLabel; - m_uptimeLabel = 0L; + m_uptimeLabel = nullptr; } if (m_config->showMemory()) { @@ -245,7 +245,7 @@ void KSim::Sysinfo::createView() else { offset++; delete m_memLabel; - m_memLabel = 0L; + m_memLabel = nullptr; } if (m_config->showSwap()) { @@ -259,7 +259,7 @@ void KSim::Sysinfo::createView() else { offset++; delete m_swapLabel; - m_swapLabel = 0L; + m_swapLabel = nullptr; } /*if (m_config->showProcs()) { diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h index 1f9cc382..a1fb1c66 100644 --- a/ksim/ksimsysinfo.h +++ b/ksim/ksimsysinfo.h @@ -37,8 +37,8 @@ namespace KSim // K_DCOP public: - Sysinfo(KSim::Config *config, TQWidget *parent=0, - const char *name=0, WFlags fl=0); + Sysinfo(KSim::Config *config, TQWidget *parent=nullptr, + const char *name=nullptr, WFlags fl=0); ~Sysinfo(); k_dcop: diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 67379c5b..3d0995cf 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -75,7 +75,7 @@ KSim::MainView::MainView(TDEConfig *config, m_topLevel = topLevel; m_oldLocation = 1; - m_prefDialog = 0L; + m_prefDialog = nullptr; m_config = new KSim::Config(config); @@ -195,7 +195,7 @@ void KSim::MainView::makeDirs() if (!themeCreated || !monitorCreated) { - KMessageBox::sorry(0, i18n("There was an error while trying to create " + KMessageBox::sorry(nullptr, i18n("There was an error while trying to create " "the local folders. This could be caused by permission problems.")); } } @@ -391,7 +391,7 @@ void KSim::MainView::runCommand(const TQCString &name) void KSim::MainView::preferences() { - if (m_prefDialog == 0L) { + if (!m_prefDialog) { m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog"); connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); @@ -423,10 +423,10 @@ void KSim::MainView::paletteChange(const TQPalette &) void KSim::MainView::destroyPref() { - if (m_prefDialog != 0L) { + if (m_prefDialog) { kdDebug(2003) << "deleting KSimPref" << endl; delete m_prefDialog; - m_prefDialog = 0L; + m_prefDialog = nullptr; } } @@ -437,7 +437,7 @@ TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const TQLayoutItem *child; for( TQLayoutIterator it = m_pluginLayout->iterator(); - (child = it.current()) != 0; ++it) + (child = it.current()) != nullptr; ++it) { TQSize sz = child->minimumSize(); if ((p == KPanelExtension::Right) || (p == KPanelExtension::Left)) diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 8f07f304..75ef3c34 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -69,13 +69,13 @@ class KSim::Chart::Timer return; delete m_timer; - m_timer = 0; + m_timer = nullptr; } static TQTimer *m_timer; }; -TQTimer *KSim::Chart::Timer::m_timer = 0; +TQTimer *KSim::Chart::Timer::m_timer = nullptr; class KSim::Chart::Private { @@ -327,7 +327,7 @@ void KSim::Chart::setDisplayMeter(bool value) // delete the meter if value is false if (!value) { delete d->krell; - d->krell = 0; + d->krell = nullptr; } } @@ -614,7 +614,7 @@ void KSim::Chart::init(bool krell, int maxValue, const TQString &title) KSim::Config::config()->setGroup("Misc"); d->variableGraphs = KSim::Config::config()->readBoolEntry("UseVariableGraphs", true); d->showKrell = krell; - d->krell = 0L; + d->krell = nullptr; d->title = title; d->minValue = 0; d->maxValue = 0; diff --git a/ksim/library/chart.h b/ksim/library/chart.h index 620e6ad3..225acad3 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -51,7 +51,7 @@ namespace KSim */ Chart(bool displayMeter, int maxValue, const TQString &title, TQWidget *parent, - const char *name = 0, WFlags fl = 0); + const char *name = nullptr, WFlags fl = 0); /** * Constructs a KSim::Chart. * @@ -61,7 +61,7 @@ namespace KSim * @param parent is the parent widget */ Chart(bool displayMeter, int maxValue, - TQWidget *parent, const char *name = 0, + TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * destructs KSim::Chart diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp index d0ff3cc7..8763afef 100644 --- a/ksim/library/ksimconfig.cpp +++ b/ksim/library/ksimconfig.cpp @@ -24,7 +24,7 @@ #include "ksimconfig.h" #include "themeloader.h" -TDEConfig *KSim::Config::mainConfig = 0; +TDEConfig *KSim::Config::mainConfig = nullptr; KSim::Config::Config(TDEConfig *config) { diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index b47309b4..5874776f 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -233,7 +233,7 @@ void KSim::Label::drawText(TQPainter *painter, const TQRect &rect, location.setX(pixmap().width() + 5); style().drawItem(painter, location, AlignCenter, colorGroup(), true, - 0, text, -1, &color); + nullptr, text, -1, &color); } void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect, @@ -243,7 +243,7 @@ void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect, location.setWidth(pixmap.width()); style().drawItem(painter, location, AlignCenter, colorGroup(), true, - pixmap.isNull() ? 0 : &pixmap, TQString()); + pixmap.isNull() ? nullptr : &pixmap, TQString()); } void KSim::Label::setTextLocation(const TQRect &rect) diff --git a/ksim/library/label.h b/ksim/library/label.h index 0ae9f65f..29497be7 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -51,7 +51,7 @@ namespace KSim * To create a KSim::Label with the normal theme look * @see KSim::ThemeLoader */ - Label(TQWidget *parent, const char *name = 0, WFlags fl = 0); + Label(TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * Constructs a KSimLabel. * @@ -66,7 +66,7 @@ namespace KSim * NOTE: this is the same as the KSim::Label(TQWidget *, const char *, WFlags) ctor * @see KSim::ThemeLoader */ - Label(int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); + Label(int type, TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * Constructs a KSim::Label. * @@ -82,7 +82,7 @@ namespace KSim * @see KSim::ThemeLoader */ Label(int type, const TQString &text, - TQWidget *parent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * destructs KSim::Label. */ diff --git a/ksim/library/led.h b/ksim/library/led.h index 8d5e0f86..0fadaa60 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -118,7 +118,7 @@ namespace KSim * @see KSim::ThemeLoader */ LedLabel(int max, int type, const TQString &label, - TQWidget *parent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * Constructs a KSim::LedLabel. * @@ -128,7 +128,7 @@ namespace KSim * @see KSim::ThemeLoader */ LedLabel(int max, int type, TQWidget *parent, - const char *name = 0, WFlags fl = 0); + const char *name = nullptr, WFlags fl = 0); /** * Constructs a KSim::LedLabel. * @@ -137,7 +137,7 @@ namespace KSim * @see KSim::ThemeLoader */ LedLabel(int max, TQWidget *parent, - const char *name = 0, WFlags fl = 0); + const char *name = nullptr, WFlags fl = 0); /** * destructor for KSim::LedLabel. */ diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp index eb6d58f3..fa918b8d 100644 --- a/ksim/library/pluginglobal.cpp +++ b/ksim/library/pluginglobal.cpp @@ -28,8 +28,8 @@ class KSim::Plugin::Private { public: - Private() : plugin(0), - view(0), page(0) + Private() : plugin(nullptr), + view(nullptr), page(nullptr) { oldState = true; enabled = true; @@ -48,9 +48,9 @@ class KSim::Plugin::Private delete view; delete page; - plugin = 0; - view = 0; - page = 0; + plugin = nullptr; + view = nullptr; + page = nullptr; } void ref() { ++count; } @@ -71,7 +71,7 @@ class KSim::Plugin::Private KSim::Plugin KSim::Plugin::null; // Null Plugin -KSim::Plugin::Plugin() : d(0) +KSim::Plugin::Plugin() : d(nullptr) { } @@ -80,8 +80,8 @@ KSim::Plugin::Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file) init(plugin, file); if (d) { - d->view = d->plugin ? d->plugin->createView(d->libName) : 0; - d->page = d->plugin ? d->plugin->createConfigPage(d->libName) : 0; + d->view = d->plugin ? d->plugin->createView(d->libName) : nullptr; + d->page = d->plugin ? d->plugin->createConfigPage(d->libName) : nullptr; } } @@ -117,7 +117,7 @@ KSim::Plugin &KSim::Plugin::operator=(const KSim::Plugin &rhs) if (d && d->deref()) delete d; - d = 0; + d = nullptr; return *this; } @@ -177,23 +177,23 @@ TQString KSim::Plugin::fileName() const KSim::PluginObject *KSim::Plugin::plugin() const { - return d ? d->plugin : 0; + return d ? d->plugin : nullptr; } KSim::PluginView *KSim::Plugin::view() const { - return d ? d->view : 0; + return d ? d->view : nullptr; } KSim::PluginPage *KSim::Plugin::configPage() const { - return d ? d->page : 0; + return d ? d->page : nullptr; } void KSim::Plugin::init(KSim::PluginObject *plugin, const TDEDesktopFile &file) { if (!plugin || file.fileName().isEmpty()) { - d = 0; + d = nullptr; return; } diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 35ea3fb5..1b5f5196 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -71,7 +71,7 @@ class KSim::PluginLoader::Private const char *const KSim::PluginLoader::Private::ksimString = "ksim_"; -KSim::PluginLoader *KSim::PluginLoader::m_instance = 0; // initialize pointer +KSim::PluginLoader *KSim::PluginLoader::m_instance = nullptr; // initialize pointer KSim::PluginLoader &KSim::PluginLoader::self() { if (!m_instance) // is it the first call? @@ -90,19 +90,19 @@ bool KSim::PluginLoader::loadPlugin(const TDEDesktopFile &file) { switch (createPlugin(file)) { case KSim::PluginLoader::EmptyLibName: - KMessageBox::error(0, i18n("KSim was unable to load the plugin %1" + KMessageBox::error(nullptr, i18n("KSim was unable to load the plugin %1" " due to the X-KSIM-LIBRARY property being empty in the" " plugins desktop file").arg(file.readName())); return false; break; case KSim::PluginLoader::LibNotFound: - KMessageBox::error(0, i18n("KSim was unable to load the plugin %1" + KMessageBox::error(nullptr, i18n("KSim was unable to load the plugin %1" " due to not being able to find the plugin, check that the plugin" " is installed and is in your $TDEDIR/lib path").arg(file.readName())); return false; break; case KSim::PluginLoader::UnSymbols: - KMessageBox::error(0, i18n("An error occurred while trying \n" + KMessageBox::error(nullptr, i18n("An error occurred while trying \n" "to load the plugin '%1'. \nThis could be caused by the" " following:
    \n
  • The plugin doesn't have the %2" " macro
    • \n
  • The plugin has been damaged or has" @@ -277,7 +277,7 @@ KSim::Plugin &KSim::PluginLoader::plugin() return (d->lastLoaded ? d->pluginList.last() : KSim::Plugin::null); } -KSim::PluginLoader::PluginLoader() : TQObject(0, "PluginLoader") +KSim::PluginLoader::PluginLoader() : TQObject(nullptr, "PluginLoader") { d = new KSim::PluginLoader::Private; d->lastLoaded = false; @@ -289,7 +289,7 @@ void KSim::PluginLoader::cleanup() return; delete m_instance; - m_instance = 0; + m_instance = nullptr; } KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const TDEDesktopFile &file) diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 18aff4a2..b7a643fc 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -81,7 +81,7 @@ class KSim::PluginPage::Private }; KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name) - : TQWidget(0, name) + : TQWidget(nullptr, name) { d = new PluginPage::Private; d->parent = parent; @@ -90,7 +90,7 @@ KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name) else { kdWarning() << className() << ": Can not create the config() " "pointer due to the parent being null" << endl; - d->config = 0; + d->config = nullptr; } } @@ -105,7 +105,7 @@ TDEConfig *KSim::PluginPage::config() const if (d) return d->config; else - return 0; + return nullptr; } class KSim::PluginView::Private @@ -117,7 +117,7 @@ class KSim::PluginView::Private }; KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) - : TQWidget(0, name) + : TQWidget(nullptr, name) { d = new PluginView::Private; d->parent = parent; @@ -130,7 +130,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) else { kdWarning() << className() << ": Can not create the config() " "pointer due to the parent being null" << endl; - d->config = 0; + d->config = nullptr; } } @@ -139,7 +139,7 @@ KSim::PluginView::~PluginView() delete d->popupMenu; delete d->config; delete d; - d = 0; + d = nullptr; } TDEConfig *KSim::PluginView::config() const diff --git a/ksim/library/progress.h b/ksim/library/progress.h index 88939d1d..d05a6f9a 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -45,7 +45,7 @@ namespace KSim * @param parent is the parent widget */ Progress(int maxValue, TQWidget *parent, - const char *name = 0, WFlags fl = 0); + const char *name = nullptr, WFlags fl = 0); /** * constructs a KSim::Progress * @@ -56,7 +56,7 @@ namespace KSim * @param parent is the parent widget */ Progress(int maxValue, int type, const TQString &label, - TQWidget *parent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * constructs a KSim::Progress * @@ -68,7 +68,7 @@ namespace KSim * @param parent is the parent widget */ Progress(int maxValue, int type, const TQString &label, - int value, TQWidget *parent, const char *name = 0, + int value, TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * constructs a KSim::Progress @@ -79,7 +79,7 @@ namespace KSim * @param parent is the parent widget */ Progress(int maxValue, int type, TQWidget *parent, - const char *name = 0, WFlags fl = 0); + const char *name = nullptr, WFlags fl = 0); /** * constructs a KSim::Progress * @@ -91,7 +91,7 @@ namespace KSim */ Progress(int maxValue, int type, ProgressType progressType, - TQWidget *parent, const char *name = 0, + TQWidget *parent, const char *name = nullptr, WFlags fl = 0); /** * destructs KSim::Chart diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index c1eb6554..c196f132 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -759,7 +759,7 @@ bool KSim::Theme::fontColours(const KSim::Base *const base, TQFont &font, KSim::Theme::Theme() { - d = 0; + d = nullptr; } KSim::Theme::Theme(const TQString &url, const TQString &fileName, int alt, @@ -881,7 +881,7 @@ TQString KSim::Theme::internalStringEntry(const TQString &entry, { \ } -KSim::ThemeLoader *KSim::ThemeLoader::m_self = 0; // initialize pointer +KSim::ThemeLoader *KSim::ThemeLoader::m_self = nullptr; // initialize pointer KSim::ThemeLoader &KSim::ThemeLoader::self() { if (!m_self) { // is it the first call? @@ -921,7 +921,7 @@ void KSim::ThemeLoader::reload() } else { delete d->globalReader; - d->globalReader = 0; + d->globalReader = nullptr; } if (m_theme.d) @@ -1188,7 +1188,7 @@ KSim::ThemeLoader::ThemeLoader() if (currentUrl() != defaultUrl()) d->globalReader = new TDEConfig(defaultUrl() + "gkrellmrc_ksim"); else - d->globalReader = 0; + d->globalReader = nullptr; d->fileNames.resize(31); d->fileNames[0] = "frame_top"; @@ -1244,7 +1244,7 @@ void KSim::ThemeLoader::cleanup() return; delete m_self; - m_self = 0; + m_self = nullptr; } void KSim::ThemeLoader::reColourItems() diff --git a/ksim/library/themetypes.h b/ksim/library/themetypes.h index 9ca4bb42..2414d22c 100644 --- a/ksim/library/themetypes.h +++ b/ksim/library/themetypes.h @@ -69,7 +69,7 @@ namespace KSim "apm", "cal", "clock", "fs", "host", "mail", "mem", "swap", "timer", - "uptime", "net", "inet", 0 + "uptime", "net", "inet", nullptr }; TQString returnString; diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index 26f6d7bc..20b7fe6b 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -32,7 +32,7 @@ namespace KSim TQ_OBJECT public: - MonitorPrefs(TQWidget *parent, const char *name=0); + MonitorPrefs(TQWidget *parent, const char *name=nullptr); ~MonitorPrefs(); public slots: diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 4d54c061..0918bea8 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -111,7 +111,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name) : KSim::PluginView(parent, name) { #ifdef Q_OS_LINUX - m_procStream = 0L; + m_procStream = nullptr; if ((m_procFile = fopen("/proc/stat", "r"))) m_procStream = new TQTextStream(m_procFile, IO_ReadOnly); #endif diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 9f9dd99f..82451d30 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -93,8 +93,8 @@ class CpuView : public KSim::PluginView Cpu() { m_num = 0; - m_chart = 0; - m_label = 0; + m_chart = nullptr; + m_label = nullptr; } Cpu(const TQString &name, @@ -104,8 +104,8 @@ class CpuView : public KSim::PluginView m_format(format), m_num(number) { - m_chart = 0; - m_label = 0; + m_chart = nullptr; + m_label = nullptr; } ~Cpu() diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index b26cc5ad..7342f211 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -108,7 +108,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name) { #ifdef Q_OS_LINUX m_bLinux24 = true; - m_procStream = 0L; + m_procStream = nullptr; if ((m_procFile = fopen("/proc/stat", "r"))) m_procStream = new TQTextStream(m_procFile, IO_ReadOnly); #endif @@ -253,7 +253,7 @@ void DiskView::updateData(DiskList &disks) m_bLinux24 = false; delete m_procStream; - m_procStream = 0; + m_procStream = nullptr; fclose(m_procFile); if ((m_procFile = fopen("/proc/diskstats", "r"))) @@ -367,7 +367,7 @@ void DiskView::updateData(DiskList &disks) int selected; int selections; long generation; - device_selection *deviceSelect = 0; + device_selection *deviceSelect = nullptr; if (devstat_getdevs(nullptr, &diskStats) < 0) return; diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index 77a34f64..75644d90 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -144,7 +144,7 @@ FilesystemStats::List FilesystemStats::readEntries() FILE * fp = setmntent( _PATH_MOUNTED, "r" ); ksim_mntent * point; - while ( ( point = ksim_getmntent( fp ) ) != 0 ) + while (( point = ksim_getmntent( fp ) ) != nullptr) { Entry entry; entry.dir = point->mnt_dir; diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 82f3f7b3..8e91ae28 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -34,7 +34,7 @@ FilesystemWidget::Filesystem::Filesystem() { - m_display = 0; + m_display = nullptr; } FilesystemWidget::Filesystem::Filesystem(KSim::Progress *display, @@ -90,7 +90,7 @@ FilesystemWidget::FilesystemWidget(TQWidget *parent, const char *name) { m_list.setAutoDelete(true); m_layout = new TQVBoxLayout(this); - m_process = 0; + m_process = nullptr; } FilesystemWidget::~FilesystemWidget() @@ -134,11 +134,11 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) if (!o->isA("KSim::Progress")) return TQWidget::eventFilter(o, e); - KSim::Progress *progressBar = 0; + KSim::Progress *progressBar = nullptr; int i = 0; TQPtrListIterator it(m_list); Filesystem *filesystem; - while ((filesystem = it.current()) != 0) { + while ((filesystem = it.current()) != nullptr) { ++it; if (filesystem->display() == o) { @@ -177,7 +177,7 @@ void FilesystemWidget::receivedStderr(TDEProcess *, char *buffer, int length) void FilesystemWidget::processExited(TDEProcess *) { delete m_process; - m_process = 0; + m_process = nullptr; kdDebug(2003) << "Deleting TDEProcess pointer" << endl; if (m_stderrString.isEmpty()) @@ -193,7 +193,7 @@ void FilesystemWidget::processExited(TDEProcess *) } message += TQString::fromLatin1("
"); - KMessageBox::sorry(0, message); + KMessageBox::sorry(nullptr, message); } void FilesystemWidget::createProcess(const TQString &command, const TQString &point) diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index bf52ad83..a0be446f 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -39,7 +39,7 @@ #include "NVCtrl.h" #include "NVCtrlLib.h" -SensorBase *SensorBase::m_self = 0; +SensorBase *SensorBase::m_self = nullptr; SensorBase *SensorBase::self() { if (!m_self) { @@ -100,7 +100,7 @@ void SensorBase::update() while ((chip = m_detectedChips(&sensor))) { int first = 0, second = 0; - const FeatureData *sFeature = 0; + const FeatureData *sFeature = nullptr; while ((sFeature = m_allFeatures(*chip, &first, &second))) { if (sFeature->mapping == NoMapping) { char *name; @@ -144,7 +144,7 @@ void SensorBase::cleanup() return; delete m_self; - m_self = 0; + m_self = nullptr; } bool SensorBase::init() diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 60bf9ce1..391a2705 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -103,12 +103,12 @@ NetView::NetView(KSim::PluginObject *parent, const char *name) : KSim::PluginView(parent, name) { #ifdef __linux__ - m_procStream = 0L; + m_procStream = nullptr; if ((m_procFile = fopen("/proc/net/dev", "r"))) m_procStream = new TQTextStream(m_procFile, IO_ReadOnly); #endif #ifdef __FreeBSD__ - m_buf = 0; + m_buf = nullptr; m_allocSize = 0; #endif @@ -179,9 +179,9 @@ void NetView::addDisplay() for ( it = m_networkList.begin(); it != m_networkList.end(); ++it ) { KSim::LedLabel *led = addLedLabel( ( *it ).name() ); - KSim::Label *label = ( ( *it ).showTimer() ? addLabel() : 0L ); + KSim::Label *label = ( ( *it ).showTimer() ? addLabel() : nullptr ); TQPopupMenu * popup = ( ( *it ).commandsEnabled() ? - addPopupMenu( ( *it ).name(), i ) : 0L ); + addPopupMenu( ( *it ).name(), i ) : nullptr ); KSim::Chart *chart = addChart(); //KSim::LedLabel *led = addLedLabel( ( *it ).name() ); //KSim::Label *label = ( ( *it ).showTimer() ? addLabel() : 0L ); @@ -362,7 +362,7 @@ void NetView::updateGraph() { start = st.st_mtime; - timer = static_cast( difftime( time( 0 ), start ) ); + timer = static_cast( difftime( time( nullptr ), start ) ); hours = timer / 3600; minutes = (timer - hours * 3600) / 60; seconds = timer % 60; @@ -456,7 +456,7 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value) void NetView::netStatistics(const TQString &device, NetData &data) { #ifdef __linux__ - if (m_procFile == 0) { + if (!m_procFile) { data.in = 0; data.out = 0; return; diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index d05cc38a..fee6329f 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -216,7 +216,7 @@ void NetConfig::removeItem(TQListViewItem *item) if (!item) return; - int result = KMessageBox::warningContinueCancel(0, i18n("Are you sure you " + int result = KMessageBox::warningContinueCancel(nullptr, i18n("Are you sure you " "want to remove the net interface '%1'?").arg(item->text(0)), TQString(), KStdGuiItem::del()); if (result == KMessageBox::Cancel) @@ -267,7 +267,7 @@ void NetConfig::getStats() { if ( ( *it ).name() == netDialog->deviceName() ) { - KMessageBox::sorry(0, i18n("You already have a network " + KMessageBox::sorry(nullptr, i18n("You already have a network " "interface by this name. Please select a different interface")); return; diff --git a/ksim/monitors/net/netdevices.h b/ksim/monitors/net/netdevices.h index b82b77d8..5503a67b 100644 --- a/ksim/monitors/net/netdevices.h +++ b/ksim/monitors/net/netdevices.h @@ -46,10 +46,10 @@ class Network Network() { - m_chart = 0; - m_led = 0; - m_label = 0; - m_popup = 0; + m_chart = nullptr; + m_led = nullptr; + m_label = nullptr; + m_popup = nullptr; m_max = 0; } @@ -67,10 +67,10 @@ class Network m_cCommand( cCommand ), m_dCommand( dCommand ) { - m_chart = 0; - m_led = 0; - m_label = 0; - m_popup = 0; + m_chart = nullptr; + m_led = nullptr; + m_label = nullptr; + m_popup = nullptr; m_max = 0; } @@ -112,10 +112,10 @@ class Network delete m_led; delete m_popup; - m_chart = 0; - m_label = 0; - m_led = 0; - m_popup = 0; + m_chart = nullptr; + m_label = nullptr; + m_led = nullptr; + m_popup = nullptr; } void setData( const NetData & data ) diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 1df7c3f3..b12091c5 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -265,7 +265,7 @@ TQStringList NetDialog::createList() const #ifdef __FreeBSD__ TQStringList output; int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; - char *buf = 0; + char *buf = nullptr; int alloc = 0; struct if_msghdr *ifm, *nextifm; struct sockaddr_dl *sdl; diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index f75692aa..714a8fe1 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -37,7 +37,7 @@ class NetDialog : public TQTabDialog TQ_OBJECT public: - NetDialog(TQWidget *parent, const char *name = 0); + NetDialog(TQWidget *parent, const char *name = nullptr); ~NetDialog(); const TQString deviceName() const; diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index e56f81c0..916990d8 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -36,7 +36,7 @@ class Monitor : public TQObject, public TQThread TQ_OBJECT public: - Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); + Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = nullptr, const char *name = nullptr ); virtual ~Monitor(); signals: @@ -52,7 +52,7 @@ protected: private slots: void performSnmpRequest(); - bool performSyncSnmpRequest( Value &data, ErrorInfo *errorInfo = 0 ); + bool performSyncSnmpRequest( Value &data, ErrorInfo *errorInfo = nullptr ); private: struct AsyncSnmpQueryResult diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h index 5ff6c354..f365196e 100644 --- a/ksim/monitors/snmp/monitorconfig.h +++ b/ksim/monitors/snmp/monitorconfig.h @@ -72,7 +72,7 @@ struct MonitorConfigMap : public TQMap< TQString, MonitorConfig > typedef TQValueList MonitorConfigList; TQString monitorDisplayTypeToString( MonitorConfig::DisplayType type ); -MonitorConfig::DisplayType stringToMonitorDisplayType( TQString string, bool *ok = 0 ); +MonitorConfig::DisplayType stringToMonitorDisplayType( TQString string, bool *ok = nullptr ); TQStringList allDisplayTypes(); } diff --git a/ksim/monitors/snmp/pdu.cpp b/ksim/monitors/snmp/pdu.cpp index 9ad11108..69eebcf0 100644 --- a/ksim/monitors/snmp/pdu.cpp +++ b/ksim/monitors/snmp/pdu.cpp @@ -60,7 +60,7 @@ void PDU::addNullVariable( Identifier oid ) netsnmp_pdu *PDU::release() { netsnmp_pdu *res = d; - d = 0; + d = nullptr; return res; } diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 0a4babe8..30ecd74a 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -73,7 +73,7 @@ bool Session::snmpGetInternal( int getType, const IdentifierList &identifiers, V if ( getType != SNMP_MSG_GETNEXT && d->session ) { SnmpLib::self()->snmp_close( d->session ); - d->session = 0; + d->session = nullptr; } if ( getType != SNMP_MSG_GETNEXT || @@ -123,7 +123,7 @@ bool Session::snmpGetInternal( int getType, const IdentifierList &identifiers, V if ( getType != SNMP_MSG_GETNEXT ) { SnmpLib::self()->snmp_close( d->session ); - d->session = 0; + d->session = nullptr; } return result; diff --git a/ksim/monitors/snmp/session.h b/ksim/monitors/snmp/session.h index 6af8e1d4..b7175731 100644 --- a/ksim/monitors/snmp/session.h +++ b/ksim/monitors/snmp/session.h @@ -38,16 +38,16 @@ public: Session( const HostConfig &snmpHostConfig ); ~Session(); - bool snmpGet( const TQString &identifier, Value &value, ErrorInfo *error = 0 ); - bool snmpGet( const Identifier &identifier, Value &value, ErrorInfo *error = 0 ); - bool snmpGet( const IdentifierList &identifiers, ValueMap &variables, ErrorInfo *error = 0 ); + bool snmpGet( const TQString &identifier, Value &value, ErrorInfo *error = nullptr ); + bool snmpGet( const Identifier &identifier, Value &value, ErrorInfo *error = nullptr ); + bool snmpGet( const IdentifierList &identifiers, ValueMap &variables, ErrorInfo *error = nullptr ); - bool snmpGetNext( Identifier &identifier, Value &value, ErrorInfo *error = 0 ); + bool snmpGetNext( Identifier &identifier, Value &value, ErrorInfo *error = nullptr ); private: Data *d; - bool snmpGetInternal( int getType, const IdentifierList &identifiers, ValueMap &variables, ErrorInfo *error = 0 ); + bool snmpGetInternal( int getType, const IdentifierList &identifiers, ValueMap &variables, ErrorInfo *error = nullptr ); bool initialize( ErrorInfo *error ); diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h index 4b1e4fbe..91e0a783 100644 --- a/ksim/monitors/snmp/snmp.h +++ b/ksim/monitors/snmp/snmp.h @@ -34,17 +34,17 @@ namespace Snmp enum SnmpVersion { SnmpVersion1, SnmpVersion2c, SnmpVersion3, SnmpLastVersion }; TQStringList allSnmpVersions(); TQString snmpVersionToString( SnmpVersion version ); -SnmpVersion stringToSnmpVersion( TQString string, bool *ok = 0 ); +SnmpVersion stringToSnmpVersion( TQString string, bool *ok = nullptr ); enum SecurityLevel { NoAuthPriv, AuthNoPriv, AuthPriv, LastSecurityLevel }; TQStringList allSecurityLevels(); TQString securityLevelToString( SecurityLevel level ); -SecurityLevel stringToSecurityLevel( TQString string, bool *ok = 0 ); +SecurityLevel stringToSecurityLevel( TQString string, bool *ok = nullptr ); enum AuthenticationProtocol { MD5Auth, SHA1Auth, LastAuthenticationProtocol }; TQStringList allAuthenticationProtocols(); TQString authenticationProtocolToString( AuthenticationProtocol proto ); -AuthenticationProtocol stringToAuthenticationProtocol( TQString string, bool *ok = 0 ); +AuthenticationProtocol stringToAuthenticationProtocol( TQString string, bool *ok = nullptr ); enum PrivacyProtocol { AESPrivacy, @@ -52,7 +52,7 @@ enum PrivacyProtocol { }; TQStringList allPrivacyProtocols(); TQString privacyProtocolToString( PrivacyProtocol proto ); -PrivacyProtocol stringToPrivacyProtocol( TQString string, bool *ok = 0 ); +PrivacyProtocol stringToPrivacyProtocol( TQString string, bool *ok = nullptr ); class ErrorInfo { diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index c74097b7..a29923fc 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -90,7 +90,7 @@ void Walker::timerEvent( TQTimerEvent *ev ) if ( ev->timerId() != m_timerId ) return; - Result *result = 0; + Result *result = nullptr; m_resultGuard.lock(); if ( !m_results.isEmpty() ) { diff --git a/ksim/systeminfo.cpp b/ksim/systeminfo.cpp index 6ab2f4fa..5d9e4725 100644 --- a/ksim/systeminfo.cpp +++ b/ksim/systeminfo.cpp @@ -66,7 +66,7 @@ int System::bytesToMegs( unsigned long value ) #endif } -System * System::m_self = 0; // initialize pointer +System * System::m_self = nullptr; // initialize pointer System & System::self() { if ( !m_self ) @@ -85,7 +85,7 @@ void System::cleanup() return; delete m_self; - m_self = 0; + m_self = nullptr; } double System::loadAverage( int load ) const diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h index 828d6495..8ece3135 100644 --- a/ksim/themeprefs.h +++ b/ksim/themeprefs.h @@ -40,7 +40,7 @@ namespace KSim class ThemeInfo { public: - ThemeInfo() : name(0), url(0), alternatives(0) {} + ThemeInfo() : name(nullptr), url(nullptr), alternatives(0) {} ThemeInfo(const TQString &name, const KURL &url, int alts=0) : name(name), url(url), alternatives(alts) {} @@ -78,7 +78,7 @@ namespace KSim TQ_OBJECT public: - ThemePrefs(TQWidget *parent, const char *name=0); + ThemePrefs(TQWidget *parent, const char *name=nullptr); ~ThemePrefs(); public slots: diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index 9d11c4c1..ff8fa430 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -324,7 +324,7 @@ KTimerJob::KTimerJob( TQObject *parent, const char *name ) d->value = 100; d->state = Stopped; d->processes.setAutoDelete( true ); - d->user = 0; + d->user = nullptr; d->timer = new TQTimer( this ); connect( d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h index 00acd6d6..1b5a809a 100644 --- a/ktimer/ktimer.h +++ b/ktimer/ktimer.h @@ -32,7 +32,7 @@ class KTimerJob : public TQObject { public: - KTimerJob( TQObject *parent=0, const char *name=0 ); + KTimerJob( TQObject *parent=nullptr, const char *name=nullptr ); virtual ~KTimerJob(); enum States { Stopped, Paused, Started }; @@ -93,7 +93,7 @@ class KTimerPref : public PrefWidget TQ_OBJECT public: - KTimerPref( TQWidget *parent=0, const char *name = 0 ); + KTimerPref( TQWidget *parent=nullptr, const char *name = nullptr ); virtual ~KTimerPref(); protected slots: diff --git a/ktimer/main.cpp b/ktimer/main.cpp index 6e8d5eec..7960243a 100644 --- a/ktimer/main.cpp +++ b/ktimer/main.cpp @@ -33,7 +33,7 @@ int main( int argc, char **argv ) TDEAboutData aboutData( "ktimer", I18N_NOOP("KTimer"), version, description, TDEAboutData::License_GPL, "(c) 2001, Stefan Schimanski"); - aboutData.addAuthor("Stefan Schimanski",0, "schimmi@kde.org"); + aboutData.addAuthor("Stefan Schimanski",nullptr, "schimmi@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; diff --git a/superkaramba/src/cpusensor.cpp b/superkaramba/src/cpusensor.cpp index bd3bbd17..9e0c4784 100644 --- a/superkaramba/src/cpusensor.cpp +++ b/superkaramba/src/cpusensor.cpp @@ -77,7 +77,7 @@ void CPUSensor::getTicks (long &u,long &s,long &n,long &i) TQRegExp rx( cpuNbr+"\\s+(\\d+)\\s+(\\d+)\\s+(\\d+)\\s+(\\d+)"); line = t.readLine(); rx.search( line ); - while( (line = t.readLine()) !=0 && rx.cap(0) == "" ) + while( (line = t.readLine()) !=nullptr && rx.cap(0) == "" ) { rx.search( line ); } @@ -135,7 +135,7 @@ void CPUSensor::update() int load = getCPULoad(); TQObjectListIt it( *objList ); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index 24e46759..b26d8df2 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -26,7 +26,7 @@ void DateSensor::update() Meter *meter; TQObjectListIt it( *objList ); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); @@ -44,12 +44,12 @@ void DateSensor::update() void DateSensor::slotCalendarDeleted() { hidden = true; - cal = 0L; + cal = nullptr; } DatePicker::DatePicker(TQWidget *parent) - : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | + : TQVBox( parent, nullptr, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); @@ -72,7 +72,7 @@ void DatePicker::keyReleaseEvent(TQKeyEvent *e) void DateSensor::toggleCalendar(TQMouseEvent *ev) { TQObjectListIt it(*objList); - while (it != 0) + while (it) { SensorParams *sp = (SensorParams*)(*it); Meter *meter = sp->getMeter(); @@ -85,7 +85,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev) if (hidden) { hidden = false; - cal = new DatePicker(0); + cal = new DatePicker(nullptr); connect(cal, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted())); TQPoint c = (TQPoint(ev->x(), ev->y())); diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp index 55f692ac..4b152c43 100644 --- a/superkaramba/src/disksensor.cpp +++ b/superkaramba/src/disksensor.cpp @@ -101,7 +101,7 @@ void DiskSensor::processExited(TDEProcess *) Meter *meter; TQObjectListIt lit( *objList ); - while (lit != 0) + while (lit) { sp = (SensorParams*)(*lit); meter = sp->getMeter(); diff --git a/superkaramba/src/gpusensor.cpp b/superkaramba/src/gpusensor.cpp index 120e5f4a..4ed0c05e 100644 --- a/superkaramba/src/gpusensor.cpp +++ b/superkaramba/src/gpusensor.cpp @@ -100,7 +100,7 @@ void GPUSensor::processExited(TDEProcess *proc) m_buffer = TQString::null; TQObjectListIt it(*objList); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index c3481b4f..9ae31383 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -132,7 +132,7 @@ ImageLabel::ImageLabel(karamba* k, int ix,int iy,int iw,int ih) : doScale = false; doRotate = false; - imageEffect = 0; + imageEffect = nullptr; } ImageLabel::ImageLabel(karamba* k) : @@ -144,10 +144,10 @@ ImageLabel::ImageLabel(karamba* k) : ImageLabel::~ImageLabel() { - if (imageEffect != 0) + if (imageEffect) { delete imageEffect; - imageEffect = 0; + imageEffect = nullptr; } if(!old_tip_rect.isNull()) { @@ -247,7 +247,7 @@ void ImageLabel::applyTransformations(bool useSmoothScale) pixmap = pixmap.xForm(scaleMat); } } - if (imageEffect != 0) + if (imageEffect) { pixmap = imageEffect -> apply(pixmap); } @@ -346,7 +346,7 @@ void ImageLabel::mUpdate(TQPainter* p, int backgroundUpdate) } } // start Timer - if (imageEffect != 0) + if (imageEffect) { imageEffect -> startTimer(); } @@ -376,7 +376,7 @@ void ImageLabel::mUpdate(TQPainter* p) } } // start Timer - if (imageEffect != 0) + if (imageEffect) { imageEffect -> startTimer(); } @@ -562,20 +562,20 @@ void ImageLabel::setTooltip(TQString txt) void ImageLabel::removeEffects() { - if (imageEffect != 0) + if (imageEffect) { delete imageEffect; - imageEffect = 0; + imageEffect = nullptr; } applyTransformations(); } void ImageLabel::intensity(float ratio, int millisec) { - if (imageEffect != 0) + if (imageEffect) { delete imageEffect; - imageEffect = 0; + imageEffect = nullptr; } //KPixmapEffect::intensity(pixmap, ratio); imageEffect = new Intensity(this, ratio, millisec); @@ -584,10 +584,10 @@ void ImageLabel::intensity(float ratio, int millisec) void ImageLabel::channelIntensity(float ratio, TQString channel, int millisec) { - if (imageEffect != 0) + if (imageEffect) { delete imageEffect; - imageEffect = 0; + imageEffect = nullptr; } //KPixmapEffect::channelIntensity(pixmap, ratio, rgbChannel); imageEffect = new ChannelIntensity(this, ratio, channel, millisec); @@ -596,10 +596,10 @@ void ImageLabel::channelIntensity(float ratio, TQString channel, int millisec) void ImageLabel::toGray(int millisec) { - if (imageEffect != 0) + if (imageEffect) { delete imageEffect; - imageEffect = 0; + imageEffect = nullptr; } //KPixmapEffect::toGray(pixmap); imageEffect = new ToGray(this, millisec); diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp index 1c826129..ce1dedcd 100644 --- a/superkaramba/src/imagelabel_python.cpp +++ b/superkaramba/src/imagelabel_python.cpp @@ -107,8 +107,8 @@ PyObject* py_createTaskIcon(PyObject *, PyObject *args) //get the specified task and insure it exists TaskList taskList = ((karamba*)widget)->taskManager.tasks(); - Task* task = 0; - Task* currTask = 0; + Task* task = nullptr; + Task* currTask = nullptr; for (task = taskList.first(); task; task = taskList.next()) { if ((long)task == (long)ctask) @@ -118,7 +118,7 @@ PyObject* py_createTaskIcon(PyObject *, PyObject *args) break; } } - if (currTask == 0) + if (!currTask) { //no task was found tqWarning("Task not found."); @@ -127,7 +127,7 @@ PyObject* py_createTaskIcon(PyObject *, PyObject *args) //retrieve the TQPixmap that represents this image TQPixmap iconPixmap = KWin::icon(currTask->window()); - ImageLabel *tmp = createImageLabel((karamba*)widget, x, y, 0, 0); + ImageLabel *tmp = createImageLabel((karamba*)widget, x, y, nullptr, 0); tmp->setValue(iconPixmap); return (Py_BuildValue((char*)"l", (long)tmp)); } diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index 6bcf7148..fa0cb254 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -50,13 +50,13 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, bool sub_theme): - TQWidget(0,"karamba", TQt::WGroupLeader | WStyle_Customize | + TQWidget(nullptr,"karamba", TQt::WGroupLeader | WStyle_Customize | WRepaintNoErase| WStyle_NoBorder | WDestructiveClose ), - meterList(0), imageList(0), clickList(0), kpop(0), widgetMask(0), - config(0), tWinModule(0), tempUnit('C'), m_instance(instance), - sensorList(0), timeList(0), - themeConfMenu(0), toDesktopMenu(0), kglobal(0), clickPos(0, 0), accColl(0), - menuAccColl(0), toggleLocked(0), pythonIface(0), defaultTextField(0), + meterList(nullptr), imageList(nullptr), clickList(nullptr), kpop(nullptr), widgetMask(nullptr), + config(nullptr), tWinModule(nullptr), tempUnit('C'), m_instance(instance), + sensorList(nullptr), timeList(nullptr), + themeConfMenu(nullptr), toDesktopMenu(nullptr), kglobal(nullptr), clickPos(0, 0), accColl(nullptr), + menuAccColl(nullptr), toggleLocked(nullptr), pythonIface(nullptr), defaultTextField(nullptr), trayMenuSeperatorId(-1), trayMenuQuitId(-1), trayMenuToggleId(-1), trayMenuThemeId(-1), m_sysTimer(nullptr) @@ -134,7 +134,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, TQTimer::singleShot(0, this, TQ_SLOT(initPythonInterface())); } - widgetMask = 0; + widgetMask = nullptr; info = new NETWinInfo( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMState ); // could be replaced with TaskManager @@ -231,7 +231,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, numberOfConfMenuItems = 0; - systray = 0; + systray = nullptr; foundKaramba = false; onTop = false; managed = false; @@ -328,31 +328,31 @@ karamba::~karamba() delete config; - if(meterList != 0) + if(meterList) { meterList->clear(); delete meterList; } - if( sensorList != 0 ) + if( sensorList ) { sensorList->clear(); delete sensorList; } - if( imageList != 0 ) + if( imageList ) { imageList->clear(); delete imageList; } - if( clickList != 0 ) + if( clickList ) { clickList->clear(); delete clickList; } - if( timeList != 0 ) + if( timeList ) { timeList->clear(); delete timeList; @@ -441,7 +441,7 @@ bool karamba::parseConfig() if(lineParser.getBoolean("MANAGED")) { managed = true; - reparent(0, TQt::WType_Dialog | WStyle_Customize | WStyle_NormalBorder + reparent(nullptr, TQt::WType_Dialog | WStyle_Customize | WStyle_NormalBorder | WRepaintNoErase | WDestructiveClose, pos()); } else @@ -579,7 +579,7 @@ bool karamba::parseConfig() // program sensor without a meter if(lineParser.meter() == "SENSOR=PROGRAM") { - setSensor(lineParser, 0 ); + setSensor(lineParser, nullptr ); } if(lineParser.meter() == "IMAGE") @@ -905,7 +905,7 @@ Sensor* karamba::findSensorFromList(Meter* meter) //tqDebug("karamba::findSensorFromList"); TQObjectListIt it( *sensorList ); // iterate over meters - while ( it != 0 ) + while ( it ) { if (((Sensor*) *it)->hasMeter(meter)) return ((Sensor*)*it); @@ -944,7 +944,7 @@ void karamba::deleteMeterFromSensors(Meter* meter) void karamba::setSensor(const LineParser& lineParser, Meter* meter) { //tqDebug("karamba::setSensor"); - Sensor* sensor = 0; + Sensor* sensor = nullptr; deleteMeterFromSensors(meter); @@ -954,7 +954,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) { TQString cpuNbr = lineParser.getString("CPU"); sensor = sensorMap["CPU"+cpuNbr]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?1000:interval; @@ -977,7 +977,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) TQString gpuDriver = lineParser.getString("DRIVER"); TQString sensorId = TQString("GPU_%1_%2").arg(gpuDriver, gpuId); sensor = sensorMap[sensorId]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0) ? 1000 : interval; @@ -994,7 +994,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "MEMORY" ) { sensor = sensorMap["MEMORY"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?3000:interval; @@ -1013,7 +1013,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "DISK" ) { sensor = sensorMap["DISK"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?5000:interval; @@ -1047,7 +1047,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) interval = (interval == 0)?2000:interval; TQString device = lineParser.getString("DEVICE"); sensor = sensorMap["NETWORK"+device]; - if (sensor == 0) + if (!sensor) { sensor = ( sensorMap["NETWORK"+device] = new NetworkSensor(device, interval)); @@ -1063,7 +1063,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "UPTIME" ) { sensor = sensorMap["UPTIME"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?60000:interval; @@ -1080,7 +1080,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "SENSOR" ) { sensor = sensorMap["SENSOR"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?30000:interval; @@ -1100,7 +1100,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) TQString path = lineParser.getString("PATH"); bool rdf = lineParser.getBoolean("RDF"); sensor = sensorMap["TEXTFILE"+path]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = ( interval == 0 )?60000:interval; @@ -1119,7 +1119,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "TIME") { sensor = sensorMap["DATE"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?60000:interval; @@ -1140,7 +1140,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "XMMS" ) { sensor = sensorMap["XMMS"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?1000:interval; @@ -1161,7 +1161,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if( sens == "NOATUN" ) { sensor = sensorMap["NOATUN"]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?1000:interval; @@ -1179,7 +1179,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) { TQString progName = lineParser.getString("PROGRAM"); sensor = sensorMap["PROGRAM"+progName]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?3600000:interval; @@ -1202,7 +1202,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) m_theme.locale()->translate(lineParser.getString("FORMAT").ascii()); sensor = sensorMap["RSS"+source]; - if (sensor == 0) + if (!sensor) { int interval = lineParser.getInt( "INTERVAL"); interval = ( interval == 0 )?60000:interval; @@ -1217,7 +1217,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) sensor->addMeter(sp); } - if (sensor != 0) + if (sensor) { TQTimer::singleShot( 0, sensor, TQ_SLOT(update()) ); sensor->start(); @@ -1326,7 +1326,7 @@ void karamba::passClick(TQMouseEvent *e) { //tqDebug("karamba::passClick"); TQObjectListIt it2( *timeList ); // iterate over meters - while ( it2 != 0 ) + while ( it2 ) { (( DateSensor* ) *it2)->toggleCalendar( e ); ++it2; @@ -1337,7 +1337,7 @@ void karamba::passClick(TQMouseEvent *e) // can change during the loop (infinite loop Bug 994359) TQObjectList clickListTmp(*clickList); TQObjectListIt it(clickListTmp); - while (it != 0) + while (it) { Meter* meter = (Meter*)(*it); // Check if meter is still in list @@ -1387,7 +1387,7 @@ void karamba::passWheelClick( TQWheelEvent *e ) TQMouseEvent fakeEvent(TQEvent::MouseButtonPress, e->pos(), e->globalPos(), button, e->state()); - while (it != 0) + while (it) { Meter* meter = (Meter*)(*it); // Check if meter is still in list @@ -1457,7 +1457,7 @@ void karamba::mouseDoubleClickEvent( TQMouseEvent *e ) void karamba::keyPressEvent(TQKeyEvent *e) { //tqDebug("karamba::keyPressEvent"); - keyPressed(e->text(), 0); + keyPressed(e->text(), nullptr); } void karamba::keyPressed(const TQString& s, const Meter* meter) @@ -1479,7 +1479,7 @@ void karamba::mouseMoveEvent( TQMouseEvent *e ) TQObjectListIt it(*clickList); bool insideArea = false; - while (it != 0) + while (it) { insideArea = ((Meter*)(*it)) -> insideActiveArea(e -> x(), e ->y()); if (insideArea) @@ -1501,7 +1501,7 @@ void karamba::mouseMoveEvent( TQMouseEvent *e ) } TQObjectListIt image_it( *imageList); // iterate over image sensors - while ( image_it != 0 ) + while ( image_it ) { ((ImageLabel*) *image_it)->rolloverImage(e); ++image_it; @@ -1558,7 +1558,7 @@ void karamba::updateSensors() { //tqDebug("karamba::updateSensors"); TQObjectListIt it( *sensorList ); // iterate over meters - while ( it != 0 ) + while ( it ) { ((Sensor*) *it)->update(); ++it; @@ -1588,7 +1588,7 @@ void karamba::updateBackground(TDESharedPixmap* kpm) p.begin(&buffer); bitBlt(&buffer,0,0,&background,0,TQt::CopyROP); - while ( it != 0 ) + while ( it ) { if (((ImageLabel*) *it)->background == 1) { @@ -1610,7 +1610,7 @@ void karamba::updateBackground(TDESharedPixmap* kpm) p.begin(&buffer2); bitBlt(&buffer2,0,0,&background,0,TQt::CopyROP); - while ( it2 != 0 ) + while ( it2 ) { ((Meter*) *it2)->mUpdate(&p); ++it2; @@ -1618,7 +1618,7 @@ void karamba::updateBackground(TDESharedPixmap* kpm) p.end(); bitBlt(&pm,0,0,&buffer2,0,TQt::CopyROP); - if (systray != 0) + if (systray) { systray->updateBackgroundPixmap(buffer2); } @@ -1655,7 +1655,7 @@ void karamba::externalStep() p.begin(&buffer); bitBlt(&buffer,0,0,&background,0,TQt::CopyROP); - while ( it != 0 ) + while ( it ) { ((Meter*) *it)->mUpdate(&p); ++it; @@ -1681,7 +1681,7 @@ void karamba::step() bitBlt(&buffer,0,0,&background,0,TQt::CopyROP); - while (it != 0) + while (it) { ((Meter*) *it)->mUpdate(&p); ++it; @@ -1837,7 +1837,7 @@ void karamba::passMenuItemClicked(int id) //Everything below is to call the python callback function if (pythonIface && pythonIface->isExtensionLoaded()) { - TDEPopupMenu* menu = 0; + TDEPopupMenu* menu = nullptr; for(int i = 0; i < (int)menuList->count(); i++) { TDEPopupMenu* tmp; @@ -1849,7 +1849,7 @@ void karamba::passMenuItemClicked(int id) { tmp = (TDEPopupMenu*) menuList->next(); } - if(tmp != 0) + if(tmp) { if(tmp->isItemVisible(id)) { @@ -2064,7 +2064,7 @@ void karamba::hideMenuExtension() kglobal->removeItem(trayMenuQuitId); delete kglobal; - kglobal = 0; + kglobal = nullptr; } } diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index 7eafbffd..6a6814b6 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -380,10 +380,10 @@ PyMODINIT_FUNC PyInit_karamba(void) return PyModule_Create(&karambadef); } -PyThreadState* KarambaPython::mainThreadState = 0; +PyThreadState* KarambaPython::mainThreadState = nullptr; KarambaPython::KarambaPython(const ThemeFile& theme, bool reloading): - pythonThemeExtensionLoaded(false), pName(0), pModule(0), pDict(0) + pythonThemeExtensionLoaded(false), pName(nullptr), pModule(nullptr), pDict(nullptr) { char pypath[1024]; diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index b4bf15cc..dcb8a139 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -32,8 +32,8 @@ int KarambaApplication::fd = -1; KarambaApplication::KarambaApplication() : - m_helpMenu(0), iface(0), themeListWindow(0), dcopIfaceStub(0), - karambaList(0), sysTrayIcon(0) + m_helpMenu(nullptr), iface(nullptr), themeListWindow(nullptr), dcopIfaceStub(nullptr), + karambaList(nullptr), sysTrayIcon(nullptr) { iface = new KarambaIface(); karambaList = new TQObjectList(); @@ -79,7 +79,7 @@ bool KarambaApplication::themeExists(TQString pretty_name) TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget * w; - while ( (w=it.current()) != 0 ) // for each widget... + while ((w=it.current()) != nullptr) // for each widget... { ++it; if (TQString(w->name()).startsWith("karamba")) @@ -100,7 +100,7 @@ TQStringList KarambaApplication::getKarambas() TQCString s; TQStringList result; - for (it = applst.begin(); (s = *it) != 0; ++it) + for (it = applst.begin(); (s = *it) != nullptr ; ++it) { if (s.left(strlen(name())) == name()) result.append(s); @@ -277,7 +277,7 @@ bool KarambaApplication::startThemes(TQStringList &lst) for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { - karamba *mainWin = 0; + karamba *mainWin = nullptr; mainWin = new karamba(*it , TQString()); mainWin->show(); @@ -353,7 +353,7 @@ void KarambaApplication::hideSysTray(bool hide) { if(sysTrayIcon) { - KMessageBox::information(0, + KMessageBox::information(nullptr, i18n("Hiding the system tray icon will keep SuperKaramba running " "in background. To show it again use the theme menu."), i18n("Hiding System Tray Icon"), "hideIcon"); diff --git a/superkaramba/src/karambainterface.cpp b/superkaramba/src/karambainterface.cpp index 5d33f689..e4f07e65 100644 --- a/superkaramba/src/karambainterface.cpp +++ b/superkaramba/src/karambainterface.cpp @@ -27,9 +27,9 @@ karamba* KarambaIface::getKaramba(TQString name) TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it(*list); // iterate over the widgets TQWidget* w; - karamba* result = 0; + karamba* result = nullptr; - while ( (w=it.current()) != 0 ) // for each widget... + while ((w=it.current()) != nullptr) // for each widget... { ++it; if (TQString(w->name()).startsWith("karamba")) @@ -52,9 +52,9 @@ ThemesDlg* KarambaIface::getThemeWnd() TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget* w; - ThemesDlg* result = 0; + ThemesDlg* result = nullptr; - while ( (w=it.current()) != 0 ) // for each widget... + while ((w=it.current()) != nullptr) // for each widget... { ++it; if (TQString(w->name()) == "ThemesLayout") diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp index fed4bb9c..ae2b1cd8 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -37,7 +37,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&) TQWidgetList *list = TQApplication::allWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget * w; - while ( (w=it.current()) != 0 ) // for each widget... + while ((w=it.current()) != nullptr) // for each widget... { ++it; if (TQString(w->name()).startsWith("karamba")) diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index 56e07695..8b2c44ee 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -172,7 +172,7 @@ void KWidgetListbox::showItems(show_callback func, void* data) { for(int i = 0; i < numRows(); ++i) { - if(func == 0) + if(!func) showRow(i); else { diff --git a/superkaramba/src/kwidgetlistbox.h b/superkaramba/src/kwidgetlistbox.h index d7913379..0b0ec7af 100644 --- a/superkaramba/src/kwidgetlistbox.h +++ b/superkaramba/src/kwidgetlistbox.h @@ -34,7 +34,7 @@ class KWidgetListbox : public TQTable public: - KWidgetListbox(TQWidget *parent = 0, const char *name = 0); + KWidgetListbox(TQWidget *parent = nullptr, const char *name = nullptr); ~KWidgetListbox(); int insertItem(TQWidget* item, int index = -1); @@ -49,7 +49,7 @@ class KWidgetListbox : public TQTable int index(TQWidget* itm) const; uint count() const { return numRows(); }; - void showItems(show_callback func = 0, void* data = 0); + void showItems(show_callback func = nullptr, void* data = nullptr); void paintCell(TQPainter* p, int row, int col, const TQRect& cr, bool selected, const TQColorGroup& cg); diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 453856b7..51e50838 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -47,8 +47,8 @@ static TDECmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, // { "!nosystray", I18N_NOOP("Disable systray icon"), 0 }, - { "+file", I18N_NOOP("A required argument 'file'"), 0 }, - { 0, 0, 0 } + { "+file", I18N_NOOP("A required argument 'file'"), nullptr }, + { nullptr, nullptr, nullptr } }; // This is for redirecting all tqWarning, tqDebug,... messages to file. @@ -92,12 +92,12 @@ int main(int argc, char **argv) version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 2003-2006 The SuperKaramba developers")); - about.addAuthor("Adam Geitgey", 0, "adam@rootnode.org"); - about.addAuthor("Hans Karlsson", 0, "karlsson.h@home.se"); - about.addAuthor("Ryan Nickell", 0, "p0z3r@earthlink.net"); - about.addAuthor("Petri Damstén", 0, "petri.damsten@iki.fi"); - about.addAuthor("Alexander Wiedenbruch", 0, "mail@wiedenbruch.de"); - about.addAuthor("Luke Kenneth Casson Leighton", 0, "lkcl@lkcl.net"); + about.addAuthor("Adam Geitgey", nullptr, "adam@rootnode.org"); + about.addAuthor("Hans Karlsson", nullptr, "karlsson.h@home.se"); + about.addAuthor("Ryan Nickell", nullptr, "p0z3r@earthlink.net"); + about.addAuthor("Petri Damstén", nullptr, "petri.damsten@iki.fi"); + about.addAuthor("Alexander Wiedenbruch", nullptr, "mail@wiedenbruch.de"); + about.addAuthor("Luke Kenneth Casson Leighton", nullptr, "lkcl@lkcl.net"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); KarambaSessionManaged ksm; diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp index 43f049e5..89fe412b 100644 --- a/superkaramba/src/memsensor.cpp +++ b/superkaramba/src/memsensor.cpp @@ -306,7 +306,7 @@ void MemSensor::update() int totalSwap = getSwapTotal(); int usedSwap = totalSwap - getSwapFree(); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); #if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018) diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp index c6cde259..da614259 100644 --- a/superkaramba/src/menu_python.cpp +++ b/superkaramba/src/menu_python.cpp @@ -69,7 +69,7 @@ bool menuExists(karamba* currTheme, TDEPopupMenu* menu) { tmp = (TDEPopupMenu*) currTheme->menuList->next(); } - if(tmp != 0) + if(tmp) { if(tmp == menu) { diff --git a/superkaramba/src/meter_python.cpp b/superkaramba/src/meter_python.cpp index a0fef0d8..a6019ac9 100644 --- a/superkaramba/src/meter_python.cpp +++ b/superkaramba/src/meter_python.cpp @@ -138,7 +138,7 @@ long getMeter(long widget, char* name) karamba* theme = (karamba*)widget; TQObjectListIt it( *theme->meterList ); // iterate over meters - while ( it != 0 ) + while ( it ) { if (strcmp(((Meter*) *it)->name(), name) == 0) return (long)*it; diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index fb7a00ee..4405eb32 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -462,7 +462,7 @@ static TQString getIncomingData(long widget) long openNamedTheme(char* path, char *name, bool is_sub_theme) { TQString filename; - karamba* currTheme = 0; + karamba* currTheme = nullptr; filename.setAscii(path); @@ -487,7 +487,7 @@ long openTheme(char* path) { TQString filename; - karamba* currTheme = 0; + karamba* currTheme = nullptr; filename.setAscii(path); @@ -584,7 +584,7 @@ int translateAll(long widget, int x, int y) TQObjectListIt it2( *currTheme->meterList ); // iterate over meters - while ( it2 != 0 ) + while ( it2 ) { ((Meter*) *it2)->setSize(((Meter*) *it2)->getX()+x, ((Meter*) *it2)->getY()+y, @@ -593,7 +593,7 @@ int translateAll(long widget, int x, int y) ++it2; } - if (currTheme->systray != 0) + if (currTheme->systray) { currTheme->systray->move(currTheme->systray->x()+x, currTheme->systray->y()+y); diff --git a/superkaramba/src/networksensor.cpp b/superkaramba/src/networksensor.cpp index 85da95fd..3bf14ef3 100644 --- a/superkaramba/src/networksensor.cpp +++ b/superkaramba/src/networksensor.cpp @@ -102,7 +102,7 @@ void NetworkSensor::getInOutBytes ( unsigned long &in,unsigned long &out) const { TQTextStream t( &file ); // use a text stream line = t.readLine(); - while(line !=0 && !line.contains(device)) + while(!line.isNull() && !line.contains(device)) { line = t.readLine(); } @@ -137,7 +137,7 @@ void NetworkSensor::update() getInOutBytes( inB, outB ); netTimer.restart(); - while( it != 0 ) + while( it ) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/noatunsensor.cpp b/superkaramba/src/noatunsensor.cpp index 0a064739..9a81a52a 100644 --- a/superkaramba/src/noatunsensor.cpp +++ b/superkaramba/src/noatunsensor.cpp @@ -50,7 +50,7 @@ void NoatunSensor::update() } - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp index aa4edcb3..d47d367a 100644 --- a/superkaramba/src/programsensor.cpp +++ b/superkaramba/src/programsensor.cpp @@ -16,7 +16,7 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en if( !encoding.isEmpty()) { codec = TQTextCodec::codecForName( encoding.ascii() ); - if ( codec == 0) + if ( !codec) codec = TQTextCodec::codecForLocale(); } else @@ -55,11 +55,11 @@ void ProgramSensor::processExited(TDEProcess *) int count = (int) lines.size(); TQObjectListIt it( *objList ); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); - if( meter != 0) + if( meter) { lineNbr = (sp->getParam("LINE")).toInt(); if ( lineNbr >= 1 && lineNbr <= (int) count ) diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp index d0664da5..f904be35 100644 --- a/superkaramba/src/richtextlabel.cpp +++ b/superkaramba/src/richtextlabel.cpp @@ -15,7 +15,7 @@ RichTextLabel::RichTextLabel(karamba* k) : Meter(k, 0, 0, 100, 100), - text(0), + text(nullptr), source(""), colorGrp(k->colorGroup()), underlineLinks(false) @@ -25,7 +25,7 @@ RichTextLabel::RichTextLabel(karamba* k) : RichTextLabel::RichTextLabel(karamba* k, int x, int y, int w, int h) : Meter(k, x, y, w, h), - text(0), + text(nullptr), source(""), colorGrp(k->colorGroup()), underlineLinks(false) @@ -36,20 +36,20 @@ RichTextLabel::RichTextLabel(karamba* k, int x, int y, int w, int h) : RichTextLabel::~RichTextLabel() { - if (text != 0) + if (text) { delete text; - text = 0; + text = nullptr; } } void RichTextLabel::setText(TQString t, bool linkUnderline) { source = t; - if (text != 0) + if (text) { delete text; - text = 0; + text = nullptr; } else { @@ -59,8 +59,8 @@ void RichTextLabel::setText(TQString t, bool linkUnderline) } text = new TQSimpleRichText(t, font, m_karamba->theme().path(), - 0, // default TQStyleSheet* - 0, // default TQMimeSourceFactory + nullptr, // default TQStyleSheet* + nullptr, // default TQMimeSourceFactory -1, // no pageBreak TQt::blue, // (has no effect) link Color underlineLinks); @@ -88,7 +88,7 @@ void RichTextLabel::setValue(long v) void RichTextLabel::setFont(TQString f) { font.setFamily(f); - if(text != 0) + if(text) text->setDefaultFont(font); } @@ -100,7 +100,7 @@ TQString RichTextLabel::getFont() const void RichTextLabel::setFontSize(int size) { font.setPixelSize(size); - if(text != 0) + if(text) text->setDefaultFont(font); } @@ -112,7 +112,7 @@ int RichTextLabel::getFontSize() const void RichTextLabel::setFixedPitch(bool fp) { font.setFixedPitch(fp); - if(text != 0) + if(text) text->setDefaultFont(font); } @@ -142,7 +142,7 @@ void RichTextLabel::setWidth(int width) void RichTextLabel::mUpdate(TQPainter* p) { - if (hidden || text == 0) + if (hidden || !text) { return; } @@ -152,7 +152,7 @@ void RichTextLabel::mUpdate(TQPainter* p) int w = getWidth(); int h = getHeight(); TQRect clipRect(x, y, w, h); - text->draw(p, x, y, clipRect, colorGrp, 0 /* no background */); + text->draw(p, x, y, clipRect, colorGrp, nullptr /* no background */); } bool RichTextLabel::click(TQMouseEvent* e) diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp index ebbdeec1..60731dce 100644 --- a/superkaramba/src/rsssensor.cpp +++ b/superkaramba/src/rsssensor.cpp @@ -29,7 +29,7 @@ RssSensor::RssSensor( const TQString &src, int interval, const TQString &form, c if( !encoding.isEmpty() ) { codec = TQTextCodec::codecForName( encoding.ascii() ); - if ( codec == 0) + if ( !codec) codec = TQTextCodec::codecForLocale(); } else @@ -76,7 +76,7 @@ void RssSensor::update() Meter *meter; TQObjectListIt it( *objList ); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/sensor.cpp b/superkaramba/src/sensor.cpp index 2a88ea57..62f6eb8a 100644 --- a/superkaramba/src/sensor.cpp +++ b/superkaramba/src/sensor.cpp @@ -38,7 +38,7 @@ void Sensor::addMeter( SensorParams *sp ) SensorParams* Sensor::hasMeter( Meter *meter ) { TQObjectListIt it( *objList ); - while ( it != 0 ) + while ( it ) { if (((SensorParams*) *it)->getMeter() == meter) { diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp index 27653687..382bac01 100644 --- a/superkaramba/src/sensorsensor.cpp +++ b/superkaramba/src/sensorsensor.cpp @@ -75,7 +75,7 @@ void SensorSensor::processExited(TDEProcess *) Meter *meter; TQObjectListIt lit( *objList ); - while (lit != 0) + while (lit) { sp = (SensorParams*)(*lit); meter = sp->getMeter(); diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp index d53db405..af6abce7 100644 --- a/superkaramba/src/showdesktop.cpp +++ b/superkaramba/src/showdesktop.cpp @@ -35,7 +35,7 @@ ShowDesktop* ShowDesktop::the() ShowDesktop::ShowDesktop() : TQObject() , showingDesktop( false ) - , tWinModule( 0 ) + , tWinModule( nullptr ) { tWinModule = new TWinModule( this ); diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index fa604753..55e100b5 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -36,7 +36,7 @@ #include Systemtray::Systemtray(TQWidget* parent) - : TQWidget(parent,0,0) + : TQWidget(parent,nullptr,0) { setBackgroundOrigin(ParentOrigin); setBackgroundMode(FixedPixmap); @@ -57,7 +57,7 @@ int Systemtray::getTraySize() { void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) { QXEmbed *emb; setPaletteBackgroundPixmap (pixmap); - for (emb = m_Wins.first(); emb != 0L; emb = m_Wins.next()) { + for (emb = m_Wins.first(); emb; emb = m_Wins.next()) { //Stupid stupid stupid work around for annoying bug //QXEmbed ignores setBackgroundOrigin(AncestorOrigin).... @@ -150,7 +150,7 @@ void Systemtray::updateTrayWindows( void ) QXEmbed *emb; emb = m_Wins.first(); - while ((emb = m_Wins.current()) != 0L) + while ((emb = m_Wins.current()) != nullptr) { WId wid = emb->embeddedWinId(); if ((wid == 0) || !twin_module->systemTrayWindows().contains(wid) ) @@ -178,7 +178,7 @@ void Systemtray::layoutSystray() aa = 1; } - for (emb = m_Wins.first(); emb != 0L; emb = m_Wins.next()) { + for (emb = m_Wins.first(); emb; emb = m_Wins.next()) { x = 2+i*24; emb->move(a*24, x); diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp index 27aede9d..4aa686a6 100644 --- a/superkaramba/src/systray_python.cpp +++ b/superkaramba/src/systray_python.cpp @@ -37,7 +37,7 @@ long moveSystray(long widget, long x, long y, long w, long h) { karamba* currTheme = (karamba*)widget; - if (currTheme->systray != 0) { + if (currTheme->systray) { currTheme->systray->move((int)x,(int)y); currTheme->systray->setMinimumSize((int)w,(int)h); currTheme->systray->layoutSystray(); @@ -61,7 +61,7 @@ long showSystray(long widget) { karamba* currTheme = (karamba*)widget; - if (currTheme->systray != 0) + if (currTheme->systray) { currTheme->systray->show(); } @@ -83,7 +83,7 @@ long hideSystray(long widget) { karamba* currTheme = (karamba*)widget; - if (currTheme->systray != 0) + if (currTheme->systray) { currTheme->systray->hide(); } @@ -106,7 +106,7 @@ long createSystray(long widget, long x, long y, long w, long h) karamba* currTheme = (karamba*)widget; //Don't create more than one systray - if (currTheme->systray == 0) { + if (!currTheme->systray) { currTheme->systray = new Systemtray(currTheme); currTheme->systray->move((int)x,(int)y); currTheme->systray->setMinimumSize((int)w,(int)h); @@ -137,7 +137,7 @@ long getCurrentWindowCount(long widget) num = 0; - if (currTheme->systray != 0) + if (currTheme->systray) { num = currTheme->systray->getCurrentWindowCount(); } @@ -159,7 +159,7 @@ long updateSystrayLayout(long widget) { karamba* currTheme = (karamba*)widget; - if (currTheme->systray != 0) + if (currTheme->systray) { currTheme->systray->layoutSystray(); } @@ -179,7 +179,7 @@ PyObject* py_update_systray_layout(PyObject *, PyObject *args) /* get the systray size from python */ int getSystraySize(long widget) { karamba* currTheme = (karamba*)widget; - if(currTheme->systray == 0) { + if(!currTheme->systray) { return 0; } else { return currTheme->systray->getTraySize(); diff --git a/superkaramba/src/task_python.cpp b/superkaramba/src/task_python.cpp index 4ba62070..9e29dd8b 100644 --- a/superkaramba/src/task_python.cpp +++ b/superkaramba/src/task_python.cpp @@ -37,7 +37,7 @@ int performTaskAction(long widget, long ctask, long action) { karamba* currTheme = (karamba*)widget; - Task* currTask = 0; + Task* currTask = nullptr; Task* task; TaskList taskList = currTheme -> taskManager.tasks(); @@ -50,7 +50,7 @@ int performTaskAction(long widget, long ctask, long action) } } - if (currTask != 0) + if (currTask) { switch (action) { @@ -122,7 +122,7 @@ PyObject* py_perform_task_action(PyObject *, PyObject *args) PyObject* getTaskInfo(long widget, long ctask) { karamba* currTheme = (karamba*)widget; - Task* currTask = 0; + Task* currTask = nullptr; Task* task; TaskList taskList = currTheme -> taskManager.tasks(); @@ -136,7 +136,7 @@ PyObject* getTaskInfo(long widget, long ctask) } - if (currTask != 0) + if (currTask) { PyObject* pList = PyList_New(0); @@ -228,7 +228,7 @@ PyObject* getStartupInfo(long widget, long cstartup) startup = currentStartup; - if (startup != 0) + if (startup) { PyObject* pList = PyList_New(0); @@ -298,7 +298,7 @@ PyObject* getTaskNames(long widget) for (task = taskList.first(); task; task = taskList.next()) { const char* tmp = task->name().latin1(); - if(tmp == 0) + if(!tmp) continue; pString = PyBytes_FromString(tmp); if(pString) diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 1f2f269c..0da4b580 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -46,10 +46,10 @@ template class TQPtrList; // variable without changing Task, which also uses it. // So, we'll leak a little memory, but it's better than crashing. // The real problem is that TWinModule should be a singleton. -TWinModule* twin_module = 0; +TWinModule* twin_module = nullptr; TaskManager::TaskManager(TQObject *parent, const char *name) - : TQObject(parent, name), _active(0), _startup_info( nullptr ) + : TQObject(parent, name), _active(nullptr), _startup_info( nullptr ) { twin_module = new TWinModule(); @@ -100,10 +100,10 @@ void TaskManager::configure_startup() Task* TaskManager::findTask(WId w) { - for (Task* t = _tasks.first(); t != 0; t = _tasks.next()) + for (Task* t = _tasks.first(); t; t = _tasks.next()) if (t->window() == w || t->hasTransient(w)) return t; - return 0; + return nullptr; } void TaskManager::windowAdded(WId w ) @@ -165,7 +165,7 @@ void TaskManager::windowRemoved(WId w ) emit taskRemoved(t); - if(t == _active) _active = 0; + if(t == _active) _active = nullptr; delete t; //kdDebug() << "TM: Task for WId " << w << " removed." << endl; } @@ -220,10 +220,10 @@ void TaskManager::activeWindowChanged(WId w ) if (!t) { if (_active) { _active->setActive(false); - _active = 0; + _active = nullptr; // there is no active window at the moment - emit activeTaskChanged(0); + emit activeTaskChanged(nullptr); } } else { @@ -252,7 +252,7 @@ void TaskManager::gotNewStartup( const TDEStartupInfoId& id, const TDEStartupInf void TaskManager::gotStartupChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data ) { - for( Startup* s = _startups.first(); s != 0; s = _startups.next()) { + for( Startup* s = _startups.first(); s; s = _startups.next()) { if ( s->id() == id ) { s->update( data ); return; @@ -267,12 +267,12 @@ void TaskManager::gotRemoveStartup( const TDEStartupInfoId& id ) void TaskManager::killStartup( const TDEStartupInfoId& id ) { - Startup* s = 0; - for(s = _startups.first(); s != 0; s = _startups.next()) { + Startup* s = nullptr; + for(s = _startups.first(); s; s = _startups.next()) { if (s->id() == id) break; } - if (s == 0) return; + if (!s) return; _startups.removeRef(s); emit startupRemoved(s); @@ -281,7 +281,7 @@ void TaskManager::killStartup( const TDEStartupInfoId& id ) void TaskManager::killStartup(Startup* s) { - if (s == 0) return; + if (!s) return; _startups.removeRef(s); emit startupRemoved(s); @@ -304,7 +304,7 @@ bool TaskManager::isOnTop(const Task* task) for (TQValueList::ConstIterator it = twin_module->stackingOrder().fromLast(); it != twin_module->stackingOrder().end(); --it ) { - for (Task* t = _tasks.first(); t != 0; t = _tasks.next() ) { + for (Task* t = _tasks.first(); t; t = _tasks.next() ) { if ( (*it) == t->window() ) { if ( t == task ) return true; @@ -332,7 +332,7 @@ Task::Task(WId win, TaskManager * parent, const char *name) : if(_pixmap.isNull()) TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(), TDEIcon::Small,TDEIcon::Small, - TDEIcon::DefaultState, 0, true); + TDEIcon::DefaultState, nullptr, true); // load xapp icon if (_pixmap.isNull()) @@ -355,7 +355,7 @@ void Task::refresh(bool icon) if(_pixmap.isNull()) { TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(), - TDEIcon::Small, TDEIcon::Small, TDEIcon::DefaultState, 0, true); + TDEIcon::Small, TDEIcon::Small, TDEIcon::DefaultState, nullptr, true); } // load xapp icon @@ -533,7 +533,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) TDEIcon::NoGroup, size, TDEIcon::DefaultState, - 0L, + nullptr, true ); isStaticIcon = true; } diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index ef6eea4c..0c2c4f2b 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -70,7 +70,7 @@ class Task: public TQObject TQ_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: - Task( WId win, TaskManager * parent, const char *name = 0 ); + Task( WId win, TaskManager * parent, const char *name = nullptr ); virtual ~Task(); TaskManager* taskManager() const { return (TaskManager*) parent(); } @@ -370,7 +370,7 @@ class Startup: public TQObject public: Startup( const TDEStartupInfoId& id, const TDEStartupInfoData& data, TQObject * parent, - const char *name = 0); + const char *name = nullptr); virtual ~Startup(); /** @@ -424,7 +424,7 @@ class TaskManager : public TQObject TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) public: - TaskManager( TQObject *parent = 0, const char *name = 0 ); + TaskManager( TQObject *parent = nullptr, const char *name = nullptr ); virtual ~TaskManager(); /** diff --git a/superkaramba/src/textfilesensor.cpp b/superkaramba/src/textfilesensor.cpp index 7956112c..86ea181b 100644 --- a/superkaramba/src/textfilesensor.cpp +++ b/superkaramba/src/textfilesensor.cpp @@ -19,7 +19,7 @@ TextFileSensor::TextFileSensor( const TQString &fn, bool iRdf, int interval, con if( !encoding.isEmpty() ) { codec = TQTextCodec::codecForName( encoding.ascii() ); - if ( codec == 0) + if ( !codec) codec = TQTextCodec::codecForLocale(); } else @@ -65,7 +65,7 @@ void TextFileSensor::update() else { TQTextStream t( &file ); // use a text stream - while( (line = t.readLine()) !=0 ) + while( (line = t.readLine()) !=nullptr ) { lines.push_back(line); } @@ -79,7 +79,7 @@ void TextFileSensor::update() int count = (int) lines.size(); TQObjectListIt it( *objList ); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index ce15a9c0..a569830b 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -41,7 +41,7 @@ class ZipFile { public: ZipFile() : - m_zip(0), m_file(0) + m_zip(nullptr), m_file(nullptr) { } void setFile(const TQString& filename) @@ -53,9 +53,9 @@ class ZipFile const KArchiveEntry* entry; entry = m_dir->entry(filename); - if(entry == 0 || !entry->isFile()) + if(!entry || !entry->isFile()) { - m_file = 0; + m_file = nullptr; return; } m_file = static_cast(entry); @@ -72,7 +72,7 @@ class ZipFile return; } m_dir = m_zip->directory(); - if(m_dir == 0) + if(!m_dir) { tqDebug("Error reading directory contents of file %s", zipfile.ascii()); return; @@ -107,7 +107,7 @@ class ZipFile bool exists() { - return (m_file != 0); + return (m_file != nullptr); } private: @@ -118,7 +118,7 @@ class ZipFile }; ThemeFile::ThemeFile(const KURL& url) - : m_stream(0), m_locale(0), m_zip(0) + : m_stream(nullptr), m_locale(nullptr), m_zip(nullptr) { if(url.isValid()) set(url); @@ -181,7 +181,7 @@ bool ThemeFile::close() if(m_stream) { delete m_stream; - m_stream = 0; + m_stream = nullptr; m_fl.close(); m_ba.resize(0); return true; diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index ca4ee1f3..80930b99 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -130,13 +130,13 @@ void ThemeLocale::unload() if(m_domain.data) { tl_nl_unload_domain((struct loaded_domain *)m_domain.data); - m_domain.data = 0; + m_domain.data = nullptr; } } TQString ThemeLocale::translate(TQString text) const { - if(text == 0) + if(!text) return TQString(); if(m_domain.data) { diff --git a/superkaramba/src/themelocale.h b/superkaramba/src/themelocale.h index 3bb079a7..762197e6 100644 --- a/superkaramba/src/themelocale.h +++ b/superkaramba/src/themelocale.h @@ -33,7 +33,7 @@ struct sk_kde_loaded_l10nfile { int decided; const void *data; - sk_kde_loaded_l10nfile() : decided(0), data(0) {} + sk_kde_loaded_l10nfile() : decided(0), data(nullptr) {} }; class ThemeLocale diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index 36663d84..5a117a15 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -56,7 +56,7 @@ ThemesDlg::ThemesDlg(TQWidget *parent, const char *name) { populateListbox(); #ifdef HAVE_TDENEWSTUFF - mNewStuff = 0; + mNewStuff = nullptr; #endif } diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h index 095f2c9d..745dd84c 100644 --- a/superkaramba/src/themesdlg.h +++ b/superkaramba/src/themesdlg.h @@ -43,7 +43,7 @@ class ThemesDlg : public ThemesLayout public: - ThemesDlg(TQWidget *parent = 0, const char *name = 0); + ThemesDlg(TQWidget *parent = nullptr, const char *name = nullptr); ~ThemesDlg(); int addTheme(const TQString &appId, const TQString &file); diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index a0acbde7..d4260dfb 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -26,7 +26,7 @@ #include ThemeWidget::ThemeWidget(TQWidget *parent, const char *name) - : ThemeWidgetLayout(parent, name), m_themeFile(0) + : ThemeWidgetLayout(parent, name), m_themeFile(nullptr) { running->setText(""); setDescriptionMaxHeight(); diff --git a/superkaramba/src/themewidget.h b/superkaramba/src/themewidget.h index f57918c1..bb4371a8 100644 --- a/superkaramba/src/themewidget.h +++ b/superkaramba/src/themewidget.h @@ -32,7 +32,7 @@ class ThemeWidget : public ThemeWidgetLayout TQ_OBJECT public: - ThemeWidget(TQWidget *parent = 0, const char *name = 0); + ThemeWidget(TQWidget *parent = nullptr, const char *name = nullptr); ThemeWidget(ThemeFile* tf); ~ThemeWidget(); diff --git a/superkaramba/src/uptimesensor.cpp b/superkaramba/src/uptimesensor.cpp index a4a6c0b7..0b9493fe 100644 --- a/superkaramba/src/uptimesensor.cpp +++ b/superkaramba/src/uptimesensor.cpp @@ -91,7 +91,7 @@ void UptimeSensor::update() Meter *meter; TQObjectListIt it( *objList ); - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index 328ddeaf..3ac2b4ca 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -175,7 +175,7 @@ PyObject* py_move_widget(PyObject *, PyObject *args) long widgetSetOnTop(long widget, bool b) { karamba* currTheme = (karamba*)widget; - if (currTheme != 0) + if (currTheme) { currTheme->setAlwaysOnTop(b); } @@ -195,7 +195,7 @@ PyObject* py_set_widget_on_top(PyObject *, PyObject *args) long toggleWidgetRedraw(long widget, bool b) { karamba* currTheme = (karamba*)widget; - if (currTheme != 0) + if (currTheme) { currTheme->toggleWidgetUpdate( b ); } diff --git a/superkaramba/src/xmmssensor.cpp b/superkaramba/src/xmmssensor.cpp index fd057440..d3d54cc4 100644 --- a/superkaramba/src/xmmssensor.cpp +++ b/superkaramba/src/xmmssensor.cpp @@ -21,10 +21,10 @@ public: if ( !libxmms->load() ) { delete libxmms; - libxmms = 0; + libxmms = nullptr; } - if ( libxmms != 0 ) + if ( libxmms ) { // resolve functions *(void**) (&xmms_remote_is_running) = @@ -49,7 +49,7 @@ public: bool isInitialized() const { - return libxmms != 0 && + return libxmms != nullptr && xmms_remote_is_running != 0 && xmms_remote_is_playing != 0 && xmms_remote_get_playlist_title != 0 && @@ -125,12 +125,12 @@ public: XMMSSensor::XMMSSensor( int interval, const TQString &encoding ) - : Sensor( interval ), xmms( 0 ) + : Sensor( interval ), xmms( nullptr ) { if( !encoding.isEmpty() ) { codec = TQTextCodec::codecForName( encoding.ascii() ); - if ( codec == 0) + if ( !codec) codec = TQTextCodec::codecForLocale(); } else @@ -176,7 +176,7 @@ void XMMSSensor::update() } #endif // HAVE_XMMS - while (it != 0) + while (it) { sp = (SensorParams*)(*it); meter = sp->getMeter(); diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp index 996abdf0..2fd71de0 100644 --- a/tdefilereplace/kaddstringdlg.cpp +++ b/tdefilereplace/kaddstringdlg.cpp @@ -100,7 +100,7 @@ void KAddStringDlg::raiseView() bool KAddStringDlg::columnContains(TQListView* lv,const TQString& s, int column) { TQListViewItem* i = lv->firstChild(); - while (i != 0) + while (i) { if(i->text(column) == s) return true; @@ -112,7 +112,7 @@ bool KAddStringDlg::columnContains(TQListView* lv,const TQString& s, int column) void KAddStringDlg::saveViewContentIntoMap() { TQListViewItem* i = m_sv->firstChild(); - while(i != 0) + while(i) { if(m_option->m_searchingOnlyMode) m_currentMap[i->text(0)] = TQString(); @@ -220,7 +220,7 @@ void KAddStringDlg::slotDeleteStringFromView() TQListViewItem* currentItem = m_sv->currentItem(); // Do nothing if list is empty - if(currentItem == 0) + if(!currentItem) return; m_currentMap.remove(currentItem->text(0)); @@ -239,7 +239,7 @@ void KAddStringDlg::slotDeleteStringFromView() delete currentItem; - currentItem = 0; + currentItem = nullptr; } void KAddStringDlg::slotHelp() diff --git a/tdefilereplace/kaddstringdlg.h b/tdefilereplace/kaddstringdlg.h index 6ca518cc..32f7ba3f 100644 --- a/tdefilereplace/kaddstringdlg.h +++ b/tdefilereplace/kaddstringdlg.h @@ -35,7 +35,7 @@ class KAddStringDlg : public KAddStringDlgS KeyValueMap m_currentMap; public: //Constructors - KAddStringDlg(RCOptions* info, TQWidget *parent=0, const char *name=0); + KAddStringDlg(RCOptions* info, TQWidget *parent=nullptr, const char *name=nullptr); private slots: void slotOK(); diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp index aa072c39..75c90908 100644 --- a/tdefilereplace/knewprojectdlg.cpp +++ b/tdefilereplace/knewprojectdlg.cpp @@ -543,7 +543,7 @@ void KNewProjectDlg::setDatas(const TQString& directoryString, const TQString& f bool KNewProjectDlg::contains(TQListView* lv,const TQString& s, int column) { TQListViewItem* i = lv->firstChild(); - while (i != 0) + while (i) { if(i->text(column) == s) return true; diff --git a/tdefilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h index 08a307e0..807295dc 100644 --- a/tdefilereplace/knewprojectdlg.h +++ b/tdefilereplace/knewprojectdlg.h @@ -36,7 +36,7 @@ class KNewProjectDlg : public KNewProjectDlgS RCOptions* m_option; public: - KNewProjectDlg(RCOptions* info, TQWidget *parent=0, const char *name=0); + KNewProjectDlg(RCOptions* info, TQWidget *parent=nullptr, const char *name=nullptr); ~KNewProjectDlg(); public: diff --git a/tdefilereplace/main.cpp b/tdefilereplace/main.cpp index f2374acc..90d24dfd 100644 --- a/tdefilereplace/main.cpp +++ b/tdefilereplace/main.cpp @@ -28,7 +28,7 @@ static const char version[] = "0.1"; static TDECmdLineOptions options[] = { - { "+[PATH]", I18N_NOOP( "Starting folder" ), 0 }, + { "+[PATH]", I18N_NOOP( "Starting folder" ), nullptr }, TDECmdLineLastOption }; diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp index 6a8f6b5a..73f6369c 100644 --- a/tdefilereplace/report.cpp +++ b/tdefilereplace/report.cpp @@ -38,7 +38,7 @@ void Report::createReportFile() TQFile report(xmlFileName); if (!report.open( IO_WriteOnly )) { - KMessageBox::error(0, i18n("Cannot open the file %1.").arg(xmlFileName)); + KMessageBox::error(nullptr, i18n("Cannot open the file %1.").arg(xmlFileName)); return ; } @@ -86,7 +86,7 @@ void Report::createReportFile() lviCurItem = lviFirst = m_stringsView->firstChild(); - if(lviCurItem == 0) + if(!lviCurItem) return ; TQString rowType="a1"; @@ -132,7 +132,7 @@ void Report::createReportFile() lviCurItem = lviFirst = m_resultsView->firstChild(); - if(lviCurItem == 0) + if(!lviCurItem) return ; unsigned int totalOccurrences = 0; @@ -191,7 +191,7 @@ void Report::createStyleSheet() TQFile styleSheet(cssFileName); if (!styleSheet.open( IO_WriteOnly )) { - KMessageBox::error(0, i18n("Cannot open the file %1.").arg(cssFileName)); + KMessageBox::error(nullptr, i18n("Cannot open the file %1.").arg(cssFileName)); return ; } diff --git a/tdefilereplace/report.h b/tdefilereplace/report.h index 75c27cb3..b6dea7fe 100644 --- a/tdefilereplace/report.h +++ b/tdefilereplace/report.h @@ -46,7 +46,7 @@ class Report m_stringsView = sv; m_isSearchFlag = m_option->m_searchingOnlyMode; } - ~Report() { m_option = 0; } + ~Report() { m_option = nullptr; } private: void createReportFile(); void createStyleSheet(); diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp index e88d4c58..1ea3983c 100644 --- a/tdefilereplace/tdefilereplace.cpp +++ b/tdefilereplace/tdefilereplace.cpp @@ -25,7 +25,7 @@ #include "tdefilereplace.h" TDEFileReplace::TDEFileReplace() - : KParts::MainWindow(0L, "TDEFileReplace") + : KParts::MainWindow(nullptr, "TDEFileReplace") { KLibFactory *factory = KLibLoader::self()->factory("libtdefilereplacepart"); if (factory) diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index 7224849a..9ab504fe 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -69,11 +69,11 @@ TDEFileReplacePart::TDEFileReplacePart(TQWidget* parentWidget, const char* , TQO TDEGlobal::locale()->insertCatalogue("tdefilereplace"); m_parentWidget = parentWidget; m_config = new TDEConfig("tdefilereplacerc"); - m_aboutDlg = 0; + m_aboutDlg = nullptr; m_stop = false; m_optionMask = TQDir::Files; m_w = widget(); - m_option = 0; + m_option = nullptr; m_circ_ref_warning_shown = false; loadOptionsFromRC(); @@ -85,16 +85,16 @@ TDEFileReplacePart::TDEFileReplacePart(TQWidget* parentWidget, const char* , TQO TDEFileReplacePart::~TDEFileReplacePart() { - m_view = 0; //it's already deleted, so set it to NULL + m_view = nullptr; //it's already deleted, so set it to NULL saveOptionsToRC(); delete m_aboutDlg; - m_aboutDlg = 0; + m_aboutDlg = nullptr; delete m_config; - m_config = 0; + m_config = nullptr; delete m_w; - m_w = 0; + m_w = nullptr; delete m_option; } @@ -251,7 +251,7 @@ void TDEFileReplacePart::slotCreateReport() TDEListView* rv = m_view->getResultsView(), * sv = m_view->getStringsView(); - if(rv->firstChild() == 0) + if(!rv->firstChild()) { KMessageBox::error(m_w, i18n("There are no results to save: the result list is empty.")); return ; @@ -354,7 +354,7 @@ void TDEFileReplacePart::slotOptionRegularExpressions() void TDEFileReplacePart::slotOptionPreferences() { - KOptionsDlg dlg(m_option, m_w, 0); + KOptionsDlg dlg(m_option, m_w, nullptr); if (!dlg.exec()) { return; @@ -366,7 +366,7 @@ void TDEFileReplacePart::slotOptionPreferences() void TDEFileReplacePart::showAboutApplication() { m_aboutDlg = new TDEAboutApplication(createAboutData(), (TQWidget *)0, (const char *)0, false); - if(m_aboutDlg == 0) + if(!m_aboutDlg) return; if(!m_aboutDlg->isVisible()) @@ -391,8 +391,8 @@ void TDEFileReplacePart::updateGUI() TDEListView *rv = m_view->getResultsView(); TDEListView *sv = m_view->getStringsView(); - bool hasResults = (rv->firstChild() != 0); - bool hasStrings = (sv->firstChild() != 0); + bool hasResults = (rv->firstChild() != nullptr); + bool hasStrings = (sv->firstChild() != nullptr); bool searchOnlyMode = m_option->m_searchingOnlyMode; // File @@ -552,7 +552,7 @@ void TDEFileReplacePart::initGUI() // Help (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); - (void)new TDEAction(i18n("&Report Bug"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("&Report Bug"), nullptr, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); } void TDEFileReplacePart::initView() @@ -1008,7 +1008,7 @@ void TDEFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQSt TQString backupExtension = m_option->m_backupExtension; bool atLeastOneStringFound = false; - TDEListViewItem *item = 0; + TDEListViewItem *item = nullptr; int occurrence = 0; replacingLoop(line, &item, atLeastOneStringFound, occurrence, m_option->m_regularExpressions, m_option->m_askConfirmReplace); @@ -1083,7 +1083,7 @@ void TDEFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const T } TQString fileSizeBeforeReplacing = TDEFileReplaceLib::formatFileSize(oldFileInfo.size()); - TDEListViewItem *item = 0; + TDEListViewItem *item = nullptr; TQTextStream oldStream( &oldFile ); if (m_option->m_encoding == "utf8") @@ -1163,7 +1163,7 @@ void TDEFileReplacePart::replacingLoop(TQString& line, TDEListViewItem** item, b if(askConfirmReplace) { - int answer = KMessageBox::questionYesNo(0, + int answer = KMessageBox::questionYesNo(nullptr, i18n("Do you want to replace the string %1 with the string %2?").arg(it.key()).arg(it.data()), i18n("Confirm Replace"), i18n("Replace"), @@ -1334,7 +1334,7 @@ void TDEFileReplacePart::search(const TQString& currentDir, const TQString& file TQFileInfo fileInfo(currentDir+"/"+fileName); - TDEListViewItem *item = 0; + TDEListViewItem *item = nullptr; //Counts occurrences int occurrence = 0; diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index 616b3e31..34b61bd8 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -153,7 +153,7 @@ void TDEFileReplaceView::stringsInvert(bool invertAll) // Cannot invert the string when search string is empty if (replaceText.isEmpty()) { - KMessageBox::error(0, i18n("Cannot invert string %1, because the search string would be empty.") + KMessageBox::error(nullptr, i18n("Cannot invert string %1, because the search string would be empty.") .arg(searchText)); } else @@ -217,7 +217,7 @@ TDEListView* TDEFileReplaceView::getStringsView() //PUBLIC SLOTS void TDEFileReplaceView::slotResultMouseButtonClicked(int button, TQListViewItem *lvi, const TQPoint &pos) { - if (lvi == 0) // No item selected + if (!lvi) // No item selected return; if (button == TQt::RightButton) @@ -229,7 +229,7 @@ void TDEFileReplaceView::slotResultMouseButtonClicked(int button, TQListViewItem void TDEFileReplaceView::slotResultReturnPressed (TQListViewItem *lvi) { - if (lvi == 0) // No item selected + if (!lvi) // No item selected return; // Left mouse button: open item in default view @@ -473,7 +473,7 @@ void TDEFileReplaceView::slotResultSave() TDEListView *rv = getResultsView(); if (!rv->firstChild()) { - KMessageBox::error(0, i18n("There are no results to save.")); + KMessageBox::error(nullptr, i18n("There are no results to save.")); return; } @@ -488,7 +488,7 @@ void TDEFileReplaceView::slotResultSave() TQFile file(fileName); if (!file.open(IO_WriteOnly)) { - KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName)); + KMessageBox::error(nullptr, i18n("File %1 cannot be saved.").arg(fileName)); return; } TQTextStream filestream(&file); @@ -666,7 +666,7 @@ void TDEFileReplaceView::slotStringsSave() TDEListView *sv = getStringsView(); if (!sv->firstChild()) { - KMessageBox::error(0, i18n("No strings to save as the list is empty.")); + KMessageBox::error(nullptr, i18n("No strings to save as the list is empty.")); return; } @@ -681,7 +681,7 @@ void TDEFileReplaceView::slotStringsSave() TQFile file(fileName); if (!file.open(IO_WriteOnly)) { - KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName)); + KMessageBox::error(nullptr, i18n("File %1 cannot be saved.").arg(fileName)); return ; } @@ -872,7 +872,7 @@ void TDEFileReplaceView::expand(TQListViewItem *lviCurrent, bool b) lviCurrent->setOpen(b); // recursivity - while((lviCurrent = lviCurrent->nextSibling()) != 0) + while((lviCurrent = lviCurrent->nextSibling()) != nullptr) { lviCurrent->setOpen(b); diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 73363273..1f1bf3fd 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -112,7 +112,7 @@ void IRKick::doQuit() { TDESimpleConfig theConfig("irkickrc"); theConfig.setGroup("General"); - switch(KMessageBox::questionYesNoCancel(0, i18n("Should the Infrared Remote Control server start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start"))) + switch(KMessageBox::questionYesNoCancel(nullptr, i18n("Should the Infrared Remote Control server start automatically when you begin TDE?"), i18n("Automatically Start?"), i18n("Start Automatically"), i18n("Do Not Start"))) { case KMessageBox::No: theConfig.writeEntry("AutoStart", false); break; case KMessageBox::Yes: theConfig.writeEntry("AutoStart", true); break; case KMessageBox::Cancel: return; @@ -131,7 +131,7 @@ void IRKick::resetModes() for(TQStringList::iterator i = remotes.begin(); i != remotes.end(); ++i) { currentModes[*i] = allModes.getDefault(*i).name(); if(theResetCount && currentModeIcons[*i]) delete currentModeIcons[*i]; - currentModeIcons[*i] = 0; + currentModeIcons[*i] = nullptr; } updateModeIcons(); theResetCount++; @@ -159,7 +159,7 @@ void IRKick::updateModeIcons() if(mode.iconFile().isNull() || mode.iconFile().isEmpty()) { if(currentModeIcons[i.key()]) { delete currentModeIcons[i.key()]; - currentModeIcons[i.key()] = 0; + currentModeIcons[i.key()] = nullptr; } } else diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h index a3b7cc36..f86f70b5 100644 --- a/tdelirc/irkick/irkick.h +++ b/tdelirc/irkick/irkick.h @@ -36,7 +36,7 @@ public: TDEPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); } TDEActionCollection* actionCollection() { return KSystemTray::actionCollection(); } - IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {} + IRKTrayIcon(TQWidget *parent = nullptr, const char *name = nullptr): KSystemTray(parent, name) {} }; class IRKick: public TQObject, public DCOPObject diff --git a/tdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp index be98cae1..d96fcae9 100644 --- a/tdelirc/irkick/main.cpp +++ b/tdelirc/irkick/main.cpp @@ -19,7 +19,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { - TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org"); + TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", nullptr, nullptr, "gav@kde.org"); aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/"); aboutData->addCredit("Malte Starostik", I18N_NOOP("Original LIRC interface code"), "malte.starostik@t-online.de"); aboutData->addCredit("Dirk Ziegelmeier", I18N_NOOP("Ideas, concept code"), "dirk@ziegelmeier.net"); diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp index c70d39a5..c977a970 100644 --- a/tdelirc/irkick/tdelircclient.cpp +++ b/tdelirc/irkick/tdelircclient.cpp @@ -43,7 +43,7 @@ #include "tdelircclient.h" -KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false) +KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(nullptr), listIsUpToDate(false) { connectToLirc(); } @@ -87,7 +87,7 @@ KLircClient::~KLircClient() void KLircClient::slotClosed() { delete theSocket; - theSocket = 0; + theSocket = nullptr; emit connectionClosed(); } diff --git a/tdelirc/irkick/tdelircclient.h b/tdelirc/irkick/tdelircclient.h index a3da5df6..de8ba6be 100644 --- a/tdelirc/irkick/tdelircclient.h +++ b/tdelirc/irkick/tdelircclient.h @@ -108,7 +108,7 @@ public: */ bool connectToLirc(); - KLircClient(TQWidget *parent = 0, const char *name = 0); + KLircClient(TQWidget *parent = nullptr, const char *name = nullptr); ~KLircClient(); }; diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp index 0ebf472c..955e2217 100644 --- a/tdelirc/kcmlirc/addaction.cpp +++ b/tdelirc/kcmlirc/addaction.cpp @@ -130,10 +130,10 @@ void AddAction::updateForPageChange() void AddAction::updateButtonStates() { switch(indexOf(currentPage())) - { case 0: setNextEnabled(currentPage(), theProfiles->currentItem() != 0 || !theUseProfile->isChecked()); break; - case 1: setNextEnabled(currentPage(), theButtons->currentItem() != 0); break; - case 2: setNextEnabled(currentPage(), theFunctions->currentItem() != 0); break; - case 3: setNextEnabled(currentPage(), theProfileFunctions->currentItem() != 0 || theJustStart->isChecked()); break; + { case 0: setNextEnabled(currentPage(), theProfiles->currentItem() != nullptr || !theUseProfile->isChecked()); break; + case 1: setNextEnabled(currentPage(), theButtons->currentItem() != nullptr); break; + case 2: setNextEnabled(currentPage(), theFunctions->currentItem() != nullptr); break; + case 3: setNextEnabled(currentPage(), theProfileFunctions->currentItem() != nullptr || theJustStart->isChecked()); break; case 4: setNextEnabled(currentPage(), true); break; case 5: setNextEnabled(currentPage(), false); setFinishEnabled(currentPage(), true); break; case 6: setNextEnabled(currentPage(), false); setFinishEnabled(currentPage(), theModes->currentItem() || !theSwitchMode->isChecked()); break; diff --git a/tdelirc/kcmlirc/editaction.h b/tdelirc/kcmlirc/editaction.h index 20b7da1a..f1eae8d1 100644 --- a/tdelirc/kcmlirc/editaction.h +++ b/tdelirc/kcmlirc/editaction.h @@ -49,7 +49,7 @@ public: virtual void updateDCOPObjects(); virtual void updateDCOPFunctions(); - EditAction(IRAIt action, TQWidget *parent = 0, const char *name = 0); + EditAction(IRAIt action, TQWidget *parent = nullptr, const char *name = nullptr); ~EditAction(); }; diff --git a/tdelirc/kcmlirc/editmode.h b/tdelirc/kcmlirc/editmode.h index 669e9913..fca5247a 100644 --- a/tdelirc/kcmlirc/editmode.h +++ b/tdelirc/kcmlirc/editmode.h @@ -27,7 +27,7 @@ public: void slotCheckText(const TQString &newText); void slotClearIcon(); - EditMode(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); + EditMode(TQWidget *parent = nullptr, const char *name = nullptr, bool modal = false, WFlags fl = 0); ~EditMode(); }; diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index c0f42126..94a2266b 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -143,7 +143,7 @@ void KCMLirc::slotAddActions() Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; if(!RemoteServer::remoteServer()->remotes()[m.remote()]) return; - SelectProfile theDialog(this, 0); + SelectProfile theDialog(this, nullptr); TQMap profileMap; TQDict dict = ProfileServer::profileServer()->profiles(); @@ -162,7 +162,7 @@ void KCMLirc::slotAddAction() if(!theKCMLircBase->theModes->selectedItem()) return; Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; - AddAction theDialog(this, 0, m); + AddAction theDialog(this, nullptr, m); connect(this, TQ_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQ_SLOT(updateButton(const TQString &, const TQString &))); // populate the modes list box @@ -282,7 +282,7 @@ void KCMLirc::slotAddMode() { if(!theKCMLircBase->theModes->selectedItem()) return; - NewMode theDialog(this, 0); + NewMode theDialog(this, nullptr); TQMap remoteMap; TQListViewItem *tr = theKCMLircBase->theModes->selectedItem(); if(tr) if(tr->parent()) tr = tr->parent(); @@ -303,7 +303,7 @@ void KCMLirc::slotEditMode() { if(!theKCMLircBase->theModes->selectedItem()) return; - EditMode theDialog(this, 0); + EditMode theDialog(this, nullptr); Mode &mode = modeMap[theKCMLircBase->theModes->selectedItem()]; theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->parent()); @@ -375,7 +375,7 @@ void KCMLirc::updateActions() theKCMLircBase->theActions->clear(); actionMap.clear(); - if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; } + if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(nullptr); return; } Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions always available") : i18n("Actions available only in mode %1").arg(m.name()))); diff --git a/tdelirc/kcmlirc/kcmlirc.h b/tdelirc/kcmlirc/kcmlirc.h index e0625347..5c7ceacb 100644 --- a/tdelirc/kcmlirc/kcmlirc.h +++ b/tdelirc/kcmlirc/kcmlirc.h @@ -79,7 +79,7 @@ public: virtual void configChanged(); virtual TQString handbookDocPath() const; - KCMLirc(TQWidget *parent = 0, const char *name = 0, TQStringList args = TQStringList()); + KCMLirc(TQWidget *parent = nullptr, const char *name = nullptr, TQStringList args = TQStringList()); ~KCMLirc(); }; diff --git a/tdelirc/kcmlirc/modeslist.h b/tdelirc/kcmlirc/modeslist.h index e60ba00d..9ddc87b3 100644 --- a/tdelirc/kcmlirc/modeslist.h +++ b/tdelirc/kcmlirc/modeslist.h @@ -28,7 +28,7 @@ class ModesList : public TDEListView public: virtual bool acceptDrag(TQDropEvent *) const; - ModesList(TQWidget *parent = 0, const char *name = 0); + ModesList(TQWidget *parent = nullptr, const char *name = nullptr); }; #endif diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp index 8840693a..45c457f7 100644 --- a/tdelirc/tdelirc/profileserver.cpp +++ b/tdelirc/tdelirc/profileserver.cpp @@ -20,7 +20,7 @@ #include "profileserver.h" -ProfileServer *ProfileServer::theInstance = 0; +ProfileServer *ProfileServer::theInstance = nullptr; ProfileServer::ProfileServer() { @@ -56,14 +56,14 @@ const ProfileAction *Profile::searchClass(const TQString &c) const { for(TQDictIterator i(theActions); i.current(); ++i) if(i.current()->getClass() == c) return i; - return 0; + return nullptr; } void Profile::loadFromFile(const TQString &fileName) { charBuffer = ""; - curPA = 0; - curPAA = 0; + curPA = nullptr; + curPAA = nullptr; TQFile xmlFile(fileName); TQXmlInputSource source(&xmlFile); @@ -77,7 +77,7 @@ const ProfileAction *ProfileServer::getAction(const TQString &appId, const TQStr if(theProfiles[appId]) if(theProfiles[appId]->theActions[actionId]) return theProfiles[appId]->theActions[actionId]; - return 0; + return nullptr; } const TQString &ProfileServer::getServiceName(const TQString &appId) const @@ -149,10 +149,10 @@ bool Profile::endElement(const TQString &, const TQString &, const TQString &nam { curPA->setProfile(this); theActions.insert(curPA->objId() + "::" + curPA->prototype(), curPA); - curPA = 0; + curPA = nullptr; } else if(name == "argument") - curPAA = 0; + curPAA = nullptr; charBuffer = ""; return true; diff --git a/tdelirc/tdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp index 13f095c5..7c6c387c 100644 --- a/tdelirc/tdelirc/remoteserver.cpp +++ b/tdelirc/tdelirc/remoteserver.cpp @@ -20,7 +20,7 @@ #include "remoteserver.h" -RemoteServer *RemoteServer::theInstance = 0; +RemoteServer *RemoteServer::theInstance = nullptr; RemoteServer::RemoteServer() { @@ -55,7 +55,7 @@ Remote::~Remote() void Remote::loadFromFile(const TQString &fileName) { charBuffer = ""; - curRB = 0; + curRB = nullptr; TQFile xmlFile(fileName); TQXmlInputSource source(&xmlFile); @@ -101,7 +101,7 @@ bool Remote::endElement(const TQString &, const TQString &, const TQString &name else if(name == "button") { theButtons.insert(curRB->id(), curRB); - curRB = 0; + curRB = nullptr; } charBuffer = ""; diff --git a/tdessh/tdessh.cpp b/tdessh/tdessh.cpp index 8e2d64a9..eb1a7d51 100644 --- a/tdessh/tdessh.cpp +++ b/tdessh/tdessh.cpp @@ -35,13 +35,13 @@ static TDECmdLineOptions options[] = { - { "+host", I18N_NOOP("Specifies the remote host"), 0 }, - { "+command", I18N_NOOP("The command to run"), 0 }, - { "u ", I18N_NOOP("Specifies the target uid"), 0 }, + { "+host", I18N_NOOP("Specifies the remote host"), nullptr }, + { "+command", I18N_NOOP("The command to run"), nullptr }, + { "u ", I18N_NOOP("Specifies the target uid"), nullptr }, { "s ", I18N_NOOP("Specify remote stub location"), "tdesu_stub" }, - { "n", I18N_NOOP("Do not keep password"), 0 }, - { "q", I18N_NOOP("Stop the daemon (forgets all passwords)"), 0 }, - { "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 }, + { "n", I18N_NOOP("Do not keep password"), nullptr }, + { "q", I18N_NOOP("Stop the daemon (forgets all passwords)"), nullptr }, + { "t", I18N_NOOP("Enable terminal output (no password keeping)"), nullptr }, TDECmdLineLastOption }; @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) if (user.isNull()) { struct passwd *pw = getpwuid(getuid()); - if (pw == 0L) + if (!pw) { kdError(1511) << "You don't exist!\n"; exit(1); @@ -162,7 +162,7 @@ int main(int argc, char *argv[]) TQString msg = i18n("Ssh returned with an error!\n" "The error message is:\n\n"); msg += proc.error(); - KMessageBox::error(0L, msg); + KMessageBox::error(nullptr, msg); exit(1); } diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp index c52a7a26..b3c0da66 100644 --- a/tdewallet/allyourbase.cpp +++ b/tdewallet/allyourbase.cpp @@ -53,13 +53,13 @@ TDEWalletFolderItem::TDEWalletFolderItem(TDEWallet::Wallet *w, TQListView* paren TQPixmap TDEWalletFolderItem::getFolderIcon(TDEIcon::Group group){ TDEIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQPixmap pix = loader->loadIcon( _name, group, 0, - TDEIcon::DefaultState, 0, true ); + TDEIcon::DefaultState, nullptr, true ); if (pix.isNull()) pix = loader->loadIcon( _name.lower(), group, 0, - TDEIcon::DefaultState, 0, true); + TDEIcon::DefaultState, nullptr, true); if (pix.isNull()) pix = loader->loadIcon( "folder_red", group, 0, - TDEIcon::DefaultState, 0, true); + TDEIcon::DefaultState, nullptr, true); return pix; } @@ -80,11 +80,11 @@ TDEWalletContainerItem* TDEWalletFolderItem::getContainer(TDEWallet::Wallet::Ent return ci; } } - return 0; + return nullptr; } bool TDEWalletFolderItem::contains(const TQString& key) { - return (getItem(key) != 0); + return (getItem(key) != nullptr); } TQListViewItem* TDEWalletFolderItem::getItem(const TQString& key) { @@ -98,7 +98,7 @@ TQListViewItem* TDEWalletFolderItem::getItem(const TQString& key) { return tmp; } } - return 0; + return nullptr; } bool TDEWalletFolderItem::acceptDrop(const TQMimeSource *mime) const { @@ -139,7 +139,7 @@ TDEWallet::Wallet::EntryType TDEWalletContainerItem::type() { } bool TDEWalletContainerItem::contains(const TQString& key) { - return getItem(key) != 0; + return getItem(key) != nullptr; } TQListViewItem *TDEWalletContainerItem::getItem(const TQString& key) { @@ -148,7 +148,7 @@ TQListViewItem *TDEWalletContainerItem::getItem(const TQString& key) { return i; } } - return 0; + return nullptr; } /**************** @@ -194,7 +194,7 @@ static bool decodeEntry(TDEWallet::Wallet *_wallet, TQDataStream& ds) { TDEWallet::Wallet::EntryType et; ds >> name; if (_wallet->hasEntry(name)) { - int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").arg(name)); + int rc = KMessageBox::warningContinueCancel(nullptr, i18n("An entry by the name '%1' already exists. Would you like to continue?").arg(name)); if (rc == KMessageBox::Cancel) { return false; } @@ -217,7 +217,7 @@ static bool decodeFolder(TDEWallet::Wallet *_wallet, TQDataStream& ds) { TQString folder; ds >> folder; if (_wallet->hasFolder(folder)) { - int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists. What would you like to do?").arg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace")); + int rc = KMessageBox::warningYesNoCancel(nullptr, i18n("A folder by the name '%1' already exists. What would you like to do?").arg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace")); if (rc == KMessageBox::Cancel) { return false; } @@ -260,7 +260,7 @@ void TDEWalletItem::dropped(TQDropEvent *e, const TQValueList& l TQString saveFolder = _wallet->currentFolder(); TQFile file; - TQDataStream *ds = 0L; + TQDataStream *ds = nullptr; if (e->provides("application/x-tdewallet-folder")) { TQByteArray edata = e->encodedData("application/x-tdewallet-folder"); @@ -282,7 +282,7 @@ void TDEWalletItem::dropped(TQDropEvent *e, const TQValueList& l return; } TQString tmpFile; - if (TDEIO::NetAccess::download(u, tmpFile, 0L)) { + if (TDEIO::NetAccess::download(u, tmpFile, nullptr)) { file.setName(tmpFile); file.open(IO_ReadOnly); ds = new TQDataStream(&file); @@ -326,7 +326,7 @@ void TDEWalletItem::dropped(TQDropEvent *e, const TQValueList& l */ class TDEWalletEntryDrag : public TQStoredDrag { public: - TDEWalletEntryDrag(TQWidget *dragSource, const char *name = 0L) + TDEWalletEntryDrag(TQWidget *dragSource, const char *name = nullptr) : TQStoredDrag("application/x-tdewallet-entry", dragSource, name) { } @@ -338,7 +338,7 @@ class TDEWalletEntryDrag : public TQStoredDrag { */ class TDEWalletFolderDrag : public TQStoredDrag { public: - TDEWalletFolderDrag(TQWidget *dragSource, const char *name = 0L) + TDEWalletFolderDrag(TQWidget *dragSource, const char *name = nullptr) : TQStoredDrag("application/x-tdewallet-folder", dragSource, name) { } @@ -385,8 +385,8 @@ void TDEWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { TQFile file; TQDataStream *ds; - TDEWalletEntryList *el = 0L; - TQListViewItem *sel = 0L; + TDEWalletEntryList *el = nullptr; + TQListViewItem *sel = nullptr; //detect if we are dragging from tdewallet itself if (e->source() && e->source()->parent() && @@ -439,7 +439,7 @@ void TDEWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { return; } TQString tmpFile; - if (TDEIO::NetAccess::download(u, tmpFile, 0L)) { + if (TDEIO::NetAccess::download(u, tmpFile, nullptr)) { file.setName(tmpFile); file.open(IO_ReadOnly); ds = new TQDataStream(&file); @@ -554,7 +554,7 @@ TDEWalletFolderItem* TDEWalletEntryList::getFolder(const TQString& name) { return fi; } } - return 0; + return nullptr; } TDEWalletFolderItem *TDEWalletEntryList::getItemFolder(TQListViewItem *item) { @@ -566,7 +566,7 @@ TDEWalletFolderItem *TDEWalletEntryList::getItemFolder(TQListViewItem *item) { case TDEWalletEntryItemClass: return dynamic_cast(item->parent()->parent()); } - return 0; + return nullptr; } /**************** @@ -574,7 +574,7 @@ TDEWalletFolderItem *TDEWalletEntryList::getItemFolder(TQListViewItem *item) { */ class TDEWalletIconDrag : public TQIconDrag { public: - TDEWalletIconDrag(TQWidget *dragSource, const char *name = 0L) + TDEWalletIconDrag(TQWidget *dragSource, const char *name = nullptr) : TQIconDrag(dragSource, name) { } @@ -586,7 +586,7 @@ class TDEWalletIconDrag : public TQIconDrag { } else if (i == 1) { return "text/uri-list"; } - return 0L; + return nullptr; } TQByteArray encodedData(const char *mime) const { @@ -701,12 +701,12 @@ TQDragObject *TDEWalletIconView::dragObject() { TQDragObject *TDEWalletEntryList::dragObject() { TQListViewItem *i = currentItem(); - TQStoredDrag *sd = 0L; + TQStoredDrag *sd = nullptr; if (i->rtti() == TDEWalletEntryItemClass) { TDEWalletEntryItem *ei = dynamic_cast(i); if (!ei) { - return 0L; + return nullptr; } sd = new TDEWalletEntryDrag(viewport(), "TDEWallet Entry Drag"); TQByteArray a; @@ -717,7 +717,7 @@ TQDragObject *TDEWalletEntryList::dragObject() { } else if (i->rtti() == TDEWalletFolderItemClass) { TDEWalletFolderItem *fi = dynamic_cast(i); if (!fi) { - return 0L; + return nullptr; } sd = new TDEWalletFolderDrag(viewport(), "TDEWallet Folder Drag"); TQByteArray a; diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h index defc408c..46416402 100644 --- a/tdewallet/allyourbase.h +++ b/tdewallet/allyourbase.h @@ -99,7 +99,7 @@ class TDEWalletEntryList : public TDEListView { TQ_OBJECT public: - TDEWalletEntryList(TQWidget *parent, const char *name = 0L); + TDEWalletEntryList(TQWidget *parent, const char *name = nullptr); virtual ~TDEWalletEntryList(); bool existsFolder(const TQString& name); @@ -136,7 +136,7 @@ class TDEWalletIconView : public TDEIconView { TQ_OBJECT public: - TDEWalletIconView(TQWidget *parent, const char *name = 0L); + TDEWalletIconView(TQWidget *parent, const char *name = nullptr); virtual ~TDEWalletIconView(); protected slots: diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 592101fa..f4c3a4ef 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -47,9 +47,9 @@ TDEWalletConfig::TDEWalletConfig(TQWidget *parent, const char *name, const TQStr TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtdewallet"), I18N_NOOP("TDE Wallet Control Module"), - 0, 0, TDEAboutData::License_GPL, + nullptr, nullptr, TDEAboutData::License_GPL, I18N_NOOP("(c) 2003 George Staikos")); - about->addAuthor("George Staikos", 0, "staikos@kde.org"); + about->addAuthor("George Staikos", nullptr, "staikos@kde.org"); setAboutData( about ); _cfg = new TDEConfig("tdewalletrc", false, false); @@ -86,7 +86,7 @@ TDEWalletConfig::TDEWalletConfig(TQWidget *parent, const char *name, const TQStr TDEWalletConfig::~TDEWalletConfig() { delete _cfg; - _cfg = 0L; + _cfg = nullptr; } diff --git a/tdewallet/konfigurator/konfigurator.h b/tdewallet/konfigurator/konfigurator.h index 85599a44..5ea52c65 100644 --- a/tdewallet/konfigurator/konfigurator.h +++ b/tdewallet/konfigurator/konfigurator.h @@ -30,7 +30,7 @@ class TDEWalletConfig : public TDECModule { TQ_OBJECT public: - TDEWalletConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList& = TQStringList()); + TDEWalletConfig(TQWidget *parent = nullptr, const char *name = nullptr, const TQStringList& = TQStringList()); virtual ~TDEWalletConfig(); void load(); diff --git a/tdewallet/kwmapeditor.h b/tdewallet/kwmapeditor.h index 484155f7..1838ce79 100644 --- a/tdewallet/kwmapeditor.h +++ b/tdewallet/kwmapeditor.h @@ -32,7 +32,7 @@ class KWMapEditor : public TQTable { public: - KWMapEditor(TQMap& map, TQWidget *parent = 0, const char *name = 0); + KWMapEditor(TQMap& map, TQWidget *parent = nullptr, const char *name = nullptr); virtual ~KWMapEditor(); public slots: diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp index 3f37c836..c9dda52a 100644 --- a/tdewallet/main.cpp +++ b/tdewallet/main.cpp @@ -42,16 +42,16 @@ class MyApp : public TDEUniqueApplication { int main(int argc, char **argv) { static TDECmdLineOptions options[] = { - {"show", I18N_NOOP("Show window on startup"), 0}, - {"tdewalletd", I18N_NOOP("For use by tdewalletd only"), 0}, - {"+name", I18N_NOOP("A wallet name"), 0}, + {"show", I18N_NOOP("Show window on startup"), nullptr}, + {"tdewalletd", I18N_NOOP("For use by tdewalletd only"), nullptr}, + {"+name", I18N_NOOP("A wallet name"), nullptr}, TDECmdLineLastOption }; TDEAboutData about("tdewalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1", I18N_NOOP("TDE Wallet Management Tool"), TDEAboutData::License_GPL, - I18N_NOOP("(c) 2003,2004 George Staikos"), 0, + I18N_NOOP("(c) 2003,2004 George Staikos"), nullptr, "http://www.kde.org/"); about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "staikos@kde.org"); diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index 968eee37..828cc5f7 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -139,11 +139,11 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * TDEWalletEditor::~TDEWalletEditor() { emit editorClosed(this); delete _newFolderAction; - _newFolderAction = 0L; + _newFolderAction = nullptr; delete _deleteFolderAction; - _deleteFolderAction = 0L; + _deleteFolderAction = nullptr; delete _w; - _w = 0L; + _w = nullptr; if (_nonLocal) { TDEWallet::Wallet::closeWallet(_walletName, true); } @@ -164,7 +164,7 @@ void TDEWalletEditor::createActions() { connect(this, TQ_SIGNAL(enableFolderActions(bool)), _newFolderAction, TQ_SLOT(setEnabled(bool))); - _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0, + _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), nullptr, 0, this, TQ_SLOT(deleteFolder()), actionCollection(), "delete_folder"); connect(this, TQ_SIGNAL(enableContextFolderActions(bool)), @@ -172,25 +172,25 @@ void TDEWalletEditor::createActions() { connect(this, TQ_SIGNAL(enableFolderActions(bool)), _deleteFolderAction, TQ_SLOT(setEnabled(bool))); - _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, this, + _passwordAction = new TDEAction(i18n("Change &Password..."), nullptr, 0, this, TQ_SLOT(changePassword()), actionCollection(), "change_password"); connect(this, TQ_SIGNAL(enableWalletActions(bool)), _passwordAction, TQ_SLOT(setEnabled(bool))); - _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, this, + _mergeAction = new TDEAction(i18n("&Merge Wallet..."), nullptr, 0, this, TQ_SLOT(importWallet()), actionCollection(), "merge"); connect(this, TQ_SIGNAL(enableWalletActions(bool)), _mergeAction, TQ_SLOT(setEnabled(bool))); - _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, this, + _importAction = new TDEAction(i18n("&Import XML..."), nullptr, 0, this, TQ_SLOT(importXML()), actionCollection(), "import"); connect(this, TQ_SIGNAL(enableWalletActions(bool)), _importAction, TQ_SLOT(setEnabled(bool))); - _exportAction = new TDEAction(i18n("&Export..."), 0, 0, this, + _exportAction = new TDEAction(i18n("&Export..."), nullptr, 0, this, TQ_SLOT(exportXML()), actionCollection(), "export"); connect(this, TQ_SIGNAL(enableWalletActions(bool)), @@ -212,7 +212,7 @@ actionCollection()); void TDEWalletEditor::walletClosed() { delete _w; _walletIsOpen = false; - _w = 0L; + _w = nullptr; _ww->setEnabled(false); emit enableWalletActions(false); emit enableFolderActions(false); @@ -382,8 +382,8 @@ void TDEWalletEditor::entryEditted() { void TDEWalletEditor::entrySelectionChanged(TQListViewItem *item) { - TDEWalletContainerItem *ci = 0L; - TDEWalletFolderItem *fi = 0L; + TDEWalletContainerItem *ci = nullptr; + TDEWalletFolderItem *fi = nullptr; switch (item->rtti()) { case TDEWalletEntryItemClass: @@ -480,7 +480,7 @@ void TDEWalletEditor::updateEntries(const TQString& folder) { for (TQListViewItem *i = pi->firstChild(); i; i = i->nextSibling()) { if (!entries.contains(i->text(0))) { if (i == _entryList->currentItem()) { - entrySelectionChanged(0L); + entrySelectionChanged(nullptr); } trash.push(i); } @@ -489,7 +489,7 @@ void TDEWalletEditor::updateEntries(const TQString& folder) { for (TQListViewItem *i = mi->firstChild(); i; i = i->nextSibling()) { if (!entries.contains(i->text(0))) { if (i == _entryList->currentItem()) { - entrySelectionChanged(0L); + entrySelectionChanged(nullptr); } trash.push(i); } @@ -498,7 +498,7 @@ void TDEWalletEditor::updateEntries(const TQString& folder) { for (TQListViewItem *i = bi->firstChild(); i; i = i->nextSibling()) { if (!entries.contains(i->text(0))) { if (i == _entryList->currentItem()) { - entrySelectionChanged(0L); + entrySelectionChanged(nullptr); } trash.push(i); } @@ -507,7 +507,7 @@ void TDEWalletEditor::updateEntries(const TQString& folder) { for (TQListViewItem *i = ui->firstChild(); i; i = i->nextSibling()) { if (!entries.contains(i->text(0))) { if (i == _entryList->currentItem()) { - entrySelectionChanged(0L); + entrySelectionChanged(nullptr); } trash.push(i); } @@ -556,7 +556,7 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi } TDEWalletListItemClasses menuClass = TDEWalletUnknownClass; - TDEWalletContainerItem *ci = 0L; + TDEWalletContainerItem *ci = nullptr; if (item) { if (item->rtti() == TDEWalletEntryItemClass) { diff --git a/tdewallet/tdewalleteditor.h b/tdewallet/tdewalleteditor.h index 64f408b7..1dea5931 100644 --- a/tdewallet/tdewalleteditor.h +++ b/tdewallet/tdewalleteditor.h @@ -39,10 +39,10 @@ class TDEWalletEditor : public TDEMainWindow { public: - TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent = 0, const char* name = 0); + TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent = nullptr, const char* name = nullptr); virtual ~TDEWalletEditor(); - bool isOpen() const { return _w != 0L; } + bool isOpen() const { return _w != nullptr; } void setNewWallet(bool newWallet); diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 16312cb7..19eb6578 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -56,7 +56,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) _shuttingDown = false; TDEConfig cfg("tdewalletrc"); // not sure why this setting isn't in tdewalletmanagerrc... TDEConfigGroup walletConfigGroup(&cfg, "Wallet"); - _dcopRef = 0L; + _dcopRef = nullptr; if (walletConfigGroup.readBoolEntry("Launch Manager", true)) { _tray = new KSystemTray(this, "tdewalletmanager tray"); _tray->setPixmap(loadSystemTrayIcon("wallet_closed")); @@ -75,12 +75,12 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) } if (!isOpen && tdeApp->isRestored()) { delete _tray; - _tray = 0L; + _tray = nullptr; TQTimer::singleShot( 0, tdeApp, TQ_SLOT( quit())); return; } } else { - _tray = 0L; + _tray = nullptr; } _iconView = new TDEWalletIconView(this, "tdewalletmanager icon view"); @@ -121,7 +121,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) if (_tray) { act->plug(_tray->contextMenu()); } - act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this, + act = new TDEAction(i18n("Close &All Wallets"), nullptr, 0, this, TQ_SLOT(closeAllWallets()), actionCollection(), "close_all_wallets"); if (_tray) { @@ -146,9 +146,9 @@ actionCollection()); TDEWalletManager::~TDEWalletManager() { - _tray = 0L; + _tray = nullptr; delete _dcopRef; - _dcopRef = 0L; + _dcopRef = nullptr; } diff --git a/tdewallet/tdewalletmanager.h b/tdewallet/tdewalletmanager.h index 01b3f544..2ca29773 100644 --- a/tdewallet/tdewalletmanager.h +++ b/tdewallet/tdewalletmanager.h @@ -36,7 +36,7 @@ class TDEWalletManager : public TDEMainWindow, public DCOPObject { K_DCOP public: - TDEWalletManager(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); + TDEWalletManager(TQWidget *parent = nullptr, const char* name = nullptr, WFlags f = 0); virtual ~TDEWalletManager(); TQPixmap loadSystemTrayIcon(const TQString &icon); diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp index 5639f55d..bdb00bd8 100644 --- a/tdewallet/tdewalletpopup.cpp +++ b/tdewallet/tdewalletpopup.cpp @@ -34,15 +34,15 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c TDEActionCollection *ac = new TDEActionCollection(this, "tdewallet context actions"); TDEAction *act; - act = new TDEAction(i18n("&New Wallet..."), 0, 0, this, + act = new TDEAction(i18n("&New Wallet..."), nullptr, 0, this, TQ_SLOT(createWallet()), ac, "wallet_create"); act->plug(this); - act = new TDEAction(i18n("&Open..."), 0, Key_Return, this, + act = new TDEAction(i18n("&Open..."), nullptr, Key_Return, this, TQ_SLOT(openWallet()), ac, "wallet_open"); act->plug(this); - act = new TDEAction(i18n("Change &Password..."), 0, 0, this, + act = new TDEAction(i18n("Change &Password..."), nullptr, 0, this, TQ_SLOT(changeWalletPassword()), ac, "wallet_password"); act->plug(this); @@ -67,7 +67,7 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c act->setEnabled(TDEWallet::Wallet::isOpen(wallet)); act->plug(this); - act = new TDEAction(i18n("&Delete"), 0, Key_Delete, this, + act = new TDEAction(i18n("&Delete"), nullptr, Key_Delete, this, TQ_SLOT(deleteWallet()), ac, "wallet_delete"); act->plug(this); } diff --git a/tdewallet/tdewalletpopup.h b/tdewallet/tdewalletpopup.h index 7f82ba10..545f11e9 100644 --- a/tdewallet/tdewalletpopup.h +++ b/tdewallet/tdewalletpopup.h @@ -29,7 +29,7 @@ class TDEWalletPopup : public TDEPopupMenu { public: - TDEWalletPopup(const TQString& wallet, TQWidget *parent = 0, const char* name = 0); + TDEWalletPopup(const TQString& wallet, TQWidget *parent = nullptr, const char* name = nullptr); virtual ~TDEWalletPopup(); public slots: -- cgit v1.2.3