From cd1840e366a0fa7b2246506970193655cbe7ef5c Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:39:22 -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 --- akode_artsplugin/akodePlayObject_impl.cpp | 16 +++--- arts/builder/execdlg.cpp | 2 +- arts/builder/main.h | 2 +- arts/builder/mwidget.h | 4 +- arts/builder/propertypanel.h | 2 +- arts/builder/qttableview.h | 6 +-- arts/gui/kde/kartswidget.h | 4 +- arts/gui/kde/kbutton_impl.h | 2 +- arts/gui/kde/kcombobox_impl.h | 2 +- arts/gui/kde/kfader.h | 4 +- arts/gui/kde/kfader_impl.h | 2 +- arts/gui/kde/kframe_impl.h | 2 +- arts/gui/kde/kgraph.h | 2 +- arts/gui/kde/kgraph_impl.h | 2 +- arts/gui/kde/khbox_impl.h | 2 +- arts/gui/kde/klabel_impl.cpp | 2 +- arts/gui/kde/klabel_impl.h | 4 +- arts/gui/kde/klayoutbox_impl.cpp | 2 +- arts/gui/kde/klayoutbox_impl.h | 6 +-- arts/gui/kde/klevelmeter_firebars.cpp | 2 +- arts/gui/kde/klevelmeter_firebars.h | 2 +- arts/gui/kde/klevelmeter_impl.cpp | 6 +-- arts/gui/kde/klevelmeter_impl.h | 2 +- arts/gui/kde/klevelmeter_linebars.h | 2 +- arts/gui/kde/klevelmeter_normalbars.h | 4 +- arts/gui/kde/klevelmeter_private.h | 2 +- arts/gui/kde/klevelmeter_small.h | 2 +- arts/gui/kde/klineedit_impl.h | 2 +- arts/gui/kde/kpoti.h | 4 +- arts/gui/kde/kpoti_impl.h | 2 +- arts/gui/kde/kspinbox_impl.h | 2 +- arts/gui/kde/ktickmarks_impl.cpp | 2 +- arts/gui/kde/ktickmarks_impl.h | 4 +- arts/gui/kde/kvbox_impl.h | 2 +- arts/gui/kde/kvolumefader_impl.cpp | 4 +- arts/gui/kde/kvolumefader_impl.h | 4 +- arts/gui/kde/kwidget_impl.h | 2 +- arts/gui/kde/tdepopupbox_impl.cpp | 2 +- arts/gui/kde/tdepopupbox_impl.h | 2 +- arts/gui/kde/tdepopupbox_private.h | 10 ++-- .../effects/kstereovolumecontrolgui_impl.cpp | 2 +- .../modules/effects/kstereovolumecontrolgui_impl.h | 4 +- .../effects/synth_stereo_fir_equalizer_impl.cpp | 2 +- arts/modules/synth/objectcache_impl.cpp | 2 +- arts/modules/synth/synth_capture_wav_impl.cpp | 2 +- arts/modules/synth/synth_midi_test_impl.cpp | 2 +- arts/modules/synth/synth_osc_impl.cpp | 24 ++++----- arts/modules/synth/synth_play_pat_impl.cpp | 12 ++--- arts/modules/synth/synth_sequence_freq_impl.cpp | 4 +- arts/modules/synth/synth_sequence_impl.cpp | 4 +- arts/tools/artsactions.cpp | 20 +++---- arts/tools/artsactions.h | 2 +- arts/tools/artscontrolapplet.cpp | 4 +- arts/tools/artscontrolapplet.h | 2 +- arts/tools/artscontrolapplet_private.h | 10 ++-- arts/tools/audiomanager.cpp | 8 +-- arts/tools/audiomanager.h | 2 +- arts/tools/choosebusdlg.cpp | 2 +- arts/tools/environmentview.cpp | 4 +- arts/tools/environmentview.h | 2 +- arts/tools/fftscopeview.cpp | 12 ++--- arts/tools/fftscopeview.h | 2 +- arts/tools/main.cpp | 4 +- arts/tools/mediatypesview.h | 2 +- arts/tools/midimanagerview.cpp | 4 +- arts/tools/statusview.h | 2 +- arts/tools/templateview.h | 2 +- audiofile_artsplugin/audiofilePlayObjectI.cpp | 4 +- juk/advancedsearchdialog.h | 4 +- juk/artsplayer.cpp | 2 +- juk/cache.cpp | 2 +- juk/collectionlist.cpp | 2 +- juk/coverdialog.cpp | 2 +- juk/covermanager.cpp | 2 +- juk/deletedialog.h | 2 +- juk/directorylist.h | 2 +- juk/dynamicplaylist.h | 2 +- juk/filerenamer.cpp | 6 +-- juk/historyplaylist.cpp | 2 +- juk/historyplaylist.h | 2 +- juk/juk.cpp | 8 +-- juk/juk.h | 2 +- juk/k3bexporter.cpp | 2 +- juk/k3bexporter.h | 4 +- juk/keydialog.h | 4 +- juk/mediafiles.h | 6 +-- juk/nowplaying.h | 4 +- juk/playermanager.cpp | 4 +- juk/playlist.cpp | 10 ++-- juk/playlist.h | 14 ++--- juk/playlistbox.cpp | 8 +-- juk/playlistbox.h | 8 +-- juk/playlistcollection.cpp | 8 +-- juk/playlistexporter.h | 2 +- juk/playlistinterface.h | 2 +- juk/playlistitem.cpp | 2 +- juk/playlistitem.h | 2 +- juk/playlistsplitter.cpp | 2 +- juk/playlistsplitter.h | 2 +- juk/searchwidget.cpp | 2 +- juk/searchwidget.h | 4 +- juk/slideraction.cpp | 8 +-- juk/sortedstringlist.cpp | 2 +- juk/splashscreen.cpp | 4 +- juk/statuslabel.h | 2 +- juk/stringhash.h | 6 +-- juk/stringshare.cpp | 2 +- juk/systemtray.cpp | 8 +-- juk/systemtray.h | 4 +- juk/tag.cpp | 2 +- juk/tageditor.cpp | 12 ++--- juk/tageditor.h | 4 +- juk/tagguesserconfigdlg.cpp | 8 +-- juk/tagguesserconfigdlg.h | 2 +- juk/tagtransactionmanager.cpp | 6 +-- juk/tagtransactionmanager.h | 2 +- juk/trackpickerdialog.h | 2 +- juk/tracksequenceiterator.cpp | 2 +- juk/tracksequenceiterator.h | 2 +- juk/tracksequencemanager.cpp | 4 +- juk/upcomingplaylist.cpp | 2 +- juk/upcomingplaylist.h | 2 +- juk/webimagefetcherdialog.h | 2 +- kaboodle/conf.h | 2 +- kaboodle/controls.h | 6 +-- kaboodle/engine.h | 2 +- kaboodle/kaboodle_factory.h | 2 +- kaudiocreator/encodefileimp.h | 2 +- kaudiocreator/encoder.cpp | 12 ++--- kaudiocreator/encoder.h | 2 +- kaudiocreator/encoderconfigimp.cpp | 6 +-- kaudiocreator/encoderconfigimp.h | 2 +- kaudiocreator/jobqueimp.h | 4 +- kaudiocreator/kaudiocreator.cpp | 10 ++-- kaudiocreator/kaudiocreator.h | 2 +- kaudiocreator/main.cpp | 6 +-- kaudiocreator/ripper.cpp | 4 +- kaudiocreator/ripper.h | 2 +- kaudiocreator/tracksimp.cpp | 4 +- kaudiocreator/tracksimp.h | 4 +- kmix/KMixApp.cpp | 2 +- kmix/dialogselectmaster.cpp | 14 ++--- kmix/dialogviewconfiguration.cpp | 4 +- kmix/kledbutton.h | 4 +- kmix/kmixapplet.h | 4 +- kmix/kmixdockwidget.h | 2 +- kmix/kmixerwidget.cpp | 4 +- kmix/kmixerwidget.h | 4 +- kmix/kmixtoolbox.cpp | 12 ++--- kmix/ksmallslider.h | 6 +-- kmix/mdwenum.cpp | 4 +- kmix/mdwenum.h | 2 +- kmix/mdwslider.cpp | 30 +++++------ kmix/mdwslider.h | 2 +- kmix/mdwswitch.cpp | 10 ++-- kmix/mdwswitch.h | 2 +- kmix/mixdevicewidget.cpp | 2 +- kmix/mixdevicewidget.h | 2 +- kmix/mixer.cpp | 44 +++++++-------- kmix/mixer_alsa9.cpp | 32 +++++------ kmix/mixer_backend.cpp | 6 +-- kmix/mixertoolbox.cpp | 8 +-- kmix/mixset.cpp | 6 +-- kmix/viewsliders.cpp | 6 +-- kmix/viewsurround.cpp | 18 +++---- krec/krecconfig_files.cpp | 4 +- krec/krecconfig_files.h | 2 +- krec/krecconfig_fileswidget.h | 2 +- krec/krecconfigure.cpp | 12 ++--- krec/krecconfigure.h | 2 +- krec/krecexport_template.h | 2 +- krec/krecexport_wave.cpp | 8 +-- krec/krecexport_wave.h | 2 +- krec/krecfile.cpp | 4 +- krec/krecfile.h | 10 ++-- krec/krecfileview.cpp | 4 +- krec/krecfileview.h | 2 +- krec/krecfileviewhelpers.cpp | 2 +- krec/krecfileviewhelpers.h | 10 ++-- krec/krecfilewidgets.cpp | 10 ++-- krec/krecfilewidgets.h | 6 +-- krec/krecglobal.h | 2 +- krec/krecnewproperties.h | 2 +- krec/krecord.cpp | 20 +++---- krec/krecord.h | 2 +- krec/krecord_private.h | 4 +- krec/mp3_export/krecexport_mp3.cpp | 2 +- krec/ogg_export/krecexport_ogg.cpp | 2 +- kscd/bwlednum.h | 2 +- kscd/cddbdlg.h | 2 +- kscd/configWidget.h | 2 +- kscd/docking.h | 2 +- kscd/kscd.h | 2 +- kscd/kscdmagic/xlibwrap.cpp | 2 +- kscd/ledlamp.h | 2 +- libkcddb/kcmcddb/cddbconfigwidget.h | 2 +- mpeglib_artsplug/mpeglibartsplay.cpp | 4 +- noatun/app/main.cpp | 4 +- noatun/library/app.cpp | 12 ++--- noatun/library/cmodule.h | 2 +- noatun/library/downloader.cpp | 20 +++---- noatun/library/effects.cpp | 14 ++--- noatun/library/effectview.cpp | 14 ++--- noatun/library/engine.cpp | 22 ++++---- noatun/library/equalizer.cpp | 8 +-- noatun/library/equalizerview.cpp | 8 +-- noatun/library/equalizerview.h | 2 +- noatun/library/ksaver.cpp | 14 ++--- noatun/library/noatun/controls.h | 6 +-- noatun/library/noatun/downloader.h | 2 +- noatun/library/noatun/engine.h | 2 +- noatun/library/noatun/player.h | 2 +- noatun/library/noatun/playlist.h | 6 +-- noatun/library/noatun/plugin.h | 8 +-- noatun/library/noatun/pref.h | 2 +- noatun/library/noatun/scrollinglabel.h | 2 +- noatun/library/noatun/stdaction.h | 20 +++---- noatun/library/noatun/stereobuttonaction.h | 12 ++--- noatun/library/noatun/video.h | 4 +- noatun/library/noatunarts/Equalizer_impl.cpp | 2 +- noatun/library/noatunarts/FFTScopes.cpp | 6 +-- .../library/noatunarts/StereoEffectStack_impl.cpp | 4 +- noatun/library/noatunstdaction.cpp | 4 +- noatun/library/noatuntags/tags.cpp | 4 +- noatun/library/player.cpp | 4 +- noatun/library/playlistsaver.cpp | 10 ++-- noatun/library/plugin.cpp | 10 ++-- noatun/library/pluginloader.cpp | 8 +-- noatun/library/pluginmodule.cpp | 12 ++--- noatun/library/pluginmodule.h | 8 +-- noatun/library/pref.cpp | 6 +-- noatun/library/titleproxy.cpp | 4 +- noatun/library/vequalizer.cpp | 12 ++--- noatun/library/video.cpp | 10 ++-- noatun/modules/excellent/userinterface.cpp | 6 +-- noatun/modules/htmlexport/htmlexport.cpp | 6 +-- noatun/modules/infrared/irprefs.cpp | 2 +- noatun/modules/infrared/lirc.cpp | 6 +-- noatun/modules/kaiman/style.cpp | 22 ++++---- noatun/modules/kaiman/style.h | 22 ++++---- noatun/modules/kaiman/userinterface.cpp | 52 +++++++++--------- noatun/modules/keyz/keyz.cpp | 6 +-- noatun/modules/kjofol-skin/kjbutton.cpp | 4 +- noatun/modules/kjofol-skin/kjequalizer.cpp | 2 +- noatun/modules/kjofol-skin/kjfont.cpp | 4 +- noatun/modules/kjofol-skin/kjloader.cpp | 44 +++++++-------- noatun/modules/kjofol-skin/kjseeker.cpp | 2 +- noatun/modules/kjofol-skin/kjsliders.cpp | 6 +-- noatun/modules/kjofol-skin/kjtextdisplay.cpp | 10 ++-- noatun/modules/kjofol-skin/kjvis.cpp | 6 +-- noatun/modules/kjofol-skin/kjwidget.h | 2 +- noatun/modules/kjofol-skin/parser.h | 2 +- noatun/modules/marquis/marquis.cpp | 4 +- noatun/modules/metatag/edit.cpp | 10 ++-- noatun/modules/monoscope/monoscope.cpp | 10 ++-- noatun/modules/net/net.cpp | 4 +- noatun/modules/noatunui/userinterface.cpp | 6 +-- noatun/modules/noatunui/userinterface.h | 2 +- noatun/modules/simple/userinterface.cpp | 2 +- noatun/modules/splitplaylist/find.cpp | 2 +- noatun/modules/splitplaylist/playlist.cpp | 14 ++--- noatun/modules/splitplaylist/view.cpp | 46 ++++++++-------- noatun/modules/splitplaylist/view.h | 10 ++-- noatun/modules/systray/kitsystemtray.h | 2 +- noatun/modules/systray/systray.cpp | 22 ++++---- noatun/modules/voiceprint/voiceprint.cpp | 6 +-- noatun/modules/winskin/waRegion.cpp | 8 +-- noatun/modules/winskin/waSkin.cpp | 4 +- noatun/modules/winskin/waSkinModel.cpp | 2 +- noatun/modules/winskin/winSkinConfig.cpp | 2 +- tdefile-plugins/flac/tdefile_flac.cpp | 6 +-- tdefile-plugins/mpc/tdefile_mpc.cpp | 4 +- tdefile-plugins/ogg/tdefile_ogg.cpp | 4 +- tdefile-plugins/theora/tdefile_theora.cpp | 2 +- tdeioslave/audiocd/audiocd.cpp | 14 ++--- tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h | 2 +- tdeioslave/audiocd/plugins/flac/encoderflac.cpp | 6 +-- .../audiocd/plugins/lame/collectingprocess.cpp | 2 +- .../audiocd/plugins/lame/collectingprocess.h | 2 +- tdemid/channelview.cpp | 2 +- tdemid/ktrianglebutton.cpp | 4 +- tdemid/ktrianglebutton.h | 2 +- tdemid/main.cpp | 2 +- tdemid/midicfgdlg.cpp | 2 +- tdemid/tdemid_part.cpp | 6 +-- tdemid/tdemid_part.h | 2 +- tdemid/tdemidclient.cpp | 20 +++---- tdemid/tdemidclient.h | 2 +- tdemid/tdemidframe.cpp | 6 +-- tdemid/tdemidframe.h | 2 +- xine_artsplugin/tools/thumbnail/videocreator.cpp | 4 +- xine_artsplugin/xinePlayObject_impl.cpp | 62 +++++++++++----------- 292 files changed, 871 insertions(+), 871 deletions(-) diff --git a/akode_artsplugin/akodePlayObject_impl.cpp b/akode_artsplugin/akodePlayObject_impl.cpp index bc3c336f..ff38a81b 100644 --- a/akode_artsplugin/akodePlayObject_impl.cpp +++ b/akode_artsplugin/akodePlayObject_impl.cpp @@ -114,7 +114,7 @@ bool akodePlayObject_impl::loadMedia(const string &filename) source = new LocalFile(filename.c_str()); if (!source->openRO()) { delete source; - source = 0; + source = nullptr; return false; } } @@ -131,7 +131,7 @@ bool akodePlayObject_impl::loadSource() if (!frameDecoder) { delete source; - source = 0; + source = nullptr; arts_warning("akode: Could not open frame-decoder"); return false; } @@ -219,25 +219,25 @@ void akodePlayObject_impl::unload() bufferedDecoder->stop(); bufferedDecoder->closeDecoder(); delete bufferedDecoder; - bufferedDecoder = 0; + bufferedDecoder = nullptr; } #endif delete frameDecoder; - frameDecoder = 0; + frameDecoder = nullptr; decoder = 0; if (buffer != inBuffer) delete inBuffer; delete buffer; - inBuffer = buffer = 0; + inBuffer = buffer = nullptr; buf_pos = 0; delete resampler; - resampler = 0; + resampler = nullptr; delete source; - source = 0; + source = nullptr; #ifndef AKODEARTS_SINGLETHREADED delete m_bytebuffer; - m_bytebuffer = 0; + m_bytebuffer = nullptr; #endif } diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index 9b673f38..cc10bc1d 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -186,7 +186,7 @@ void ExecDlg::saveSession() { chdir(DirManager::sessionDir()); - TQString filename = KFileDialog::getSaveFileName(0,"*.arts-session",this); + TQString filename = KFileDialog::getSaveFileName(nullptr,"*.arts-session",this); if(!filename.isEmpty()) { arts_debug("save... %s",filename.local8Bit().data()); diff --git a/arts/builder/main.h b/arts/builder/main.h index 5fd9b8bf..dc658b66 100644 --- a/arts/builder/main.h +++ b/arts/builder/main.h @@ -69,7 +69,7 @@ public: void clear(); void checkName(); - TQString getOpenFilename(const char *pattern, const char *initialDir = 0); + TQString getOpenFilename(const char *pattern, const char *initialDir = nullptr); bool isModified(); bool promptToSave(); bool queryClose(); diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h index 11fe76c0..9350d334 100644 --- a/arts/builder/mwidget.h +++ b/arts/builder/mwidget.h @@ -109,8 +109,8 @@ public: TQPoint componentPos(const StructureComponent *component) const; TQPoint portPos(const ModulePort *port) const; - ModuleWidget( Structure *structure, TQWidget *parent = 0, - const char *name = 0, WFlags f = 0); + ModuleWidget( Structure *structure, TQWidget *parent = nullptr, + const char *name = nullptr, WFlags f = 0); ~ModuleWidget(); diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h index af156fda..f82d5109 100644 --- a/arts/builder/propertypanel.h +++ b/arts/builder/propertypanel.h @@ -36,7 +36,7 @@ class PropertyPanel: public PropertyPanelBase public: - PropertyPanel( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PropertyPanel( TQWidget* parent = nullptr, const char* name = nullptr, WFlags fl = 0 ); public slots: void setSelectedComponent( StructureComponent *component ); diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h index 39f5d757..45da0721 100644 --- a/arts/builder/qttableview.h +++ b/arts/builder/qttableview.h @@ -37,7 +37,7 @@ public: void repaint( const TQRect &, bool erase=true ); protected: - QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + QtTableView( TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0 ); ~QtTableView(); int numRows() const; @@ -132,9 +132,9 @@ private: virtual void setHorScrollBar( bool on, bool update = true ); virtual void setVerScrollBar( bool on, bool update = true ); void updateView(); - int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0, + int findRawRow( int yPos, int *cellMaxY, int *cellMinY = nullptr, bool goOutsideView = false ) const; - int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0, + int findRawCol( int xPos, int *cellMaxX, int *cellMinX = nullptr, bool goOutsideView = false ) const; int maxColsVisible() const; diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index 43cb0b95..f09fce6a 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -69,9 +69,9 @@ public: * * BCI: should replace the above in the next major release. ( akrille ) */ - KArtsWidget( Arts::Widget, TQWidget* =0, const char* =0, WFlags =0 ); + KArtsWidget( Arts::Widget, TQWidget* =nullptr, const char* =nullptr, WFlags =0 ); // same without the content - KArtsWidget( TQWidget* =0, const char* =0, WFlags =0 ); + KArtsWidget( TQWidget* =nullptr, const char* =nullptr, WFlags =0 ); /** * destructor diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h index 22c4cf81..0b28fcbf 100644 --- a/arts/gui/kde/kbutton_impl.h +++ b/arts/gui/kde/kbutton_impl.h @@ -54,7 +54,7 @@ protected: TQPushButton * _qpushbutton; public: - KButton_impl( TQPushButton * w = 0 ); + KButton_impl( TQPushButton * w = nullptr ); void constructor( Widget parent ); void constructor( const std::string &, Widget ); diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h index e1b533ad..5d40e399 100644 --- a/arts/gui/kde/kcombobox_impl.h +++ b/arts/gui/kde/kcombobox_impl.h @@ -56,7 +56,7 @@ protected: void applyValue(); public: - KComboBox_impl( KComboBox * w = 0 ); + KComboBox_impl( KComboBox * w = nullptr ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h index 84e4d371..a6835e93 100644 --- a/arts/gui/kde/kfader.h +++ b/arts/gui/kde/kfader.h @@ -32,8 +32,8 @@ class KFader : public TQSlider protected: void init(); public: - KFader( TQWidget * parent = 0, const char * name = 0 ); - KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = 0, const char * name = 0 ); + KFader( TQWidget * parent = nullptr, const char * name = nullptr ); + KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent = nullptr, const char * name = nullptr ); virtual ~KFader(); diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h index 5dd03f2a..c553e619 100644 --- a/arts/gui/kde/kfader_impl.h +++ b/arts/gui/kde/kfader_impl.h @@ -62,7 +62,7 @@ protected: void applyValue(); public: - KFader_impl( KFader * w = 0 ); + KFader_impl( KFader * w = nullptr ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h index a55d8271..2738fe9c 100644 --- a/arts/gui/kde/kframe_impl.h +++ b/arts/gui/kde/kframe_impl.h @@ -33,7 +33,7 @@ class TDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel, TQFrame * _qframe; public: - KFrame_impl( TQFrame * widget = 0 ); + KFrame_impl( TQFrame * widget = nullptr ); inline void constructor( Widget p ) { parent( p ); } long margin(); diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h index 6da8247e..62448849 100644 --- a/arts/gui/kde/kgraph.h +++ b/arts/gui/kde/kgraph.h @@ -47,7 +47,7 @@ protected: inline GraphPoint q2gPoint(const TQPoint &qp); inline TQPoint g2qPoint(const GraphPoint &gp); public: - KGraph( TQWidget * parent = 0, const char * name = 0 ); + KGraph( TQWidget * parent = nullptr, const char * name = nullptr ); virtual ~KGraph(); void addLine(Arts::KGraphLine_impl *line); diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h index 61ca3f2b..1e200262 100644 --- a/arts/gui/kde/kgraph_impl.h +++ b/arts/gui/kde/kgraph_impl.h @@ -43,7 +43,7 @@ protected: KGraph * _kgraph; public: - KGraph_impl( KGraph * w = 0 ); + KGraph_impl( KGraph * w = nullptr ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/khbox_impl.h b/arts/gui/kde/khbox_impl.h index df35bf36..24a18f28 100644 --- a/arts/gui/kde/khbox_impl.h +++ b/arts/gui/kde/khbox_impl.h @@ -37,7 +37,7 @@ protected: TQHBox * _qhbox; public: - KHBox_impl( TQHBox * w = 0 ); + KHBox_impl( TQHBox * w = nullptr ); long spacing(); void spacing( long ); diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp index 045feb59..13f05614 100644 --- a/arts/gui/kde/klabel_impl.cpp +++ b/arts/gui/kde/klabel_impl.cpp @@ -27,7 +27,7 @@ using namespace Arts; using namespace std; -KLabel_impl::KLabel_impl( TQFrame *widget ) : KFrame_impl( widget ? widget : new RotateLabel( 0 ) ) { +KLabel_impl::KLabel_impl( TQFrame *widget ) : KFrame_impl( widget ? widget : new RotateLabel( nullptr ) ) { _label = static_cast( _qwidget ); } diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h index 1b1c0a73..ab55eed9 100644 --- a/arts/gui/kde/klabel_impl.h +++ b/arts/gui/kde/klabel_impl.h @@ -41,7 +41,7 @@ class TDE_EXPORT KLabel_impl : virtual public Arts::Label_skel, protected: RotateLabel* _label; public: - KLabel_impl( TQFrame* w=0 ); + KLabel_impl( TQFrame* w=nullptr ); void constructor( Widget p ) { parent( p ); } std::string text(); @@ -67,7 +67,7 @@ class RotateLabel : public TQFrame { TQ_OBJECT public: - RotateLabel( TQWidget*, const char* =0 ); + RotateLabel( TQWidget*, const char* =nullptr ); void paintEvent( TQPaintEvent* ); void fontfamily( TQString ); diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 84a4e202..ef6c94b2 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -31,7 +31,7 @@ using namespace Arts; using namespace std; -KLayoutBox_impl::KLayoutBox_impl( TQFrame *widget ) : KFrame_impl( widget ? widget :new TQFrame( 0 ) ) +KLayoutBox_impl::KLayoutBox_impl( TQFrame *widget ) : KFrame_impl( widget ? widget :new TQFrame( nullptr ) ) { _qframe = static_cast( _qwidget ); _layout = new TQBoxLayout( _qframe, TQBoxLayout::LeftToRight ); diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index c42fd146..8f85d60c 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -41,7 +41,7 @@ protected: LayoutBox self() { return LayoutBox::_from_base( _copy() ); } public: - KLayoutBox_impl( TQFrame* w=0 ); + KLayoutBox_impl( TQFrame* w=nullptr ); ~KLayoutBox_impl(); Direction direction(); @@ -82,7 +82,7 @@ class TDE_EXPORT KLayoutBox_Separator : public TQWidget { TQ_OBJECT public: - KLayoutBox_Separator( TQWidget*, const char* =0 ); + KLayoutBox_Separator( TQWidget*, const char* =nullptr ); void resizeEvent( TQResizeEvent* ); void paintEvent( TQPaintEvent* ); TQSize minimumSizeHint() const; @@ -94,7 +94,7 @@ class KLayoutBox_Line : public TQWidget { private: int _width, _space; public: - KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); + KLayoutBox_Line( int, int, TQWidget*, const char* =nullptr ); void paintEvent( TQPaintEvent* ); TQSize minimumSizeHint() const; }; diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp index 658cabfa..59e0e603 100644 --- a/arts/gui/kde/klevelmeter_firebars.cpp +++ b/arts/gui/kde/klevelmeter_firebars.cpp @@ -62,7 +62,7 @@ kdDebug() << k_funcinfo << dir << endl; KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) { //kdDebug()<<"KLevelMeter_FireBars::KLevelMeter_FireBars( Arts::KLevelMeter_impl* "<setMinimumSize( 5, 5 ); - _bar = new KLevelMeter_FireBars_private( this, 0 ); + _bar = new KLevelMeter_FireBars_private( this, nullptr ); _peakwidget = new TQWidget( this ); _peakwidget->resize( size() ); _peakwidget->setPaletteBackgroundColor( color( 1 ) ); diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h index 04ecc3dc..cc2f0323 100644 --- a/arts/gui/kde/klevelmeter_firebars.h +++ b/arts/gui/kde/klevelmeter_firebars.h @@ -43,7 +43,7 @@ class KLevelMeter_FireBars : public KLevelMeter_Template { TQ_OBJECT public: - KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =nullptr, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp index 26ddd3b6..ae9f7af9 100644 --- a/arts/gui/kde/klevelmeter_impl.cpp +++ b/arts/gui/kde/klevelmeter_impl.cpp @@ -45,7 +45,7 @@ KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame : TQObject( parent, name ) , _impl( impl ) , _frame( frame ) - , _levelmeter( 0 ) + , _levelmeter( nullptr ) , _style( defstyle ) , _substyle( 0 ) , _count( 20 ) @@ -57,7 +57,7 @@ KLevelMeter_Private::KLevelMeter_Private( KLevelMeter_impl* impl, TQFrame* frame } void KLevelMeter_Private::createWidget() { - if ( _levelmeter != 0 ) { _levelmeter->hide(); delete _levelmeter; _levelmeter=0; } + if ( _levelmeter ) { _levelmeter->hide(); delete _levelmeter; _levelmeter=nullptr; } switch ( _style ) { case lmNormalBars: _levelmeter = new KLevelMeter_NormalBars( _impl, _frame, _substyle, _count, _direction, _dbmin, _dbmax ); @@ -78,7 +78,7 @@ void KLevelMeter_Private::createWidget() { _levelmeter->setMinimumSize( 10,10 ); } -KLevelMeter_impl::KLevelMeter_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new TQFrame( 0 ) ) { +KLevelMeter_impl::KLevelMeter_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new TQFrame( nullptr ) ) { //kdDebug()<<"KLevelMeter_impl::KLevelMeter_impl( TQFrame* "<createWidget(); diff --git a/arts/gui/kde/klevelmeter_impl.h b/arts/gui/kde/klevelmeter_impl.h index a3fe9d02..85733c62 100644 --- a/arts/gui/kde/klevelmeter_impl.h +++ b/arts/gui/kde/klevelmeter_impl.h @@ -37,7 +37,7 @@ class KLevelMeter_impl : virtual public Arts::LevelMeter_skel, private: KLevelMeter_Private *p; public: - KLevelMeter_impl( TQFrame* =0 ); + KLevelMeter_impl( TQFrame* =nullptr ); LevelMeterStyle style(); void style( LevelMeterStyle ); diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h index 3a7def62..3d0d31ea 100644 --- a/arts/gui/kde/klevelmeter_linebars.h +++ b/arts/gui/kde/klevelmeter_linebars.h @@ -27,7 +27,7 @@ class KLevelMeter_LineBars : public KLevelMeter_Template { TQ_OBJECT public: - KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =nullptr, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h index e0f1eebf..6ce2d7a4 100644 --- a/arts/gui/kde/klevelmeter_normalbars.h +++ b/arts/gui/kde/klevelmeter_normalbars.h @@ -32,14 +32,14 @@ class KLevelMeter_NormalBars : public KLevelMeter_Template { TQ_OBJECT public: - KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =nullptr, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); void count( long ); long count(); - void resizeEvent( TQResizeEvent* =0 ); + void resizeEvent( TQResizeEvent* =nullptr ); private: float _value, _peak; TQPtrList bars; diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h index b7662cd7..6a3fc593 100644 --- a/arts/gui/kde/klevelmeter_private.h +++ b/arts/gui/kde/klevelmeter_private.h @@ -47,7 +47,7 @@ public: float _peakvalue; float _dbmin, _dbmax; - KLevelMeter_Private( Arts::KLevelMeter_impl* impl, TQFrame* frame, Arts::LevelMeterStyle defstyle, TQObject* =0, const char* =0 ); + KLevelMeter_Private( Arts::KLevelMeter_impl* impl, TQFrame* frame, Arts::LevelMeterStyle defstyle, TQObject* =nullptr, const char* =nullptr ); void createWidget(); }; diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h index 2fa67e68..ec122258 100644 --- a/arts/gui/kde/klevelmeter_small.h +++ b/arts/gui/kde/klevelmeter_small.h @@ -27,7 +27,7 @@ class KLevelMeter_Small : public KLevelMeter_Template { TQ_OBJECT public: - KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); + KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =nullptr, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 ); void invalue( float, float =0 ); diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h index 7ce88794..12c9b1c1 100644 --- a/arts/gui/kde/klineedit_impl.h +++ b/arts/gui/kde/klineedit_impl.h @@ -37,7 +37,7 @@ protected: KLineEdit * _klineedit; public: - KLineEdit_impl( KLineEdit * w = 0 ); + KLineEdit_impl( KLineEdit * w = nullptr ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index ad7be8f1..c038e17b 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -34,9 +34,9 @@ class KPoti : public TQFrame, public TQRangeControl public: - KPoti( TQWidget *parent=0, const char *name=0 ); + KPoti( TQWidget *parent=nullptr, const char *name=nullptr ); KPoti( int minValue, int maxValue, int step, int value, - TQWidget *parent=0, const char *name=0 ); + TQWidget *parent=nullptr, const char *name=nullptr ); ~KPoti(); diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h index e7d1d75b..67d6befc 100644 --- a/arts/gui/kde/kpoti_impl.h +++ b/arts/gui/kde/kpoti_impl.h @@ -61,7 +61,7 @@ protected: void applyValue(); public: - KPoti_impl( KPoti * w = 0 ); + KPoti_impl( KPoti * w = nullptr ); std::string caption(); void caption(const std::string& newText); diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h index 1369393a..a1d9d9ee 100644 --- a/arts/gui/kde/kspinbox_impl.h +++ b/arts/gui/kde/kspinbox_impl.h @@ -54,7 +54,7 @@ protected: void applyValue(); public: - KSpinBox_impl( TQSpinBox * w = 0 ); + KSpinBox_impl( TQSpinBox * w = nullptr ); void constructor( Widget p ) { parent( p ); } std::string caption(); diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 6bee2d0a..479e1fe2 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -25,7 +25,7 @@ #include #include -KTickmarks_impl::KTickmarks_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new KTickmarks_Widget( 0 ) ) +KTickmarks_impl::KTickmarks_impl( TQFrame* w ) : Arts::KFrame_impl( w ? w : new KTickmarks_Widget( nullptr ) ) { //kdDebug()<<"KTickmarks_impl::KTickmarks_impl( TQFrame* w="<( _qwidget ); diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h index 498ad9f4..1c08e5d9 100644 --- a/arts/gui/kde/ktickmarks_impl.h +++ b/arts/gui/kde/ktickmarks_impl.h @@ -36,7 +36,7 @@ class KTickmarks_impl : virtual public Arts::Tickmarks_skel, virtual public Arts::KFrame_impl { public: - KTickmarks_impl( TQFrame* =0 ); + KTickmarks_impl( TQFrame* =nullptr ); float min(); void min( float ); @@ -65,7 +65,7 @@ class KTickmarks_Widget : public TQFrame, public dB2VolCalc { private: KTickmarks_impl* _impl; public: - KTickmarks_Widget( KTickmarks_impl*, TQWidget* =0, const char* =0 ); + KTickmarks_Widget( KTickmarks_impl*, TQWidget* =nullptr, const char* =nullptr ); void drawContents( TQPainter* ); long _pos; Arts::Direction _dir; diff --git a/arts/gui/kde/kvbox_impl.h b/arts/gui/kde/kvbox_impl.h index 916979cf..ea9a9009 100644 --- a/arts/gui/kde/kvbox_impl.h +++ b/arts/gui/kde/kvbox_impl.h @@ -37,7 +37,7 @@ protected: TQVBox * _qvbox; public: - KVBox_impl( TQVBox * w = 0 ); + KVBox_impl( TQVBox * w = nullptr ); long spacing(); void spacing( long ); diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index 4236e0cd..8db72ed8 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -32,7 +32,7 @@ #include KVolumeFader_impl::KVolumeFader_impl( TQFrame* w ) - : Arts::KFrame_impl( w ? w : new KVolumeFader_Widget( 0 ) ) + : Arts::KFrame_impl( w ? w : new KVolumeFader_Widget( nullptr ) ) , dB2VolCalc( -36, 6 ) , _dir( Arts::BottomToTop ) , dbmin_inupdate( false ) @@ -116,7 +116,7 @@ void KVolumeFader_impl::constructor( float dbmin, float dbmax, Arts::Direction d KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n ) : TQFrame( p,n ) - , _impl( 0 ) + , _impl( nullptr ) , _inupdate( false ) , _value( -1 ) , _dir( Arts::BottomToTop ) diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h index 0604497f..3dc794c4 100644 --- a/arts/gui/kde/kvolumefader_impl.h +++ b/arts/gui/kde/kvolumefader_impl.h @@ -37,7 +37,7 @@ class KVolumeFader_impl : virtual public Arts::VolumeFader_skel, public dB2VolCalc { public: - KVolumeFader_impl( TQFrame* =0 ); + KVolumeFader_impl( TQFrame* =nullptr ); ~KVolumeFader_impl(); float dbmin(); @@ -79,7 +79,7 @@ private: TDEAction *_aExactValue; TQColor interpolate( TQColor, TQColor, float ); public: - KVolumeFader_Widget( TQWidget* =0, const char* =0 ); + KVolumeFader_Widget( TQWidget* =nullptr, const char* =nullptr ); ~KVolumeFader_Widget(); void setImpl( KVolumeFader_impl* ); void setValue( float ); diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h index 430e8c97..f0ba3d45 100644 --- a/arts/gui/kde/kwidget_impl.h +++ b/arts/gui/kde/kwidget_impl.h @@ -38,7 +38,7 @@ protected: long _parentID; long _widgetID; public: - KWidget_impl( TQWidget * w = 0 ); + KWidget_impl( TQWidget * w = nullptr ); ~KWidget_impl(); diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp index 150cccb7..2f28b191 100644 --- a/arts/gui/kde/tdepopupbox_impl.cpp +++ b/arts/gui/kde/tdepopupbox_impl.cpp @@ -114,7 +114,7 @@ void TDEPopupBox_widget::hide( bool n ) { void TDEPopupBox_widget::own( bool n ) { if ( n ) - _artswidget->reparent( 0, _artswidget->mapToGlobal( _artswidget->pos() ), !( _artswidget->isHidden() ) ); + _artswidget->reparent( nullptr, _artswidget->mapToGlobal( _artswidget->pos() ), !( _artswidget->isHidden() ) ); else { _artswidget->reparent( this, TQPoint( 0,0 ), !( _artswidget->isHidden() ) ); diff --git a/arts/gui/kde/tdepopupbox_impl.h b/arts/gui/kde/tdepopupbox_impl.h index 9dc37949..497a5eba 100644 --- a/arts/gui/kde/tdepopupbox_impl.h +++ b/arts/gui/kde/tdepopupbox_impl.h @@ -39,7 +39,7 @@ public: /// selfreference like 'this' PopupBox self() { return PopupBox::_from_base( _copy() ); } /// Constructor - TDEPopupBox_impl( TDEPopupBox_widget *w=0 ); + TDEPopupBox_impl( TDEPopupBox_widget *w=nullptr ); ~TDEPopupBox_impl(); /// The name of the widget diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h index 21fc3034..b908f0a4 100644 --- a/arts/gui/kde/tdepopupbox_private.h +++ b/arts/gui/kde/tdepopupbox_private.h @@ -37,7 +37,7 @@ class TDEPopupBox_widget : public TQFrame TQ_OBJECT public: - TDEPopupBox_widget( TQWidget* =0, const char* =0); + TDEPopupBox_widget( TQWidget* =nullptr, const char* =nullptr); ~TDEPopupBox_widget(); Arts::Direction direction(); @@ -83,7 +83,7 @@ class HandleDrag : public TQWidget { TQ_OBJECT public: - HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {} + HandleDrag( TQWidget *parent, const char* name=nullptr ) : TQWidget( parent,name ) {} void paintEvent( TQPaintEvent * ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; @@ -116,7 +116,7 @@ private: TQBoxLayout::Direction _dir; TQPixmap _pmleft, _pmright, _pmup, _pmdown; public: - ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) + ShowButton( TQWidget *parent, const char* name=nullptr ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight ) { connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( owntoggle( bool ) ) ); setToggleButton( true ); @@ -172,7 +172,7 @@ class OwnButton : public TQPushButton { private: TQPixmap _pmown, _pminside; public: - OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ) + OwnButton( TQWidget *parent, const char* name=nullptr ) : TQPushButton( parent,name ) { connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggle( bool ) ) ); setToggleButton( true ); @@ -210,7 +210,7 @@ class OwnWidget : public KArtsWidget ShowButton *_b; public: - OwnWidget( ShowButton* b, TQWidget* p, const char* n=0, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } + OwnWidget( ShowButton* b, TQWidget* p, const char* n=nullptr, WFlags f=0 ) : KArtsWidget( p,n,f ) { _b = b; } ~OwnWidget() {} public slots: void closeEvent( TQCloseEvent * ) { _b->toggle(); } diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp index d7f8d30b..200c1201 100644 --- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp +++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp @@ -27,7 +27,7 @@ using namespace Arts; -KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) ) +KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( nullptr ) ) { //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<& points) float *filter_re = (float*) malloc(fft_size * sizeof(float)); float *filter_im = (float*) malloc(fft_size * sizeof(float)); - arts_fft_float (fft_size, 1, re, 0, filter_re, filter_im); + arts_fft_float (fft_size, 1, re, nullptr, filter_re, filter_im); for(int i=0;i *l = objects[name]; - if(l == 0) objects[name] = l = new list; + if(!l) objects[name] = l = new list; l->push_back(obj); } diff --git a/arts/modules/synth/synth_capture_wav_impl.cpp b/arts/modules/synth/synth_capture_wav_impl.cpp index 84e91648..86d53533 100644 --- a/arts/modules/synth/synth_capture_wav_impl.cpp +++ b/arts/modules/synth/synth_capture_wav_impl.cpp @@ -114,7 +114,7 @@ void Synth_CAPTURE_WAV_impl::streamInit() write(audiofd,&datalen,4); maxsamples = 0; - outblock = 0; + outblock = nullptr; v = 0; running = true; } diff --git a/arts/modules/synth/synth_midi_test_impl.cpp b/arts/modules/synth/synth_midi_test_impl.cpp index 91714cac..8d4c136e 100644 --- a/arts/modules/synth/synth_midi_test_impl.cpp +++ b/arts/modules/synth/synth_midi_test_impl.cpp @@ -590,7 +590,7 @@ void Synth_MIDI_TEST_impl::noteOn(mcopbyte channel, mcopbyte note, arts_info("Synth_MIDI_TEST: duplicate noteOn (mixed channels?)"); } - vector *params = 0; + vector *params = nullptr; if(useMap) { mcopbyte program = channelData[channel].program; diff --git a/arts/modules/synth/synth_osc_impl.cpp b/arts/modules/synth/synth_osc_impl.cpp index 214c2a16..6e81d804 100644 --- a/arts/modules/synth/synth_osc_impl.cpp +++ b/arts/modules/synth/synth_osc_impl.cpp @@ -77,7 +77,7 @@ public: memset(&cfg, 0, sizeof(GslOscConfig)); memset(&osc, 0, sizeof(GslOscData)); - cfg.table = 0; + cfg.table = nullptr; cfg.exponential_fm = 0; cfg.fm_strength = 0; cfg.self_fm_strength = 0; @@ -102,17 +102,17 @@ public: updateConnected(); arts_debug("gop tab%p samples%ld f%p m%p is%p ov%p os%p\n", - cfg.table, samples, infrequency_connected?infrequency:0, - modulation_connected?modulation:0, - insync_connected?insync:0, - outvalue_connected?outvalue:0, - outsync_connected?outsync:0); - - gsl_osc_process(&osc, samples, infrequency_connected?infrequency:0, - modulation_connected?modulation:0, - insync_connected?insync:0, - outvalue_connected?outvalue:0, - outsync_connected?outsync:0); + cfg.table, samples, infrequency_connected?infrequency:nullptr, + modulation_connected?modulation:nullptr, + insync_connected?insync:nullptr, + outvalue_connected?outvalue:nullptr, + outsync_connected?outsync:nullptr); + + gsl_osc_process(&osc, samples, infrequency_connected?infrequency:nullptr, + modulation_connected?modulation:nullptr, + insync_connected?insync:nullptr, + outvalue_connected?outvalue:nullptr, + outsync_connected?outsync:nullptr); } SynthOscWaveForm waveForm() { diff --git a/arts/modules/synth/synth_play_pat_impl.cpp b/arts/modules/synth/synth_play_pat_impl.cpp index 7c2699f7..5d76a4da 100644 --- a/arts/modules/synth/synth_play_pat_impl.cpp +++ b/arts/modules/synth/synth_play_pat_impl.cpp @@ -325,7 +325,7 @@ CachedPat *CachedPat::load(Cache *cache, const string& filename) if(!pat->initOk) // loading failed { pat->decRef(); - return 0; + return nullptr; } } @@ -402,8 +402,8 @@ protected: public: Synth_PLAY_PAT_impl() { - pat = 0; - selected = 0; + pat = nullptr; + selected = nullptr; } void unload() @@ -411,7 +411,7 @@ public: if(pat) { pat->decRef(); - pat = 0; + pat = nullptr; } } @@ -423,7 +423,7 @@ public: void streamStart() { fpos = 0.0; - selected = 0; + selected = nullptr; } void calculateBlock(unsigned long samples) @@ -507,7 +507,7 @@ public: void clearDList() { - selected = 0; + selected = nullptr; } diff --git a/arts/modules/synth/synth_sequence_freq_impl.cpp b/arts/modules/synth/synth_sequence_freq_impl.cpp index e3458d74..b53d2813 100644 --- a/arts/modules/synth/synth_sequence_freq_impl.cpp +++ b/arts/modules/synth/synth_sequence_freq_impl.cpp @@ -39,8 +39,8 @@ protected: public: Synth_SEQUENCE_FREQ_impl() : _speed( 1 ) - , fsequence( 0 ) - , slen( 0 ) + , fsequence( nullptr ) + , slen( nullptr ) { } diff --git a/arts/modules/synth/synth_sequence_impl.cpp b/arts/modules/synth/synth_sequence_impl.cpp index fb4f553a..b03a1ff5 100644 --- a/arts/modules/synth/synth_sequence_impl.cpp +++ b/arts/modules/synth/synth_sequence_impl.cpp @@ -47,8 +47,8 @@ protected: public: Synth_SEQUENCE_impl() : _speed( 1 ) - , fsequence( 0 ) - , slen( 0 ) + , fsequence( nullptr ) + , slen( nullptr ) { } diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 226c0bad..51a6e3f1 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -40,11 +40,11 @@ ArtsActions::ArtsActions( KArtsServer* server, TDEActionCollection* col, TQWidge : TQObject( parent,name ) , _kartsserver( server ) , _actioncollection( col ) - , _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 ) + , _a_sv( nullptr ), _a_am( nullptr ), _a_asv( nullptr ), _a_mmv( nullptr ), _a_ev( nullptr ), _a_mtv( nullptr ) // , _a_morebars( 0 ), _a_lessbars( 0 ) - , _a_style_normal( 0 ), _a_style_fire( 0 ), _a_style_line( 0 ), _a_style_led( 0 ), _a_style_analog( 0 ), _a_style_small( 0 ) - , _stylemenu( 0 ) - , _sv( 0 ), _am( 0 ), _asv( 0 ), _mmv( 0 ), _ev( 0 ), _mtv( 0 ) + , _a_style_normal( nullptr ), _a_style_fire( nullptr ), _a_style_line( nullptr ), _a_style_led( nullptr ), _a_style_analog( nullptr ), _a_style_small( nullptr ) + , _stylemenu( nullptr ) + , _sv( nullptr ), _am( nullptr ), _asv( nullptr ), _mmv( nullptr ), _ev( nullptr ), _mtv( nullptr ) { //kdDebug()<insertCatalogue( "artscontrol" ); @@ -139,7 +139,7 @@ void ArtsActions::viewScopeView() { connect( _sv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewScopeView() ) ); } else { delete _sv; - _sv = 0; + _sv = nullptr; } } void ArtsActions::viewAudioManager() { @@ -148,7 +148,7 @@ void ArtsActions::viewAudioManager() { connect( _am, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewAudioManager() ) ); } else { delete _am; - _am = 0; + _am = nullptr; } } void ArtsActions::viewArtsStatusView() { @@ -157,7 +157,7 @@ void ArtsActions::viewArtsStatusView() { connect( _asv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewArtsStatusView() ) ); } else { delete _asv; - _asv = 0; + _asv = nullptr; } } void ArtsActions::viewMidiManagerView() { @@ -166,7 +166,7 @@ void ArtsActions::viewMidiManagerView() { connect( _mmv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMidiManagerView() ) ); } else { delete _mmv; - _mmv = 0; + _mmv = nullptr; } } void ArtsActions::viewEnvironmentView() { @@ -175,7 +175,7 @@ void ArtsActions::viewEnvironmentView() { connect( _ev, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewEnvironmentView() ) ); } else { delete _ev; - _ev = 0; + _ev = nullptr; } } void ArtsActions::viewMediaTypesView() { @@ -184,7 +184,7 @@ void ArtsActions::viewMediaTypesView() { connect( _mtv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMediaTypesView() ) ); } else { delete _mtv; - _mtv = 0; + _mtv = nullptr; } } diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index f542fb9b..d602a5e8 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -51,7 +51,7 @@ public: @param qwidget the parent TQWidget @param name the name of the object */ - ArtsActions( KArtsServer* artsserver, TDEActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); + ArtsActions( KArtsServer* artsserver, TDEActionCollection* actioncollection, TQWidget* qwidget, const char* name=nullptr ); /** Destructor */ ~ArtsActions(); diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index 6b9b92fd..a5a92a65 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -45,7 +45,7 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int ksConfig = config(); p = new ArtsControlAppletPrivate( this ); - if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet.")); + if( !p->barts ) KMessageBox::information(nullptr, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet.")); setCustomMenu(p->menu); p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); @@ -143,7 +143,7 @@ kdDebug() << k_funcinfo << endl; layout->addWidget( svinline ); } else { delete svinline; - svinline = 0; + svinline = nullptr; } _parent->supdatelayout(); } diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h index 3e894870..8e6c6cb1 100644 --- a/arts/tools/artscontrolapplet.h +++ b/arts/tools/artscontrolapplet.h @@ -43,7 +43,7 @@ public: * @param name A TQt object name for your applet. **/ ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0, - TQWidget * = 0, const char * = 0); + TQWidget * = nullptr, const char * = nullptr); /** destructor */ ~ArtsControlApplet(); /** diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 05b6ee2d..372c7b0e 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -72,15 +72,15 @@ public: , barts( false ) , bInUpdate( false ) { - arts = new KArtsServer( 0 ); - dispatcher = new KArtsDispatcher( 0 ); + arts = new KArtsServer( nullptr ); + dispatcher = new KArtsDispatcher( nullptr ); if( ! arts->server().isNull() ) barts = true; if( barts ) volume = arts->server().outVolume(); - svinline=0; + svinline=nullptr; - _artsactions = new ArtsActions( arts, 0, parent ); + _artsactions = new ArtsActions( arts, nullptr, parent ); - menu = new TDEPopupMenu( 0 ); + menu = new TDEPopupMenu( nullptr ); _showSV = _artsactions->actionScopeView(); _showSV->plug( menu ); _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( SVinline() ), this ); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index 10f901ee..6ae30948 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -42,14 +42,14 @@ Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Tem this->setCaption( i18n( "Audio Manager" ) ); this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) ); //printf("constructor\n"); - ParentWidget = 0; - listview = 0; + ParentWidget = nullptr; + listview = nullptr; inDialog = false; proxy = new GuiAudioManagerProxy(this); AudioManager = Arts::Reference("global:Arts_AudioManager"); changes = AudioManager.changes()-1; - setParent(this,0); + setParent(this,nullptr); tick(); show(); @@ -146,7 +146,7 @@ void Gui_AUDIO_MANAGER::tick() void Gui_AUDIO_MANAGER::edit(TQListViewItem *item) { AudioManagerItem *ai = (AudioManagerItem *)item; - ChooseBusDlg *cd = new ChooseBusDlg(0); + ChooseBusDlg *cd = new ChooseBusDlg(nullptr); assert(cd); inDialog = true; diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index 1378e702..3c9eb516 100644 --- a/arts/tools/audiomanager.h +++ b/arts/tools/audiomanager.h @@ -48,7 +48,7 @@ protected: unsigned long changes; int x,y; public: - Gui_AUDIO_MANAGER( TQWidget* =0, const char* =0 ); + Gui_AUDIO_MANAGER( TQWidget* =nullptr, const char* =nullptr ); ~Gui_AUDIO_MANAGER(); void setParent(TQWidget *Parent,TQBoxLayout *layout); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index 19f3beb3..fd72a2af 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -150,7 +150,7 @@ TQString ChooseBusDlg::result() { return(listbox->text(listbox->currentItem())); } - return(0); + return(nullptr); } void ChooseBusDlg::help() diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index 1e223629..9e7ce613 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -47,13 +47,13 @@ public: Item item; KArtsWidget *widget; ItemView(TQListBox *listBox, Item item) - : TQListBoxText(listBox), item(item), widget(0) + : TQListBoxText(listBox), item(item), widget(nullptr) { } ~ItemView() { delete widget; - widget = 0; + widget = nullptr; printf("~ItemView()\n"); } TQString text() const { diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h index a0c2b578..cc82c301 100644 --- a/arts/tools/environmentview.h +++ b/arts/tools/environmentview.h @@ -40,7 +40,7 @@ protected: TQString defaultEnvFileName; public: - EnvironmentView( Arts::Environment::Container container, TQWidget* =0, const char* =0 ); + EnvironmentView( Arts::Environment::Container container, TQWidget* =nullptr, const char* =nullptr ); public slots: void view(TQListBoxItem *i); diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index 5d0a8672..245ae669 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -40,7 +40,7 @@ using namespace Arts; FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent ) : Template_ArtsView( parent ) , server( server ) - , scopeData( 0 ) + , scopeData( nullptr ) { kdDebug()<setCaption( i18n( "FFT Scope View" ) ); @@ -79,10 +79,10 @@ kdDebug()<start( 100 ); connect( updatetimer,TQ_SIGNAL( timeout() ),this,TQ_SLOT( updateScope() ) ); - _artsactions = new ArtsActions( 0, 0, this ); - _moreBars = ArtsActions::actionMoreBars( this, TQ_SLOT( moreBars() ), 0 ); - _lessBars = ArtsActions::actionLessBars( this, TQ_SLOT( lessBars() ), 0 ); - _menu = new TDEPopupMenu( 0 ); + _artsactions = new ArtsActions( nullptr, nullptr, this ); + _moreBars = ArtsActions::actionMoreBars( this, TQ_SLOT( moreBars() ), nullptr ); + _lessBars = ArtsActions::actionLessBars( this, TQ_SLOT( lessBars() ), nullptr ); + _menu = new TDEPopupMenu( nullptr ); _moreBars->plug( _menu ); _lessBars->plug( _menu ); _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQ_SLOT( substyle() ), this ); _substyle->plug( _menu ); @@ -153,7 +153,7 @@ void FFTScopeView::styleSmall() { setStyle( Arts::lmSmall ); } #include void FFTScopeView::substyle() { - int _substyle = KInputDialog::getInteger( i18n("Substyle"), i18n("Please enter substyle:"), 0, 0, 10, 1, 0, this ); + int _substyle = KInputDialog::getInteger( i18n("Substyle"), i18n("Please enter substyle:"), 0, 0, 10, 1, nullptr, this ); for ( unsigned int i=0; isize(); i++ ) scopeScales[ i ].substyle( _substyle ); } diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h index 91a27378..df428861 100644 --- a/arts/tools/fftscopeview.h +++ b/arts/tools/fftscopeview.h @@ -61,7 +61,7 @@ protected: void mousePressEvent( TQMouseEvent* ); public: void updateScopeData(); - FFTScopeView( Arts::SimpleSoundServer server, TQWidget* =0 ); + FFTScopeView( Arts::SimpleSoundServer server, TQWidget* =nullptr ); ~FFTScopeView(); public slots: diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 74a9ed6f..de67d91f 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -83,7 +83,7 @@ FreeVerbView::~FreeVerbView() { VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent) - , freeVerbView(0) + , freeVerbView(nullptr) , server( artsserver ) { @@ -139,7 +139,7 @@ void VControl::showFreeVerbView() { connect(freeVerbView,TQ_SIGNAL(closed()),this,TQ_SLOT(showFreeVerbView())); } else { delete freeVerbView; - freeVerbView = 0; + freeVerbView = nullptr; } } diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h index 4c7e4d63..d427db19 100644 --- a/arts/tools/mediatypesview.h +++ b/arts/tools/mediatypesview.h @@ -30,7 +30,7 @@ class MediaTypesView : public Template_ArtsView { TQ_OBJECT public: - MediaTypesView( TQWidget* =0, const char* =0 ); + MediaTypesView( TQWidget* =nullptr, const char* =nullptr ); ~MediaTypesView(); }; diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 4e92c000..a443af96 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -218,7 +218,7 @@ void MidiManagerView::addOSSMidiPort() { //lukas: no i18n here, TQDialog's CTOR doesn't know about TQString //lukas: can't use that with const char *, i18n()'ed in the dialog itself - MidiPortDlg *dlg = new MidiPortDlg(0,"/dev/midi","OSS Midi Port"); + MidiPortDlg *dlg = new MidiPortDlg(nullptr,"/dev/midi","OSS Midi Port"); if(dlg->exec()) { @@ -236,7 +236,7 @@ void MidiManagerView::addOSSMidiPort() void MidiManagerView::addArtsMidiOutput() { - MidiInstDlg *dlg = new MidiInstDlg(0); + MidiInstDlg *dlg = new MidiInstDlg(nullptr); if(dlg->exec()) { diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h index c970e0a6..0931fda0 100644 --- a/arts/tools/statusview.h +++ b/arts/tools/statusview.h @@ -37,7 +37,7 @@ class ArtsStatusView : public Template_ArtsView { TQ_OBJECT public: - ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 ); + ArtsStatusView(Arts::SoundServer server, TQWidget* =nullptr, const char* =nullptr ); public slots: void updateStatus(); diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h index 9b1124bb..1009c87c 100644 --- a/arts/tools/templateview.h +++ b/arts/tools/templateview.h @@ -29,7 +29,7 @@ class Template_ArtsView : public TQFrame TQ_OBJECT public: - Template_ArtsView( TQWidget* =0, const char* =0 ); + Template_ArtsView( TQWidget* =nullptr, const char* =nullptr ); ~Template_ArtsView(); void closeEvent( TQCloseEvent* ); diff --git a/audiofile_artsplugin/audiofilePlayObjectI.cpp b/audiofile_artsplugin/audiofilePlayObjectI.cpp index 36cac754..e35ff206 100644 --- a/audiofile_artsplugin/audiofilePlayObjectI.cpp +++ b/audiofile_artsplugin/audiofilePlayObjectI.cpp @@ -113,10 +113,10 @@ audiofilePlayObjectI::audiofilePlayObjectI() audiofilePlayObjectI::~audiofilePlayObjectI() { delete refiller; - refiller = 0; + refiller = nullptr; delete resampler; - resampler = 0; + resampler = nullptr; if (sanityCheck()) { diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h index 11069273..411c785b 100644 --- a/juk/advancedsearchdialog.h +++ b/juk/advancedsearchdialog.h @@ -39,8 +39,8 @@ public: AdvancedSearchDialog(const TQString &defaultName, const PlaylistSearch &defaultSearch = PlaylistSearch(), - TQWidget *parent = 0, - const char *name = 0); + TQWidget *parent = nullptr, + const char *name = nullptr); virtual ~AdvancedSearchDialog(); diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp index a20b4674..347b3eaf 100644 --- a/juk/artsplayer.cpp +++ b/juk/artsplayer.cpp @@ -105,7 +105,7 @@ void ArtsPlayer::stop() if(m_playobject) { m_playobject->halt(); delete m_playobject; - m_playobject = 0; + m_playobject = nullptr; } if(!m_volumeControl.isNull()) { m_volumeControl.stop(); diff --git a/juk/cache.cpp b/juk/cache.cpp index fc12625e..3fedddf9 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -132,7 +132,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static TQ_INT32 playlistType; s >> playlistType; - Playlist *playlist = 0; + Playlist *playlist = nullptr; switch(playlistType) { case Search: diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 3cc0eb6a..f98770a2 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -40,7 +40,7 @@ using namespace ActionCollection; // static methods //////////////////////////////////////////////////////////////////////////////// -CollectionList *CollectionList::m_list = 0; +CollectionList *CollectionList::m_list = nullptr; CollectionList *CollectionList::instance() { diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp index fa152697..d4d71261 100644 --- a/juk/coverdialog.cpp +++ b/juk/coverdialog.cpp @@ -135,7 +135,7 @@ void CoverDialog::slotArtistClicked(TQListViewItem *item) void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt) { - static TDEPopupMenu *menu = 0; + static TDEPopupMenu *menu = nullptr; if(!item) return; diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index 958995ff..eff2089e 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -46,7 +46,7 @@ const char *CoverDrag::mimetype = "application/x-juk-coverid"; // memory for no reason. typedef TQCache CoverPixmapCache; -CoverManagerPrivate *CoverManager::m_data = 0; +CoverManagerPrivate *CoverManager::m_data = nullptr; // Used to save and load CoverData from a TQDataStream TQDataStream &operator<<(TQDataStream &out, const CoverData &data); diff --git a/juk/deletedialog.h b/juk/deletedialog.h index a5e1fbd3..11f28504 100644 --- a/juk/deletedialog.h +++ b/juk/deletedialog.h @@ -32,7 +32,7 @@ class DeleteWidget : public DeleteDialogBase public: - DeleteWidget(TQWidget *parent = 0, const char *name = 0); + DeleteWidget(TQWidget *parent = nullptr, const char *name = nullptr); void setFiles(const TQStringList &files); diff --git a/juk/directorylist.h b/juk/directorylist.h index c780b59b..24539c3d 100644 --- a/juk/directorylist.h +++ b/juk/directorylist.h @@ -34,7 +34,7 @@ public: }; DirectoryList(const TQStringList &directories, bool importPlaylists, - TQWidget *parent = 0, const char *name = 0); + TQWidget *parent = nullptr, const char *name = nullptr); virtual ~DirectoryList(); public slots: diff --git a/juk/dynamicplaylist.h b/juk/dynamicplaylist.h index ead7851c..7289f3f8 100644 --- a/juk/dynamicplaylist.h +++ b/juk/dynamicplaylist.h @@ -56,7 +56,7 @@ public slots: * it can synchronize the playing item with the one that playlist it was * create from. */ - void lower(TQWidget *top = 0); + void lower(TQWidget *top = nullptr); protected: /** diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index 667a20fe..0258ce92 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -60,7 +60,7 @@ class ConfirmationDialog : public KDialogBase { public: ConfirmationDialog(const TQMap &files, - TQWidget *parent = 0, const char *name = 0) + TQWidget *parent = nullptr, const char *name = nullptr) : KDialogBase(parent, name, true, i18n("Warning"), Ok | Cancel) { TQVBox *vbox = makeVBoxMainWidget(); @@ -398,9 +398,9 @@ bool FileRenamerWidget::removeRow(unsigned id) // Remove widget. Don't delete it since it appears TQSignalMapper may still need it. m_rows[id].widget->deleteLater(); - m_rows[id].widget = 0; + m_rows[id].widget = nullptr; m_rows[id].enableButton = 0; - m_rows[id].upButton = 0; + m_rows[id].upButton = nullptr; m_rows[id].optionsButton = 0; m_rows[id].downButton = 0; diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index 85d01c0c..d73f3e51 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -139,7 +139,7 @@ TQDataStream &operator>>(TQDataStream &s, HistoryPlaylist &p) TQ_INT32 count; s >> count; - HistoryPlaylistItem *after = 0; + HistoryPlaylistItem *after = nullptr; TQString fileName; TQDateTime dateTime; diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h index 2b1e5c2e..d8853e63 100644 --- a/juk/historyplaylist.h +++ b/juk/historyplaylist.h @@ -43,7 +43,7 @@ public: HistoryPlaylist(PlaylistCollection *collection); virtual ~HistoryPlaylist(); - virtual HistoryPlaylistItem *createItem(const FileHandle &file, TQListViewItem *after = 0, + virtual HistoryPlaylistItem *createItem(const FileHandle &file, TQListViewItem *after = nullptr, bool emitChanged = true); virtual void createItems(const PlaylistItemList &siblings); virtual int columnOffset() const { return 1; } diff --git a/juk/juk.cpp b/juk/juk.cpp index 57794459..2c3d4936 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -216,7 +216,7 @@ void JuK::setupSystemTray() connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotAboutToQuit())); } else { - m_systemTray = 0; + m_systemTray = nullptr; m_toggleDockOnCloseAction->setEnabled(false); m_togglePopupsAction->setEnabled(false); } @@ -375,14 +375,14 @@ bool JuK::queryExit() action("stop")->activate(); delete m_systemTray; - m_systemTray = 0; + m_systemTray = nullptr; CoverManager::shutdown(); Cache::instance()->save(); saveConfig(); delete m_splitter; - m_splitter = 0; + m_splitter = nullptr; return true; } @@ -438,7 +438,7 @@ void JuK::slotToggleSystemTray(bool enabled) setupSystemTray(); else if(!enabled && m_systemTray) { delete m_systemTray; - m_systemTray = 0; + m_systemTray = nullptr; m_toggleDockOnCloseAction->setEnabled(false); m_togglePopupsAction->setEnabled(false); } diff --git a/juk/juk.h b/juk/juk.h index 9dfb4910..b376ce4c 100644 --- a/juk/juk.h +++ b/juk/juk.h @@ -40,7 +40,7 @@ class JuK : public TDEMainWindow public: - JuK(TQWidget* parent = 0, const char *name = 0); + JuK(TQWidget* parent = nullptr, const char *name = nullptr); virtual ~JuK(); virtual TDEActionCollection *actionCollection() const; diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp index 9ed2c6ce..e6359526 100644 --- a/juk/k3bexporter.cpp +++ b/juk/k3bexporter.cpp @@ -39,7 +39,7 @@ using ActionCollection::actions; // static member variable definition -PlaylistAction *K3bExporter::m_action = 0; +PlaylistAction *K3bExporter::m_action = nullptr; // Special TDEAction subclass used to automatically call a slot when activated, // depending on the visible playlist at the time. In other words, use *one* diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h index 89337038..afe897b9 100644 --- a/juk/k3bexporter.h +++ b/juk/k3bexporter.h @@ -33,7 +33,7 @@ class K3bExporter : public PlaylistExporter public: - K3bExporter(Playlist *parent = 0); + K3bExporter(Playlist *parent = nullptr); /** * Returns a TDEAction that can be used to invoke the export. @@ -80,7 +80,7 @@ class K3bPlaylistExporter : public K3bExporter TQ_OBJECT public: - K3bPlaylistExporter(PlaylistBox *parent = 0); + K3bPlaylistExporter(PlaylistBox *parent = nullptr); virtual TDEAction *action(); diff --git a/juk/keydialog.h b/juk/keydialog.h index 347042c1..fad53bc2 100644 --- a/juk/keydialog.h +++ b/juk/keydialog.h @@ -32,7 +32,7 @@ public: /** * Constructs a KeyDialog called @p name as a child of @p parent. */ - KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0); + KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = nullptr, const char* name = nullptr); /** * Destructor. Deletes all resources used by a KeyDialog object. @@ -44,7 +44,7 @@ public: * accelerators and actions. It behaves essentially like the functions * in KKeyDialog. */ - static int configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = 0); + static int configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection, TQWidget *parent = nullptr); /** * This is a member function, provided to create a global accelerator with diff --git a/juk/mediafiles.h b/juk/mediafiles.h index 0b5c87a1..e99feef5 100644 --- a/juk/mediafiles.h +++ b/juk/mediafiles.h @@ -26,13 +26,13 @@ namespace MediaFiles /** * Creates a JuK specific KFileDialog with the specified parent. */ - TQStringList openDialog(TQWidget *parent = 0); + TQStringList openDialog(TQWidget *parent = nullptr); /** * Creates a JuK specific KFileDialog for saving a playlist with the name * playlistName and the specified parent and returns the file name. */ - TQString savePlaylistDialog(const TQString &playlistName, TQWidget *parent = 0); + TQString savePlaylistDialog(const TQString &playlistName, TQWidget *parent = nullptr); /** * Returns true if fileName is a supported media file. @@ -83,7 +83,7 @@ namespace MediaFiles * @param w TDEIO may need the widget to handle user interaction. * @return list of all local files in urlList, converted to absolute paths. */ - TQStringList convertURLsToLocal(const TQStringList &urlList, TQWidget *w = 0); + TQStringList convertURLsToLocal(const TQStringList &urlList, TQWidget *w = nullptr); } #endif diff --git a/juk/nowplaying.h b/juk/nowplaying.h index 0fc57f07..1b0dfed3 100644 --- a/juk/nowplaying.h +++ b/juk/nowplaying.h @@ -44,7 +44,7 @@ class NowPlaying : public TQHBox public: NowPlaying(TQWidget *parent, PlaylistCollection *collection, - const char *name = 0); + const char *name = nullptr); void addItem(NowPlayingItem *item); PlaylistCollection *collection() const; @@ -115,7 +115,7 @@ private: class LinkLabel : public KActiveLabel { public: - LinkLabel(TQWidget *parent, const char *name = 0) : KActiveLabel(parent, name) {} + LinkLabel(TQWidget *parent, const char *name = nullptr) : KActiveLabel(parent, name) {} virtual void openLink(const TQString &) {} }; diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index 8fe33f72..b0ba0b38 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -57,7 +57,7 @@ enum SoundSystem { ArtsBackend = 0, GStreamerBackend = 1, AkodeBackend = 2 }; static Player *createPlayer(int system = ArtsBackend) { - Player *p = 0; + Player *p = nullptr; switch(system) { #ifdef HAVE_AKODE case AkodeBackend: @@ -241,7 +241,7 @@ void PlayerManager::setStatusLabel(StatusLabel *label) TDESelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static { - TDESelectAction *action = 0; + TDESelectAction *action = nullptr; action = new TDESelectAction(i18n("&Output To"), 0, parent, "outputSelect"); TQStringList l; diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 784db887..7e1db8df 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -167,7 +167,7 @@ private: TDEGlobalSettings::Completion m_inlineCompletion; }; -Playlist::SharedSettings *Playlist::SharedSettings::m_instance = 0; +Playlist::SharedSettings *Playlist::SharedSettings::m_instance = nullptr; //////////////////////////////////////////////////////////////////////////////// // Playlist::SharedSettings public members @@ -510,7 +510,7 @@ void Playlist::playPrevious() bool random = action("randomPlay") && action("randomPlay")->isChecked(); - PlaylistItem *previous = 0; + PlaylistItem *previous = nullptr; if(random && !m_history.isEmpty()) { PlaylistItemList::Iterator last = m_history.fromLast(); @@ -810,7 +810,7 @@ void Playlist::slotRemoveCover() void Playlist::slotShowCoverManager() { - static CoverDialog *managerDialog = 0; + static CoverDialog *managerDialog = nullptr; if(!managerDialog) managerDialog = new CoverDialog(this); @@ -1277,7 +1277,7 @@ void Playlist::read(TQDataStream &s) TQStringList files; s >> files; - TQListViewItem *after = 0; + TQListViewItem *after = nullptr; m_blockDataChanged = true; @@ -1676,7 +1676,7 @@ void Playlist::loadFile(const TQString &fileName, const TQFileInfo &fileInfo) setSorting(PlaylistItem::lastColumn() + columnOffset() + 1); - PlaylistItem *after = 0; + PlaylistItem *after = nullptr; m_disableColumnWidthUpdates = true; diff --git a/juk/playlist.h b/juk/playlist.h index 2425b760..ed99afce 100644 --- a/juk/playlist.h +++ b/juk/playlist.h @@ -163,7 +163,7 @@ public: * both PlaylistItems and CollectionListItems. */ virtual PlaylistItem *createItem(const FileHandle &file, - TQListViewItem *after = 0, + TQListViewItem *after = nullptr, bool emitChanged = true); /** @@ -175,10 +175,10 @@ public: */ template ItemType *createItem(const FileHandle &file, - TQListViewItem *after = 0, + TQListViewItem *after = nullptr, bool emitChanged = true); - virtual void createItems(const PlaylistItemList &siblings, PlaylistItem *after = 0); + virtual void createItems(const PlaylistItemList &siblings, PlaylistItem *after = nullptr); /** * This handles adding files of various types -- music, playlist or directory @@ -189,7 +189,7 @@ public: * items since it has the overhead of checking to see if the file is a playlist * or directory first. */ - virtual void addFiles(const TQStringList &files, PlaylistItem *after = 0); + virtual void addFiles(const TQStringList &files, PlaylistItem *after = nullptr); /** * Returns the file name associated with this playlist (an m3u file) or @@ -423,7 +423,7 @@ protected: virtual TQDragObject *dragObject(TQWidget *parent); virtual TQDragObject *dragObject() { return dragObject(this); } virtual bool canDecode(TQMimeSource *s); - virtual void decode(TQMimeSource *s, PlaylistItem *item = 0); + virtual void decode(TQMimeSource *s, PlaylistItem *item = nullptr); virtual void contentsDropEvent(TQDropEvent *e); virtual void contentsMouseDoubleClickEvent(TQMouseEvent *e); virtual void contentsDragEnterEvent(TQDragEnterEvent *e); @@ -463,7 +463,7 @@ protected: void setDynamicListsFrozen(bool frozen); template - ItemType *createItem(SiblingType *sibling, ItemType *after = 0); + ItemType *createItem(SiblingType *sibling, ItemType *after = nullptr); /** * As a template this allows us to use the same code to initialize the items @@ -471,7 +471,7 @@ protected: * ItemType should be a PlaylistItem subclass. */ template - void createItems(const TQValueList &siblings, ItemType *after = 0); + void createItems(const TQValueList &siblings, ItemType *after = nullptr); protected slots: void slotPopulateBackMenu() const; diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index a9614ea3..9063628b 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -444,7 +444,7 @@ void PlaylistBox::contentsDropEvent(TQDropEvent *e) if(m_dropItem) { Item *old = m_dropItem; - m_dropItem = 0; + m_dropItem = nullptr; old->repaint(); } } @@ -497,7 +497,7 @@ void PlaylistBox::contentsDragMoveEvent(TQDragMoveEvent *e) m_showTimer->start(1500, true); } else - m_dropItem = 0; + m_dropItem = nullptr; if(old) old->repaint(); @@ -516,7 +516,7 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e) { if(m_dropItem) { Item *old = m_dropItem; - m_dropItem = 0; + m_dropItem = nullptr; old->repaint(); } TDEListView::contentsDragLeaveEvent(e); @@ -683,7 +683,7 @@ void PlaylistBox::setupUpcomingPlaylist() // PlaylistBox::Item protected methods //////////////////////////////////////////////////////////////////////////////// -PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = 0; +PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = nullptr; PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l) : TQObject(listBox), TDEListViewItem(listBox, 0, text), diff --git a/juk/playlistbox.h b/juk/playlistbox.h index 4bcd82f9..5164c513 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -50,7 +50,7 @@ public: friend class Item; PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack, - const char *name = 0); + const char *name = nullptr); virtual ~PlaylistBox(); @@ -66,7 +66,7 @@ public: Item *dropItem() const { return m_dropItem; } - void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem = 0); + void setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem = nullptr); public slots: void paste(); @@ -152,8 +152,8 @@ public: virtual ~Item(); protected: - Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = 0); - Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0); + Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = nullptr); + Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = nullptr); Playlist *playlist() const { return m_playlist; } PlaylistBox *listView() const { return static_cast(TDEListViewItem::listView()); } diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index ab7b2659..e92e8d8d 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -52,7 +52,7 @@ using namespace ActionCollection; // static methods //////////////////////////////////////////////////////////////////////////////// -PlaylistCollection *PlaylistCollection::m_instance = 0; +PlaylistCollection *PlaylistCollection::m_instance = nullptr; //////////////////////////////////////////////////////////////////////////////// // public methods @@ -554,7 +554,7 @@ void PlaylistCollection::setHistoryPlaylistEnabled(bool enable) } else { delete m_historyPlaylist; - m_historyPlaylist = 0; + m_historyPlaylist = nullptr; } } @@ -579,7 +579,7 @@ void PlaylistCollection::setUpcomingPlaylistEnabled(bool enable) action("showUpcoming")->setChecked(false); bool raiseCollection = m_playlistStack->visibleWidget() == m_upcomingPlaylist; delete m_upcomingPlaylist; - m_upcomingPlaylist = 0; + m_upcomingPlaylist = nullptr; if(raiseCollection) { tdeApp->processEvents(); // Seems to stop a crash, weird. @@ -785,7 +785,7 @@ void PlaylistCollection::dirChanged(const TQString &path) Playlist *PlaylistCollection::playlistByName(const TQString &name) const { TQObjectList *l = m_playlistStack->queryList("Playlist"); - Playlist *list = 0; + Playlist *list = nullptr; TQObject *obj; for(obj = l->first(); obj; obj = l->next()) { diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h index 2619e9cd..3dac48ec 100644 --- a/juk/playlistexporter.h +++ b/juk/playlistexporter.h @@ -31,7 +31,7 @@ class TDEActionCollection; class PlaylistExporter : public TQObject { public: - PlaylistExporter(TQWidget *parent = 0) : TQObject(parent) { } + PlaylistExporter(TQWidget *parent = nullptr) : TQObject(parent) { } virtual ~PlaylistExporter() { } /** diff --git a/juk/playlistinterface.h b/juk/playlistinterface.h index deaa900f..00520343 100644 --- a/juk/playlistinterface.h +++ b/juk/playlistinterface.h @@ -90,7 +90,7 @@ public: */ virtual void updateData() = 0; - void clearWatched() { m_playlist = 0; } + void clearWatched() { m_playlist = nullptr; } protected: PlaylistObserver(PlaylistInterface *playlist); diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index 0339290d..cf685147 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -458,7 +458,7 @@ void PlaylistItem::Pointer::clear(PlaylistItem *item) // static TQValueList l = m_map[item]; for(TQValueList::Iterator it = l.begin(); it != l.end(); ++it) - (*it)->m_item = 0; + (*it)->m_item = nullptr; m_map.remove(item); item->m_watched = false; } diff --git a/juk/playlistitem.h b/juk/playlistitem.h index db7170b8..f111b815 100644 --- a/juk/playlistitem.h +++ b/juk/playlistitem.h @@ -202,7 +202,7 @@ private: inline kdbgstream &operator<<(kdbgstream &s, const PlaylistItem &item) { - if(&item == 0) + if(&!item) s << "(nil)"; else s << item.text(PlaylistItem::TrackColumn); diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp index d1eff928..4c1b0a6f 100644 --- a/juk/playlistsplitter.cpp +++ b/juk/playlistsplitter.cpp @@ -231,7 +231,7 @@ void PlaylistSplitter::slotPlaylistChanged(TQWidget *w) m_newVisible = p; m_searchWidget->setSearch(p->search()); - m_newVisible = 0; + m_newVisible = nullptr; } #include "playlistsplitter.moc" diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index 914bad4b..e669a2b5 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -44,7 +44,7 @@ class PlaylistSplitter : public TQSplitter public: - PlaylistSplitter(TQWidget *parent, const char *name = 0); + PlaylistSplitter(TQWidget *parent, const char *name = nullptr); virtual ~PlaylistSplitter(); PlaylistInterface *playlist() const { return m_playlistBox; } diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp index de6a1aa8..33893915 100644 --- a/juk/searchwidget.cpp +++ b/juk/searchwidget.cpp @@ -68,7 +68,7 @@ SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) : this, TQ_SIGNAL(signalQueryChanged())); } else - m_caseSensitive = 0; + m_caseSensitive = nullptr; updateColumns(); } diff --git a/juk/searchwidget.h b/juk/searchwidget.h index a1d0a306..67e6f695 100644 --- a/juk/searchwidget.h +++ b/juk/searchwidget.h @@ -40,7 +40,7 @@ class SearchLine : public TQHBox public: enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 }; - SearchLine(TQWidget *parent, bool simple = false, const char *name = 0); + SearchLine(TQWidget *parent, bool simple = false, const char *name = nullptr); virtual ~SearchLine() {} PlaylistSearch::Component searchComponent() const; @@ -76,7 +76,7 @@ class SearchWidget : public TDEToolBar, public SearchIface public: - SearchWidget(TQWidget *parent, const char *name = 0); + SearchWidget(TQWidget *parent, const char *name = nullptr); virtual ~SearchWidget(); PlaylistSearch search(const PlaylistList &playlists) const; diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp index f16b21eb..a4973bc5 100644 --- a/juk/slideraction.cpp +++ b/juk/slideraction.cpp @@ -188,7 +188,7 @@ void SliderAction::unplug(TQWidget *parent) m_toolBar->removeItem(itemId(index)); removeContainer(index); - m_toolBar = 0; + m_toolBar = nullptr; } } } @@ -343,13 +343,13 @@ void SliderAction::slotToolbarDestroyed() if(index != -1) removeContainer(index); - m_toolBar = 0; + m_toolBar = nullptr; // This is probably a leak, but this code path hardly ever occurs, and it's // too hard to debug correctly. - m_trackPositionSlider = 0; - m_volumeSlider = 0; + m_trackPositionSlider = nullptr; + m_volumeSlider = nullptr; } #include "slideraction.moc" diff --git a/juk/sortedstringlist.cpp b/juk/sortedstringlist.cpp index 0886a88d..d9d9a596 100644 --- a/juk/sortedstringlist.cpp +++ b/juk/sortedstringlist.cpp @@ -137,7 +137,7 @@ SortedStringList::Node *SortedStringList::find(const TQString &value) const bool SortedStringList::BSTInsert(const TQString &value) { - Node *previousNode = 0; + Node *previousNode = nullptr; Node *node = m_root; while(node) { diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp index 94488e7e..75b4188a 100644 --- a/juk/splashscreen.cpp +++ b/juk/splashscreen.cpp @@ -23,7 +23,7 @@ #include "splashscreen.h" -SplashScreen *SplashScreen::splash = 0; +SplashScreen *SplashScreen::splash = nullptr; bool SplashScreen::done = false; int SplashScreen::count = 0; @@ -48,7 +48,7 @@ void SplashScreen::finishedLoading() { done = true; delete splash; - splash = 0; + splash = nullptr; } void SplashScreen::increment() diff --git a/juk/statuslabel.h b/juk/statuslabel.h index 9d9657a5..5f066f28 100644 --- a/juk/statuslabel.h +++ b/juk/statuslabel.h @@ -31,7 +31,7 @@ class StatusLabel : public TQHBox, public PlaylistObserver public: - StatusLabel(PlaylistInterface *playlist, TQWidget *parent = 0, const char *name = 0); + StatusLabel(PlaylistInterface *playlist, TQWidget *parent = nullptr, const char *name = nullptr); virtual ~StatusLabel(); virtual void updateCurrent(); diff --git a/juk/stringhash.h b/juk/stringhash.h index eaf5b6b9..66cd5936 100644 --- a/juk/stringhash.h +++ b/juk/stringhash.h @@ -99,7 +99,7 @@ public: Iterator end() const { Iterator it(*this); - it.m_node = 0; + it.m_node = nullptr; it.m_index = m_tableSize - 1; return it; } @@ -207,7 +207,7 @@ bool Hash::insert(T value) { int h = hash(value); Node *i = m_table[h]; - Node *j = 0; + Node *j = nullptr; while(i) { if(i->key == value) @@ -242,7 +242,7 @@ template bool Hash::remove(T value) { int h = hash(value); - Node *previous = 0; + Node *previous = nullptr; Node *i = m_table[h]; while(i && i->key != value) { diff --git a/juk/stringshare.cpp b/juk/stringshare.cpp index 195fd64f..87ed5a96 100644 --- a/juk/stringshare.cpp +++ b/juk/stringshare.cpp @@ -17,7 +17,7 @@ const int SIZE = 5003; -StringShare::Data* StringShare::s_data = 0; +StringShare::Data* StringShare::s_data = nullptr; /** * We store the strings in two simple direct-mapped (i.e. no collision handling, diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index 2e46272e..cdd2e46f 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -50,7 +50,7 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y); class FlickerFreeLabel : public TQLabel { public: - FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = 0) : + FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = nullptr) : TQLabel(text, parent, name) { m_textColor = paletteForegroundColor(); @@ -242,7 +242,7 @@ void SystemTray::slotStop() setToolTip(); delete m_popup; - m_popup = 0; + m_popup = nullptr; } void SystemTray::slotPopupDestroyed() @@ -301,7 +301,7 @@ void SystemTray::slotMouseInPopup() TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file) { - TQVBox *infoBox = 0; + TQVBox *infoBox = nullptr; if(buttonsToLeft()) { @@ -351,7 +351,7 @@ void SystemTray::createPopup() return; delete m_popup; - m_popup = 0; + m_popup = nullptr; m_fadeTimer->stop(); // This will be reset after this function call by slot(Forward|Back) diff --git a/juk/systemtray.h b/juk/systemtray.h index 469cf9ee..8d51fd4f 100644 --- a/juk/systemtray.h +++ b/juk/systemtray.h @@ -40,7 +40,7 @@ class PassiveInfo : public KPassivePopup TQ_OBJECT public: - PassiveInfo(TQWidget *parent = 0, const char *name = 0); + PassiveInfo(TQWidget *parent = nullptr, const char *name = nullptr); public slots: void setTimeout(int delay); @@ -68,7 +68,7 @@ class SystemTray : public KSystemTray public: - SystemTray(TQWidget *parent = 0, const char *name = 0); + SystemTray(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~SystemTray(); signals: diff --git a/juk/tag.cpp b/juk/tag.cpp index c5290610..29a0ccf2 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -103,7 +103,7 @@ bool Tag::save() bool result; TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8); - TagLib::File *file = 0; + TagLib::File *file = nullptr; if(MediaFiles::isMP3(m_fileName)) file = new TagLib::MPEG::File(TQFile::encodeName(m_fileName).data()); diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index e4bbfffc..d4deebdc 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -51,7 +51,7 @@ using namespace ActionCollection; class FileNameValidator : public TQValidator { public: - FileNameValidator(TQObject *parent, const char *name = 0) : + FileNameValidator(TQObject *parent, const char *name = nullptr) : TQValidator(parent, name) {} virtual void fixup(TQString &s) const @@ -87,7 +87,7 @@ public: FixedHLayout(TQWidget *parent, int margin = 0, int spacing = -1, const char *name = 0) : TQHBoxLayout(parent, margin, spacing, name), m_width(-1) {} - FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) : + FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = nullptr) : TQHBoxLayout(parentLayout, spacing, name), m_width(-1) {} void setWidth(int w = -1) @@ -165,11 +165,11 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) // Store the playlist that we're setting because saveChangesPrompt // can delete the PlaylistItems in list. - Playlist *itemPlaylist = 0; + Playlist *itemPlaylist = nullptr; if(!list.isEmpty()) itemPlaylist = list.first()->playlist(); - bool hadPlaylist = m_currentPlaylist != 0; + bool hadPlaylist = m_currentPlaylist != nullptr; saveChangesPrompt(); @@ -179,7 +179,7 @@ void TagEditor::slotSetItems(const PlaylistItemList &list) } if(hadPlaylist && !m_currentPlaylist || !itemPlaylist) { - m_currentPlaylist = 0; + m_currentPlaylist = nullptr; m_items.clear(); } else { @@ -794,7 +794,7 @@ void TagEditor::slotItemRemoved(PlaylistItem *item) void TagEditor::slotPlaylistDestroyed(Playlist *p) { if(m_currentPlaylist == p) { - m_currentPlaylist = 0; + m_currentPlaylist = nullptr; slotSetItems(PlaylistItemList()); } } diff --git a/juk/tageditor.h b/juk/tageditor.h index 14cc9c67..eec13dcf 100644 --- a/juk/tageditor.h +++ b/juk/tageditor.h @@ -40,7 +40,7 @@ class TagEditor : public TQWidget public: - TagEditor(TQWidget *parent = 0, const char *name = 0); + TagEditor(TQWidget *parent = nullptr, const char *name = nullptr); virtual ~TagEditor(); PlaylistItemList items() const { return m_items; } void setupObservers(); @@ -83,7 +83,7 @@ private: private slots: void slotDataChanged(bool c = true); void slotItemRemoved(PlaylistItem *item); - void slotPlaylistRemoved() { m_currentPlaylist = 0; } + void slotPlaylistRemoved() { m_currentPlaylist = nullptr; } private: typedef TQMap BoxMap; diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp index 201e2215..487a2a5b 100644 --- a/juk/tagguesserconfigdlg.cpp +++ b/juk/tagguesserconfigdlg.cpp @@ -73,10 +73,10 @@ void TagGuesserConfigDlg::accept() void TagGuesserConfigDlg::slotCurrentChanged(TQListViewItem *item) { - m_child->bMoveUp->setEnabled(item != 0 && item->itemAbove() != 0); - m_child->bMoveDown->setEnabled(item != 0 && item->itemBelow() != 0); - m_child->bModify->setEnabled(item != 0); - m_child->bRemove->setEnabled(item != 0); + m_child->bMoveUp->setEnabled(item != nullptr && item->itemAbove() != 0); + m_child->bMoveDown->setEnabled(item != nullptr && item->itemBelow() != 0); + m_child->bModify->setEnabled(item != nullptr); + m_child->bRemove->setEnabled(item != nullptr); } void TagGuesserConfigDlg::slotRenameItem(TQListViewItem *item, const TQPoint &, int c) diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h index ef0bca01..d8e65bd2 100644 --- a/juk/tagguesserconfigdlg.h +++ b/juk/tagguesserconfigdlg.h @@ -19,7 +19,7 @@ class TagGuesserConfigDlg : public KDialogBase TQ_OBJECT public: - TagGuesserConfigDlg(TQWidget *parent, const char *name = 0); + TagGuesserConfigDlg(TQWidget *parent, const char *name = nullptr); protected slots: virtual void accept(); diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp index ee1bd7ca..18645dd5 100644 --- a/juk/tagtransactionmanager.cpp +++ b/juk/tagtransactionmanager.cpp @@ -30,7 +30,7 @@ using ActionCollection::action; -TagTransactionManager *TagTransactionManager::m_manager = 0; +TagTransactionManager *TagTransactionManager::m_manager = nullptr; TagTransactionAtom::TagTransactionAtom() : m_item(0), m_tag(0) { @@ -40,7 +40,7 @@ TagTransactionAtom::TagTransactionAtom() : m_item(0), m_tag(0) TagTransactionAtom::TagTransactionAtom(const TagTransactionAtom &other) : m_item(other.m_item), m_tag(other.m_tag) { - other.m_tag = 0; // Only allow one owner + other.m_tag = nullptr; // Only allow one owner } TagTransactionAtom::TagTransactionAtom(PlaylistItem *item, Tag *tag) : @@ -58,7 +58,7 @@ TagTransactionAtom &TagTransactionAtom::operator=(const TagTransactionAtom &othe m_item = other.m_item; m_tag = other.m_tag; - other.m_tag = 0; // Only allow one owner + other.m_tag = nullptr; // Only allow one owner return *this; } diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h index 0e169bba..c1f93061 100644 --- a/juk/tagtransactionmanager.h +++ b/juk/tagtransactionmanager.h @@ -114,7 +114,7 @@ class TagTransactionManager : public TQObject * * @param parent The parent TQWidget. */ - TagTransactionManager(TQWidget *parent = 0); + TagTransactionManager(TQWidget *parent = nullptr); /** * Returns the global TagTransactionManager instance. diff --git a/juk/trackpickerdialog.h b/juk/trackpickerdialog.h index 4fd2b1fb..177ce31c 100644 --- a/juk/trackpickerdialog.h +++ b/juk/trackpickerdialog.h @@ -34,7 +34,7 @@ class TrackPickerDialog : public KDialogBase public: TrackPickerDialog(const TQString &name, const KTRMResultList &results, - TQWidget *parent = 0); + TQWidget *parent = nullptr); virtual ~TrackPickerDialog(); diff --git a/juk/tracksequenceiterator.cpp b/juk/tracksequenceiterator.cpp index 0d43f5a3..c9d6592d 100644 --- a/juk/tracksequenceiterator.cpp +++ b/juk/tracksequenceiterator.cpp @@ -171,7 +171,7 @@ void DefaultSequenceIterator::prepareToPlay(Playlist *playlist) if(items.isEmpty()) items = playlist->visibleItems(); - PlaylistItem *newItem = 0; + PlaylistItem *newItem = nullptr; if(!items.isEmpty()) newItem = items[TDEApplication::random() % items.count()]; diff --git a/juk/tracksequenceiterator.h b/juk/tracksequenceiterator.h index da96d592..7c2c6728 100644 --- a/juk/tracksequenceiterator.h +++ b/juk/tracksequenceiterator.h @@ -219,7 +219,7 @@ private: * @param p The Playlist to read items from. If p is 0, the playlist of * the currently playing item is used instead. */ - void refillRandomList(Playlist *p = 0); + void refillRandomList(Playlist *p = nullptr); void initAlbumSearch(PlaylistItem *searchItem); private: diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp index 34076bf7..7c558c7b 100644 --- a/juk/tracksequencemanager.cpp +++ b/juk/tracksequencemanager.cpp @@ -35,7 +35,7 @@ TrackSequenceManager::~TrackSequenceManager() { // m_playlist and m_popupMenu don't belong to us, don't try to delete them if(m_iterator == m_defaultIterator) - m_iterator = 0; + m_iterator = nullptr; delete m_iterator; delete m_defaultIterator; @@ -66,7 +66,7 @@ TrackSequenceIterator *TrackSequenceManager::takeIterator() { TrackSequenceIterator *temp = m_iterator; - m_iterator = 0; + m_iterator = nullptr; return temp; } diff --git a/juk/upcomingplaylist.cpp b/juk/upcomingplaylist.cpp index ab6b8e63..a4bb008b 100644 --- a/juk/upcomingplaylist.cpp +++ b/juk/upcomingplaylist.cpp @@ -261,7 +261,7 @@ TQDataStream &operator<<(TQDataStream &s, const UpcomingPlaylist &p) TQDataStream &operator>>(TQDataStream &s, UpcomingPlaylist &p) { TQString fileName; - PlaylistItem *newItem = 0; + PlaylistItem *newItem = nullptr; TQ_INT32 count; s >> count; diff --git a/juk/upcomingplaylist.h b/juk/upcomingplaylist.h index 92d08d40..13782565 100644 --- a/juk/upcomingplaylist.h +++ b/juk/upcomingplaylist.h @@ -90,7 +90,7 @@ public: */ virtual void clearItem(PlaylistItem *item, bool emitChanged = true); - virtual void addFiles(const TQStringList &files, PlaylistItem *after = 0); + virtual void addFiles(const TQStringList &files, PlaylistItem *after = nullptr); /** * Returns a reference to the index between items in the list and the diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h index 5d34a614..625d1fdd 100644 --- a/juk/webimagefetcherdialog.h +++ b/juk/webimagefetcherdialog.h @@ -32,7 +32,7 @@ class WebImageFetcherDialog : public KDialogBase public: WebImageFetcherDialog(const WebImageList &urlList, const FileHandle &file, - TQWidget *parent = 0); + TQWidget *parent = nullptr); virtual ~WebImageFetcherDialog(); diff --git a/kaboodle/conf.h b/kaboodle/conf.h index 59c0d3bd..13e2214d 100644 --- a/kaboodle/conf.h +++ b/kaboodle/conf.h @@ -39,7 +39,7 @@ TQ_OBJECT public: - Conf(TQWidget *_parent = 0, const char *_name = 0); + Conf(TQWidget *_parent = nullptr, const char *_name = nullptr); protected: virtual void accept(void); diff --git a/kaboodle/controls.h b/kaboodle/controls.h index 36bf4cb4..a635eda5 100644 --- a/kaboodle/controls.h +++ b/kaboodle/controls.h @@ -45,10 +45,10 @@ class L33tSlider : public TQSlider TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=nullptr); + L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=nullptr); L33tSlider(int minValue, int maxValue, int pageStep, int value, - TQt::Orientation, TQWidget * parent, const char * name=0); + TQt::Orientation, TQWidget * parent, const char * name=nullptr); bool currentlyPressed() const; signals: diff --git a/kaboodle/engine.h b/kaboodle/engine.h index ccd5c6ba..47eb945d 100644 --- a/kaboodle/engine.h +++ b/kaboodle/engine.h @@ -48,7 +48,7 @@ TQ_OBJECT public: - Engine(TQObject *parent=0); + Engine(TQObject *parent=nullptr); ~Engine(); Arts::PlayObject playObject() const; diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h index 4d14300d..f99b9de6 100644 --- a/kaboodle/kaboodle_factory.h +++ b/kaboodle/kaboodle_factory.h @@ -41,7 +41,7 @@ public: KaboodleFactory(); virtual ~KaboodleFactory(); - virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); + virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = nullptr, const char *name = nullptr, const char *classname = "TQObject", const TQStringList &args = TQStringList()); static const TDEAboutData *aboutData(); static TDEInstance *instance(); diff --git a/kaudiocreator/encodefileimp.h b/kaudiocreator/encodefileimp.h index f7ffff87..6700a585 100644 --- a/kaudiocreator/encodefileimp.h +++ b/kaudiocreator/encodefileimp.h @@ -40,7 +40,7 @@ signals: void startJob(Job *newJob); public: - EncodeFileImp(TQWidget* parent = 0, const char* name = 0); + EncodeFileImp(TQWidget* parent = nullptr, const char* name = nullptr); protected slots: // Encode button diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp index 2bd14870..25167f4e 100644 --- a/kaudiocreator/encoder.cpp +++ b/kaudiocreator/encoder.cpp @@ -56,7 +56,7 @@ EncoderPrefs* Encoder::loadEncoder( int encoder ){ TQString currentEncoderGroup = TQString("Encoder_%1").arg(encoder); prefs = EncoderPrefs::prefs(currentEncoderGroup); if ( !EncoderPrefs::hasPrefs(currentEncoderGroup) ) { - KMessageBox::sorry(0, i18n("No encoder has been selected.\nPlease select an encoder in the configuration."), i18n("No Encoder Selected")); + KMessageBox::sorry(nullptr, i18n("No encoder has been selected.\nPlease select an encoder in the configuration."), i18n("No Encoder Selected")); prefs->setCommandLine(TQString()); } @@ -188,7 +188,7 @@ void Encoder::tendToNewJobs() { int lastSlash = desiredFile.findRev('/',-1); if ( lastSlash == -1 || !(TDEStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) { - KMessageBox::sorry(0, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed")); + KMessageBox::sorry(nullptr, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed")); emit jobsChanged(); updateProgress(job->id, -1); return; @@ -284,13 +284,13 @@ void Encoder::jobDone(TDEProcess *process ) { bool showDebugBox = false; if ( process->exitStatus() == 127 ) { - KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").arg(job->errorString), i18n("Encoding Failed")); + KMessageBox::sorry(nullptr, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").arg(job->errorString), i18n("Encoding Failed")); emit(updateProgress(job->id, -1)); } else if ( TQFile::exists(job->newLocation) ) { // fyi segfaults return 136 if ( process->exitStatus() != 0 ) { - if ( KMessageBox::questionYesNo(0, i18n("The encoder exited with a error. Please check that the file was created.\nDo you want to see the full encoder output?"), i18n("Encoding Failed"),i18n("Show Output"),i18n("Skip Output")) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo(nullptr, i18n("The encoder exited with a error. Please check that the file was created.\nDo you want to see the full encoder output?"), i18n("Encoding Failed"),i18n("Show Output"),i18n("Skip Output")) == KMessageBox::Yes ) { showDebugBox = true; } @@ -305,7 +305,7 @@ void Encoder::jobDone(TDEProcess *process ) { } else { - if ( KMessageBox::questionYesNo(0, i18n("The encoded file was not created.\nPlease check the encoder options.\nThe wav file has been removed.\nDo you want to see the full encoder output?"), i18n("Encoding Failed"),i18n("Show Output"),i18n("Skip Output")) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo(nullptr, i18n("The encoded file was not created.\nPlease check the encoder options.\nThe wav file has been removed.\nDo you want to see the full encoder output?"), i18n("Encoding Failed"),i18n("Show Output"),i18n("Skip Output")) == KMessageBox::Yes ) { showDebugBox = true; } @@ -316,7 +316,7 @@ void Encoder::jobDone(TDEProcess *process ) { TQFile::remove( job->location ); if( showDebugBox ){ - EncoderOutput dlg( 0, "Encoder Output" ); + EncoderOutput dlg( nullptr, "Encoder Output" ); job->output = job->errorString + "\n\n\n" + job->output; dlg.output->setText(job->output); dlg.exec(); diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h index 281be620..19932064 100644 --- a/kaudiocreator/encoder.h +++ b/kaudiocreator/encoder.h @@ -41,7 +41,7 @@ signals: void jobsChanged(); public: - Encoder( TQObject* parent = 0, const char* name = 0); + Encoder( TQObject* parent = nullptr, const char* name = nullptr); ~Encoder(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index e2ca1188..12b2b894 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -137,7 +137,7 @@ void EncoderConfigImp::addEncoderSlot(){ KDialogBase::Swallow, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); - dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); + dialog->addPage(new EncoderEdit(nullptr, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadEncoderList())); dialog->show(); } @@ -197,7 +197,7 @@ void EncoderConfigImp::configureEncoderSlot() { KDialogBase::Swallow, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help); dialog->setCaption(i18n("Configure Encoder")); - dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); + dialog->addPage(new EncoderEdit(nullptr, groupName.latin1()), i18n("Encoder Configuration"), "package_settings"); connect(dialog, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(updateEncoder(TQObject *))); connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SIGNAL(encoderUpdated())); connect(dialog, TQ_SIGNAL(settingsChanged(const char *)), this, TQ_SLOT(updateEncoder(const char *))); @@ -251,7 +251,7 @@ void EncoderConfigImp::updateEncoder(const char *dialogName){ encoderNames.erase(encoderName); } -TQDict *EncoderPrefs::m_prefs = 0; +TQDict *EncoderPrefs::m_prefs = nullptr; EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName) { diff --git a/kaudiocreator/encoderconfigimp.h b/kaudiocreator/encoderconfigimp.h index dce1c111..236522a2 100644 --- a/kaudiocreator/encoderconfigimp.h +++ b/kaudiocreator/encoderconfigimp.h @@ -38,7 +38,7 @@ signals: void encoderUpdated(); public: - EncoderConfigImp( TQWidget* parent = 0, const char* name = 0); + EncoderConfigImp( TQWidget* parent = nullptr, const char* name = nullptr); private slots: void addEncoderSlot(); diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h index 97c76ab4..f5b45f18 100644 --- a/kaudiocreator/jobqueimp.h +++ b/kaudiocreator/jobqueimp.h @@ -36,7 +36,7 @@ class TQListView; class QueListViewItem : public TQListViewItem { public: - QueListViewItem (TQListView * p = nullptr, const TQString a=0, const TQString b=0, const TQString c=0, const TQString d=0, const TQString e=0); + QueListViewItem (TQListView * p = nullptr, const TQString a=nullptr, const TQString b=nullptr, const TQString c=nullptr, const TQString d=nullptr, const TQString e=nullptr); virtual void paintCell (TQPainter * p,const TQColorGroup &cg,int column, int width,int align); double percentDone; @@ -55,7 +55,7 @@ signals: void removeJob( int idNumber ); public: - JobQueImp( TQWidget* parent = 0, const char* name = 0 ); + JobQueImp( TQWidget* parent = nullptr, const char* name = nullptr ); int numberOfJobsNotFinished(); public slots: diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 115de82f..01094dc7 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -237,11 +237,11 @@ void KAudioCreator::showSettings(){ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config) : TDEConfigDialog(parent, name, config), - cddb(0), cddbChanged(false) + cddb(nullptr), cddbChanged(false) { - addPage(new General(0, "General"), i18n("General"), "package_settings", + addPage(new General(nullptr, "General"), i18n("General"), "package_settings", i18n("General Configuration")); - addPage(new CdConfig(0, "CD"), i18n("CD"), "package_system", + addPage(new CdConfig(nullptr, "CD"), i18n("CD"), "package_system", i18n("CD Configuration")); // Because WE don't segfault on our users... @@ -256,11 +256,11 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele connect(cddb, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(slotCddbChanged(bool))); } } - RipConfig *rip = new RipConfig(0, "Ripper"); + RipConfig *rip = new RipConfig(nullptr, "Ripper"); rip->kcfg_tempDir->setMode(KFile::Directory); addPage(rip, i18n("Ripper"), "gear", i18n("Ripper Configuration") ); - encoderConfigImp = new EncoderConfigImp(0, "Encoder"); + encoderConfigImp = new EncoderConfigImp(nullptr, "Encoder"); addPage(encoderConfigImp, i18n("Encoder"), "filter", i18n("Encoder Configuration") ); } diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index a31280c2..52a4a477 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -39,7 +39,7 @@ TQ_OBJECT public: - KAudioCreator( TQWidget* parent = 0, const char* name = 0); + KAudioCreator( TQWidget* parent = nullptr, const char* name = nullptr); void setDevice( const TQString &device ); protected: diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp index bf5ab59e..fa5d6c9f 100644 --- a/kaudiocreator/main.cpp +++ b/kaudiocreator/main.cpp @@ -25,7 +25,7 @@ #include static const TDECmdLineOptions options[] = { - {"+[device]",I18N_NOOP( "CD device, can be a path or a media:/ URL" ),0}, + {"+[device]",I18N_NOOP( "CD device, can be a path or a media:/ URL" ),nullptr}, TDECmdLineLastOption }; @@ -33,14 +33,14 @@ static const TDECmdLineOptions options[] = { int main(int argc, char *argv[]){ TDEAboutData aboutData("kaudiocreator", I18N_NOOP("KAudioCreator"), "1.13", I18N_NOOP("CD ripper and audio encoder frontend"), TDEAboutData::License_LGPL, "(c) 2003-2005, Benjamin Meyer", - 0, "http://www.icefox.net/"); + nullptr, "http://www.icefox.net/"); aboutData.addAuthor("Benjamin Meyer", I18N_NOOP("Original author"), "ben+kaudiocreator@meyerhome.net", "http://www.icefox.net/"); // command line TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication a(argc, argv); - KAudioCreator *app = new KAudioCreator(0, "MainWindow"); + KAudioCreator *app = new KAudioCreator(nullptr, "MainWindow"); // we need some strings from libkcddb for the cddb album dialog TDEGlobal::locale()->insertCatalogue("libkcddb"); diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index 3a7b62de..c925d913 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -215,12 +215,12 @@ void Ripper::copyJobResult(TDEIO::Job *copyjob){ emit( encodeWav(newJob)); } else{ - copyJob->showErrorDialog(0); + copyJob->showErrorDialog(nullptr); TQFile file( (copyJob->destURL()).path()); file.remove(); emit updateProgress(newJob->id, -1); delete newJob; - newJob = 0; + newJob = nullptr; } if(newJob && newJob->lastSongInAlbum){ diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 78d2234f..9f82b09c 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -41,7 +41,7 @@ signals: void jobsChanged(); public: - Ripper( TQObject* parent = 0, const char* name = 0 ); + Ripper( TQObject* parent = nullptr, const char* name = nullptr ); ~Ripper(); int activeJobCount(); int pendingJobCount(); diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index 89725f00..7d8296da 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -387,7 +387,7 @@ void TracksImp::startSession( int encoder ) if ( encoder == -1 ) encoder = Prefs::currentEncoder(); - Job *lastJob = 0; + Job *lastJob = nullptr; TracksItem *item = selected.first(); for( ; item ; item = selected.next() ) @@ -503,7 +503,7 @@ void TracksImp::newAlbum() } } - TracksItem *last = 0; + TracksItem *last = nullptr; for( unsigned i = 0; i < t.count(); i++ ) { TQString trackArtist; diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h index e25b6fa7..b1599701 100644 --- a/kaudiocreator/tracksimp.h +++ b/kaudiocreator/tracksimp.h @@ -66,7 +66,7 @@ public: void setChecked( const bool &b ) { m_checked = b; b ? setPixmap( HEADER_RIP, SmallIcon( "apply", height()-2 ) ) : - setPixmap( HEADER_RIP, 0 ); + setPixmap( HEADER_RIP, nullptr ); } private: @@ -94,7 +94,7 @@ signals: void hasTracks(bool); public: - TracksImp( TQWidget* parent = 0, const char* name = 0); + TracksImp( TQWidget* parent = nullptr, const char* name = nullptr); ~TracksImp(); bool hasCD(); diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp index 407fc1aa..1405db96 100644 --- a/kmix/KMixApp.cpp +++ b/kmix/KMixApp.cpp @@ -26,7 +26,7 @@ KMixApp::KMixApp() - : TDEUniqueApplication(), m_kmix( 0 ) + : TDEUniqueApplication(), m_kmix( nullptr ) { // We handle autostart via standard autostart-enabled .desktop file instead of the session manager disableSessionManagement(); diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index 1d1f2d61..9b8a48e9 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -41,8 +41,8 @@ DialogSelectMaster::DialogSelectMaster(Mixer *mixer) : KDialogBase( Plain, i18n( "Select Master Channel" ), Ok|Cancel, Ok ) { - _layout = 0; - m_vboxForScrollView = 0; + _layout = nullptr; + m_vboxForScrollView = nullptr; createWidgets(mixer); // Open with Mixer Hardware #0 } @@ -84,7 +84,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) TQToolTip::add(m_cMixer, i18n("Current mixer")); connect(m_cMixer, TQ_SIGNAL(activated(int)), this, TQ_SLOT(createPageByID(int))); - for ( Mixer *mixer = Mixer::mixers().first(); mixer !=0; mixer = Mixer::mixers().next() ) { + for ( Mixer *mixer = Mixer::mixers().first(); mixer; mixer = Mixer::mixers().next() ) { m_cMixer->insertItem(mixer->mixerName()); } } @@ -102,7 +102,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) void DialogSelectMaster::show(Mixer *curr_mixer) { - tdeApp->config()->setGroup(0); + tdeApp->config()->setGroup(nullptr); bool useDefaultMaster = tdeApp->config()->readBoolEntry("UseDefaultMaster", true); if (useDefaultMaster) { @@ -171,11 +171,11 @@ void DialogSelectMaster::createPage(Mixer *mixer) TQString masterKey = "----noMaster---"; // Use a non-matching name as default MixDevice* master = mixer->masterDevice(); - if ( master != 0 ) masterKey = master->getPK(); + if ( master ) masterKey = master->getPK(); const MixSet& mixset = mixer->getMixSet(); MixSet& mset = const_cast(mixset); - for( MixDevice* md = mset.first(); md != 0; md = mset.next() ) + for( MixDevice* md = mset.first(); md; md = mset.next() ) { // Create a RadioButton for each MixDevice (excluding Enum's) if ( ! md->isEnum() && ! md->isSwitch() ) { @@ -210,7 +210,7 @@ void DialogSelectMaster::apply() // A channel was selected by the user => emit the "newMasterSelected()" signal //kdDebug(67100) << "DialogSelectMaster::apply(): default master=" << m_defaultMaster->isChecked() << ", card=" << soundcard_id << ", channel=" << channel_id << endl; Mixer *mixer = Mixer::mixers().at(soundcard_id); - if ( mixer == 0 ) { + if ( !mixer ) { kdError(67100) << "DialogSelectMaster::apply(): Invalid Mixer (mixerID=" << soundcard_id << ")" << endl; return; // can not happen } diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index 81a411fe..f0fc249b 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -45,7 +45,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) //TQLabel* qlb = new TQLabel( i18n("Show"), plainPage() ); _layout->addWidget(qlb); - for ( TQWidget *qw = mdws.first(); qw != 0; qw = mdws.next()) + for ( TQWidget *qw = mdws.first(); qw; qw = mdws.next()) { if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast(qw); @@ -74,7 +74,7 @@ void DialogViewConfiguration::apply() // --- Step 1: Show and Hide Widgets --- TQCheckBox *cb = _qEnabledCB.first(); - for ( TQWidget *qw = mdws.first(); qw != 0; qw = mdws.next()) + for ( TQWidget *qw = mdws.first(); qw; qw = mdws.next()) { if ( qw->inherits("MixDeviceWidget") ) { MixDeviceWidget *mdw = static_cast(qw); diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h index a2bafdec..c3a38197 100644 --- a/kmix/kledbutton.h +++ b/kmix/kledbutton.h @@ -34,9 +34,9 @@ class KLedButton : public KLed { TQ_OBJECT public: - KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0); + KLedButton(const TQColor &col=TQt::green, TQWidget *parent=nullptr, const char *name=nullptr); KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape, - TQWidget *parent=0, const char *name=0); + TQWidget *parent=nullptr, const char *name=nullptr); ~KLedButton(); TQSize sizeHint () const; diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index e2f6c207..a7213c9e 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -45,7 +45,7 @@ class AppletConfigDialog : public KDialogBase TQ_OBJECT public: - AppletConfigDialog( TQWidget * parent=0, const char * name=0 ); + AppletConfigDialog( TQWidget * parent=nullptr, const char * name=nullptr ); virtual ~AppletConfigDialog() {}; void setActiveColors(const TQColor& high, const TQColor& low, const TQColor& back); @@ -75,7 +75,7 @@ class KMixApplet : public KPanelApplet public: KMixApplet( const TQString& configFile, Type t = Normal, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = nullptr, const char *name = nullptr ); virtual ~KMixApplet(); struct Colors { diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h index 8f119ace..ee6b3c47 100644 --- a/kmix/kmixdockwidget.h +++ b/kmix/kmixdockwidget.h @@ -43,7 +43,7 @@ class KMixDockWidget : public KSystemTray { friend class KMixWindow; public: - KMixDockWidget(Mixer *, TQWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false); + KMixDockWidget(Mixer *, TQWidget *parent=nullptr, const char *name=nullptr, bool volumePopup=true, bool dockIconMuting=false); ~KMixDockWidget(); void setErrorPixmap(); diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index cc12c7dd..99437d3f 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -60,8 +60,8 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask, TQWidget * parent, const char * name, ViewBase::ViewFlags vflags ) - : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(0), - m_topLayout(0), + : TQWidget( parent, name ), _mixer(mixer), m_balanceSlider(nullptr), + m_topLayout(nullptr), m_id( _id ), _iconsEnabled( true ), _labelsEnabled( false ), _ticksEnabled( false ), _valueStyle ( -1 ) // this definitely does not correspond to the 'default value display' style, diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h index 073a6a88..fae446ae 100644 --- a/kmix/kmixerwidget.h +++ b/kmix/kmixerwidget.h @@ -64,7 +64,7 @@ class KMixerWidget : public TQWidget public: KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, MixDevice::DeviceCategory categoryMask = MixDevice::ALL , - TQWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0 ); + TQWidget *parent=nullptr, const char *name=nullptr, ViewBase::ViewFlags vflags=0 ); ~KMixerWidget(); enum KMixerWidgetIO { OUTPUT=0, INPUT }; @@ -73,7 +73,7 @@ class KMixerWidget : public TQWidget int id() const { return m_id; }; - TDEActionCollection* getActionCollection() const { return 0; /* m_actions; */ } + TDEActionCollection* getActionCollection() const { return nullptr; /* m_actions; */ } signals: void masterMuted( bool ); diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp index 9376a69d..a26a2422 100644 --- a/kmix/kmixtoolbox.cpp +++ b/kmix/kmixtoolbox.cpp @@ -45,7 +45,7 @@ into the MixerToolBox class. ***********************************************************************************/ void KMixToolBox::setIcons(TQPtrList &mdws, bool on ) { - for ( TQWidget *qmdw=mdws.first(); qmdw!=0; qmdw=mdws.next() ) { + for ( TQWidget *qmdw=mdws.first(); qmdw; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here static_cast(qmdw)->setIcons( on ); } @@ -54,7 +54,7 @@ void KMixToolBox::setIcons(TQPtrList &mdws, bool on ) { void KMixToolBox::setLabels(TQPtrList &mdws, bool on ) { TQWidget *qmdw; - for ( qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { + for ( qmdw=mdws.first(); qmdw; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here static_cast(qmdw)->setLabeled( on ); } @@ -63,7 +63,7 @@ void KMixToolBox::setLabels(TQPtrList &mdws, bool on ) { void KMixToolBox::setTicks(TQPtrList &mdws, bool on ) { TQWidget *qmdw; - for ( qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { + for ( qmdw=mdws.first(); qmdw; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- in reality it is only in MDWSlider static_cast(qmdw)->setTicks( on ); } @@ -72,7 +72,7 @@ void KMixToolBox::setTicks(TQPtrList &mdws, bool on ) { void KMixToolBox::setValueStyle(TQPtrList &mdws, int vs ) { TQWidget *qmdw; - for ( qmdw=mdws.first(); qmdw != 0; qmdw=mdws.next() ) { + for ( qmdw=mdws.first(); qmdw; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- in reality it is only in MDWSlider static_cast(qmdw)->setValueStyle( (MixDeviceWidget::ValueStyle) vs ); } @@ -84,7 +84,7 @@ void KMixToolBox::loadConfig(TQPtrList &mdws, TDEConfig *config, const config->setGroup( grp ); int num = config->readNumEntry( viewPrefix + ".Devs", 0); - for ( TQWidget *qmdw=mdws.first(); qmdw!=0 && ninherits("MixDeviceWidget") ) { // -<- play safe here MixDeviceWidget* mdw = static_cast(qmdw); TQString devgrp; @@ -166,7 +166,7 @@ void KMixToolBox::saveConfig(TQPtrList &mdws, TDEConfig *config, const config->writeEntry( viewPrefix + ".Devs", mdws.count() ); int n=0; - for ( TQWidget *qmdw=mdws.first(); qmdw!=0; qmdw=mdws.next() ) { + for ( TQWidget *qmdw=mdws.first(); qmdw; qmdw=mdws.next() ) { if ( qmdw->inherits("MixDeviceWidget") ) { // -<- play safe here MixDeviceWidget* mdw = static_cast(qmdw); diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h index 2729cf15..edcf239a 100644 --- a/kmix/ksmallslider.h +++ b/kmix/ksmallslider.h @@ -34,10 +34,10 @@ class KSmallSlider : public TQWidget, public TQRangeControl public: - KSmallSlider( TQWidget *parent, const char *name=0 ); - KSmallSlider( TQt::Orientation, TQWidget *parent, const char *name=0 ); + KSmallSlider( TQWidget *parent, const char *name=nullptr ); + KSmallSlider( TQt::Orientation, TQWidget *parent, const char *name=nullptr ); KSmallSlider( int minValue, int maxValue, int pageStep, int value, - TQt::Orientation, TQWidget *parent, const char *name=0 ); + TQt::Orientation, TQWidget *parent, const char *name=nullptr ); //virtual void setTracking( bool enable ); //bool tracking() const; diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index da41a3e2..c846fe4f 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -48,7 +48,7 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md, TQt::Orientation orientation, TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,false,orientation,parent,mw,name), - _label(0), _enumCombo(0), _layout(0) + _label(nullptr), _enumCombo(nullptr), _layout(nullptr) { // create actions (on _mdwActions, see MixDeviceWidget) @@ -128,7 +128,7 @@ void MDWEnum::showContextMenu() } TQSize MDWEnum::sizeHint() const { - if ( _layout != 0 ) { + if ( _layout ) { return _layout->sizeHint(); } else { diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index 8a1c972b..1c8f7e9b 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -46,7 +46,7 @@ class MDWEnum : public MixDeviceWidget public: MDWEnum( Mixer *mixer, MixDevice* md, TQt::Orientation orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = nullptr, ViewBase* mw = nullptr, const char* name = nullptr); ~MDWEnum(); void addActionToPopup( TDEAction *action ); diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 09f528d9..8b7d30cb 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -60,7 +60,7 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, bool small, TQt::Orientation orientation, TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), - m_linked(true), m_valueStyle( NNONE), m_iconLabel( 0 ), m_muteLED( 0 ), m_recordLED( 0 ), m_label( 0 ), _layout(0) + m_linked(true), m_valueStyle( NNONE), m_iconLabel( nullptr ), m_muteLED( nullptr ), m_recordLED( nullptr ), m_label( nullptr ), _layout(nullptr) { // create actions (on _mdwActions, see MixDeviceWidget) @@ -68,11 +68,11 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md, _mdwActions, "stereo" ); new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" ); - TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" ); + TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, nullptr, nullptr, _mdwActions, "mute" ); connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleMuted()) ); if( m_mixdevice->isRecordable() ) { - a = new TDEToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" ); + a = new TDEToggleAction( i18n("Set &Record Source"), 0, nullptr, nullptr, _mdwActions, "recsrc" ); connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT( toggleRecsrc()) ); } @@ -200,7 +200,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) iconLayout->setAlignment(TQt::AlignHCenter); } - m_iconLabel = 0L; + m_iconLabel = nullptr; setIcon( m_mixdevice->type() ); iconLayout->addStretch(); iconLayout->addWidget( m_iconLabel ); @@ -443,7 +443,7 @@ MDWSlider::setIcon( int icontype ) bool MDWSlider::isLabeled() const { - if ( m_label == 0 ) + if ( !m_label ) return false; else return !m_label->isHidden(); @@ -481,7 +481,7 @@ MDWSlider::setStereoLinked(bool value) firstSliderValueValid = true; } - for( slider=m_sliders.next(), number=_numbers.next(); slider!=0 && number!=0; slider=m_sliders.next(), number=_numbers.next() ) { + for( slider=m_sliders.next(), number=_numbers.next(); slider && number; slider=m_sliders.next(), number=_numbers.next() ) { if ( m_linked ) { slider->hide(); number->hide(); @@ -520,7 +520,7 @@ MDWSlider::setStereoLinked(bool value) void MDWSlider::setLabeled(bool value) { - if ( m_label == 0 ) + if ( !m_label ) return; if (value ) @@ -567,7 +567,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle ) int i = 0; TQValueList::Iterator it = _slidersChids.begin(); - for(TQLabel *number = _numbers.first(); number!=0; number = _numbers.next(), ++i, ++it) { + for(TQLabel *number = _numbers.first(); number; number = _numbers.next(), ++i, ++it) { Volume::ChannelID chid = *it; switch ( m_valueStyle ) { case NNONE: number->hide(); break; @@ -584,7 +584,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle ) void MDWSlider::setIcons(bool value) { - if ( m_iconLabel != 0 ) { + if ( m_iconLabel ) { if ( ( !m_iconLabel->isHidden()) !=value ) { if (value) m_iconLabel->show(); @@ -599,7 +599,7 @@ MDWSlider::setIcons(bool value) void MDWSlider::setColors( TQColor high, TQColor low, TQColor back ) { - for( TQWidget *slider=m_sliders.first(); slider!=0; slider=m_sliders.next() ) { + for( TQWidget *slider=m_sliders.first(); slider; slider=m_sliders.next() ) { KSmallSlider *smallSlider = dynamic_cast(slider); if ( smallSlider ) smallSlider->setColors( high, low, back ); } @@ -608,7 +608,7 @@ MDWSlider::setColors( TQColor high, TQColor low, TQColor back ) void MDWSlider::setMutedColors( TQColor high, TQColor low, TQColor back ) { - for( TQWidget *slider=m_sliders.first(); slider!=0; slider=m_sliders.next() ) { + for( TQWidget *slider=m_sliders.first(); slider; slider=m_sliders.next() ) { KSmallSlider *smallSlider = dynamic_cast(slider); if ( smallSlider ) smallSlider->setGrayColors( high, low, back ); } @@ -677,7 +677,7 @@ void MDWSlider::volumeChange( int ) int n = 0; TQValueList::Iterator it = _slidersChids.begin(); TQLabel *number = _numbers.first(); - for( TQWidget *slider=m_sliders.first(); slider!=0 && number!=0; slider=m_sliders.next(), number=_numbers.next(), ++it ) + for( TQWidget *slider=m_sliders.first(); slider && number; slider=m_sliders.next(), number=_numbers.next(), ++it ) { Volume::ChannelID chid = *it; if ( slider->inherits( "KSmallSlider" ) ) @@ -787,7 +787,7 @@ void MDWSlider::update() long avgVol = vol.getAvgVolume( Volume::MMAIN ); TQWidget *slider = m_sliders.first(); - if ( slider == 0 ) { + if ( !slider ) { return; // !!! Development version, check this !!! } slider->blockSignals( true ); @@ -822,7 +822,7 @@ void MDWSlider::update() for( int i=0; isizeHint(); } else { diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index fcd3636b..f597d8d8 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -61,7 +61,7 @@ public: MDWSlider( Mixer *mixer, MixDevice* md, bool showMuteLED, bool showRecordLED, bool small, TQt::Orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = nullptr, ViewBase* mw = nullptr, const char* name = nullptr); ~MDWSlider() {} void addActionToPopup( TDEAction *action ); diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index a81c95a9..9cb7eb2d 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -49,7 +49,7 @@ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md, bool small, TQt::Orientation orientation, TQWidget* parent, ViewBase* mw, const char* name) : MixDeviceWidget(mixer,md,small,orientation,parent,mw,name), - _label(0) , _labelV(0) , _switchLED(0), _layout(0) + _label(nullptr) , _labelV(nullptr) , _switchLED(nullptr), _layout(nullptr) { // create actions (on _mdwActions, see MixDeviceWidget) @@ -130,7 +130,7 @@ void MDWSwitch::createWidgets() void MDWSwitch::update() { - if ( _switchLED != 0 ) { + if ( _switchLED ) { _switchLED->blockSignals( true ); if( m_mixdevice->isRecordable() ) _switchLED->setState( m_mixdevice->isRecSource() ? KLed::On : KLed::Off ); @@ -143,10 +143,10 @@ void MDWSwitch::update() void MDWSwitch::setBackgroundMode(BackgroundMode m) { - if ( _label != 0 ){ + if ( _label ){ _label->setBackgroundMode(m); } - if ( _labelV != 0 ){ + if ( _labelV ){ _labelV->setBackgroundMode(m); } _switchLED->setBackgroundMode(m); @@ -165,7 +165,7 @@ void MDWSwitch::showContextMenu() } TQSize MDWSwitch::sizeHint() const { - if ( _layout != 0 ) { + if ( _layout ) { return _layout->sizeHint(); } else { diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 8be74e95..05fd6752 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -56,7 +56,7 @@ class MDWSwitch : public MixDeviceWidget public: MDWSwitch( Mixer *mixer, MixDevice* md, bool small, TQt::Orientation orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = nullptr, ViewBase* mw = nullptr, const char* name = nullptr); ~MDWSwitch(); void addActionToPopup( TDEAction *action ); diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index 81d7c4ed..501697da 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -87,7 +87,7 @@ TDEGlobalAccel *MixDeviceWidget::keys( void ) void MixDeviceWidget::defineKeys() { if (m_keys) { - KKeyDialog::configure(m_keys, 0, false); + KKeyDialog::configure(m_keys, nullptr, false); // The keys are saved in KMixerWidget::saveConfig, see kmixerwidget.cpp m_keys->updateConnections(); } diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h index ccd779f6..c42c6fba 100644 --- a/kmix/mixdevicewidget.h +++ b/kmix/mixdevicewidget.h @@ -60,7 +60,7 @@ public: MixDeviceWidget( Mixer *mixer, MixDevice* md, bool small, TQt::Orientation orientation, - TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0); + TQWidget* parent = nullptr, ViewBase* mw = nullptr, const char* name = nullptr); ~MixDeviceWidget(); void addActionToPopup( TDEAction *action ); diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 0712d858..9b410114 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -55,7 +55,7 @@ int Mixer::numDrivers() { MixerFactory *factory = g_mixerFactories; int num = 0; - while( factory->getMixer!=0 ) + while( factory->getMixer ) { num++; factory++; @@ -75,11 +75,11 @@ TQPtrList& Mixer::mixers() Mixer::Mixer( int driver, int device ) : DCOPObject( "Mixer" ) { - _pollingTimer = 0; + _pollingTimer = nullptr; - _mixerBackend = 0; + _mixerBackend = nullptr; getMixerFunc *f = g_mixerFactories[driver].getMixer; - if( f!=0 ) { + if( f ) { _mixerBackend = f( device ); } @@ -134,7 +134,7 @@ void Mixer::volumeLoad( TDEConfig *config ) // set new settings TQPtrListIterator it( _mixerBackend->m_mixDevices ); - for(MixDevice *md=it.toFirst(); md!=0; md=++it ) + for(MixDevice *md=it.toFirst(); md; md=++it ) { // kdDebug(67100) << "Mixer::volumeLoad() writeVolumeToHW(" << md->num() << ", "<< md->getVolume() << ")" << endl; // !! @todo Restore record source @@ -168,7 +168,7 @@ int Mixer::open() } MixDevice* recommendedMaster = _mixerBackend->recommendedMaster(); - if ( recommendedMaster != 0 ) { + if ( recommendedMaster ) { setMasterDevice(recommendedMaster->getPK() ); } else { @@ -249,7 +249,7 @@ bool Mixer::isValid() { } bool Mixer::isOpen() const { - if ( _mixerBackend == 0 ) + if ( !_mixerBackend ) return false; else return _mixerBackend->isOpen(); @@ -288,7 +288,7 @@ void Mixer::readSetFromHW() } _readSetFromHWforceUpdate = false; MixDevice* md; - for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) + for( md = _mixerBackend->m_mixDevices.first(); md; md = _mixerBackend->m_mixDevices.next() ) { Volume& vol = md->getVolume(); _mixerBackend->readVolumeFromHW( md->num(), vol ); @@ -315,7 +315,7 @@ void Mixer::setBalance(int balance) m_balance = balance; MixDevice* master = masterDevice(); - if ( master == 0 ) { + if ( !master ) { // no master device available => return return; } @@ -355,7 +355,7 @@ int Mixer::devnum() TQString Mixer::driverName( int driver ) { getDriverNameFunc *f = g_mixerFactories[driver].getDriverName; - if( f!=0 ) + if( f ) return f(); else return "unknown"; @@ -413,10 +413,10 @@ void Mixer::setMasterCardDevice(const TQString &ref_id) MixDevice* Mixer::masterCardDevice() { - MixDevice* md = 0; + MixDevice* md = nullptr; Mixer *mixer = masterCard(); - if ( mixer != 0 ) { - for( md = mixer->_mixerBackend->m_mixDevices.first(); md != 0; md = mixer->_mixerBackend->m_mixDevices.next() ) { + if ( mixer ) { + for( md = mixer->_mixerBackend->m_mixDevices.first(); md; md = mixer->_mixerBackend->m_mixDevices.next() ) { if ( md->getPK() == _masterCardDevice ) @@ -448,7 +448,7 @@ void Mixer::setRecordSource( int devnum, bool on ) { if( !_mixerBackend->setRecsrcHW( devnum, on ) ) // others have to be updated { - for( MixDevice* md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) { + for( MixDevice* md = _mixerBackend->m_mixDevices.first(); md; md = _mixerBackend->m_mixDevices.next() ) { bool isRecsrc = _mixerBackend->isRecsrcHW( md->num() ); // kdDebug(67100) << "Mixer::setRecordSource(): isRecsrcHW(" << md->num() << ") =" << isRecsrc << endl; md->setRecSource( isRecsrc ); @@ -458,7 +458,7 @@ void Mixer::setRecordSource( int devnum, bool on ) } else { // just the actual mixdevice - for( MixDevice* md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) { + for( MixDevice* md = _mixerBackend->m_mixDevices.first(); md; md = _mixerBackend->m_mixDevices.next() ) { if( md->num() == devnum ) { bool isRecsrc = _mixerBackend->isRecsrcHW( md->num() ); md->setRecSource( isRecsrc ); @@ -484,8 +484,8 @@ void Mixer::setMasterDevice(TQString &devPK) MixDevice* Mixer::find(TQString& devPK) { - MixDevice* md = 0; - for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) { + MixDevice* md = nullptr; + for( md = _mixerBackend->m_mixDevices.first(); md; md = _mixerBackend->m_mixDevices.next() ) { if( devPK == md->getPK() ) { break; } @@ -498,7 +498,7 @@ MixDevice *Mixer::mixDeviceByType( int deviceidx ) { unsigned int i=0; while (inum()!=deviceidx) i++; - if (i==size()) return 0; + if (i==size()) return nullptr; return (*this)[i]; } @@ -541,7 +541,7 @@ void Mixer::commitVolumeChange( MixDevice* md ) { void Mixer::setMasterVolume( int percentage ) { MixDevice *master = masterDevice(); - if (master != 0 ) { + if (master ) { setVolume( master->num(), percentage ); } } @@ -627,7 +627,7 @@ int Mixer::masterVolume() { int vol = 0; MixDevice *master = masterDevice(); - if (master != 0 ) { + if (master ) { vol = volume( master->num() ); } return vol; @@ -723,7 +723,7 @@ void Mixer::toggleMute( int deviceidx ) void Mixer::toggleMasterMute() { MixDevice *master = masterDevice(); - if (master != 0 ) { + if (master ) { toggleMute( master->num() ); } } @@ -742,7 +742,7 @@ bool Mixer::mute( int deviceidx ) bool Mixer::masterMute() { MixDevice *master = masterDevice(); - if (master != 0 ) { + if (master ) { return mute( master->num() ); } return true; diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp index 7a981e51..d400a2eb 100644 --- a/kmix/mixer_alsa9.cpp +++ b/kmix/mixer_alsa9.cpp @@ -56,9 +56,9 @@ ALSA_getMixer( int device ) Mixer_ALSA::Mixer_ALSA( int device ) : Mixer_Backend( device ) { - m_fds = 0; - m_sns = 0; - _handle = 0; + m_fds = nullptr; + m_sns = nullptr; + _handle = nullptr; _initialUpdate = true; } @@ -154,7 +154,7 @@ Mixer_ALSA::open() { kdDebug(67100) << probeMessage << "not found: snd_mixer_open err=" << snd_strerror(err) << endl; //errormsg( Mixer::ERR_NODEV ); - _handle = 0; + _handle = nullptr; return Mixer::ERR_NODEV; // if we cannot open the mixer, we have no devices } //kdDebug(67100) << "OUT Mixer_ALSA snd_mixer_open()" << endl; @@ -190,8 +190,8 @@ Mixer_ALSA::open() if ( ! snd_mixer_selem_is_active ( elem ) ) { // ...but we still want to insert a null value into our mixer element // list so that the list indexes match up. - mixer_elem_list.append( 0 ); - mixer_sid_list.append( 0 ); + mixer_elem_list.append( nullptr ); + mixer_sid_list.append( nullptr ); continue; } @@ -224,7 +224,7 @@ Mixer_ALSA::open() //kdDebug() << "--- Loop: name=" << snd_mixer_selem_id_get_name( sid ) << " , mixerIdx=" << mixerIdx << "------------" << endl; - Volume* volPlay = 0, *volCapture = 0; + Volume* volPlay = nullptr, *volCapture = nullptr; TQPtrList enumList; if ( snd_mixer_selem_is_enumerated(elem) ) { cc = MixDevice::ENUM; @@ -351,7 +351,7 @@ Mixer_ALSA::open() { MixDevice* md; bool found = false; - for ( md = m_mixDevices.first(); md != 0; md = m_mixDevices.next() ) { + for ( md = m_mixDevices.first(); md; md = m_mixDevices.next() ) { if ( md->num() == mixerIdx ) { found = true; writeVolumeToHW( mixerIdx, md->getVolume() ); @@ -426,14 +426,14 @@ void Mixer_ALSA::removeSignalling() { if ( m_fds ) free( m_fds ); - m_fds = 0; + m_fds = nullptr; if ( m_sns ) { for ( int i = 0; i < m_count; i++ ) delete m_sns[i]; delete [] m_sns; - m_sns = 0; + m_sns = nullptr; } } @@ -442,7 +442,7 @@ Mixer_ALSA::close() { int ret=0; m_isOpen = false; - if ( _handle != 0 ) + if ( _handle ) { //kdDebug(67100) << "IN Mixer_ALSA::close()" << endl; snd_mixer_free ( _handle ); @@ -457,7 +457,7 @@ Mixer_ALSA::close() if ( ret == 0 ) ret = ret2; // no error before => use current error code } - _handle = 0; + _handle = nullptr; //kdDebug(67100) << "OUT Mixer_ALSA::close()" << endl; } @@ -473,7 +473,7 @@ Mixer_ALSA::close() snd_mixer_elem_t* Mixer_ALSA::getMixerElem(int devnum) { - snd_mixer_elem_t* elem = 0; + snd_mixer_elem_t* elem = nullptr; if ( ! m_isOpen ) return elem; // unplugging guard if ( int( mixer_sid_list.count() ) > devnum ) { @@ -481,7 +481,7 @@ snd_mixer_elem_t* Mixer_ALSA::getMixerElem(int devnum) { // The next line (hopefully) only finds selem's, not elem's. elem = snd_mixer_find_selem(_handle, sid); - if ( elem == 0 ) { + if ( !elem ) { // !! Check, whether the warning should be omitted. Probably // Route controls are non-simple elements. kdDebug(67100) << "Error finding mixer element " << devnum << endl; @@ -662,7 +662,7 @@ Mixer_ALSA::setRecsrcHW( int devnum, bool on ) void Mixer_ALSA::setEnumIdHW(int mixerIdx, unsigned int idx) { //kdDebug(67100) << "Mixer_ALSA::setEnumIdHW(" << mixerIdx << ", idx=" << idx << ") 1\n"; snd_mixer_elem_t *elem = getMixerElem( mixerIdx ); - if ( elem==0 || ( !snd_mixer_selem_is_enumerated(elem)) ) + if (!elem || !snd_mixer_selem_is_enumerated(elem)) { return; } @@ -685,7 +685,7 @@ void Mixer_ALSA::setEnumIdHW(int mixerIdx, unsigned int idx) { */ unsigned int Mixer_ALSA::enumIdHW(int mixerIdx) { snd_mixer_elem_t *elem = getMixerElem( mixerIdx ); - if ( elem==0 || ( !snd_mixer_selem_is_enumerated(elem)) ) + if (!elem || !snd_mixer_selem_is_enumerated(elem)) { return 0; } diff --git a/kmix/mixer_backend.cpp b/kmix/mixer_backend.cpp index ffd6ced0..fe0d4ee7 100644 --- a/kmix/mixer_backend.cpp +++ b/kmix/mixer_backend.cpp @@ -24,7 +24,7 @@ #include "mixer.h" Mixer_Backend::Mixer_Backend(int device) : - m_devnum (device) , m_isOpen(false), m_recommendedMaster(0) + m_devnum (device) , m_isOpen(false), m_recommendedMaster(nullptr) { m_mixDevices.setAutoDelete( true ); } @@ -63,8 +63,8 @@ bool Mixer_Backend::prepareUpdateFromHW() { * The users preference is NOT returned by this method - see the Mixer class for that. */ MixDevice* Mixer_Backend::recommendedMaster() { - MixDevice* recommendedMixDevice = 0; - if ( m_recommendedMaster != 0 ) { + MixDevice* recommendedMixDevice = nullptr; + if ( m_recommendedMaster ) { recommendedMixDevice = m_recommendedMaster; } // recommendation from Backend else { diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp index 4a19673b..86be9d79 100644 --- a/kmix/mixertoolbox.cpp +++ b/kmix/mixertoolbox.cpp @@ -163,7 +163,7 @@ void MixerToolBox::initMixer(TQPtrList &mixers, bool multiDriverMode, TQS else { delete mixer; - mixer = 0; + mixer = nullptr; } // invalid /* Lets decide if we the autoprobing shall continue: */ @@ -213,7 +213,7 @@ void MixerToolBox::initMixer(TQPtrList &mixers, bool multiDriverMode, TQS } // loop over sound card devices of current driver } // loop over soundcard drivers - if (Mixer::masterCard() == 0) + if (!Mixer::masterCard()) { // We have no master card yet. This actually only happens when there was // not one defined in the kmixrc. @@ -223,7 +223,7 @@ void MixerToolBox::initMixer(TQPtrList &mixers, bool multiDriverMode, TQS Mixer *mixer = Mixer::mixers().first(); Mixer::setMasterCard(mixer->id()); MixSet ms = mixer->getMixSet(); - for (MixDevice *md = ms.first(); md != 0; md = ms.next()) + for (MixDevice *md = ms.first(); md; md = ms.next()) { if (!md->isRecordable() && !md->isSwitch() && !md->isEnum()) { @@ -256,7 +256,7 @@ void MixerToolBox::deinitMixer() { //kdDebug(67100) << "IN MixerToolBox::deinitMixer()"<close(); diff --git a/kmix/mixset.cpp b/kmix/mixset.cpp index 18e7fe7c..4c631fb2 100644 --- a/kmix/mixset.cpp +++ b/kmix/mixset.cpp @@ -32,7 +32,7 @@ void MixSet::clone( MixSet &set ) { clear(); - for( MixDevice *md=set.first(); md!=0; md=set.next() ) + for( MixDevice *md=set.first(); md; md=set.next() ) { append( new MixDevice( *md ) ); } @@ -45,7 +45,7 @@ void MixSet::read( TDEConfig *config, const TQString& grp ) m_name = config->readEntry( "name", m_name ); MixDevice* md; - for( md=first(); md!=0; md=next() ) + for( md=first(); md; md=next() ) { md->read( config, grp ); } @@ -58,7 +58,7 @@ void MixSet::write( TDEConfig *config, const TQString& grp ) config->writeEntry( "name", m_name ); MixDevice* md; - for( md=first(); md!=0; md=next() ) + for( md=first(); md; md=next() ) { md->write( config, grp ); } diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp index fcd6e423..da74a931 100644 --- a/kmix/viewsliders.cpp +++ b/kmix/viewsliders.cpp @@ -61,7 +61,7 @@ ViewSliders::~ViewSliders() { void ViewSliders::setMixSet(MixSet *mixset) { MixDevice* md; - for ( md = mixset->first(); md != 0; md = mixset->next() ) { + for ( md = mixset->first(); md; md = mixset->next() ) { if ( (! md->isSwitch()) && ( ! md->isEnum() ) ) { _mixSet->append(md); } @@ -116,8 +116,8 @@ void ViewSliders::refreshVolumeLevels() { TQWidget *mdw = _mdws.first(); MixDevice* md; - for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { - if ( mdw == 0 ) { + for ( md = _mixSet->first(); md; md = _mixSet->next() ) { + if ( !mdw ) { kdError(67100) << "ViewSliders::refreshVolumeLevels(): mdw == 0\n"; break; // sanity check (normally the lists are set up correctly) } diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index a7ab291c..9041f02c 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -42,8 +42,8 @@ ViewSurround::ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags) : ViewBase(parent, name, caption, mixer, WStyle_Customize|WStyle_NoBorder, vflags) { - _mdSurroundFront = 0; - _mdSurroundBack = 0; + _mdSurroundFront = nullptr; + _mdSurroundBack = nullptr; _layoutMDW = new TQHBoxLayout(this); _layoutMDW->setMargin(8); // Create switch buttonGroup @@ -64,7 +64,7 @@ ViewSurround::~ViewSurround() { void ViewSurround::setMixSet(MixSet *mixset) { MixDevice* md; - for ( md = mixset->first(); md != 0; md = mixset->next() ) { + for ( md = mixset->first(); md; md = mixset->next() ) { if ( ! md->isSwitch() ) { switch ( md->type() ) { case MixDevice::VOLUME: @@ -175,14 +175,14 @@ void ViewSurround::constructionFinished() { personLabel->setMidLineWidth( 3 ); personLabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); int rowOfSpeaker = 0; - if ( _mdSurroundBack != 0 ) { + if ( _mdSurroundBack ) { // let the speaker "sit" in the rear of the room, if there is // rear speaker support in this sound card rowOfSpeaker = 1; } _layoutSurround->addWidget(personLabel ,rowOfSpeaker, 2, TQt::AlignHCenter | TQt::AlignVCenter); - if ( _mdSurroundFront != 0 ) { + if ( _mdSurroundFront ) { MixDeviceWidget *mdw = createMDW(_mdSurroundFront, true, TQt::Vertical); _layoutSurround->addWidget(mdw,0,4, TQt::AlignBottom | TQt::AlignRight); _mdws.append(mdw); @@ -199,7 +199,7 @@ void ViewSurround::constructionFinished() { } - if ( _mdSurroundBack != 0 ) { + if ( _mdSurroundBack ) { MixDeviceWidget *mdw = createMDW(_mdSurroundBack, true, TQt::Vertical); _layoutSurround->addWidget(mdw,2,4, TQt::AlignTop | TQt::AlignRight); _mdws.append(mdw); @@ -230,9 +230,9 @@ void ViewSurround::refreshVolumeLevels() { TQWidget *mdw = _mdws.first(); MixDevice* md; - for ( md = _mixSet->first(); md != 0; md = _mixSet->next() ) { - if ( mdw == 0 ) { - kdError(67100) << "ViewSurround::refreshVolumeLevels(): mdw == 0\n"; + for ( md = _mixSet->first(); md; md = _mixSet->next() ) { + if ( !mdw ) { + kdError(67100) << "ViewSurround::refreshVolumeLevels(): mdw == nullptr\n"; break; // sanity check (normally the lists are set up correctly) } else { diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp index 6d4d58a1..feca29a7 100644 --- a/krec/krecconfig_files.cpp +++ b/krec/krecconfig_files.cpp @@ -33,8 +33,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_krec_files, KRecConfigFilesFactory( "krec" ) ) KRecConfigFiles::KRecConfigFiles( TQWidget* p, const char*, const TQStringList& s ) : TDECModule( KRecConfigFilesFactory::instance(), p, s ) - , _layout( 0 ) - , _filewidget( 0 ) + , _layout( nullptr ) + , _filewidget( nullptr ) { _layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h index dcaa7b3d..a541a311 100644 --- a/krec/krecconfig_files.h +++ b/krec/krecconfig_files.h @@ -31,7 +31,7 @@ class KRecConfigFiles : public TDECModule { TQ_OBJECT public: - KRecConfigFiles( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); + KRecConfigFiles( TQWidget*, const char* =nullptr, const TQStringList& = TQStringList() ); ~KRecConfigFiles(); void load(); diff --git a/krec/krecconfig_fileswidget.h b/krec/krecconfig_fileswidget.h index d40cd1d3..949895e9 100644 --- a/krec/krecconfig_fileswidget.h +++ b/krec/krecconfig_fileswidget.h @@ -31,7 +31,7 @@ class KRecConfigFilesWidget : public TQVBox { TQ_OBJECT public: - KRecConfigFilesWidget( TQWidget*, const char* =0 ); + KRecConfigFilesWidget( TQWidget*, const char* =nullptr ); ~KRecConfigFilesWidget(); void load(); diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 04311206..31f76d6f 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -36,12 +36,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_krec, KRecConfigGeneralFactory( "krec" ) ) KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringList& s ) : TDECModule( KRecConfigGeneralFactory::instance(), p, s ) - , _layout( 0 ), _layout_display( 0 ) - , _display_title( 0 ) - , _displaybox( 0 ), _framebasebox( 0 ) - , _display0( 0 ), _display1( 0 ), _display2( 0 ), _display3( 0 ) - , _framebase30( 0 ), _framebase25( 0 ), _framebase75( 0 ), _framebaseother( 0 ) - , _framebaseotherbox( 0 ), _framebaseotherlabel( 0 ), _framebaseotherline( 0 ) + , _layout( nullptr ), _layout_display( nullptr ) + , _display_title( nullptr ) + , _displaybox( nullptr ), _framebasebox( nullptr ) + , _display0( nullptr ), _display1( nullptr ), _display2( nullptr ), _display3( nullptr ) + , _framebase30( nullptr ), _framebase25( nullptr ), _framebase75( nullptr ), _framebaseother( nullptr ) + , _framebaseotherbox( nullptr ), _framebaseotherlabel( nullptr ), _framebaseotherline( nullptr ) , _displaymode( 0 ), _framebase( 25 ) { _layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h index 51774fc5..821b1f95 100644 --- a/krec/krecconfigure.h +++ b/krec/krecconfigure.h @@ -31,7 +31,7 @@ class KRecConfigGeneral : public TDECModule { TQ_OBJECT public: - KRecConfigGeneral( TQWidget*, const char* =0, const TQStringList& = TQStringList() ); + KRecConfigGeneral( TQWidget*, const char* =nullptr, const TQStringList& = TQStringList() ); ~KRecConfigGeneral(); void load(); diff --git a/krec/krecexport_template.h b/krec/krecexport_template.h index 5eb64031..d6932923 100644 --- a/krec/krecexport_template.h +++ b/krec/krecexport_template.h @@ -37,7 +37,7 @@ private: bool _running; int _samplingRate, _bits, _channels; protected: - KRecExportItem( TQObject*, const char* =0, const TQStringList& =0 ); + KRecExportItem( TQObject*, const char* =nullptr, const TQStringList& =nullptr ); /** * This registers this class at the KRecGlobal. diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp index c7f3e18a..55b076a9 100644 --- a/krec/krecexport_wave.cpp +++ b/krec/krecexport_wave.cpp @@ -24,11 +24,11 @@ K_EXPORT_COMPONENT_FACTORY( libkrecexport_wave, KGenericFactory ) -KRecExport_Wave krecExportWave( 0 ); +KRecExport_Wave krecExportWave( nullptr ); KRecExport_Wave::KRecExport_Wave( TQObject* p, const char* n, const TQStringList& ) : KRecExportItem( p,n ) - , _file( 0 ) + , _file( nullptr ) { kdDebug( 60005 ) << k_funcinfo << endl; registerAtGlobal( this ); @@ -40,7 +40,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; KRecExport_Wave* KRecExport_Wave::newItem() { kdDebug( 60005 ) << k_funcinfo << endl; - return new KRecExport_Wave( 0 ); + return new KRecExport_Wave( nullptr ); } TQStringList KRecExport_Wave::extensions() { @@ -126,7 +126,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _file->close(); delete _file; - _file = 0; + _file = nullptr; return true; } else return false; diff --git a/krec/krecexport_wave.h b/krec/krecexport_wave.h index 9322211c..6dc84a4b 100644 --- a/krec/krecexport_wave.h +++ b/krec/krecexport_wave.h @@ -23,7 +23,7 @@ class KRecExport_Wave : public KRecExportItem { TQ_OBJECT public: - KRecExport_Wave( TQObject*, const char* =0, const TQStringList& =0 ); + KRecExport_Wave( TQObject*, const char* =nullptr, const TQStringList& =nullptr ); ~KRecExport_Wave(); KRecExport_Wave* newItem(); diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index 08faa7d2..5c0e15fe 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -178,7 +178,7 @@ void KRecFile::exportwave( const TQString &filename ) { TQByteArray* KRecFile::getData( int ) { kdDebug( 60005 ) << k_funcinfo << endl; - return 0; + return nullptr; } void KRecFile::getData( TQByteArray& data ) { @@ -286,7 +286,7 @@ void KRecFile::deleteBuffer( KRecBuffer* b ) { KRecBuffer* KRecFile::getTopBuffer_buffer( int pos ) { //kdDebug( 60005 ) << k_funcinfo << pos << endl; TQValueList::iterator it = _buffers.begin(); - KRecBuffer* out = 0; + KRecBuffer* out = nullptr; while ( it != _buffers.end() ) { if ( ( *it )->startpos() <= pos && offsetToSamples( ( *it )->size() ) + ( *it )->startpos() > pos && ( *it )->active() ) out = ( *it ); diff --git a/krec/krecfile.h b/krec/krecfile.h index ae9e7337..6838371e 100644 --- a/krec/krecfile.h +++ b/krec/krecfile.h @@ -31,8 +31,8 @@ class KRecFile : virtual public TQObject { friend class KRecFileWidget; public: - KRecFile( TQObject*, const char* =0 ); - KRecFile( const TQString &, TQObject*, const char* =0 ); + KRecFile( TQObject*, const char* =nullptr ); + KRecFile( const TQString &, TQObject*, const char* =nullptr ); ~KRecFile(); TQString filename(); @@ -57,7 +57,7 @@ public slots: void newBuffer(); /// Deletes the buffer from the file. - void deleteBuffer( KRecBuffer* =0 ); + void deleteBuffer( KRecBuffer* =nullptr ); void writeData( Arts::mcopbyte* data, uint length ); void writeData( TQByteArray* ); @@ -128,7 +128,7 @@ class KRecBuffer : virtual public TQObject { TQ_OBJECT public: - KRecBuffer( const TQString &, int, bool, KRecFile*, const char* =0 ); + KRecBuffer( const TQString &, int, bool, KRecFile*, const char* =nullptr ); ~KRecBuffer(); // After how many samples in the File this Buffer starts... @@ -150,7 +150,7 @@ public: @param config The configuration thats read @param dir The directory where the file is saved */ - static KRecBuffer* fromConfig( TDEConfig* config, TQDir* dir, KRecFile* p, const char* n=0 ); + static KRecBuffer* fromConfig( TDEConfig* config, TQDir* dir, KRecFile* p, const char* n=nullptr ); TQString filename() const; diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp index 5c9f4c06..b1d4bb95 100644 --- a/krec/krecfileview.cpp +++ b/krec/krecfileview.cpp @@ -34,7 +34,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout_td = new TQBoxLayout( this, TQBoxLayout::TopToBottom, 5, 5 ); _filename = new TQLabel( i18n( "" ), this ); _layout_td->addWidget( _filename, 1 ); - _fileview = new KRecFileWidget( 0, this ); + _fileview = new KRecFileWidget( nullptr, this ); _layout_td->addWidget( _fileview, 100 ); _timebar = new KRecTimeBar( this ); _layout_td->addWidget( _timebar, 50 ); @@ -43,7 +43,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout_lr->addStretch( 20 ); _timedisplay = new KRecTimeDisplay( this ); _layout_td->addWidget( _timedisplay, 1 ); - _file = 0; + _file = nullptr; } KRecFileView::~KRecFileView() { kdDebug( 60005 ) << k_funcinfo << endl; diff --git a/krec/krecfileview.h b/krec/krecfileview.h index b4583467..da726526 100644 --- a/krec/krecfileview.h +++ b/krec/krecfileview.h @@ -31,7 +31,7 @@ class KRecFileView : virtual public TQWidget { TQ_OBJECT public: - KRecFileView( TQWidget*, const char* =0 ); + KRecFileView( TQWidget*, const char* =nullptr ); ~KRecFileView(); void setFile( KRecFile* ); diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index 4757078f..9c07b286 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -75,7 +75,7 @@ void KRecTimeBar::newSize( int n ) { KRecTimeDisplay::KRecTimeDisplay( TQWidget* p, const char* n ) : TQFrame( p,n ) - , _posmenu( 0 ), _sizemenu( 0 ) + , _posmenu( nullptr ), _sizemenu( nullptr ) , _sizevalue( 0 ), _posvalue( 0 ) , _samplingRate( 44100 ), _bits( 16 ), _channels( 2 ) { diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index 8faf225e..be482e1e 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -29,7 +29,7 @@ class KRecTimeBar : public TQFrame { TQ_OBJECT public: - KRecTimeBar( TQWidget*, const char* =0 ); + KRecTimeBar( TQWidget*, const char* =nullptr ); ~KRecTimeBar(); void drawContents( TQPainter* ); @@ -59,7 +59,7 @@ class KRecTimeDisplay : public TQFrame { TQ_OBJECT public: - KRecTimeDisplay( TQWidget*, const char* =0 ); + KRecTimeDisplay( TQWidget*, const char* =nullptr ); ~KRecTimeDisplay(); /// Resets the display to its defaultvalues @@ -96,9 +96,9 @@ class AKLabel : public TQLabel { TQ_OBJECT public: - AKLabel( TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( p, n, f ) { init(); } - AKLabel( const TQString& s, TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( s, p, n, f ) { init(); } - AKLabel( TQWidget* w, const TQString& s, TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( w,s,p,n,f ) { init(); } + AKLabel( TQWidget* p, const char* n=nullptr, WFlags f=0 ) : TQLabel( p, n, f ) { init(); } + AKLabel( const TQString& s, TQWidget* p, const char* n=nullptr, WFlags f=0 ) : TQLabel( s, p, n, f ) { init(); } + AKLabel( TQWidget* w, const TQString& s, TQWidget* p, const char* n=nullptr, WFlags f=0 ) : TQLabel( w,s,p,n,f ) { init(); } void mousePressEvent( TQMouseEvent* ); signals: diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index c626a961..409e6f52 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -35,7 +35,7 @@ KRecFileWidget::KRecFileWidget( KRecFile* file, TQWidget* p, const char* n ) : TQFrame( p,n ) - , _file( 0 ) + , _file( nullptr ) { kdDebug( 60005 ) << k_funcinfo << file << endl; setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); @@ -106,12 +106,12 @@ void KRecFileWidget::newBuffer( KRecBuffer* buffer ) { void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) { //kdDebug( 60005 ) << k_funcinfo << buffer << endl; TQValueList::iterator it = bufferwidgets.begin(); - KRecBufferWidget* tmp = 0; + KRecBufferWidget* tmp = nullptr; while ( it != bufferwidgets.end() ) { if ( ( *it )->buffer() == buffer ) tmp = ( *it ); ++it; } - if ( tmp != 0 ) { + if ( tmp ) { delete tmp; bufferwidgets.remove( tmp ); } @@ -144,7 +144,7 @@ void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) { KRecBufferWidget::KRecBufferWidget( KRecBuffer* buffer, TQWidget* p, const char* n ) : TQFrame( p,n ) , _buffer( buffer ) - , _main_region( 0 ), _title_region( 0 ), _fileend_region( 0 ) + , _main_region( nullptr ), _title_region( nullptr ), _fileend_region( nullptr ) , alreadyreadsize( 0 ) { connect( _buffer, TQ_SIGNAL( somethingChanged() ), this, TQ_SLOT( update() ) ); @@ -170,7 +170,7 @@ void KRecBufferWidget::initLayout() { _title_region = new TQRegion( TQRect( 0, 0, _title_width, _title_height ) ); else _title_region = new TQRegion( TQRect( 0, _title_height/2, _title_width, _title_height/2 ) ); - if ( _fileend_region ) { delete _fileend_region; _fileend_region=0; } + if ( _fileend_region ) { delete _fileend_region; _fileend_region=nullptr; } if ( _buffer->active() ) _fileend_region = new TQRegion( TQRect( width()-4, _title_height/2, 4, _title_height/2 ) ); else diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h index 1c3f8329..faf4928d 100644 --- a/krec/krecfilewidgets.h +++ b/krec/krecfilewidgets.h @@ -39,12 +39,12 @@ class KRecFileWidget : public TQFrame { TQ_OBJECT public: - KRecFileWidget( KRecFile*, TQWidget*, const char* =0 ); + KRecFileWidget( KRecFile*, TQWidget*, const char* =nullptr ); ~KRecFileWidget(); void setFile( KRecFile* ); - void resizeEvent( TQResizeEvent* =0 ); + void resizeEvent( TQResizeEvent* =nullptr ); void mouseReleaseEvent( TQMouseEvent* ); public slots: void newBuffer( KRecBuffer* ); @@ -79,7 +79,7 @@ class KRecBufferWidget : public TQFrame { TQ_OBJECT public: - KRecBufferWidget( KRecBuffer*, TQWidget*, const char* =0 ); + KRecBufferWidget( KRecBuffer*, TQWidget*, const char* =nullptr ); ~KRecBufferWidget(); const KRecBuffer* buffer() { return _buffer; } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 4daa3dab..8ce14b92 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -29,7 +29,7 @@ class KRecGlobal : public TQObject { TQ_OBJECT private: - KRecGlobal( TQObject* =0, const char* =0 ); + KRecGlobal( TQObject* =nullptr, const char* =nullptr ); ~KRecGlobal(); public: diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h index 978af5dd..be0bfdc9 100644 --- a/krec/krecnewproperties.h +++ b/krec/krecnewproperties.h @@ -30,7 +30,7 @@ class KRecNewProperties : public TQDialog { TQ_OBJECT public: - KRecNewProperties( TQWidget*, const char* =0 ); + KRecNewProperties( TQWidget*, const char* =nullptr ); ~KRecNewProperties(); TQString filename(); diff --git a/krec/krecord.cpp b/krec/krecord.cpp index d4ac5413..2aa45e35 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -39,17 +39,17 @@ KRecPrivate::KRecPrivate( KRecord* p, const char* n ) : TQObject( p,n ) - , _confdlg( 0 ) - , server( new KArtsServer( 0 ) ) - , dispatcher( new KArtsDispatcher( 0 ) ) + , _confdlg( nullptr ) + , server( new KArtsServer( nullptr ) ) + , dispatcher( new KArtsDispatcher( nullptr ) ) , m_playStream( new KAudioPlayStream( server, "KRec::Out", server ) ) , m_recStream( new KAudioRecordStream( server, "KRec::In", server ) ) - , w( 0 ) + , w( nullptr ) , b_arts( true ), b_comp( true ) , _impl( p ) , mainwidget( new KRecMainWidget( p ) ) - , _currentFile( 0 ) - , _exportitem( 0 ) + , _currentFile( nullptr ) + , _exportitem( nullptr ) { //kdDebug( 60005 ) << k_funcinfo << endl; m_recStream->usePolling( false ); @@ -78,7 +78,7 @@ KRecPrivate::~KRecPrivate() { //kdDebug( 60005 ) << k_funcinfo << endl; mainwidget->_artswidget = Arts::StereoVolumeControlGui::null(); delete _currentFile; - _currentFile = 0; + _currentFile = nullptr; //kdDebug( 60005 ) << k_funcinfo << "done." << endl; } @@ -144,7 +144,7 @@ bool KRecPrivate::closeFile() { // go on if KMessageBox::No } delete _currentFile; - _currentFile = 0; + _currentFile = nullptr; mainwidget->_fileview->setFile( _currentFile ); } checkActions(); @@ -188,8 +188,8 @@ void KRecPrivate::exportFile() { void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQ_SLOT( endExportFile2() ) ); } void KRecPrivate::endExportFile2() { _exportitem->finalize(); - disconnect( _currentFile, 0, _exportitem, 0 ); - disconnect( _exportitem, 0, 0, 0 ); + disconnect( _currentFile, nullptr, _exportitem, nullptr ); + disconnect( _exportitem, nullptr, nullptr, nullptr ); checkActions(); } diff --git a/krec/krecord.h b/krec/krecord.h index 73628926..a22d5c7a 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -34,7 +34,7 @@ class KRecord : public TDEMainWindow { public: /// Constructor - KRecord( TQWidget* /*parent*/=0, const char* /*name*/=0 ); + KRecord( TQWidget* /*parent*/=nullptr, const char* /*name*/=nullptr ); /// Destructor ~KRecord(); public slots: diff --git a/krec/krecord_private.h b/krec/krecord_private.h index 3be786c3..ee409b3e 100644 --- a/krec/krecord_private.h +++ b/krec/krecord_private.h @@ -48,7 +48,7 @@ class KRecPrivate : public TQObject { public: /// Constructor - KRecPrivate( KRecord*, const char* =0 ); + KRecPrivate( KRecord*, const char* =nullptr ); /// Destructor ~KRecPrivate(); public slots: @@ -132,7 +132,7 @@ class KRecMainWidget : public TQWidget { TQ_OBJECT public: - KRecMainWidget( TQWidget* p, const char* n=0 ) : TQWidget( p,n ) { + KRecMainWidget( TQWidget* p, const char* n=nullptr ) : TQWidget( p,n ) { _layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight, 2 ); _kaw_volumecontrol = new KArtsWidget( this ); _layout->addWidget( _kaw_volumecontrol, 0 ); diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp index a40c5b1f..2fe9c0be 100644 --- a/krec/mp3_export/krecexport_mp3.cpp +++ b/krec/mp3_export/krecexport_mp3.cpp @@ -149,7 +149,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _file->close(); delete _file; - _file = 0; + _file = nullptr; return true; } else return false; diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index 05823b60..2fd6d5d9 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -184,7 +184,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _file->close(); delete _file; - _file = 0; + _file = nullptr; return true; } else return false; diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h index 79497a18..e81f089b 100644 --- a/kscd/bwlednum.h +++ b/kscd/bwlednum.h @@ -24,7 +24,7 @@ class BW_LED_Number : public TQFrame public: - BW_LED_Number( TQWidget *parent=0, const char *name=0 ); + BW_LED_Number( TQWidget *parent=nullptr, const char *name=nullptr ); ~BW_LED_Number(); void setSmallLED(bool ); // if you LED is small it might look better diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h index 8df7da01..97ef5686 100644 --- a/kscd/cddbdlg.h +++ b/kscd/cddbdlg.h @@ -15,7 +15,7 @@ class CDDBDlg : public KDialogBase public: - CDDBDlg(TQWidget* parent, const char* name = 0); + CDDBDlg(TQWidget* parent, const char* name = nullptr); ~CDDBDlg(); void setData( diff --git a/kscd/configWidget.h b/kscd/configWidget.h index 8bec1002..26d19e54 100644 --- a/kscd/configWidget.h +++ b/kscd/configWidget.h @@ -34,7 +34,7 @@ class configWidget : public configWidgetUI public: - configWidget(KSCD* player, TQWidget* parent = 0, const char* name = 0); + configWidget(KSCD* player, TQWidget* parent = nullptr, const char* name = nullptr); ~configWidget(); protected: diff --git a/kscd/docking.h b/kscd/docking.h index 481bbca7..d54f8ed9 100644 --- a/kscd/docking.h +++ b/kscd/docking.h @@ -49,7 +49,7 @@ class DockWidget : public KSystemTray public: - DockWidget( KSCD* parent, const char *name=0); + DockWidget( KSCD* parent, const char *name=nullptr); ~DockWidget(); public slots: diff --git a/kscd/kscd.h b/kscd/kscd.h index b8730280..aecd233e 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -109,7 +109,7 @@ k_dcop: TQStringList trackList(); public: - KSCD( TQWidget *parent = 0, const char *name = 0 ); + KSCD( TQWidget *parent = nullptr, const char *name = nullptr ); ~KSCD(); virtual bool saveState(TQSessionManager& sm); diff --git a/kscd/kscdmagic/xlibwrap.cpp b/kscd/kscdmagic/xlibwrap.cpp index b893ea84..3ef32a93 100644 --- a/kscd/kscdmagic/xlibwrap.cpp +++ b/kscd/kscdmagic/xlibwrap.cpp @@ -49,7 +49,7 @@ void screenInit(int xHint,int yHint,int widthHint,int heightHint) d = xalloc_display("KSCD Magic",xHint,yHint,widthHint,heightHint,&xparams); - if (d == 0) + if (!d) error("setting up a window"); if (!alloc_image(d)) diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h index e9eb98cb..f0b73bad 100644 --- a/kscd/ledlamp.h +++ b/kscd/ledlamp.h @@ -34,7 +34,7 @@ public: enum Type { Rect, Loop }; - LedLamp(TQWidget *parent=0, Type t=Rect); + LedLamp(TQWidget *parent=nullptr, Type t=Rect); enum State { On, Off }; diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h index 515ae811..50a37484 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.h +++ b/libkcddb/kcmcddb/cddbconfigwidget.h @@ -31,7 +31,7 @@ class CDDBConfigWidget : public CDDBConfigWidgetBase public: - CDDBConfigWidget(TQWidget * parent = 0, const char * name = 0); + CDDBConfigWidget(TQWidget * parent = nullptr, const char * name = nullptr); protected slots: diff --git a/mpeglib_artsplug/mpeglibartsplay.cpp b/mpeglib_artsplug/mpeglibartsplay.cpp index 627a72c3..23271956 100644 --- a/mpeglib_artsplug/mpeglibartsplay.cpp +++ b/mpeglib_artsplug/mpeglibartsplay.cpp @@ -34,8 +34,8 @@ using namespace std; string file1; string file2; -Arts::Dispatcher* d=0; -Arts::SimpleSoundServer* server=0; +Arts::Dispatcher* d=nullptr; +Arts::SimpleSoundServer* server=nullptr; diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp index 85f6571c..3df24e85 100644 --- a/noatun/app/main.cpp +++ b/noatun/app/main.cpp @@ -10,7 +10,7 @@ static const char version[] = NOATUN_VERSION; static TDECmdLineOptions options[] = { - { "+[URL]", I18N_NOOP("Files/URLs to open"), 0 }, + { "+[URL]", I18N_NOOP("Files/URLs to open"), nullptr }, TDECmdLineLastOption }; @@ -19,7 +19,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char **argv) TDEAboutData aboutData("noatun", I18N_NOOP("Noatun"), version, description, TDEAboutData::License_BSD, I18N_NOOP("(c) 2000-2004, The Noatun Developers"), - 0, "http://noatun.kde.org"); + nullptr, "http://noatun.kde.org"); aboutData.addAuthor("Charles Samuels", I18N_NOOP("Noatun Developer"), "charles@kde.org"); aboutData.addAuthor("Stefan Westerfeld", I18N_NOOP("Patron of the aRts"), diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 66b0907b..06d79f64 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -52,11 +52,11 @@ struct NoatunApp::Private NoatunApp::NoatunApp() - : TDEUniqueApplication(true, true, true), mPluginMenu(0), mPluginActionMenu(0), mEqualizer(0) + : TDEUniqueApplication(true, true, true), mPluginMenu(nullptr), mPluginActionMenu(nullptr), mEqualizer(nullptr) { d = new Private; - d->vequalizer=0; - d->effects=0; + d->vequalizer=nullptr; + d->effects=nullptr; Visualization::internalVis=true; @@ -82,7 +82,7 @@ NoatunApp::NoatunApp() config->sync(); } // 1 - mPref=new NoatunPreferences(0L); // 115 + mPref=new NoatunPreferences(nullptr); // 115 mPref->hide(); // 1 mLibraryLoader = new LibraryLoader; // 0 @@ -115,7 +115,7 @@ NoatunApp::NoatunApp() loadPlugins(); // 1531 if (!playlist()) { - KMessageBox::error(0,i18n("No playlist plugin was found. " \ + KMessageBox::error(nullptr,i18n("No playlist plugin was found. " \ "Please make sure that Noatun was installed correctly.")); TDEApplication::quit(); delete this; @@ -405,7 +405,7 @@ void NoatunApp::quit() void NoatunApp::fileOpen() { - KURL::List files = KFileDialog::getOpenURLs(":mediadir", mimeTypes(), 0, + KURL::List files = KFileDialog::getOpenURLs(":mediadir", mimeTypes(), nullptr, i18n("Select File to Play")); if (files.count()) diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h index ac287a13..e26eeadd 100644 --- a/noatun/library/cmodule.h +++ b/noatun/library/cmodule.h @@ -24,7 +24,7 @@ class General : public CModule TQ_OBJECT public: - General(TQObject *parent=0); + General(TQObject *parent=nullptr); virtual void save(); private slots: diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index 2c65f536..5da5655b 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -66,7 +66,7 @@ void DownloadItem::dequeue() Downloader::Downloader(TQObject *parent) - : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0) + : TQObject(parent), localfile(nullptr), current(nullptr), mJob(nullptr), mTimeout(nullptr) { mStarted=false; mUnstartedQueue=new TQPtrList; @@ -93,7 +93,7 @@ void Downloader::start() } delete mUnstartedQueue; - mUnstartedQueue=0; + mUnstartedQueue=nullptr; TQTimer::singleShot(0, this, TQ_SLOT(getNext())); } @@ -113,7 +113,7 @@ static TQString nonExistantFile(const TQString &file) TQString Downloader::enqueue(DownloadItem *notifier, const KURL &file) { - if (file.isLocalFile()) return 0; + if (file.isLocalFile()) return nullptr; QueueItem *i=new QueueItem; i->notifier=notifier; i->file=file; @@ -197,32 +197,32 @@ void Downloader::data(TDEIO::Job *, const TQByteArray &data) localfile->writeBlock(data); localfile->flush(); delete mTimeout; - mTimeout=0; + mTimeout=nullptr; } void Downloader::jobDone(TDEIO::Job *) { delete mTimeout; - mTimeout=0; + mTimeout=nullptr; current->notifier->downloadFinished(); if (mStarted) emit dequeued(current->notifier); delete current; - current=0; - mJob=0; + current=nullptr; + mJob=nullptr; getNext(); } void Downloader::giveUpWithThisDownloadServerIsRunningNT() { delete mTimeout; - mTimeout=0; + mTimeout=nullptr; if (!current) return; DownloadItem *old=current->notifier; if (!old) return; old->downloadTimeout(); - current=0; - mJob=0; + current=nullptr; + mJob=nullptr; delete old; getNext(); } diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp index 2e4d6038..a4bcbe14 100644 --- a/noatun/library/effects.cpp +++ b/noatun/library/effects.cpp @@ -30,13 +30,13 @@ using namespace Arts; class EffectConfigWidget : public TQWidget { public: - EffectConfigWidget(Effect *e, TQWidget *parent=0) + EffectConfigWidget(Effect *e, TQWidget *parent=nullptr) : TQWidget(parent), mEf(e) {} virtual ~EffectConfigWidget() { - mEf->mConfig=0; + mEf->mConfig=nullptr; } private: @@ -45,7 +45,7 @@ private: Effect::Effect(const char *name) - : mId(0), mName(name), mConfig(0) + : mId(0), mName(name), mConfig(nullptr) { mEffect=new StereoEffect; *mEffect=DynamicCast(server.createObject(std::string(name))); @@ -74,7 +74,7 @@ Effect *Effect::after() const return *i; } - return 0; + return nullptr; } Effect *Effect::before() const @@ -89,7 +89,7 @@ Effect *Effect::before() const return *i; } - return 0; + return nullptr; } TQCString Effect::name() const @@ -119,7 +119,7 @@ TQWidget *Effect::configure(bool /*friendly*/) { #ifdef HAS_ARTSVERSION_H if (mConfig) return mConfig; - if (!configurable()) return 0; + if (!configurable()) return nullptr; GenericGuiFactory factory; Widget gui = factory.createGui(*mEffect); @@ -265,7 +265,7 @@ Effect *Effects::findId(long id) const for (TQPtrListIterator i(mItems); i.current(); ++i) if ((*i)->id()==id) return *i; - return 0; + return nullptr; } TQPtrList Effects::effects() const diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 193d8adb..f9068824 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -67,12 +67,12 @@ bool EffectList::acceptDrag(TQDropEvent *event) const TQDragObject *EffectList::dragObject() const { - if (!currentItem()) return 0; + if (!currentItem()) return nullptr; return new TQStoredDrag("application/x-noatun-effectdrag", (TQWidget*)this); } EffectView::EffectView() - : KDialogBase((TQWidget*)0L, 0, false, i18n("Effects"), Help | Close, Close, true) + : KDialogBase((TQWidget*)0L, nullptr, false, i18n("Effects"), Help | Close, Close, true) , initialized(false) { } @@ -85,7 +85,7 @@ void EffectView::show() namespace { -TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0) +TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = nullptr) { TQToolButton *button = new TQToolButton(parent, name); button->setIconSet(iconSet); @@ -148,7 +148,7 @@ void EffectView::init(void) available->setCurrentItem(0); connect(active, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(activeChanged(TQListViewItem *))); - active->setCurrentItem(0); + active->setCurrentItem(nullptr); // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); @@ -181,7 +181,7 @@ void EffectView::init(void) void EffectView::activeDrop(TQDropEvent *, TQListViewItem *pafter) { EffectListItem *after(static_cast(pafter)); - napp->effects()->move(after ? after->effect() : 0, + napp->effects()->move(after ? after->effect() : nullptr, static_cast(active->currentItem())->effect()); activeChanged(active->currentItem()); } @@ -191,7 +191,7 @@ TQListViewItem *EffectView::toListItem(Effect *e) const for(TQListViewItem *i = active->firstChild(); i; i = i->itemBelow()) if(static_cast(i)->effect() == e) return i; - return 0; + return nullptr; } void EffectView::added(Effect *item) @@ -231,7 +231,7 @@ void EffectView::moveUp() if (e->before()->before()) napp->effects()->move(e->before()->before(), e); else - napp->effects()->move(0, e); + napp->effects()->move(nullptr, e); } active->setCurrentItem(toListItem(e)); active->setSelected(toListItem(e), true); diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index fcf5d160..0f15fc84 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -200,13 +200,13 @@ class Engine::EnginePrivate { public: EnginePrivate() - : playobj(0), + : playobj(nullptr), server(Arts::SoundServerV2::null()), globalEffectStack(Noatun::StereoEffectStack::null()), effectsStack(Noatun::StereoEffectStack::null()), visStack(Noatun::StereoEffectStack::null()), - volumeControl(0), session(Noatun::Session::null()), - pProxy(0) + volumeControl(nullptr), session(Noatun::Session::null()), + pProxy(nullptr) { } @@ -252,7 +252,7 @@ Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false) // Connect to aRts if (!initArts()) { - KMessageBox::error(0, i18n("There was an error communicating to the aRts daemon."), i18n("aRts error")); + KMessageBox::error(nullptr, i18n("There was an error communicating to the aRts daemon."), i18n("aRts error")); exit(0); } @@ -281,7 +281,7 @@ bool Engine::open(const PlaylistItem &file) if(!initArts()) return false; - d->playobj = 0; + d->playobj = nullptr; KDE::PlayObjectFactory factory(d->server); @@ -315,7 +315,7 @@ bool Engine::open(const PlaylistItem &file) kdDebug(66666) << k_funcinfo << "No playobject for '" << file.url().prettyURL() << "'" << endl; delete d->playobj; - d->playobj=0; + d->playobj=nullptr; emit playingFailed(); return false; } @@ -345,7 +345,7 @@ void Engine::slotProxyError() void Engine::deleteProxy() { delete d->pProxy; - d->pProxy = 0; + d->pProxy = nullptr; } void Engine::connectPlayObject() @@ -384,7 +384,7 @@ void Engine::stop() d->playobj->halt(); delete d->playobj; - d->playobj=0; + d->playobj=nullptr; } void Engine::seek(int msec) // pass time in msecs @@ -454,7 +454,7 @@ bool Engine::initArts() d->server = Arts::Reference("global:Arts_SoundServerV2"); int volume = d->volumeControl ? d->volumeControl->volume() : -1; delete d->volumeControl; - d->volumeControl=0; + d->volumeControl=nullptr; if( d->server.isNull() || d->server.error() ) { @@ -572,12 +572,12 @@ bool Engine::initArts() else { crapOut: - KMessageBox::error( 0, i18n("Connecting/starting aRts soundserver failed. Make sure that artsd is configured properly.")); + KMessageBox::error( nullptr, i18n("Connecting/starting aRts soundserver failed. Make sure that artsd is configured properly.")); exit(1); } } - d->playobj=0; + d->playobj=nullptr; emit artsError(); return true; } diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index da85115d..44a8907d 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -26,7 +26,7 @@ struct OldEqCruft }; -static OldEqCruft *eqCruft=0; +static OldEqCruft *eqCruft=nullptr; Preset::Preset(const TQString &) { } // unused @@ -146,7 +146,7 @@ Equalizer::~Equalizer() delete eqCruft; // save(napp->dirs()->saveLocation("data", "noatun/") + "equalizer", "auto"); - for (Band *i=mBands.first(); i!=0; i=mBands.next()) + for (Band *i=mBands.first(); i; i=mBands.next()) delete i; } @@ -224,7 +224,7 @@ TQPtrList Equalizer::presets() const Preset *Equalizer::preset(const TQString &file) { VPreset p = VEQ->presetByFile(file); - if (!p) return 0; + if (!p) return nullptr; return new Preset(p); } @@ -236,7 +236,7 @@ bool Equalizer::presetExists(const TQString &name) const Preset *Equalizer::createPreset(const TQString &name, bool smart) { VPreset p = VEQ->createPreset(name, smart); - if (!p) return 0; + if (!p) return nullptr; return new Preset(p); } diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index e2e2f0c1..f80cceb1 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -108,8 +108,8 @@ void EqualizerLevel::changed(int v) // EqualizerView EqualizerView::EqualizerView() - : KDialogBase(0L, "EqualizerView", false, i18n("Equalizer"), Help | Close, Close, true), - first(true), mWidget(0), bandsLayout(0), mPresets(0), mGoingPreset(false) + : KDialogBase(nullptr, "EqualizerView", false, i18n("Equalizer"), Help | Close, Close, true), + first(true), mWidget(nullptr), bandsLayout(nullptr), mPresets(nullptr), mGoingPreset(false) { mBands.setAutoDelete(true); } @@ -186,13 +186,13 @@ void EqualizerView::show() TQListViewItem *EqualizerView::itemFor(const TQString &filename) { - for (TQListViewItem *i=mPresets->firstChild(); i!=0; i=i->itemBelow()) + for (TQListViewItem *i=mPresets->firstChild(); i; i=i->itemBelow()) { TQString t = i->text(1); if ((t.length()==0 && filename.length()==0) || t==filename) return i; } - return 0; + return nullptr; } TQListViewItem *EqualizerView::itemFor(const VPreset &preset) diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h index d8293a3a..d1547ae9 100644 --- a/noatun/library/equalizerview.h +++ b/noatun/library/equalizerview.h @@ -39,7 +39,7 @@ class PresetList : public TDEListView TQ_OBJECT public: - PresetList(TQWidget *parent, const char *name=0); + PresetList(TQWidget *parent, const char *name=nullptr); public: void rename(TQListViewItem *item, int c); diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index bd65db6d..c56f2c0a 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -36,7 +36,7 @@ class Noatun::KSaver::KSaverPrivate { public: - KSaverPrivate() : isLocal(true), tempFile(0), file(0), textStream(0), dataStream(0) {}; + KSaverPrivate() : isLocal(true), tempFile(nullptr), file(nullptr), textStream(nullptr), dataStream(nullptr) {}; bool isLocal; KTempFile *tempFile; TQFile *file; @@ -93,18 +93,18 @@ bool Noatun::KSaver::close(void) { if(!d->isLocal && d->tempFile) delete d->textStream; - d->textStream = 0; + d->textStream = nullptr; if(!d->isLocal && d->tempFile) delete d->dataStream; - d->dataStream = 0; + d->dataStream = nullptr; if(d->isLocal) { if(!d->file) return true; delete d->file; - d->file = 0; + d->file = nullptr; return true; } else @@ -112,13 +112,13 @@ bool Noatun::KSaver::close(void) if(!d->tempFile) return true; d->tempFile->close(); - d->textStream = 0; - d->dataStream = 0; + d->textStream = nullptr; + d->dataStream = nullptr; bool retval = TDEIO::NetAccess::upload(d->tempFile->name(), d->url); delete d->tempFile; - d->tempFile = 0; + d->tempFile = nullptr; return retval; } diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 8648a514..8ebe838f 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -25,10 +25,10 @@ class TDE_EXPORT L33tSlider : public TQSlider TQ_OBJECT public: - L33tSlider(TQWidget * parent, const char * name=0); - L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=nullptr); + L33tSlider(TQt::Orientation, TQWidget * parent, const char * name=nullptr); L33tSlider(int minValue, int maxValue, int pageStep, int value, - TQt::Orientation, TQWidget * parent, const char * name=0); + TQt::Orientation, TQWidget * parent, const char * name=nullptr); bool currentlyPressed() const; signals: diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h index ea0d48f3..4a7f4fdd 100644 --- a/noatun/library/noatun/downloader.h +++ b/noatun/library/noatun/downloader.h @@ -75,7 +75,7 @@ TQ_OBJECT }; public: - Downloader(TQObject *parent=0); + Downloader(TQObject *parent=nullptr); virtual ~Downloader(); public slots: diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index 10b73293..f3c8beda 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -36,7 +36,7 @@ TQ_OBJECT friend class NoatunApp; public: - Engine(TQObject *parent=0); + Engine(TQObject *parent=nullptr); ~Engine(); void setInitialized(); bool initialized() const; diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index a5022269..f865d3be 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -42,7 +42,7 @@ public: enum LoopType { None=0, Song, Playlist, Random }; public: - Player(TQObject *parent=0); + Player(TQObject *parent=nullptr); ~Player(); /** diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index 4a8ebeb4..6f98a30d 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -43,7 +43,7 @@ public: * * This returns the property, or def if such a property doesn't exist **/ - virtual TQString property(const TQString &key, const TQString &def=0) const=0; + virtual TQString property(const TQString &key, const TQString &def=nullptr) const=0; /** * This sets the property with the given key and value. @@ -210,7 +210,7 @@ class TDE_EXPORT PlaylistItem public: PlaylistItem(const PlaylistItem &source); PlaylistItem(PlaylistItemData *source); - PlaylistItem() : mData(0) {} + PlaylistItem() : mData(nullptr) {} ~PlaylistItem(); PlaylistItem &operator =(const PlaylistItem &source); @@ -243,7 +243,7 @@ public: bool operator !=(const PlaylistItemData *i) const { return ! (*this->data()==*i); } - TQString property(const TQString &key, const TQString &def=0) const + TQString property(const TQString &key, const TQString &def=nullptr) const { assert(mData); return mData->property(key, def); diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index e42ec136..a9301a51 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -49,7 +49,7 @@ public: * only needed with playlist plugins * generally "return this" in here **/ - virtual Playlist *playlist() { return 0; } + virtual Playlist *playlist() { return nullptr; } }; /** @@ -409,7 +409,7 @@ TQ_OBJECT friend class NoatunListenerNotif; public: - NoatunListener(TQObject *parent=0); + NoatunListener(TQObject *parent=nullptr); virtual ~NoatunListener(); signals: @@ -433,7 +433,7 @@ protected: class ExitNotifier : public NoatunListener { public: - ExitNotifier(int pid, TQObject *parent=0); + ExitNotifier(int pid, TQObject *parent=nullptr); virtual ~ExitNotifier(); private: @@ -456,7 +456,7 @@ class BoolNotifier : public TQObject TQ_OBJECT public: - BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0); + BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=nullptr); private slots: void event() {*mValue=false;} diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 58780594..87a7a7b6 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -67,7 +67,7 @@ public: * parent is the object that is this modules virtual-parent. * When that is deleted, this also will go away, automagically. **/ - CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0); + CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=nullptr); virtual ~CModule(); diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index 3260c70c..ba47d485 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -35,7 +35,7 @@ class ScrollingLabel : public TQWidget public: ScrollingLabel(const TQString &initialText,TQWidget *parent, - const char * name = 0); + const char * name = nullptr); virtual ~ScrollingLabel(); /** diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index af3cec69..67ad73f8 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -121,33 +121,33 @@ private: /** * @return pointer to a TDEAction which opens the effects dialog on activation */ -TDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *effects(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to a TDEAction which opens the equalizer dialog on activation */ -TDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *equalizer(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to a TDEAction which goes back one track on activation */ -TDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *back(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to a TDEAction which stops playback on activation */ -TDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *stop(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to a TDEAction which starts/pauses playback on activation */ -TDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *playpause(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to a TDEAction which advances one track on activation */ -TDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *forward(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to a TDEToggleAction which shows/hides the playlist */ -TDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEToggleAction *playlist(TQObject *parent = nullptr, const char *name = nullptr); /** * loop action @@ -157,12 +157,12 @@ TDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); /** * play action */ -TDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *play(TQObject *parent = nullptr, const char *name = nullptr); /** * pause action */ -TDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *pause(TQObject *parent = nullptr, const char *name = nullptr); /** * @return pointer to the global PluginActionMenu object (there is only one instance) @@ -172,7 +172,7 @@ TDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -TDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT VisActionMenu *visualizations(TQObject *parent = nullptr, const char *name = nullptr); /** * The global popupmenu of noatun, there's not two or three but only one of these :) diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h index 477443d4..3c9dd62e 100644 --- a/noatun/library/noatun/stereobuttonaction.h +++ b/noatun/library/noatun/stereobuttonaction.h @@ -15,12 +15,12 @@ class StereoButtonAction : public TDEAction TQ_OBJECT public: - StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = nullptr, const char* name = nullptr ); + StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = nullptr ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = nullptr, const char* name = nullptr ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = nullptr, const char* name = nullptr ); + StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = nullptr ); + StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = nullptr ); public slots: void disable(void); void enable(void); diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h index 9719f245..cb387cf3 100644 --- a/noatun/library/noatun/video.h +++ b/noatun/library/noatun/video.h @@ -20,8 +20,8 @@ TQ_OBJECT static VideoFrame *whose; public: - VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0); - VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0); + VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=nullptr, const char *name=nullptr, WFlags f=0); + VideoFrame(TQWidget *parent = nullptr, const char *name=nullptr, WFlags f=0); ~VideoFrame(); /** diff --git a/noatun/library/noatunarts/Equalizer_impl.cpp b/noatun/library/noatunarts/Equalizer_impl.cpp index 40bcd35f..d031cddf 100644 --- a/noatun/library/noatunarts/Equalizer_impl.cpp +++ b/noatun/library/noatunarts/Equalizer_impl.cpp @@ -241,7 +241,7 @@ public: Equalizer_impl() : mEnabled(false) { - mBuffer=0; + mBuffer=nullptr; mBufferLength=0; } diff --git a/noatun/library/noatunarts/FFTScopes.cpp b/noatun/library/noatunarts/FFTScopes.cpp index a2b373ea..e8eedd04 100644 --- a/noatun/library/noatunarts/FFTScopes.cpp +++ b/noatun/library/noatunarts/FFTScopes.cpp @@ -39,7 +39,7 @@ namespace Noatun static void doFft(float combine, float *inBuffer, vector &scope) { float out_real[SAMPLES],out_img[SAMPLES]; - fft_float(SAMPLES,0,inBuffer,0,out_real,out_img); + fft_float(SAMPLES,0,inBuffer,nullptr,out_real,out_img); scope.clear(); @@ -297,7 +297,7 @@ public: RawScope_impl() { - mScope=0; + mScope=nullptr; buffer(512); } @@ -396,7 +396,7 @@ public: RawScopeStereo_impl() { - mScopeLeft=mScopeRight=0; + mScopeLeft=mScopeRight=nullptr; buffer(512); } diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp index 9c1013c8..0b291508 100644 --- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp +++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp @@ -50,7 +50,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod else { list::iterator ei; - EffectEntry *laste = 0; + EffectEntry *laste = nullptr; long count = 0; for(ei = fx.begin(); ei != fx.end(); ei++, count++) @@ -173,7 +173,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod ~StereoEffectStack_impl() { // disconnect remaining effects - EffectEntry *laste = 0; + EffectEntry *laste = nullptr; list::iterator ei; for(ei = fx.begin(); ei != fx.end(); ei++) diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index f9e6f49f..b3a87aef 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -317,11 +317,11 @@ TDEToggleAction *playlist(TQObject *parent, const char *name) return new PlaylistAction(parent, name); } -TDEPopupMenu *ContextMenu::mContextMenu = 0; +TDEPopupMenu *ContextMenu::mContextMenu = nullptr; TDEPopupMenu *ContextMenu::contextMenu() { - if(!mContextMenu) mContextMenu = createContextMenu(0); + if(!mContextMenu) mContextMenu = createContextMenu(nullptr); return mContextMenu; } diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 62cd97bb..e8f6f88b 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -11,7 +11,7 @@ #include #include -TagsGetter *Tags::getter=0; +TagsGetter *Tags::getter=nullptr; TagsGetter::TagsGetter() { @@ -173,7 +173,7 @@ Tags::Tags(int priority) : mPriority(priority) Tags::~Tags() { if (getter->unassociate(this)) - getter=0; + getter=nullptr; } diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index bf1ecaed..2277fdc6 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -89,7 +89,7 @@ void Player::stop() position=0; mEngine->stop(); emit stopped(); - mCurrent=0; + mCurrent=nullptr; } void Player::play() @@ -179,7 +179,7 @@ void Player::playCurrent() { if (!mEngine->initialized()) return; stop(); - mCurrent=0; + mCurrent=nullptr; if (napp->playlist()->current()) play(); } diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 418c2a42..adebf62d 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -440,7 +440,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) "file='" << url.url() << "', opt=" << opt << endl; TQString dest; - if(TDEIO::NetAccess::download(url, dest, 0L)) + if(TDEIO::NetAccess::download(url, dest, nullptr)) { TQFile file(dest); if (!file.open(IO_ReadOnly)) @@ -479,7 +479,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl; TQString localFile; - if(!TDEIO::NetAccess::download(file, localFile, 0L)) + if(!TDEIO::NetAccess::download(file, localFile, nullptr)) return false; // if it's a PLS, transfer control, again (TDEIO bug?) @@ -678,7 +678,7 @@ bool PlaylistSaver::saveM3U(const KURL &file, int opt) } saver.close(); - TDEIO::NetAccess::upload(local, file, 0L); + TDEIO::NetAccess::upload(local, file, nullptr); saver.remove(); return true; } @@ -690,7 +690,7 @@ static TQString findNoCase(const TQMap &map, const TQString & if (i.key().lower() == key.lower()) return i.data(); } - return 0; + return nullptr; } bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) @@ -698,7 +698,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) kdDebug(66666) << k_funcinfo << "file='" << file.path() << endl; TQString localFile; - if(!TDEIO::NetAccess::download(file, localFile, 0L)) + if(!TDEIO::NetAccess::download(file, localFile, nullptr)) return false; TQFile checkFile(localFile); diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 63eb6464..be966545 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -21,7 +21,7 @@ using std::vector; -Arts::Dispatcher *Visualization::mDispatcher=0; +Arts::Dispatcher *Visualization::mDispatcher=nullptr; bool Visualization::internalVis=false; Plugin::Plugin() @@ -239,7 +239,7 @@ StereoFFTScope::StereoFFTScope(int timeout, int pid) : FFTScope(timeout, pid) if ((*mScope).isNull()) { delete mScope; - mScope=0; + mScope=nullptr; } else { @@ -300,7 +300,7 @@ MonoFFTScope::MonoFFTScope(int timeout, int pid) : FFTScope(timeout, pid) if ((*mScope).isNull()) { delete mScope; - mScope=0; + mScope=nullptr; } else { @@ -367,7 +367,7 @@ MonoScope::MonoScope(int timeout, int pid) : Scope(timeout, pid) if ((*mScope).isNull()) { delete mScope; - mScope=0; + mScope=nullptr; } else { @@ -421,7 +421,7 @@ StereoScope::StereoScope(int timeout, int pid) : Scope(timeout, pid) if ((*mScope).isNull()) { delete mScope; - mScope=0; + mScope=nullptr; } else { diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index bc1cc2ff..8822f652 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -16,7 +16,7 @@ bool operator ==(const NoatunLibraryInfo &a, const NoatunLibraryInfo &b) return a.specfile == b.specfile; } -LibraryLoader::LibraryLoader() : mPlaylist(0) +LibraryLoader::LibraryLoader() : mPlaylist(nullptr) { } @@ -222,7 +222,7 @@ void LibraryLoader::add(const TQString &spec) void LibraryLoader::setModules(const TQStringList &mods) { TDEConfig *config=TDEGlobal::config(); - config->setGroup(0); + config->setGroup(nullptr); config->writeEntry("Modules", mods); config->sync(); } @@ -268,7 +268,7 @@ bool LibraryLoader::remove(const TQString& spec, bool terminateOnLastUI) else if (info.type=="playlist") { //kdWarning(66666) << "Unloading playlist, this might be dangerous" << endl; - mPlaylist=0; + mPlaylist=nullptr; } removeNow(spec); @@ -358,7 +358,7 @@ void LibraryLoader::removeNow(const TQString &spec) if (!lib) return; delete lib->plugin; - lib->plugin=0; + lib->plugin=nullptr; mLibHash.remove(spec); delete lib; } diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index a7a59b48..9bc07cff 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -217,7 +217,7 @@ void Plugins::reopen() } else if((*i).type == "sm" || (*i).type=="hidden") { - parent = 0; + parent = nullptr; } else if ((*i).type == "visualization") { @@ -299,7 +299,7 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info) PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const { - for(TQListViewItem *cur = otherList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = otherList->firstChild(); cur; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast(cur); if(item && item->info() == info) @@ -307,7 +307,7 @@ PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const } // visualizations - for(TQListViewItem *cur = visList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = visList->firstChild(); cur; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast(cur); if(item && item->info() == info) @@ -316,7 +316,7 @@ PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const // If our only interface has a dependency removed, that's a double dose of trouble // We may as well have this here for completeness, though - for(TQListViewItem *cur = interfaceList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = interfaceList->firstChild(); cur; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast(cur); if(item && item->info() == info) @@ -325,14 +325,14 @@ PluginListItem *Plugins::findItem(const NoatunLibraryInfo &info) const // If a playlist is added or removed due to a dependency, we're doom-diddly-oomed // We may as well have this here for completeness, though - for(TQListViewItem *cur = playlistList->firstChild(); cur != 0; cur = cur->itemBelow()) + for(TQListViewItem *cur = playlistList->firstChild(); cur; cur = cur->itemBelow()) { PluginListItem *item = dynamic_cast(cur); if(item && item->info() == info) return item; } - return 0; + return nullptr; } void Plugins::save() diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h index 804ea492..bb7d6386 100644 --- a/noatun/library/pluginmodule.h +++ b/noatun/library/pluginmodule.h @@ -56,9 +56,9 @@ TQ_OBJECT friend class PluginListItem; public: - PluginListView(TQWidget *_parent = 0, const char *_name = 0); - PluginListView(unsigned _min, TQWidget *_parent = 0, const char *_name = 0); - PluginListView(unsigned _min, unsigned _max, TQWidget *_parent = 0, const char *_name = 0); + PluginListView(TQWidget *_parent = nullptr, const char *_name = nullptr); + PluginListView(unsigned _min, TQWidget *_parent = nullptr, const char *_name = nullptr); + PluginListView(unsigned _min, unsigned _max, TQWidget *_parent = nullptr, const char *_name = nullptr); virtual void clear(); @@ -78,7 +78,7 @@ class Plugins : public CModule TQ_OBJECT public: - Plugins(TQObject *_parent = 0); + Plugins(TQObject *_parent = nullptr); virtual void save(); virtual void reopen(); diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 55926830..89296518 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -25,7 +25,7 @@ void NoatunPreferences::slotOk() void NoatunPreferences::show() { - for (CModule *i=mModules.first(); i != 0; i=mModules.next()) + for (CModule *i=mModules.first(); i; i=mModules.next()) i->reopen(); KDialogBase::show(); } @@ -40,7 +40,7 @@ void NoatunPreferences::show(CModule *page) void NoatunPreferences::slotApply() { - for (CModule *i=mModules.first(); i != 0; i=mModules.next()) + for (CModule *i=mModules.first(); i; i=mModules.next()) i->save(); } @@ -56,7 +56,7 @@ void NoatunPreferences::remove(CModule *page) CModule::CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *owner) : TQWidget(napp->preferencesBox()->addPage(name, description, TDEGlobal::iconLoader()->loadIcon( - icon, TDEIcon::Small,0, TDEIcon::DefaultState,0, true))) + icon, TDEIcon::Small,0, TDEIcon::DefaultState,nullptr, true))) { if (owner) connect(owner, TQ_SIGNAL(destroyed()), TQ_SLOT(ownerDeleted())); diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index a4439207..0de7f537 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -39,7 +39,7 @@ Proxy::Proxy( KURL url ) , m_byteCount( 0 ) , m_metaLen( 0 ) , m_usedPort( 0 ) - , m_pBuf( 0 ) + , m_pBuf( nullptr ) { kdDebug(66666) << k_funcinfo << endl; @@ -55,7 +55,7 @@ Proxy::Proxy( KURL url ) connect( &m_sockRemote, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( readRemote() ) ); uint i = 0; - Server* server = 0; + Server* server = nullptr; for ( i = MIN_PROXYPORT; i <= MAX_PROXYPORT; i++ ) { server = new Server( i, this ); diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index 8b23322b..23591b5b 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -114,7 +114,7 @@ VBand::~VBand() VBand::VBand(const VBand ©) { - d=0; + d=nullptr; operator=(copy); } @@ -586,7 +586,7 @@ bool VEqualizer::save(const KURL &filename, const TQString &friendly) const bool VEqualizer::load(const KURL &filename) { TQString dest; - if(TDEIO::NetAccess::download(filename, dest, 0L)) + if(TDEIO::NetAccess::download(filename, dest, nullptr)) { TQFile file(dest); if (!file.open(IO_ReadOnly)) @@ -830,15 +830,15 @@ VPreset & VPreset::operator=(const VPreset ©) TQString VPreset::name() const { TQFile file(d->file); - if (!file.open(IO_ReadOnly)) return 0; + if (!file.open(IO_ReadOnly)) return nullptr; TQDomDocument doc("noatunequalizer"); - if (!doc.setContent(&file)) return 0; + if (!doc.setContent(&file)) return nullptr; TQDomElement docElem = doc.documentElement(); - if (docElem.tagName()!="noatunequalizer") return 0; + if (docElem.tagName()!="noatunequalizer") return nullptr; bool standard=docElem.attribute("default", "0")=="0"; - TQString n=docElem.attribute("name", 0); + TQString n=docElem.attribute("name", nullptr); { // All the translations for the presets # ifdef I18N_STUFF diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index 8105127d..eca2de9d 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -17,7 +17,7 @@ // sorry :) TQPtrList VideoFrame::frames; -VideoFrame *VideoFrame::whose=0; +VideoFrame *VideoFrame::whose=nullptr; struct VideoFrame::Private { @@ -47,13 +47,13 @@ VideoFrame::~VideoFrame() if (whose == this) { embed(Arts::VideoPlayObject::null()); - whose=0; + whose=nullptr; } frames.removeRef(this); VideoFrame *l = frames.last(); if (l) l->give(); - else whose=0; + else whose=nullptr; delete d; } @@ -78,7 +78,7 @@ void VideoFrame::give() VideoFrame *old=whose; whose = this; - if (whose != old && old != 0) + if (whose != old && old) { old->embed(Arts::VideoPlayObject::null()); emit old->lost(); @@ -114,7 +114,7 @@ void VideoFrame::stopped() GlobalVideo::GlobalVideo() - : TQWidget( 0, 0, WType_TopLevel | WStyle_Customize | WStyle_DialogBorder | WStyle_Title ) + : TQWidget( nullptr, nullptr, WType_TopLevel | WStyle_Customize | WStyle_DialogBorder | WStyle_Title ) { setCaption(i18n("Video - Noatun")); (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index b03a2dbc..6ee9198f 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -62,7 +62,7 @@ #include Excellent::Excellent() - : TDEMainWindow(0, "NoatunExcellent") + : TDEMainWindow(nullptr, "NoatunExcellent") , UserInterface() { setAcceptDrops(true); @@ -163,7 +163,7 @@ Excellent::Excellent() config.setGroup("excellent"); - volumeSlider = 0; + volumeSlider = nullptr; volumeAction->setChecked( config.readBoolEntry("volumeShown", false) ); showVolumeControl(); @@ -383,7 +383,7 @@ void Excellent::growVolumeControl(void) void Excellent::shrinkVolumeControl(void) { delete volumeSlider; - volumeSlider = 0; + volumeSlider = nullptr; } void Excellent::changeVolume(int slider) diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 3facc98c..bf212083 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -13,7 +13,7 @@ extern "C" } } -HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin() +HTMLExport::HTMLExport(): TQObject(nullptr, "HTMLExport"), Plugin() { NOATUNPLUGINC(HTMLExport); @@ -38,7 +38,7 @@ void HTMLExport::slotExport() // get output target KURL url = KFileDialog::getSaveURL(TQString(), "text/html", - 0, + nullptr, i18n("Export Playlist")); // write into tempfile @@ -129,7 +129,7 @@ void HTMLExport::slotExport() file.close(); // tempfile -> userdefined file - TDEIO::NetAccess::upload(temp.name(), url, 0); + TDEIO::NetAccess::upload(temp.name(), url, nullptr); } TQString HTMLExport::htmlEscape(const TQString &source) { diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 829f51aa..1f1c6a32 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -47,7 +47,7 @@ private: int m_interval; }; -Lirc *IRPrefs::s_lirc = 0; +Lirc *IRPrefs::s_lirc = nullptr; bool IRPrefs::s_configRead = false; TQMap IRPrefs::s_commands; diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 2a6e2ec5..89ee17f0 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -14,12 +14,12 @@ Lirc::Lirc(TQObject *parent) : TQObject(parent), - m_socket(0) + m_socket(nullptr) { int sock = ::socket(PF_UNIX, SOCK_STREAM, 0); if (sock == -1) { - KMessageBox::sorry(0, i18n("Could not create a socket to receive infrared signals. The error is:\n") + strerror(errno)); + KMessageBox::sorry(nullptr, i18n("Could not create a socket to receive infrared signals. The error is:\n") + strerror(errno)); return; } sockaddr_un addr; @@ -27,7 +27,7 @@ Lirc::Lirc(TQObject *parent) strcpy(addr.sun_path, "/dev/lircd"); if (::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1) { - KMessageBox::sorry(0, i18n("Could not establish a connection to receive infrared signals. The error is:\n") + strerror(errno)); + KMessageBox::sorry(nullptr, i18n("Could not establish a connection to receive infrared signals. The error is:\n") + strerror(errno)); ::close(sock); return; } diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index ca96c933..31a10332 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -1031,8 +1031,8 @@ void KaimanStyle::interpretTokens(TQStringList& ref_s_tokens) ++ li_s_tokens; // Skip the name of the element // 1) Create a new KaimanStyleElement, that is inserted into I_styleElem. - KaimanStyleElement *l_kse_elem = 0; - KaimanStyleButton *but = 0; + KaimanStyleElement *l_kse_elem = nullptr; + KaimanStyleButton *but = nullptr; switch ( l_elementType ) { @@ -1378,11 +1378,11 @@ bool KaimanStyle::loadStyle(const TQString &styleName, const TQString &descFile) else { if ( l_i_ret == KaimanStyle::FileNotFound ) { // File not found - KMessageBox::error( 0, i18n("Cannot load style. Style not installed.") ); + KMessageBox::error( nullptr, i18n("Cannot load style. Style not installed.") ); } else { // Parsing not OK: Notify user - KMessageBox::error( 0, i18n("Cannot load style. Unsupported or faulty style description.") ); + KMessageBox::error( nullptr, i18n("Cannot load style. Unsupported or faulty style description.") ); } } } @@ -1407,10 +1407,10 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) TQPoint mousePos( m->x()+static_cast(o)->x(), m->y()+static_cast(o)->y() ); - TQWidget *slider = 0; + TQWidget *slider = nullptr; /* find slider that is under the mouse position */ - for ( TQWidget *s = i_sliders.first(); s!=0; s=i_sliders.next() ) + for ( TQWidget *s = i_sliders.first(); s; s=i_sliders.next() ) { TQRect sliderRect( s->pos(), s->size() ); if ( sliderRect.contains(mousePos) ) slider = s; @@ -1435,7 +1435,7 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) bool KaimanStyle::loadPixmaps() { TQString l_s_tmpName; - TQPixmap *l_pixmap_Background = 0, *l_pixmap_Mask = 0; + TQPixmap *l_pixmap_Background = nullptr, *l_pixmap_Mask = nullptr; KaimanStyleElement *l_kse_elem; for ( uint l_i_elem = 0; l_i_elemfind("Background"); - if ( l_kse_elem != 0 ) { + if ( l_kse_elem ) { l_pixmap_Background = l_kse_elem->pixmaps[0]; } l_kse_elem = this->find("Mask"); - if ( l_kse_elem != 0 ) { + if ( l_kse_elem ) { l_pixmap_Mask = l_kse_elem->pixmaps[0]; } - if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) { + if (l_pixmap_Background && l_pixmap_Mask) { // OK, background and mask are defined. So now I can calculate the shape int l_i_width_Mask = l_pixmap_Mask->width(); @@ -1499,6 +1499,6 @@ KaimanStyleElement* KaimanStyle::find(const char *val_s_elemName) return I_styleElem[i]; } } - return 0; + return nullptr; } #include "style.moc" diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index f3489448..ba67614d 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -33,7 +33,7 @@ class KaimanStyleElement : public TQWidget TQ_OBJECT public: - KaimanStyleElement(TQWidget *parent, const char *name=0); + KaimanStyleElement(TQWidget *parent, const char *name=nullptr); ~KaimanStyleElement(); virtual void loadPixmaps(TQString &val_s_filename); @@ -74,7 +74,7 @@ class KaimanStyleMasked : public KaimanStyleElement TQ_OBJECT public: - KaimanStyleMasked(TQWidget *parent, const char *name=0) + KaimanStyleMasked(TQWidget *parent, const char *name=nullptr) : KaimanStyleElement( parent, name ) {}; virtual void loadPixmaps(TQString &val_s_filename) @@ -91,7 +91,7 @@ class KaimanStyleButton : public KaimanStyleMasked TQ_OBJECT public: - KaimanStyleButton(TQWidget *parent, const char *name=0); + KaimanStyleButton(TQWidget *parent, const char *name=nullptr); ~KaimanStyleButton(); // Button states. @@ -129,7 +129,7 @@ class KaimanStyleSlider : public KaimanStyleMasked TQ_OBJECT public: - KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0); + KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=nullptr); ~KaimanStyleSlider(); int value() { return _value; }; @@ -168,7 +168,7 @@ class KaimanStyleBackground : public KaimanStyleMasked TQ_OBJECT public: - KaimanStyleBackground(TQWidget *parent, const char *name=0); + KaimanStyleBackground(TQWidget *parent, const char *name=nullptr); ~KaimanStyleBackground(); protected: @@ -188,7 +188,7 @@ class KaimanStyleValue : public KaimanStyleMasked TQ_OBJECT public: - KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0); + KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=nullptr); ~KaimanStyleValue(); int value() { return _value; }; @@ -207,7 +207,7 @@ class KaimanStyleState : public KaimanStyleMasked TQ_OBJECT public: - KaimanStyleState(TQWidget *parent, const char *name=0); + KaimanStyleState(TQWidget *parent, const char *name=nullptr); ~KaimanStyleState(); int value() { return _value; }; @@ -231,7 +231,7 @@ class KaimanStyleNumber : public KaimanStyleElement TQ_OBJECT public: - KaimanStyleNumber(TQWidget *parent, const char *name=0); + KaimanStyleNumber(TQWidget *parent, const char *name=nullptr); ~KaimanStyleNumber(); virtual void loadPixmaps(TQString &val_s_filename); @@ -256,7 +256,7 @@ class KaimanStyleText : public KaimanStyleElement TQ_OBJECT public: - KaimanStyleText(TQWidget *parent, const char *name=0); + KaimanStyleText(TQWidget *parent, const char *name=nullptr); ~KaimanStyleText(); virtual void loadPixmaps(TQString &val_s_filename); @@ -291,7 +291,7 @@ class KaimanStyleAnimation : public KaimanStyleMasked TQ_OBJECT public: - KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0); + KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=nullptr); ~KaimanStyleAnimation(); public slots: @@ -312,7 +312,7 @@ class KaimanStyle : public TQWidget TQ_OBJECT public: - KaimanStyle(TQWidget *parent, const char *name=0); + KaimanStyle(TQWidget *parent, const char *name=nullptr); ~KaimanStyle(); enum { background, mask, play_Button, stop_Button, pause_Button, prev_Button, next_Button, repeat_Button, shuffle_Button, playlist_Button, mixer_Button, exit_Button, Iconify_Button, Config_Button, Alt_Skin_Button, Minute_Number, Second_Number, in_Rate_Number, in_Hz_Number, song_Number, status_Item, cPU_Number, digit_Large, digit_Small_Default, title, volume_Item, volume_Slider, position_Item, position_Slider }; diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index dfcc15ab..73609908 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -61,11 +61,11 @@ #include #include -Kaiman* Kaiman::kaiman=0; +Kaiman* Kaiman::kaiman=nullptr; const char Kaiman::DEFAULT_SKIN[]="car-preset"; Kaiman::Kaiman() - : TDEMainWindow(0, "NoatunKaiman"), UserInterface() + : TDEMainWindow(nullptr, "NoatunKaiman"), UserInterface() { NOATUNPLUGINC(Kaiman); kaiman=this; @@ -75,7 +75,7 @@ Kaiman::Kaiman() setBackgroundMode( NoBackground ); setAcceptDrops(true); - _style = 0; + _style = nullptr; _seeking = false; _altSkin = false; @@ -153,11 +153,11 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) if ( !_style->loadStyle( style, desc ) ) { delete _style; - _style = 0; + _style = nullptr; return false; } - if ( _style->Mask() != 0 ) + if (_style->Mask()) { // Set the shaped window form XShapeCombineMask( tqt_xdisplay(), winId(), ShapeBounding, 0,0, @@ -166,7 +166,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) KaimanStyleElement* item = _style->find("Background"); setBackgroundMode(TQWidget::NoBackground); - if ( item!=0 ) + if ( item ) { _style->resize( item->width(), item->height()); resize( item->width(), item->height()); @@ -174,53 +174,53 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) } item = _style->find("Playlist_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) ); item = _style->find("Play_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); item = _style->find("Pause_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); item = _style->find("Stop_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) ); item = _style->find("Next_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) ); item = _style->find("Prev_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) ); item = _style->find("Exit_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) ); item = _style->find("Mixer_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(execMixer()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(execMixer()) ); item = _style->find("Iconify_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMinimized()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMinimized()) ); item = _style->find("Alt_Skin_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleSkin()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleSkin()) ); item = _style->find("Repeat_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleLoop()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleLoop()) ); item = _style->find("Shuffle_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShuffle()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShuffle()) ); item = _style->find("Config_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp, TQ_SLOT(preferences()) ); + if( item ) connect( item, TQ_SIGNAL(clicked()), napp, TQ_SLOT(preferences()) ); item = _style->find("Volume_Up_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeUp())); + if( item ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeUp())); item = _style->find("Volume_Down_Button"); - if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeDown())); + if( item ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeDown())); KaimanStyleSlider* slider = static_cast(_style->find("Position_Slider")); - if( slider!=0 ) + if( slider ) { connect( slider, TQ_SIGNAL(newValueDrag(int)), this, TQ_SLOT(seekStart(int)) ); connect( slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(seekDrag(int)) ); @@ -229,7 +229,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) } slider = static_cast(_style->find("Volume_Slider")); - if ( slider!=0 ) + if ( slider ) { connect(slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); @@ -386,9 +386,9 @@ void Kaiman::timeout() // update volume KaimanStyleSlider* l_elem_volslider = static_cast(_style->find("Volume_Slider")); KaimanStyleValue* l_elem_volitem = static_cast(_style->find("Volume_Item")); - if ( l_elem_volslider!=0 ) + if ( l_elem_volslider ) l_elem_volslider->setValue( napp->player()->volume(), 0, 100 ); - if ( l_elem_volitem!=0 ) + if ( l_elem_volitem ) l_elem_volitem->setValue( napp->player()->volume(), 0, 100 ); // update position @@ -418,7 +418,7 @@ void Kaiman::timeout() } const PlaylistItem &item = napp->playlist()->current(); - KaimanStyleNumber* numItem = 0; + KaimanStyleNumber* numItem = nullptr; numItem = static_cast(_style->find("In_Rate_Number")); if ( numItem ) diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 19e29288..d5728257 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -20,9 +20,9 @@ extern "C" } } -TDEGlobalAccel * Keyz::s_accel = 0L; +TDEGlobalAccel * Keyz::s_accel = nullptr; -Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) +Keyz::Keyz() : TQObject( nullptr, "Keyz" ), Plugin(), preMuteVol(0) { NOATUNPLUGINC(Keyz); Player *player = napp->player(); @@ -93,7 +93,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) Keyz::~Keyz() { delete s_accel; - s_accel = 0L; + s_accel = nullptr; } void Keyz::slotVolumeUp() diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 31e1ad96..24e05e01 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -31,7 +31,7 @@ *******************************************/ KJButton::KJButton(const TQStringList &i, KJLoader *parent) - : TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false) + : TQObject(nullptr), KJWidget(parent), mTitle(i[0]), mShowPressed(false) { // kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl; mPushedPixmap = (i.count() >= 7); @@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in) napp->player()->playpause(); else if (mTitle=="openfilebutton") { - KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play"))); + KURL file(KFileDialog::getOpenURL(nullptr, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play"))); if (file.isValid()) napp->player()->openFile(file); } diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index c82d1a93..16a51ebd 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -17,7 +17,7 @@ #include KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p) - : TQObject(0), KJWidget(p), mBack(0), mView(0), mInterpEq(0) + : TQObject(nullptr), KJWidget(p), mBack(nullptr), mView(nullptr), mInterpEq(nullptr) { int x=l[1].toInt(); int y=l[2].toInt(); diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp index f48010b6..996b6578 100644 --- a/noatun/modules/kjofol-skin/kjfont.cpp +++ b/noatun/modules/kjofol-skin/kjfont.cpp @@ -23,7 +23,7 @@ * KJFont *******************************************/ -KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0) +KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(nullptr), mTransparentRGB(0) { // kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl; @@ -93,7 +93,7 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp } mUseSysFont = KJLoader::kjofol->prefs()->useSysFont(); - sysFontMetrics = 0L; + sysFontMetrics = nullptr; if (mUseSysFont) recalcSysFont(); } diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 9c8be489..15ed9511 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -83,7 +83,7 @@ protected: return; TQPtrList things=mParent->widgetsAt(p); - for (KJWidget *i=things.first(); i!=0; i=things.next()) + for (KJWidget *i=things.first(); i; i=things.next()) { TQString string=i->tip(); if (string.length()) @@ -99,20 +99,20 @@ private: }; -KJLoader *KJLoader::kjofol=0; +KJLoader *KJLoader::kjofol=nullptr; KJLoader::KJLoader() - : TQWidget(0, "NoatunKJLoader", + : TQWidget(nullptr, "NoatunKJLoader", WType_TopLevel | WStyle_NoBorder | WRepaintNoErase ), UserInterface(), moving(false), - mClickedIn(0), - mText(0), - mNumbers(0), - mVolumeFont(0), - mPitchFont(0), - splashScreen(0) + mClickedIn(nullptr), + mText(nullptr), + mNumbers(nullptr), + mVolumeFont(nullptr), + mPitchFont(nullptr), + splashScreen(nullptr) { kjofol = this; @@ -172,7 +172,7 @@ TQPtrList KJLoader::widgetsAt(const TQPoint &pt) const void KJLoader::removeChild(KJWidget *c) { if ( mClickedIn == c ) - mClickedIn = 0; + mClickedIn = nullptr; if (subwidgets.findRef(c) != -1) subwidgets.take(); } @@ -204,12 +204,12 @@ void KJLoader::loadSkin(const TQString &file) Parser::open( filenameNoCase(file) ); - KJPitchText *pitchText=0; - KJVolumeText *volumeText=0; - mText = 0; - mNumbers = 0; - mVolumeFont = 0; - mPitchFont = 0; + KJPitchText *pitchText=nullptr; + KJVolumeText *volumeText=nullptr; + mText = nullptr; + mNumbers = nullptr; + mVolumeFont = nullptr; + mPitchFont = nullptr; if ( exist("splashscreen") && mPrefs->displaySplash() ) showSplash(); @@ -711,7 +711,7 @@ KJLoader::~KJLoader() void KJLoader::paintEvent(TQPaintEvent *e) { TQPainter p(this); - for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) + for (KJWidget* i=subwidgets.first(); i; i=subwidgets.next()) if (i->rect().intersects(e->rect())) i->paint(&p, e->rect().intersect(i->rect())); // TQWidget::paintEvent(e); @@ -748,7 +748,7 @@ void KJLoader::mousePressEvent(TQMouseEvent *e) { mMousePoint = mapFromGlobal(TQCursor::pos()); // try to find a KJWidget that is here - for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) + for (KJWidget* i=subwidgets.first(); i; i=subwidgets.next()) if (i->rect().contains(mMousePoint)) { if (i->mousePress(mMousePoint-i->rect().topLeft())) @@ -775,7 +775,7 @@ void KJLoader::mouseReleaseEvent(TQMouseEvent */*e*/) mClickedIn->rect().topLeft(), mClickedIn->rect().contains( mapFromGlobal(TQCursor::pos()))); - mClickedIn=0; + mClickedIn=nullptr; } moving = false; @@ -791,20 +791,20 @@ void KJLoader::newSong() { if (!napp->player()->current()) return; - for ( KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next() ) + for ( KJWidget* i=subwidgets.first(); i; i=subwidgets.next() ) i->newFile(); } void KJLoader::readConfig() { // kdDebug(66666) << "KJLoader::readConfig()" << endl; - for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next()) + for (KJWidget* i=subwidgets.first(); i; i=subwidgets.next()) i->readConfig(); } void KJLoader::showSplash() { - splashScreen = new TQLabel( 0L, "SplashScreen", + splashScreen = new TQLabel( nullptr, "SplashScreen", WType_TopLevel | WStyle_NoBorder | WRepaintNoErase | WX11BypassWM ); TQPixmap splashPix = pixmap(item("splashscreen")[1]); diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp index d368e95d..f75edf51 100644 --- a/noatun/modules/kjofol-skin/kjseeker.cpp +++ b/noatun/modules/kjofol-skin/kjseeker.cpp @@ -108,7 +108,7 @@ TQPixmap *KJSeeker::toPixmap(int n) barmode[n]->convertFromImage(*barmodeImages[n]); delete barmodeImages[n]; - barmodeImages[n]=0; + barmodeImages[n]=nullptr; return barmode[n]; } diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index d570249e..5ea59cdd 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -33,7 +33,7 @@ *******************************************/ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p) - : KJWidget(p), mVolume(0), mText(0) + : KJWidget(p), mVolume(0), mText(nullptr) { int x, y, xs, ys; x=i[1].toInt(); @@ -121,7 +121,7 @@ void KJVolumeBar::timeUpdate(int) *******************************************/ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p) - : KJWidget(p), mVolume(0), mOldVolume(0), mText(0) + : KJWidget(p), mVolume(0), mOldVolume(0), mText(nullptr) { int x, y, xs, ys; x=i[1].toInt(); @@ -196,7 +196,7 @@ void KJVolumeBMP::timeUpdate(int) *******************************************/ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p) - : KJWidget(p), mText(0) + : KJWidget(p), mText(nullptr) { int x = i[1].toInt(); int y = i[2].toInt(); diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index e75613d2..5379cd04 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -36,7 +36,7 @@ *******************************************/ KJFilename::KJFilename(const TQStringList &l, KJLoader *p) - : TQObject(0), KJWidget(p), mBack(0) + : TQObject(nullptr), KJWidget(p), mBack(nullptr) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -185,7 +185,7 @@ TQString KJFilename::tip() *******************************************/ KJTime::KJTime(const TQStringList &l, KJLoader *p) - : KJWidget(p), mBack(0) + : KJWidget(p), mBack(nullptr) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -343,7 +343,7 @@ TQString KJTime::tip() *******************************************/ KJVolumeText::KJVolumeText(const TQStringList &l, KJLoader *p) - : KJWidget(p), mBack(0) + : KJWidget(p), mBack(nullptr) { int x=l[1].toInt(); int y=l[2].toInt(); @@ -435,7 +435,7 @@ TQString KJVolumeText::tip() *******************************************/ KJPitchText::KJPitchText(const TQStringList &l, KJLoader *p) - : KJWidget(p), mBack(0) + : KJWidget(p), mBack(nullptr) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -543,7 +543,7 @@ TQString KJPitchText::tip() *******************************************/ KJFileInfo::KJFileInfo(const TQStringList &l, KJLoader *p) - : KJWidget(p), mBack(0) + : KJWidget(p), mBack(nullptr) { mInfoType = l[0]; // type of info-display diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index a7873fe1..777d8158 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -42,7 +42,7 @@ void KJVisScope::swapScope(Visuals newOne) KJLoader::kjofol->prefs()->setVisType ( newOne ); - KJWidget *w = 0; + KJWidget *w = nullptr; switch (newOne) { case Null: @@ -119,7 +119,7 @@ void KJNullScope::readConfig() *************************************************/ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), MonoFFTScope(50), mGradient(0) + : KJVisScope(parent), MonoFFTScope(50), mGradient(nullptr) { int x = l[1].toInt(); int y = l[2].toInt(); @@ -251,7 +251,7 @@ void KJFFT::readConfig() *************************************************/ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent) - : KJVisScope(parent), StereoFFTScope(50), mGradient(0) + : KJVisScope(parent), StereoFFTScope(50), mGradient(nullptr) { //kdDebug(66666) << k_funcinfo << endl; diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h index 5f1edcac..a0772082 100644 --- a/noatun/modules/kjofol-skin/kjwidget.h +++ b/noatun/modules/kjofol-skin/kjwidget.h @@ -28,7 +28,7 @@ public: // repaint myself virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false); - virtual TQString tip() { return 0; } + virtual TQString tip() { return nullptr; } public: static TQBitmap getMask(const TQImage &color, TQRgb=tqRgb(255,0,255)); diff --git a/noatun/modules/kjofol-skin/parser.h b/noatun/modules/kjofol-skin/parser.h index 3f691253..c762af8d 100644 --- a/noatun/modules/kjofol-skin/parser.h +++ b/noatun/modules/kjofol-skin/parser.h @@ -12,7 +12,7 @@ class Parser : public TQDict class ImagePixmap { public: - ImagePixmap() : mImage(0), mPixmap(0) {} + ImagePixmap() : mImage(nullptr), mPixmap(nullptr) {} ~ImagePixmap() {} TQImage mImage; TQPixmap mPixmap; diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index ba3c258b..2bd9e407 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -69,7 +69,7 @@ static void setPlayStatus( Player *player, int status ) Marquis::Marquis() - : TDEMainWindow(0, "Marquis") + : TDEMainWindow(nullptr, "Marquis") , SessionManagement() { hide(); @@ -158,7 +158,7 @@ void Marquis::readSessionConfig(TDEConfig *c) if (!napp->playlist()) { - KMessageBox::error(0,i18n("No playlist plugin was found. " \ + KMessageBox::error(nullptr,i18n("No playlist plugin was found. " \ "Please make sure that Noatun was installed correctly.")); napp->quit(); return; diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 16d09ece..086e46dd 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -24,7 +24,7 @@ #include "edit.h" Editor::Editor() -: KDialogBase((TQWidget*)0L, 0, false, i18n("Tag Editor"), Ok | Cancel) +: KDialogBase((TQWidget*)0L, nullptr, false, i18n("Tag Editor"), Ok | Cancel) { mMainWidget = makeMainWidget(); // mMainWidget->setMinimumWidth(325); @@ -159,11 +159,11 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget } MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &label, const TQString &key, TQVariant::Type default_type, bool optional, TQWidget *parent) { - TQLabel *tmp_label = 0L; + TQLabel *tmp_label = nullptr; KFileMetaInfoItem info_item = meta_info.item(key); TQVariant::Type type; - MetaWidget *meta_widget = 0L; - TQValidator *validator = 0L; + MetaWidget *meta_widget = nullptr; + TQValidator *validator = nullptr; TQString groupName = keyGroup(meta_info, key); bool known_key = ((!groupName.isNull()) && meta_info.group(groupName).contains(key)); bool addable = keyAddable(meta_info, key); @@ -171,7 +171,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe // This key isn't a real thing, and we can't even create it if ((!info_item.isEditable()) && (!addable) && optional) - return 0; + return nullptr; if (!groupName.isNull()) { type = info->groupInfo(groupName)->itemInfo(key)->type(); diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 4c717c42..79a345fd 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -15,20 +15,20 @@ extern "C" } } -Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin() +Monoscope::Monoscope() : TQWidget(nullptr,nullptr,WRepaintNoErase), MonoScope(30), Plugin() { NOATUNPLUGINC(Monoscope); - mAction=0L; + mAction=nullptr; mLowColor=tqRgb(0,0,0); mHighColor=tqRgb(238,238,238); resize(320, 240); MonoScope::start(); setCaption(i18n("Monoscope")); show(); - resizeEvent(0); + resizeEvent(nullptr); repaint(0,0, TQWidget::width(), height(), false); - resizeEvent(0); + resizeEvent(nullptr); setBackgroundColor(mLowColor); } @@ -40,7 +40,7 @@ Monoscope::~Monoscope() void Monoscope::init() { - mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0, + mAction = new TDEToggleAction(i18n("Toggle Monoscope"), nullptr, 0, this, TQ_SLOT(toggle()), this, "togglemonoscope"); mAction->setChecked(!isHidden()); napp->pluginActionMenu()->insert(mAction); diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp index 752b2005..df5bf011 100644 --- a/noatun/modules/net/net.cpp +++ b/noatun/modules/net/net.cpp @@ -34,7 +34,7 @@ void Net::newSong() if (!napp->player()->current()) return; - for (TQSocket *i=mFDs.first(); i!=0; i=mFDs.next()) + for (TQSocket *i=mFDs.first(); i; i=mFDs.next()) { TQCString line; line=napp->player()->current().title().latin1(); @@ -45,7 +45,7 @@ void Net::newSong() void Net::closed() { - for (TQSocket *i=mFDs.first(); i!=0; i=mFDs.next()) + for (TQSocket *i=mFDs.first(); i; i=mFDs.next()) { if (sender()==i) mFDs.removeRef(i); diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 7fbc497b..197dbf0e 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -28,7 +28,7 @@ #include #include -MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() +MilkChocolate::MilkChocolate() : TQWidget(nullptr,"NoatunUI"), UserInterface() { setAcceptDrops(true); static const int buttonSize=32; @@ -240,13 +240,13 @@ void MilkChocolate::slotTimeout() seeker()->setRange ( 0, (int)napp->player()->getLength()/1000 ); seeker()->setValue ( (int)napp->player()->getTime()/1000 ); } - changeStatusbar(0, napp->player()->lengthString()); + changeStatusbar(nullptr, napp->player()->lengthString()); } void MilkChocolate::sliderMoved(int seconds) { if (napp->player()->current()) - changeStatusbar(0, napp->player()->lengthString(seconds*1000)); + changeStatusbar(nullptr, napp->player()->lengthString(seconds*1000)); } void MilkChocolate::skipToWrapper(int second) diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h index 797fc4ac..d78c04e8 100644 --- a/noatun/modules/noatunui/userinterface.h +++ b/noatun/modules/noatunui/userinterface.h @@ -60,7 +60,7 @@ signals: void skipTo( int ); // emitted by skipToWrapper() private slots: - void changeStatusbar(const TQString& text, const TQString &text2=0); + void changeStatusbar(const TQString& text, const TQString &text2=nullptr); void changeCaption(const TQString& text); void popup(); diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 72edda51..9bda00a1 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -50,7 +50,7 @@ #include "volume.xpm" SimpleUI::SimpleUI() - : TDEMainWindow(0, "NoatunSimpleUI"), UserInterface() + : TDEMainWindow(nullptr, "NoatunSimpleUI"), UserInterface() { setAcceptDrops( true ); setCaption( i18n("Noatun") ); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 7c504383..0485d45a 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -5,7 +5,7 @@ #include #include -Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"edit-find")) +Finder::Finder(TQWidget *parent) : KDialogBase(parent, nullptr, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"edit-find")) { TQWidget *mainWidget = new TQWidget(this); mainWidget->setMinimumWidth(320); diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index d940c8ca..f4ce4615 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -9,10 +9,10 @@ #include -SplitPlaylist *SplitPlaylist::Self=0; +SplitPlaylist *SplitPlaylist::Self=nullptr; SplitPlaylist::SplitPlaylist() - : Playlist(0, "SplitPlaylist"), Plugin(), mExiting(false) + : Playlist(nullptr, "SplitPlaylist"), Plugin(), mExiting(false) { Self=this; } @@ -64,7 +64,7 @@ PlaylistItem SplitPlaylist::next(bool play) } else { - nextItem = 0; + nextItem = nullptr; } } else @@ -82,7 +82,7 @@ PlaylistItem SplitPlaylist::next(bool play) if (!nextItem) // don't set a null-item as current item { - return 0; + return nullptr; // nextItem = static_cast(static_cast(getFirst().data())); } @@ -144,7 +144,7 @@ PlaylistItem SplitPlaylist::previous() static_cast(current().data())->itemAbove()); } if (!nextItem) // don't set a null-item as current item - return 0; + return nullptr; setCurrent(nextItem); @@ -164,7 +164,7 @@ PlaylistItem SplitPlaylist::getAfter(const PlaylistItem &item) const { if (item) return static_cast(static_cast(item.data())->nextSibling()); - return 0; + return nullptr; } bool SplitPlaylist::listVisible() const @@ -208,7 +208,7 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC) emitC = emitC && currentItem; if (!i) { - currentItem=0; + currentItem=nullptr; } else { diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index f724d490..6e77dfc2 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -44,12 +44,12 @@ #define SPL SplitPlaylist::SPL() SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const KURL &text) - : TQCheckListItem(parent,0, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) + : TQCheckListItem(parent,nullptr, TQCheckListItem::CheckBox), PlaylistItemData(), removed(false) { addRef(); setUrl(text); - static_cast(parent)->moveItem(this, 0, after); + static_cast(parent)->moveItem(this, nullptr, after); setOn(true); // is this really needed, it makes the listview too wide for me :( @@ -66,7 +66,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co } SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap &props) - : TQCheckListItem(parent, 0, TQCheckListItem::CheckBox), removed(false) + : TQCheckListItem(parent, nullptr, TQCheckListItem::CheckBox), removed(false) { addRef(); @@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co } } - static_cast(parent)->moveItem(this, 0, after); + static_cast(parent)->moveItem(this, nullptr, after); modified(); if (!streamable() && enqueue(url())) @@ -289,7 +289,7 @@ void SafeListViewItem::stateChange(bool s) // but not if I'm not selected if (list.containsRef(this)) - for (TQListViewItem *i=list.first(); i != 0; i=list.next()) + for (TQListViewItem *i=list.first(); i; i=list.next()) static_cast(i)->setOn(s); else TQCheckListItem::stateChange(s); @@ -315,7 +315,7 @@ void SafeListViewItem::remove() if (napp->player()->current()==this && !itemAbove() && !itemBelow()) { napp->player()->stop(); - SPL->setCurrent(0); + SPL->setCurrent(nullptr); } else if (napp->player()->current()==this) { @@ -325,7 +325,7 @@ void SafeListViewItem::remove() if (napp->player()->isPlaying() && !SPL->exiting()) napp->player()->forward(); else - SPL->setCurrent(0); + SPL->setCurrent(nullptr); } if (listView()) @@ -337,7 +337,7 @@ void SafeListViewItem::remove() } else if (SPL->currentItem==this) { - SPL->setCurrent(0); + SPL->setCurrent(nullptr); } dequeue(); @@ -345,7 +345,7 @@ void SafeListViewItem::remove() } List::List(View *parent) - : TDEListView(parent), recursiveAddAfter(0), listJob(0) + : TDEListView(parent), recursiveAddAfter(nullptr), listJob(nullptr) { addColumn(i18n("File")); addColumn(i18n("Time")); @@ -425,11 +425,11 @@ class NoatunSaver : public PlaylistSaver List *mList; SafeListViewItem *after, *mFirst; public: - NoatunSaver(List *l, TQListViewItem *after=0) + NoatunSaver(List *l, TQListViewItem *after=nullptr) : mList(l) { this->after = static_cast(after); - mFirst = 0; + mFirst = nullptr; } TQListViewItem *getAfter() { return after; } @@ -439,7 +439,7 @@ protected: virtual void readItem(const TQMap &properties) { after = new SafeListViewItem(mList, after, properties); - if (mFirst==0) + if (!mFirst) mFirst = after; } @@ -480,7 +480,7 @@ void View::exportTo(const KURL &url) TQTextStream t(&saver); // navigate the list for (SafeListViewItem *i=static_cast(listView()->firstChild()); - i != 0; i=static_cast(i->itemBelow())) + i; i=static_cast(i->itemBelow())) { KURL u=i->url(); if (u.isLocalFile()) @@ -594,7 +594,7 @@ void List::addDirectoryRecursive(const KURL &dir, TQListViewItem *after) void List::slotResult(TDEIO::Job *job) { - listJob= 0; + listJob= nullptr; if (job && job->error()) job->showErrorDialog(); addNextPendingDirectory(); @@ -634,7 +634,7 @@ void List::slotRedirection(TDEIO::Job *, const KURL & url) ///////////////////////////////// View::View(SplitPlaylist *) - : TDEMainWindow(0, "NoatunSplitplaylistView") + : TDEMainWindow(nullptr, "NoatunSplitplaylistView") { list=new List(this); setCentralWidget(list); @@ -761,7 +761,7 @@ void View::findIt(Finder *f) { { // select none TQPtrList sel=list->selectedItems(); - for (TQListViewItem *i=sel.first(); i!=0; i=sel.next()) + for (TQListViewItem *i=sel.first(); i; i=sel.next()) list->setSelected(i, false); } list->setSelected(search, true); @@ -787,7 +787,7 @@ void View::init() { KURL internalURL; internalURL.setPath(napp->dirs()->saveLocation("data", "noatun/") + "splitplaylistdata"); - NoatunSaver saver(list, 0); + NoatunSaver saver(list, nullptr); saver.load(internalURL, PlaylistSaver::M3U); } else @@ -836,7 +836,7 @@ void View::save() void View::saveAs() { - KURL u=KFileDialog::getSaveURL(0, "*.xml splitplaylistdata *.pls *.m3u\n*", this, i18n("Save Playlist")); + KURL u=KFileDialog::getSaveURL(nullptr, "*.xml splitplaylistdata *.pls *.m3u\n*", this, i18n("Save Playlist")); if(!u.isValid()) return; mPlaylistFile = u; @@ -845,7 +845,7 @@ void View::saveAs() void View::open() { - KURL u=KFileDialog::getOpenURL(0, "*.xml splitplaylistdata *.pls *.m3u\n*", this, i18n("Open Playlist")); + KURL u=KFileDialog::getOpenURL(nullptr, "*.xml splitplaylistdata *.pls *.m3u\n*", this, i18n("Open Playlist")); if(!u.isValid()) return; mPlaylistFile = u; @@ -861,7 +861,7 @@ void View::openNew() void List::clear() { - SPL->setCurrent(0); + SPL->setCurrent(nullptr); TQListView::clear(); } @@ -872,7 +872,7 @@ void View::deleteSelected() bool stopped=false; // noatun shouldn't play files for now - TQListViewItem *afterLast=0; + TQListViewItem *afterLast=nullptr; for (TQPtrListIterator it(items); it.current(); ++it) { @@ -880,7 +880,7 @@ void View::deleteSelected() if (!stopped && SPL->current() == i) { napp->player()->stop(); - SPL->setCurrent(0); + SPL->setCurrent(nullptr); stopped = true; } i->remove(); @@ -907,7 +907,7 @@ void View::addFiles() void View::addDirectory() { - TQString file=KFileDialog::getExistingDirectory(0, this, i18n("Select Folder")); + TQString file=KFileDialog::getExistingDirectory(nullptr, this, i18n("Select Folder")); if (!file) return; KURL url; diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 54578cb4..4c10e1e1 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -25,7 +25,7 @@ public: SafeListViewItem(TQListView *parent, TQListViewItem *after, const TQMap &properties); virtual ~SafeListViewItem(); - virtual TQString property(const TQString &, const TQString & = 0) const; + virtual TQString property(const TQString &, const TQString & = nullptr) const; virtual void setProperty(const TQString &, const TQString &); virtual void clearProperty(const TQString &); virtual TQStringList properties() const; @@ -63,10 +63,10 @@ friend class View; public: List(View *parent); virtual ~List(); - TQListViewItem *openGlobal(const KURL&, TQListViewItem * =0); - TQListViewItem *importGlobal(const KURL&, TQListViewItem * =0); - TQListViewItem *addFile(const KURL&, bool play=false, TQListViewItem * =0); - void addDirectoryRecursive(const KURL &dir, TQListViewItem *after= 0); + TQListViewItem *openGlobal(const KURL&, TQListViewItem * =nullptr); + TQListViewItem *importGlobal(const KURL&, TQListViewItem * =nullptr); + TQListViewItem *addFile(const KURL&, bool play=false, TQListViewItem * =nullptr); + void addDirectoryRecursive(const KURL &dir, TQListViewItem *after= nullptr); public slots: virtual void clear(); diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h index 709a8f07..3aa31259 100644 --- a/noatun/modules/systray/kitsystemtray.h +++ b/noatun/modules/systray/kitsystemtray.h @@ -40,7 +40,7 @@ TQ_OBJECT public: - KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name = 0); + KitSystemTray(const TQString &contextMenu, TDEMainWindow *parent, const char *name = nullptr); void changeTitle(const TQPixmap &, const TQString &); protected: virtual void showEvent(TQShowEvent *); diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index ee3024ec..5b9cb7f7 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -72,7 +72,7 @@ const int COVER_MAXH = 128; class PassivePopup : public KPassivePopup { public: - PassivePopup(TQWidget *parent = 0, const char *name = 0) : KPassivePopup(parent, name) {} + PassivePopup(TQWidget *parent = nullptr, const char *name = nullptr) : KPassivePopup(parent, name) {} protected: virtual void enterEvent(TQEvent *) @@ -90,8 +90,8 @@ protected: //NoatunSystray *NoatunSystray::self = 0; -NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), - mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L) +NoatunSystray::NoatunSystray() : TDEMainWindow(nullptr, "NoatunSystray"), Plugin(), + mTray(nullptr), trayStatus(nullptr), trayBase(nullptr), mPassivePopup(nullptr) { //self = this; hide(); @@ -179,7 +179,7 @@ void NoatunSystray::slotLoadSettings() else { delete mPassivePopup; - mPassivePopup = 0L; + mPassivePopup = nullptr; } } @@ -187,7 +187,7 @@ void NoatunSystray::slotLoadSettings() void NoatunSystray::closeEvent(TQCloseEvent*) { //kdDebug(66666) << k_funcinfo << "Called." << endl; - disconnect(napp->player(), 0, 0, 0); + disconnect(napp->player(), nullptr, nullptr, nullptr); unload(); } @@ -338,7 +338,7 @@ void NoatunSystray::updateCover() else tmpimg = src; - tmpimg.setText("Title", 0, title); //add Title in the image text for cache usage + tmpimg.setText("Title", nullptr, title); //add Title in the image text for cache usage tmpimg.save(tmpCoverPath, "PNG", 0); } else @@ -379,7 +379,7 @@ void NoatunSystray::showPassivePopup() return; } - mPassivePopup->reparent(0L, TQPoint(0,0)); + mPassivePopup->reparent(nullptr, TQPoint(0,0)); if (YHConfig::self()->passivePopupButtons() && !napp->player()->isStopped()) { @@ -403,11 +403,11 @@ void NoatunSystray::showPassivePopup() TQVBox *buttonBox = new TQVBox(box); buttonBox->setSpacing(3); - TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); + TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), nullptr, buttonBox, "popup_forward"); forwardButton->setFlat(true); connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); - TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); + TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), nullptr, buttonBox, "popup_back"); backButton->setFlat(true); connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); @@ -427,11 +427,11 @@ void NoatunSystray::showPassivePopup() TQVBox *buttonBox = new TQVBox(box); buttonBox->setSpacing(3); - TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); + TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), nullptr, buttonBox, "popup_forward"); forwardButton->setFlat(true); connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); - TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); + TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), nullptr, buttonBox, "popup_back"); backButton->setFlat(true); connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); } diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index f9f65105..554b845e 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -15,9 +15,9 @@ extern "C" } } -VoicePrint *VoicePrint::voicePrint=0; +VoicePrint *VoicePrint::voicePrint=nullptr; -VoicePrint::VoicePrint() : TQWidget(0,0,WRepaintNoErase), MonoFFTScope(50), Plugin() +VoicePrint::VoicePrint() : TQWidget(nullptr,nullptr,WRepaintNoErase), MonoFFTScope(50), Plugin() { voicePrint=this; mOffset=0; @@ -38,7 +38,7 @@ void VoicePrint::init() Prefs *p=new Prefs(this); p->reopen(); p->save(); - resizeEvent(0); + resizeEvent(nullptr); } void VoicePrint::setColors(const TQColor &bg, const TQColor &fg, const TQColor &l) diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index 562aea00..b94ffb6e 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -23,16 +23,16 @@ WaRegion *windowRegion = nullptr; // Hack around case-insensitivity in Winamp INI files by searching for common capitializations // Needs to be replaced with an all-custom loader after 3.0 -const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointList", "POINTLIST", 0}; -const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", 0}; +const char *pointListNames[] = {"PointList", "pointlist", "Pointlist", "pointList", "POINTLIST", nullptr}; +const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoints", "NUMPOINTS", nullptr}; WaRegion::WaRegion(TQString filename) { // Load the region file, which happens to be in TDEConfig format TDESimpleConfig regionFile(filename, true); // Clear our variables by default - window_mask = 0; - shade_mask = 0; + window_mask = nullptr; + shade_mask = nullptr; // Make the new bitmaps, default window size window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true); diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 40682634..166d7bf6 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -57,7 +57,7 @@ WaSkin *_waskin_instance = nullptr; -WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() +WaSkin::WaSkin() : TQWidget(nullptr, "NoatunWinampSkin"), UserInterface() { mJumpPressed = false; mVolumePressed = false; @@ -135,7 +135,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() WaSkin::~WaSkin() { delete waSkinManager; - waSkinManager = 0L; + waSkinManager = nullptr; } void WaSkin::loadSkin(TQString newSkinDir) diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index f00ab7b7..ed450fb5 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -139,7 +139,7 @@ void WaSkinModel::loadRegion(const TQDir &dir) { if (windowRegion) { delete windowRegion; - windowRegion = 0; + windowRegion = nullptr; } windowRegion = new WaRegion(regionFile); diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 03e469f1..d3e9e6a8 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -38,7 +38,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : skin_list = new TQListBox(this, "skin_list"); vbox->addWidget(skin_list); - TQHBoxLayout* hbox = new TQHBoxLayout( 0, 6, 6 ); + TQHBoxLayout* hbox = new TQHBoxLayout( nullptr, 6, 6 ); TQPushButton* buttonInstall = new TQPushButton( i18n("&Install New Skin..."), this ); hbox->addWidget(buttonInstall); diff --git a/tdefile-plugins/flac/tdefile_flac.cpp b/tdefile-plugins/flac/tdefile_flac.cpp index 207e3928..93bc0fe4 100644 --- a/tdefile-plugins/flac/tdefile_flac.cpp +++ b/tdefile-plugins/flac/tdefile_flac.cpp @@ -76,14 +76,14 @@ void KFlacPlugin::makeMimeTypeInfo(const TQString& mimeType) { KFileMimeTypeInfo* info = addMimeTypeInfo( mimeType ); - KFileMimeTypeInfo::GroupInfo* group = 0; + KFileMimeTypeInfo::GroupInfo* group = nullptr; // comment group group = addGroupInfo(info, "Comment", i18n("Comment")); setAttributes(group, KFileMimeTypeInfo::Addable | KFileMimeTypeInfo::Removable); - KFileMimeTypeInfo::ItemInfo* item = 0; + KFileMimeTypeInfo::ItemInfo* item = nullptr; item = addItemInfo(group, "Artist", i18n("Artist"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Author); @@ -161,7 +161,7 @@ bool KFlacPlugin::readInfo( KFileMetaInfo& info, uint what ) KFileMetaInfo::DontCare | KFileMetaInfo::TechnicalInfo)) readTech = true; - TagLib::File *file = 0; + TagLib::File *file = nullptr; if (info.mimeType() == "audio/x-flac") file = new TagLib::FLAC::File(TQFile::encodeName(info.path()).data(), readTech); diff --git a/tdefile-plugins/mpc/tdefile_mpc.cpp b/tdefile-plugins/mpc/tdefile_mpc.cpp index b239ad69..af4f3cce 100644 --- a/tdefile-plugins/mpc/tdefile_mpc.cpp +++ b/tdefile-plugins/mpc/tdefile_mpc.cpp @@ -58,14 +58,14 @@ KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name, KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/x-musepack" ); - KFileMimeTypeInfo::GroupInfo* group = 0; + KFileMimeTypeInfo::GroupInfo* group = nullptr; // comment group group = addGroupInfo(info, "Comment", i18n("Comment")); setAttributes(group, KFileMimeTypeInfo::Addable | KFileMimeTypeInfo::Removable); - KFileMimeTypeInfo::ItemInfo* item = 0; + KFileMimeTypeInfo::ItemInfo* item = nullptr; item = addItemInfo(group, "Artist", i18n("Artist"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Author); diff --git a/tdefile-plugins/ogg/tdefile_ogg.cpp b/tdefile-plugins/ogg/tdefile_ogg.cpp index c53f7b5d..c3827046 100644 --- a/tdefile-plugins/ogg/tdefile_ogg.cpp +++ b/tdefile-plugins/ogg/tdefile_ogg.cpp @@ -69,14 +69,14 @@ KOggPlugin::KOggPlugin( TQObject *parent, const char *name, KFileMimeTypeInfo* info = addMimeTypeInfo( "audio/vorbis" ); - KFileMimeTypeInfo::GroupInfo* group = 0; + KFileMimeTypeInfo::GroupInfo* group = nullptr; // comment group group = addGroupInfo(info, "Comment", i18n("Comment")); setAttributes(group, KFileMimeTypeInfo::Addable | KFileMimeTypeInfo::Removable); - KFileMimeTypeInfo::ItemInfo* item = 0; + KFileMimeTypeInfo::ItemInfo* item = nullptr; item = addItemInfo(group, "Artist", i18n("Artist"), TQVariant::String); setHint(item, KFileMimeTypeInfo::Author); diff --git a/tdefile-plugins/theora/tdefile_theora.cpp b/tdefile-plugins/theora/tdefile_theora.cpp index 5c8fadb2..90c9e026 100644 --- a/tdefile-plugins/theora/tdefile_theora.cpp +++ b/tdefile-plugins/theora/tdefile_theora.cpp @@ -64,7 +64,7 @@ theoraPlugin::theoraPlugin(TQObject *parent, const char *name, KFileMimeTypeInfo* info = addMimeTypeInfo( "video/x-theora" ); - KFileMimeTypeInfo::GroupInfo* group = 0; + KFileMimeTypeInfo::GroupInfo* group = nullptr; KFileMimeTypeInfo::ItemInfo* item; // video group diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp index 4fe76933..a00edf47 100644 --- a/tdeioslave/audiocd/audiocd.cpp +++ b/tdeioslave/audiocd/audiocd.cpp @@ -208,7 +208,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) parseURLArgs(url); struct cdrom_drive * drive = getDrive(); - if (0 == drive) + if (!drive) return 0; // Update our knowledge of the disc @@ -731,7 +731,7 @@ struct cdrom_drive *AudioCDProtocol::getDrive() { TQCString device(TQFile::encodeName(d->device)); - struct cdrom_drive * drive = 0; + struct cdrom_drive * drive = nullptr; if (!device.isEmpty() && device != "/") drive = cdda_identify(device, CDDA_MESSAGE_PRINTIT, 0); @@ -739,14 +739,14 @@ struct cdrom_drive *AudioCDProtocol::getDrive() { drive = cdda_find_a_cdrom(CDDA_MESSAGE_PRINTIT, 0); - if (0 == drive) + if (!drive) { if (TQFile(TQFile::decodeName(DEFAULT_CD_DEVICE)).exists()) drive = cdda_identify(DEFAULT_CD_DEVICE, CDDA_MESSAGE_PRINTIT, 0); } } - if (0 == drive) { + if (!drive) { kdDebug(7117) << "Can't find an audio CD on: \"" << d->device << "\"" << endl; TQFileInfo fi(d->device); @@ -785,7 +785,7 @@ void AudioCDProtocol::paranoiaRead( return; cdrom_paranoia * paranoia = paranoia_init(drive); - if (0 == paranoia) { + if (!paranoia) { kdDebug(7117) << "paranoia_init failed" << endl; return; } @@ -834,7 +834,7 @@ void AudioCDProtocol::paranoiaRead( warning(i18n("AudioCD: Disk damage detected on this track, risk of data corruption.")); warned = 1; } - if (0 == buf) { + if (!buf) { kdDebug(7117) << "Unrecoverable error in paranoia_read" << endl; ok = false; error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).arg( fileName ) ); @@ -928,7 +928,7 @@ void AudioCDProtocol::paranoiaRead( error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).arg( fileName ) ); paranoia_free(paranoia); - paranoia = 0; + paranoia = nullptr; } /** diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h index b7f186cb..e2cba022 100644 --- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h @@ -36,7 +36,7 @@ class KAudiocdModule : public AudiocdConfig public: - KAudiocdModule(TQWidget *parent=0, const char *name=0); + KAudiocdModule(TQWidget *parent=nullptr, const char *name=nullptr); ~KAudiocdModule(); TQString quickHelp() const; diff --git a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp index 44391531..674c4679 100644 --- a/tdeioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp @@ -89,7 +89,7 @@ static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableS EncoderFLAC::EncoderFLAC(TDEIO::SlaveBase *slave) : AudioCDEncoder(slave) { d = new Private(); d->ioslave = slave; - d->encoder = 0; + d->encoder = nullptr; } EncoderFLAC::~EncoderFLAC() { @@ -99,7 +99,7 @@ EncoderFLAC::~EncoderFLAC() { bool EncoderFLAC::init(){ d->encoder = FLAC__stream_encoder_new(); - d->metadata = 0; + d->metadata = nullptr; d->data = 0; return true; } @@ -165,7 +165,7 @@ long EncoderFLAC::readCleanup() if (d->metadata) { FLAC__metadata_object_delete(d->metadata[0]); delete[] d->metadata; - d->metadata = 0; + d->metadata = nullptr; } return 0; } diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp index 50bf5d42..f8b72a5d 100644 --- a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp @@ -54,7 +54,7 @@ CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) } CollectingProcess::~CollectingProcess() { - delete d; d = 0; + delete d; d = nullptr; } bool CollectingProcess::start( RunMode runmode, Communication comm ) { diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.h b/tdeioslave/audiocd/plugins/lame/collectingprocess.h index d23e43ab..be216955 100644 --- a/tdeioslave/audiocd/plugins/lame/collectingprocess.h +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.h @@ -47,7 +47,7 @@ class CollectingProcess : public TDEProcess { TQ_OBJECT public: - CollectingProcess( TQObject * parent = 0, const char * name = 0 ); + CollectingProcess( TQObject * parent = nullptr, const char * name = nullptr ); ~CollectingProcess(); /** Starts the process in NotifyOnExit mode and writes in to stdin of diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp index 140d6a7e..e5f3def0 100644 --- a/tdemid/channelview.cpp +++ b/tdemid/channelview.cpp @@ -31,7 +31,7 @@ #include -ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView") +ChannelView::ChannelView(void) : TDEMainWindow(nullptr, "ChannelView") { setCaption(i18n("Channel View")); for (int i=0;i<16;i++) diff --git a/tdemid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp index 4f7fb139..fb30ebae 100644 --- a/tdemid/ktrianglebutton.cpp +++ b/tdemid/ktrianglebutton.cpp @@ -80,7 +80,7 @@ void KTriangleButton::paint( TQPainter *painter ) height(), colorGroup(), true ); else qDrawShadePanel( painter, 0, 0, width(), - height(), colorGroup(), true, 2, 0L ); + height(), colorGroup(), true, 2, nullptr ); } else if ( raised ) { @@ -89,7 +89,7 @@ void KTriangleButton::paint( TQPainter *painter ) colorGroup(), false ); else qDrawShadePanel( painter, 0, 0, width(), height(), - colorGroup(), false, 2, 0L ); + colorGroup(), false, 2, nullptr ); } if (dir==Right) diff --git a/tdemid/ktrianglebutton.h b/tdemid/ktrianglebutton.h index a6b840ee..a60a381a 100644 --- a/tdemid/ktrianglebutton.h +++ b/tdemid/ktrianglebutton.h @@ -48,7 +48,7 @@ protected: int timeCount; public: - KTriangleButton( Direction d,TQWidget *_parent = 0L, const char *name = 0L ); + KTriangleButton( Direction d,TQWidget *_parent = nullptr, const char *name = nullptr ); ~KTriangleButton(); virtual void leaveEvent( TQEvent *_ev ); diff --git a/tdemid/main.cpp b/tdemid/main.cpp index 3f12b7c9..19094091 100644 --- a/tdemid/main.cpp +++ b/tdemid/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char **argv) static TDECmdLineOptions options[] = { - { "+file", I18N_NOOP("File to open"), 0 }, + { "+file", I18N_NOOP("File to open"), nullptr }, TDECmdLineLastOption }; TDECmdLineArgs::addCmdLineOptions(options); diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp index 85375da7..c3348b40 100644 --- a/tdemid/midicfgdlg.cpp +++ b/tdemid/midicfgdlg.cpp @@ -114,7 +114,7 @@ void MidiConfigDialog::browseMap() if( !url.isLocalFile() ) { - KMessageBox::sorry( 0L, i18n( "Only local files are currently supported." ) ); + KMessageBox::sorry( nullptr, i18n( "Only local files are currently supported." ) ); return; } diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp index ae176f8c..79145bf8 100644 --- a/tdemid/tdemid_part.cpp +++ b/tdemid/tdemid_part.cpp @@ -19,11 +19,11 @@ K_EXPORT_COMPONENT_FACTORY( libtdemidpart, KMidFactory ) * We need one static instance of the factory for our C 'main' * function */ -TDEInstance *KMidFactory::s_instance = 0L; +TDEInstance *KMidFactory::s_instance = nullptr; KMidFactory::KMidFactory() { - s_instance=0L; + s_instance=nullptr; } KMidFactory::~KMidFactory() @@ -34,7 +34,7 @@ KMidFactory::~KMidFactory() delete s_instance; } - s_instance = 0; + s_instance = nullptr; } KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h index 03c053ef..707db3c9 100644 --- a/tdemid/tdemid_part.h +++ b/tdemid/tdemid_part.h @@ -18,7 +18,7 @@ class TDE_EXPORT KMidFactory : public KParts::Factory virtual ~KMidFactory(); virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName, - TQObject* parent = 0, const char* name = 0, + TQObject* parent = nullptr, const char* name = nullptr, const char* classname = "TQObject", const TQStringList &args = TQStringList()); diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp index 58bcf913..52a50fea 100644 --- a/tdemid/tdemidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -71,12 +71,12 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char actionCollection=ac; TDEConfig *cfg=tdeApp->config(); cfg->setGroup("KMid"); - midifile_opened=0L; + midifile_opened=nullptr; loopsong=cfg->readNumEntry("Loop",0); collectionplaymode=0; - collectionplaylist=0L; - channelView=0L; - noteArray=0L; + collectionplaylist=nullptr; + channelView=nullptr; + noteArray=nullptr; shuttingdown=false; TDEConfig *tdeconf=TDEGlobal::instance()->config(); @@ -158,7 +158,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char exit(1); } - m_kMid.pctl=(PlayerController *)shmat(m_kMid.pctlsmID,0L,0); + m_kMid.pctl=(PlayerController *)shmat(m_kMid.pctlsmID,nullptr,0); if (!m_kMid.pctl) printf("ERROR: Cannot get shared memory !!! " "Please report to larrosa@kde.org\n"); @@ -236,7 +236,7 @@ tdemidClient::~tdemidClient() if (m_kMid.pid!=0) { kill(m_kMid.pid,SIGTERM); - waitpid(m_kMid.pid, 0L, 0); + waitpid(m_kMid.pid, nullptr, 0); m_kMid.midi->closeDev(); m_kMid.pid=0; } @@ -253,8 +253,8 @@ tdemidClient::~tdemidClient() // Let's detach and delete shared memory shmdt((char *)m_kMid.pctl); - shmctl(m_kMid.pctlsmID, IPC_RMID, 0L); - m_kMid.pctl=0L; + shmctl(m_kMid.pctlsmID, IPC_RMID, nullptr); + m_kMid.pctl=nullptr; } // Use KURL::filename ! (David) @@ -307,7 +307,7 @@ int tdemidClient::openFile(const char *filename) KMessageBox::error(this, errormsg); // player->loadSong(midifile_opened); if (midifile_opened) delete midifile_opened; - midifile_opened=0L; + midifile_opened=nullptr; timebar->setRange(0,240000); timebar->setValue(0); timetags->repaint(true); @@ -1303,7 +1303,7 @@ void tdemidClient::setSongLoop(int i) void tdemidClient::generateCPL(void) { delete [] collectionplaylist; - collectionplaylist=0; + collectionplaylist=nullptr; if (!currentsl) return; diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h index 99dc52d5..ee8be286 100644 --- a/tdemid/tdemidclient.h +++ b/tdemid/tdemidclient.h @@ -106,7 +106,7 @@ private: int openFile(const char *filename); void allNotesOff(void); public: - tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char *name=0); + tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char *name=nullptr); ~tdemidClient(); char *midiFileName(void) {return midifile_opened;}; diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp index ad0a5b49..48c0fec3 100644 --- a/tdemid/tdemidframe.cpp +++ b/tdemid/tdemidframe.cpp @@ -59,7 +59,7 @@ #include "version.h" tdemidFrame::tdemidFrame(const char *name) - :TDEMainWindow(0, name) + :TDEMainWindow(nullptr, name) { tdemidclient=new tdemidClient(this,actionCollection(), "KMidClient"); tdemidclient->setSongType(1); @@ -283,7 +283,7 @@ void tdemidFrame::file_Open() if( !url.isLocalFile() ) { - KMessageBox::sorry( 0L, i18n( "Only local files are currently supported." ) ); + KMessageBox::sorry( nullptr, i18n( "Only local files are currently supported." ) ); return; } @@ -558,7 +558,7 @@ void tdemidFrame::file_SaveLyrics() if( !url.isLocalFile() ) { - KMessageBox::sorry( 0L, i18n( "Only local files are currently supported." ) ); + KMessageBox::sorry( nullptr, i18n( "Only local files are currently supported." ) ); return; } diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h index 247e6745..61bf65e3 100644 --- a/tdemid/tdemidframe.h +++ b/tdemid/tdemidframe.h @@ -77,7 +77,7 @@ protected: public: - tdemidFrame(const char *name=0); + tdemidFrame(const char *name=nullptr); virtual ~tdemidFrame(); public slots: diff --git a/xine_artsplugin/tools/thumbnail/videocreator.cpp b/xine_artsplugin/tools/thumbnail/videocreator.cpp index 37f434d0..60c16670 100644 --- a/xine_artsplugin/tools/thumbnail/videocreator.cpp +++ b/xine_artsplugin/tools/thumbnail/videocreator.cpp @@ -72,7 +72,7 @@ static void *xine_timeout_routine( void * ) { pthread_mutex_lock( &xine_mutex ); - while (xine_shared != 0) + while (xine_shared) { if (xineRefCount == 0) { @@ -109,7 +109,7 @@ static xine_t *xine_shared_init() ++xineRefCount; - if (xine_shared == 0) + if (!xine_shared) { pthread_t thread; diff --git a/xine_artsplugin/xinePlayObject_impl.cpp b/xine_artsplugin/xinePlayObject_impl.cpp index deb109ae..dddc1c05 100644 --- a/xine_artsplugin/xinePlayObject_impl.cpp +++ b/xine_artsplugin/xinePlayObject_impl.cpp @@ -67,7 +67,7 @@ static void *xine_timeout_routine( void * ) { pthread_mutex_lock( &xine_mutex ); - while (xine_shared != 0) + while (xine_shared) { if (xineRefCount == 0) { @@ -104,7 +104,7 @@ static xine_t *xine_shared_init() ++xineRefCount; - if (xine_shared == 0) + if (!xine_shared) { pthread_t thread; @@ -254,7 +254,7 @@ xinePlayObject_impl::~xinePlayObject_impl() } // Destroy stream, xine and related resources - if (stream != 0) + if (stream) { halt(); @@ -263,7 +263,7 @@ xinePlayObject_impl::~xinePlayObject_impl() xine_close_audio_driver( xine, ao_port ); xine_close_video_driver( xine, vo_port ); } - if (xine != 0) + if (xine) { xine_shared_exit( xine ); } @@ -286,9 +286,9 @@ bool xinePlayObject_impl::loadMedia( const string &url ) mrl = ""; - if (stream == 0) + if (!stream) { - if (xine == 0) + if (!xine) { xine = xine_shared_init(); } @@ -301,35 +301,35 @@ bool xinePlayObject_impl::loadMedia( const string &url ) XINE_VISUAL_TYPE_X11, (void *)&visual ); } - if (vo_port == 0 && !audioOnly) + if (!vo_port && !audioOnly) { vo_port = xine_open_video_driver( xine, "Xv", XINE_VISUAL_TYPE_X11, (void *)&visual ); } - if (vo_port == 0 && !audioOnly) + if (!vo_port && !audioOnly) { vo_port = xine_open_video_driver( xine, "XShm", XINE_VISUAL_TYPE_X11, (void *)&visual ); } - if (vo_port == 0 && !audioOnly) + if (!vo_port && !audioOnly) { vo_port = xine_open_video_driver( xine, "OpenGL", XINE_VISUAL_TYPE_X11, (void *)&visual ); } - if (vo_port == 0) + if (!vo_port) { vo_port = xine_open_video_driver( xine, 0, XINE_VISUAL_TYPE_NONE, 0 ); } - if (ao_port != 0 && vo_port != 0 ) + if (ao_port && vo_port != 0 ) { stream = xine_stream_new( xine, ao_port, vo_port ); - if (stream != 0) + if (stream) { xine_set_param( stream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, 0 ); xine_set_param( stream, XINE_PARAM_SPU_CHANNEL, -1 ); @@ -338,22 +338,22 @@ bool xinePlayObject_impl::loadMedia( const string &url ) xine_event_create_listener_thread( queue, xine_handle_event, this ); } } - if (stream == 0) + if (!stream) { - if (ao_port != 0) + if (ao_port) { xine_close_audio_driver( xine, ao_port ); - ao_port = 0; + ao_port = nullptr; } - if (vo_port != 0) + if (vo_port) { xine_close_video_driver( xine, vo_port ); - vo_port = 0; + vo_port = nullptr; } } } - if (stream != 0) + if (stream) { if (xine_get_status( stream ) == XINE_STATUS_PLAY) { @@ -392,7 +392,7 @@ poTime xinePlayObject_impl::currentTime() pthread_mutex_lock( &mutex ); - if (stream != 0 && !mrl.empty()) + if (stream && !mrl.empty()) { if (xine_get_pos_length( stream, 0, &pos_time, 0 )) { @@ -423,7 +423,7 @@ poTime xinePlayObject_impl::overallTime() pthread_mutex_lock( &mutex ); - if (stream != 0 && !mrl.empty()) + if (stream && !mrl.empty()) { if (xine_get_pos_length( stream, 0, 0, &length_time )) { @@ -458,7 +458,7 @@ poCapabilities xinePlayObject_impl::capabilities() pthread_mutex_lock( &mutex ); - n = (stream == 0) ? 0 : xine_get_stream_info( stream, XINE_STREAM_INFO_SEEKABLE ); + n = stream ? xine_get_stream_info( stream, XINE_STREAM_INFO_SEEKABLE ) : 0; pthread_mutex_unlock( &mutex ); @@ -476,7 +476,7 @@ poState xinePlayObject_impl::state() pthread_mutex_lock( &mutex ); - if (stream == 0 || xine_get_status( stream ) != XINE_STATUS_PLAY) + if (!stream || xine_get_status( stream ) != XINE_STATUS_PLAY) state = posIdle; else if (xine_get_param( stream, XINE_PARAM_SPEED ) == XINE_SPEED_PAUSE) state = posPaused; @@ -492,7 +492,7 @@ void xinePlayObject_impl::play() { pthread_mutex_lock( &mutex ); - if (stream != 0) + if (stream) { if (xine_get_status( stream ) == XINE_STATUS_PLAY) { @@ -513,7 +513,7 @@ void xinePlayObject_impl::halt() { pthread_mutex_lock( &mutex ); - if (stream != 0 && xine_get_status( stream ) == XINE_STATUS_PLAY) + if (stream && xine_get_status( stream ) == XINE_STATUS_PLAY) { ao_fifo_clear( ao_driver, 2 ); @@ -531,7 +531,7 @@ void xinePlayObject_impl::seek( const class poTime &t ) { pthread_mutex_lock( &mutex ); - if (stream != 0 && xine_get_status( stream ) == XINE_STATUS_PLAY) + if (stream && xine_get_status( stream ) == XINE_STATUS_PLAY) { int seekPosition = (1000 * t.seconds) + t.ms; int paused = (xine_get_param( stream, XINE_PARAM_SPEED ) == XINE_SPEED_PAUSE); @@ -560,7 +560,7 @@ void xinePlayObject_impl::pause() { pthread_mutex_lock( &mutex ); - if (stream != 0 && xine_get_status( stream ) == XINE_STATUS_PLAY) + if (stream && xine_get_status( stream ) == XINE_STATUS_PLAY) { ao_fifo_clear( ao_driver, 1 ); @@ -577,7 +577,7 @@ void xinePlayObject_impl::calculateBlock( unsigned long samples ) pthread_mutex_lock( &mutex ); - if (stream != 0) + if (stream) { // Calculate resampling parameters speed = (double)audio.sample_rate / samplingRateFloat; @@ -729,7 +729,7 @@ void xinePlayObject_impl::eventLoop() if (event.type == Expose && event.xexpose.count == 0 && event.xexpose.window == visual.d) { pthread_mutex_lock( &mutex ); - if (stream != 0) { + if (stream) { xine_port_send_gui_data( vo_port, XINE_GUI_SEND_EXPOSE_EVENT, &event ); @@ -742,7 +742,7 @@ void xinePlayObject_impl::eventLoop() else if (event.type == shmCompletionType) { pthread_mutex_lock( &mutex ); - if (stream != 0) { + if (stream) { xine_port_send_gui_data( vo_port, XINE_GUI_SEND_COMPLETION_EVENT, &event ); @@ -779,7 +779,7 @@ void xineVideoPlayObject_impl::x11WindowId( long window ) XSelectInput( display, window, ExposureMask ); - if (stream != 0) + if (stream) { resizeNotify(); @@ -804,7 +804,7 @@ long xineVideoPlayObject_impl::x11Snapshot() pthread_mutex_lock( &mutex ); - if (stream != 0 && xine_get_status( stream ) == XINE_STATUS_PLAY) + if (stream && xine_get_status( stream ) == XINE_STATUS_PLAY) { // FIXME: snapshot... pixmap = (long)-1; -- cgit v1.2.3