aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
commitb917024aa1ac4cb0a40164132db3c6d2913157eb (patch)
tree4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins
parentbef5a901922c002815d047d276e61ec0bf8c0f46 (diff)
downloadqmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz
qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2
qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8572 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp2
-rw-r--r--src/plugins/Effect/bs2b/bs2bplugin.cpp4
-rw-r--r--src/plugins/Effect/bs2b/settingsdialog.h2
-rw-r--r--src/plugins/Effect/crossfade/crossfadeplugin.cpp2
-rw-r--r--src/plugins/Effect/crossfade/settingsdialog.h2
-rw-r--r--src/plugins/Effect/filewriter/filewriterplugin.cpp6
-rw-r--r--src/plugins/Effect/filewriter/settingsdialog.h2
-rw-r--r--src/plugins/Effect/ladspa/ladspabutton.h2
-rw-r--r--src/plugins/Effect/ladspa/ladspahost.cpp8
-rw-r--r--src/plugins/Effect/ladspa/ladspaslider.h2
-rw-r--r--src/plugins/Effect/ladspa/settingsdialog.cpp6
-rw-r--r--src/plugins/Effect/ladspa/settingsdialog.h2
-rw-r--r--src/plugins/Effect/monotostereo/monotostereoplugin.cpp4
-rw-r--r--src/plugins/Effect/soxr/settingsdialog.h2
-rw-r--r--src/plugins/Effect/soxr/soxresampler.cpp14
-rw-r--r--src/plugins/Effect/stereo/settingsdialog.h2
-rw-r--r--src/plugins/Effect/stereo/stereoplugin.cpp4
-rw-r--r--src/plugins/Engines/mplayer/mplayerengine.cpp6
-rw-r--r--src/plugins/Engines/mplayer/mplayerenginefactory.h2
-rw-r--r--src/plugins/Engines/mplayer/settingsdialog.h2
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp2
-rw-r--r--src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h4
-rw-r--r--src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp2
-rw-r--r--src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h4
-rw-r--r--src/plugins/General/converter/converter.cpp10
-rw-r--r--src/plugins/General/converter/converter.h2
-rw-r--r--src/plugins/General/converter/converterdialog.h2
-rw-r--r--src/plugins/General/converter/converterfactory.cpp2
-rw-r--r--src/plugins/General/converter/converterhelper.h2
-rw-r--r--src/plugins/General/converter/preseteditor.h2
-rw-r--r--src/plugins/General/copypaste/copypaste.h2
-rw-r--r--src/plugins/General/copypaste/copypastefactory.cpp2
-rw-r--r--src/plugins/General/covermanager/covermanager.h2
-rw-r--r--src/plugins/General/covermanager/covermanagerfactory.cpp2
-rw-r--r--src/plugins/General/covermanager/coverwidget.h2
-rw-r--r--src/plugins/General/fileops/fileops.h2
-rw-r--r--src/plugins/General/fileops/hotkeydialog.h2
-rw-r--r--src/plugins/General/fileops/settingsdialog.h2
-rw-r--r--src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp2
-rw-r--r--src/plugins/General/gnomehotkey/mediakeys.cpp2
-rw-r--r--src/plugins/General/gnomehotkey/mediakeys.h2
-rw-r--r--src/plugins/General/hal/haldevice.h2
-rw-r--r--src/plugins/General/hal/halmanager.h2
-rw-r--r--src/plugins/General/hal/halplugin.cpp4
-rw-r--r--src/plugins/General/hal/halplugin.h2
-rw-r--r--src/plugins/General/hal/settingsdialog.h2
-rw-r--r--src/plugins/General/history/dateinputdialog.h2
-rw-r--r--src/plugins/General/history/history.h2
-rw-r--r--src/plugins/General/history/historysettingsdialog.h2
-rw-r--r--src/plugins/General/history/historywindow.h2
-rw-r--r--src/plugins/General/history/progressbaritemdelegate.h2
-rw-r--r--src/plugins/General/hotkey/hotkeydialog.h2
-rw-r--r--src/plugins/General/hotkey/hotkeymanager.h2
-rw-r--r--src/plugins/General/hotkey/settingsdialog.cpp2
-rw-r--r--src/plugins/General/hotkey/settingsdialog.h2
-rw-r--r--src/plugins/General/kdenotify/kdenotify.h2
-rw-r--r--src/plugins/General/kdenotify/settingsdialog.h2
-rw-r--r--src/plugins/General/lyrics/lyrics.h2
-rw-r--r--src/plugins/General/lyrics/lyricsfactory.cpp2
-rw-r--r--src/plugins/General/lyrics/lyricswindow.cpp6
-rw-r--r--src/plugins/General/lyrics/lyricswindow.h2
-rw-r--r--src/plugins/General/mpris/mpris.h2
-rw-r--r--src/plugins/General/mpris/mpris2/player2object.cpp8
-rw-r--r--src/plugins/General/mpris/mpris2/player2object.h2
-rw-r--r--src/plugins/General/mpris/mpris2/root2object.h2
-rw-r--r--src/plugins/General/mpris/mprisfactory.cpp2
-rw-r--r--src/plugins/General/notifier/notifier.cpp2
-rw-r--r--src/plugins/General/notifier/notifier.h2
-rw-r--r--src/plugins/General/notifier/popupwidget.h2
-rw-r--r--src/plugins/General/notifier/settingsdialog.h2
-rw-r--r--src/plugins/General/rdetect/settingsdialog.h2
-rw-r--r--src/plugins/General/rgscan/rgscandialog.cpp2
-rw-r--r--src/plugins/General/rgscan/rgscandialog.h2
-rw-r--r--src/plugins/General/rgscan/rgscanfactory.cpp2
-rw-r--r--src/plugins/General/rgscan/rgscanhelper.h2
-rw-r--r--src/plugins/General/rgscan/rgscanner.cpp14
-rw-r--r--src/plugins/General/scrobbler/scrobbler.cpp18
-rw-r--r--src/plugins/General/scrobbler/scrobbler.h4
-rw-r--r--src/plugins/General/scrobbler/scrobblerhandler.h2
-rw-r--r--src/plugins/General/scrobbler/settingsdialog.h2
-rw-r--r--src/plugins/General/statusicon/coverwidget.h2
-rw-r--r--src/plugins/General/statusicon/qmmptrayicon.h2
-rw-r--r--src/plugins/General/statusicon/settingsdialog.h2
-rw-r--r--src/plugins/General/statusicon/statusicon.h2
-rw-r--r--src/plugins/General/statusicon/statusiconpopupwidget.h4
-rw-r--r--src/plugins/General/streambrowser/editstreamdialog.h2
-rw-r--r--src/plugins/General/streambrowser/streambrowser.h2
-rw-r--r--src/plugins/General/streambrowser/streambrowserfactory.cpp2
-rw-r--r--src/plugins/General/streambrowser/streamwindow.cpp6
-rw-r--r--src/plugins/General/streambrowser/streamwindow.h2
-rw-r--r--src/plugins/General/taskbar/taskbarhelper.h2
-rw-r--r--src/plugins/General/trackchange/settingsdialog.h2
-rw-r--r--src/plugins/General/trackchange/trackchange.h2
-rw-r--r--src/plugins/General/udisks2/settingsdialog.h2
-rw-r--r--src/plugins/General/udisks2/udisks2device.h2
-rw-r--r--src/plugins/General/udisks2/udisks2manager.h2
-rw-r--r--src/plugins/General/udisks2/udisks2plugin.cpp4
-rw-r--r--src/plugins/General/udisks2/udisks2plugin.h2
-rw-r--r--src/plugins/Input/aac/decoder_aac.cpp10
-rw-r--r--src/plugins/Input/aac/decoderaacfactory.cpp2
-rw-r--r--src/plugins/Input/archive/archiveinputdevice.cpp6
-rw-r--r--src/plugins/Input/archive/archiveinputdevice.h4
-rw-r--r--src/plugins/Input/archive/decoder_archive.cpp10
-rw-r--r--src/plugins/Input/archive/decoderarchivefactory.cpp6
-rw-r--r--src/plugins/Input/cdaudio/decoder_cdaudio.cpp22
-rw-r--r--src/plugins/Input/cdaudio/decodercdaudiofactory.cpp2
-rw-r--r--src/plugins/Input/cdaudio/settingsdialog.h2
-rw-r--r--src/plugins/Input/cue/cueparser.cpp4
-rw-r--r--src/plugins/Input/cue/decoder_cue.cpp18
-rw-r--r--src/plugins/Input/cue/decodercuefactory.cpp2
-rw-r--r--src/plugins/Input/cue/settingsdialog.h2
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp56
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp36
-rw-r--r--src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp12
-rw-r--r--src/plugins/Input/ffmpeg/replaygainreader.cpp2
-rw-r--r--src/plugins/Input/ffmpeg/settingsdialog.h2
-rw-r--r--src/plugins/Input/flac/decoder_flac.cpp16
-rw-r--r--src/plugins/Input/flac/decoderflacfactory.cpp10
-rw-r--r--src/plugins/Input/flac/flacmetadatamodel.cpp8
-rw-r--r--src/plugins/Input/gme/decoder_gme.cpp4
-rw-r--r--src/plugins/Input/gme/decodergmefactory.cpp2
-rw-r--r--src/plugins/Input/gme/gmehelper.cpp16
-rw-r--r--src/plugins/Input/gme/settingsdialog.h2
-rw-r--r--src/plugins/Input/modplug/archivereader.h2
-rw-r--r--src/plugins/Input/modplug/decoder_modplug.cpp10
-rw-r--r--src/plugins/Input/modplug/decodermodplugfactory.cpp2
-rw-r--r--src/plugins/Input/modplug/modplugmetadatamodel.cpp2
-rw-r--r--src/plugins/Input/modplug/settingsdialog.h2
-rw-r--r--src/plugins/Input/mpc/decoder_mpc.cpp4
-rw-r--r--src/plugins/Input/mpc/mpcmetadatamodel.cpp4
-rw-r--r--src/plugins/Input/mpeg/decoder_mad.cpp16
-rw-r--r--src/plugins/Input/mpeg/decoder_mad.h2
-rw-r--r--src/plugins/Input/mpeg/decoder_mpg123.cpp16
-rw-r--r--src/plugins/Input/mpeg/decodermpegfactory.cpp12
-rw-r--r--src/plugins/Input/mpeg/mpegmetadatamodel.cpp4
-rw-r--r--src/plugins/Input/mpeg/settingsdialog.h2
-rw-r--r--src/plugins/Input/mpeg/tagextractor.cpp2
-rw-r--r--src/plugins/Input/opus/decoder_opus.cpp10
-rw-r--r--src/plugins/Input/sid/decoder_sid.cpp4
-rw-r--r--src/plugins/Input/sid/decodersidfactory.cpp2
-rw-r--r--src/plugins/Input/sid/settingsdialog.h2
-rw-r--r--src/plugins/Input/sid/sidhelper.cpp6
-rw-r--r--src/plugins/Input/sndfile/decoder_sndfile.cpp6
-rw-r--r--src/plugins/Input/sndfile/decodersndfilefactory.cpp8
-rw-r--r--src/plugins/Input/vorbis/decoder_vorbis.cpp4
-rw-r--r--src/plugins/Input/wavpack/decoder_wavpack.cpp14
-rw-r--r--src/plugins/Input/wavpack/decoderwavpackfactory.cpp4
-rw-r--r--src/plugins/Input/wildmidi/decoder_wildmidi.cpp2
-rw-r--r--src/plugins/Input/wildmidi/decoderwildmidifactory.cpp2
-rw-r--r--src/plugins/Input/wildmidi/settingsdialog.h2
-rw-r--r--src/plugins/Input/wildmidi/wildmidihelper.cpp4
-rw-r--r--src/plugins/Input/wildmidi/wildmidihelper.h2
-rw-r--r--src/plugins/Output/alsa/outputalsa.cpp26
-rw-r--r--src/plugins/Output/alsa/settingsdialog.cpp6
-rw-r--r--src/plugins/Output/alsa/settingsdialog.h2
-rw-r--r--src/plugins/Output/jack/outputjackfactory.cpp2
-rw-r--r--src/plugins/Output/null/outputnullfactory.cpp2
-rw-r--r--src/plugins/Output/oss/settingsdialog.h2
-rw-r--r--src/plugins/Output/oss4/outputoss4.cpp10
-rw-r--r--src/plugins/Output/pulseaudio/outputpulseaudio.cpp40
-rw-r--r--src/plugins/Output/shout/outputshoutfactory.cpp4
-rw-r--r--src/plugins/Output/shout/settingsdialog.h2
-rw-r--r--src/plugins/Output/shout/shoutoutput.cpp20
-rw-r--r--src/plugins/Output/wasapi/settingsdialog.h2
-rw-r--r--src/plugins/Transports/http/httpinputfactory.h2
-rw-r--r--src/plugins/Transports/http/httpinputsource.h2
-rw-r--r--src/plugins/Transports/http/httpstreamreader.cpp18
-rw-r--r--src/plugins/Transports/http/settingsdialog.h2
-rw-r--r--src/plugins/Transports/mms/mmsinputfactory.h2
-rw-r--r--src/plugins/Transports/mms/mmsinputsource.h2
-rw-r--r--src/plugins/Transports/mms/mmsstreamreader.cpp10
-rw-r--r--src/plugins/Transports/mms/settingsdialog.h2
-rw-r--r--src/plugins/Ui/qsui/aboutqsuidialog.h2
-rw-r--r--src/plugins/Ui/qsui/actionmanager.cpp14
-rw-r--r--src/plugins/Ui/qsui/actionmanager.h2
-rw-r--r--src/plugins/Ui/qsui/colorwidget.h2
-rw-r--r--src/plugins/Ui/qsui/coverwidget.h2
-rw-r--r--src/plugins/Ui/qsui/elidinglabel.h4
-rw-r--r--src/plugins/Ui/qsui/equalizer.h2
-rw-r--r--src/plugins/Ui/qsui/filesystembrowser.h2
-rw-r--r--src/plugins/Ui/qsui/hotkeyeditor.h2
-rw-r--r--src/plugins/Ui/qsui/keyboardmanager.cpp2
-rw-r--r--src/plugins/Ui/qsui/keyboardmanager.h2
-rw-r--r--src/plugins/Ui/qsui/listwidget.cpp16
-rw-r--r--src/plugins/Ui/qsui/listwidget.h2
-rw-r--r--src/plugins/Ui/qsui/listwidgetdrawer.cpp8
-rw-r--r--src/plugins/Ui/qsui/logo.h2
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp14
-rw-r--r--src/plugins/Ui/qsui/mainwindow.h2
-rw-r--r--src/plugins/Ui/qsui/playlistbrowser.h2
-rw-r--r--src/plugins/Ui/qsui/playlistheader.cpp6
-rw-r--r--src/plugins/Ui/qsui/playlistheader.h2
-rw-r--r--src/plugins/Ui/qsui/popupsettings.h2
-rw-r--r--src/plugins/Ui/qsui/popupwidget.h2
-rw-r--r--src/plugins/Ui/qsui/positionslider.h2
-rw-r--r--src/plugins/Ui/qsui/qsuianalyzer.cpp6
-rw-r--r--src/plugins/Ui/qsui/qsuianalyzer.h2
-rw-r--r--src/plugins/Ui/qsui/qsuiquicksearch.h2
-rw-r--r--src/plugins/Ui/qsui/qsuisettings.h2
-rw-r--r--src/plugins/Ui/qsui/qsuitabbar.h2
-rw-r--r--src/plugins/Ui/qsui/qsuitabwidget.cpp12
-rw-r--r--src/plugins/Ui/qsui/qsuitabwidget.h2
-rw-r--r--src/plugins/Ui/qsui/shortcutdialog.h2
-rw-r--r--src/plugins/Ui/qsui/visualmenu.cpp2
-rw-r--r--src/plugins/Ui/qsui/visualmenu.h4
-rw-r--r--src/plugins/Ui/qsui/volumeslider.h2
-rw-r--r--src/plugins/Ui/skinned/actionmanager.cpp6
-rw-r--r--src/plugins/Ui/skinned/actionmanager.h2
-rw-r--r--src/plugins/Ui/skinned/balancebar.h2
-rw-r--r--src/plugins/Ui/skinned/display.h2
-rw-r--r--src/plugins/Ui/skinned/dock.cpp6
-rw-r--r--src/plugins/Ui/skinned/dock.h2
-rw-r--r--src/plugins/Ui/skinned/eqgraph.h2
-rw-r--r--src/plugins/Ui/skinned/eqslider.h2
-rw-r--r--src/plugins/Ui/skinned/eqtitlebar.cpp12
-rw-r--r--src/plugins/Ui/skinned/eqtitlebar.h2
-rw-r--r--src/plugins/Ui/skinned/eqwidget.cpp2
-rw-r--r--src/plugins/Ui/skinned/eqwidget.h2
-rw-r--r--src/plugins/Ui/skinned/horizontalslider.h2
-rw-r--r--src/plugins/Ui/skinned/hotkeyeditor.h2
-rw-r--r--src/plugins/Ui/skinned/listwidget.cpp14
-rw-r--r--src/plugins/Ui/skinned/listwidget.h4
-rw-r--r--src/plugins/Ui/skinned/listwidgetdrawer.cpp4
-rw-r--r--src/plugins/Ui/skinned/mainvisual.cpp14
-rw-r--r--src/plugins/Ui/skinned/mainvisual.h2
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp2
-rw-r--r--src/plugins/Ui/skinned/mainwindow.h2
-rw-r--r--src/plugins/Ui/skinned/monostereo.h2
-rw-r--r--src/plugins/Ui/skinned/number.h2
-rw-r--r--src/plugins/Ui/skinned/pixmapwidget.h2
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp8
-rw-r--r--src/plugins/Ui/skinned/playlist.h2
-rw-r--r--src/plugins/Ui/skinned/playlistbrowser.h2
-rw-r--r--src/plugins/Ui/skinned/playlistcontrol.h2
-rw-r--r--src/plugins/Ui/skinned/playlistheader.cpp6
-rw-r--r--src/plugins/Ui/skinned/playlistheader.h2
-rw-r--r--src/plugins/Ui/skinned/playlistselector.cpp6
-rw-r--r--src/plugins/Ui/skinned/playlistselector.h2
-rw-r--r--src/plugins/Ui/skinned/playlistslider.h2
-rw-r--r--src/plugins/Ui/skinned/playlisttitlebar.cpp8
-rw-r--r--src/plugins/Ui/skinned/playlisttitlebar.h4
-rw-r--r--src/plugins/Ui/skinned/playstatus.h2
-rw-r--r--src/plugins/Ui/skinned/popupsettings.h2
-rw-r--r--src/plugins/Ui/skinned/popupwidget.h2
-rw-r--r--src/plugins/Ui/skinned/positionbar.h2
-rw-r--r--src/plugins/Ui/skinned/preseteditor.cpp4
-rw-r--r--src/plugins/Ui/skinned/preseteditor.h2
-rw-r--r--src/plugins/Ui/skinned/shadedbar.h2
-rw-r--r--src/plugins/Ui/skinned/shadedvisual.h2
-rw-r--r--src/plugins/Ui/skinned/shortcutdialog.h2
-rw-r--r--src/plugins/Ui/skinned/skin.cpp4
-rw-r--r--src/plugins/Ui/skinned/skin.h2
-rw-r--r--src/plugins/Ui/skinned/skinnedsettings.h2
-rw-r--r--src/plugins/Ui/skinned/skinreader.h2
-rw-r--r--src/plugins/Ui/skinned/symboldisplay.h2
-rw-r--r--src/plugins/Ui/skinned/textscroller.cpp6
-rw-r--r--src/plugins/Ui/skinned/textscroller.h2
-rw-r--r--src/plugins/Ui/skinned/timeindicator.h4
-rw-r--r--src/plugins/Ui/skinned/titlebar.cpp16
-rw-r--r--src/plugins/Ui/skinned/titlebar.h2
-rw-r--r--src/plugins/Ui/skinned/titlebarcontrol.h2
-rw-r--r--src/plugins/Ui/skinned/visualmenu.cpp2
-rw-r--r--src/plugins/Ui/skinned/visualmenu.h4
-rw-r--r--src/plugins/Ui/skinned/volumebar.h2
-rw-r--r--src/plugins/Visual/analyzer/analyzer.cpp8
-rw-r--r--src/plugins/Visual/analyzer/analyzer.h2
-rw-r--r--src/plugins/Visual/analyzer/colorwidget.h2
-rw-r--r--src/plugins/Visual/analyzer/settingsdialog.h2
-rw-r--r--src/plugins/Visual/projectm/projectmplugin.h2
-rw-r--r--src/plugins/Visual/projectm/projectmwidget.cpp2
-rw-r--r--src/plugins/Visual/projectm/projectmwidget.h2
-rw-r--r--src/plugins/Visual/projectm/projectmwrapper.h4
-rw-r--r--src/plugins/Visual/projectm/visualprojectmfactory.cpp2
273 files changed, 615 insertions, 615 deletions
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index fd30a012f..4ea09b94d 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -64,7 +64,7 @@ QString PlayListOption::executeCommand(int id, const QStringList &args)
QString out;
PlayListManager *pl_manager = PlayListManager::instance();
MediaPlayer *player = MediaPlayer::instance();
- QmmpUiSettings *ui_settings = (id == PL_HELP) ? 0 : QmmpUiSettings::instance();
+ QmmpUiSettings *ui_settings = (id == PL_HELP) ? nullptr : QmmpUiSettings::instance();
switch (id)
{
diff --git a/src/plugins/Effect/bs2b/bs2bplugin.cpp b/src/plugins/Effect/bs2b/bs2bplugin.cpp
index 52df6aa63..5460e4c9a 100644
--- a/src/plugins/Effect/bs2b/bs2bplugin.cpp
+++ b/src/plugins/Effect/bs2b/bs2bplugin.cpp
@@ -24,7 +24,7 @@
#include <qmmp/qmmp.h>
#include "bs2bplugin.h"
-Bs2bPlugin *Bs2bPlugin::m_instance = 0;
+Bs2bPlugin *Bs2bPlugin::m_instance = nullptr;
Bs2bPlugin::Bs2bPlugin() : Effect()
{
@@ -37,7 +37,7 @@ Bs2bPlugin::Bs2bPlugin() : Effect()
Bs2bPlugin::~Bs2bPlugin()
{
- m_instance = 0;
+ m_instance = nullptr;
bs2b_close(m_bs2b_handler);
}
diff --git a/src/plugins/Effect/bs2b/settingsdialog.h b/src/plugins/Effect/bs2b/settingsdialog.h
index 9813712e9..7b1128df5 100644
--- a/src/plugins/Effect/bs2b/settingsdialog.h
+++ b/src/plugins/Effect/bs2b/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Effect/crossfade/crossfadeplugin.cpp b/src/plugins/Effect/crossfade/crossfadeplugin.cpp
index 3d9850361..29e76bd86 100644
--- a/src/plugins/Effect/crossfade/crossfadeplugin.cpp
+++ b/src/plugins/Effect/crossfade/crossfadeplugin.cpp
@@ -26,7 +26,7 @@
CrossfadePlugin::CrossfadePlugin() : Effect()
{
- m_buffer = 0;
+ m_buffer = nullptr;
m_buffer_at = 0;
m_buffer_size = 0;
m_core = SoundCore::instance() ;
diff --git a/src/plugins/Effect/crossfade/settingsdialog.h b/src/plugins/Effect/crossfade/settingsdialog.h
index 625fe4085..40a8a4a87 100644
--- a/src/plugins/Effect/crossfade/settingsdialog.h
+++ b/src/plugins/Effect/crossfade/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp
index e60047ac1..f45a8b4e3 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.cpp
+++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp
@@ -27,7 +27,7 @@
FileWriterPlugin::FileWriterPlugin()
{
- qsrand(time(NULL));
+ qsrand(time(nullptr));
m_inited = false;
}
@@ -67,7 +67,7 @@ void FileWriterPlugin::applyEffect(Buffer *b)
while(ok && vorbis_analysis_blockout(&m_vd, &m_vb) == 1)
{
// analysis, assume we want to use bitrate management
- vorbis_analysis(&m_vb, NULL);
+ vorbis_analysis(&m_vb, nullptr);
vorbis_bitrate_addblock(&m_vb);
while(ok && vorbis_bitrate_flushpacket(&m_vd, &m_op))
@@ -167,7 +167,7 @@ void FileWriterPlugin::init(const TrackInfo &info)
{ Qmmp::YEAR, "date"},
{ Qmmp::COMPOSER, "composer"},
{ Qmmp::DISCNUMBER, "discnumber"},
- { Qmmp::UNKNOWN, 0}
+ { Qmmp::UNKNOWN, nullptr}
};
int i = 0;
diff --git a/src/plugins/Effect/filewriter/settingsdialog.h b/src/plugins/Effect/filewriter/settingsdialog.h
index e3a64c9c3..8902ba2bf 100644
--- a/src/plugins/Effect/filewriter/settingsdialog.h
+++ b/src/plugins/Effect/filewriter/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Effect/ladspa/ladspabutton.h b/src/plugins/Effect/ladspa/ladspabutton.h
index e4a96d6dc..e29813b20 100644
--- a/src/plugins/Effect/ladspa/ladspabutton.h
+++ b/src/plugins/Effect/ladspa/ladspabutton.h
@@ -33,7 +33,7 @@ class LADSPAButton : public QCheckBox
{
Q_OBJECT
public:
- LADSPAButton(LADSPA_Data *value, QWidget *parent = 0);
+ LADSPAButton(LADSPA_Data *value, QWidget *parent = nullptr);
private slots:
void enable(bool yes);
diff --git a/src/plugins/Effect/ladspa/ladspahost.cpp b/src/plugins/Effect/ladspa/ladspahost.cpp
index 171346a12..b962f3d81 100644
--- a/src/plugins/Effect/ladspa/ladspahost.cpp
+++ b/src/plugins/Effect/ladspa/ladspahost.cpp
@@ -35,7 +35,7 @@
#define PATH_MAX 4096
#endif
-LADSPAHost *LADSPAHost::m_instance = 0;
+LADSPAHost *LADSPAHost::m_instance = nullptr;
/* Based on xmms_ladspa */
@@ -55,7 +55,7 @@ LADSPAHost::LADSPAHost(QObject *parent) : QObject(parent)
int id = settings.value("id").toInt();
- LADSPAPlugin *plugin = 0;
+ LADSPAPlugin *plugin = nullptr;
foreach(LADSPAPlugin *p, plugins())
{
if(p->unique_id == id)
@@ -78,7 +78,7 @@ LADSPAHost::LADSPAHost(QObject *parent) : QObject(parent)
LADSPAHost::~LADSPAHost()
{
- m_instance = 0;
+ m_instance = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
for(int i = 0; i < settings.value("LADSPA/plugins_number", 0).toInt(); ++i)
{
@@ -178,7 +178,7 @@ void LADSPAHost::findModules(const QString &path)
unsigned long k = 0;
const LADSPA_Descriptor *descriptor;
- while((descriptor = descriptor_fn(k)) != 0)
+ while((descriptor = descriptor_fn(k)) != nullptr)
{
if(LADSPA_IS_INPLACE_BROKEN(descriptor->Properties))
{
diff --git a/src/plugins/Effect/ladspa/ladspaslider.h b/src/plugins/Effect/ladspa/ladspaslider.h
index 0c7775349..e40e8f686 100644
--- a/src/plugins/Effect/ladspa/ladspaslider.h
+++ b/src/plugins/Effect/ladspa/ladspaslider.h
@@ -37,7 +37,7 @@ public:
double max,
double step,
LADSPA_Data *value,
- QWidget *parent = 0);
+ QWidget *parent = nullptr);
private slots:
void setValue(double);
diff --git a/src/plugins/Effect/ladspa/settingsdialog.cpp b/src/plugins/Effect/ladspa/settingsdialog.cpp
index 52f97a1da..ab52723a3 100644
--- a/src/plugins/Effect/ladspa/settingsdialog.cpp
+++ b/src/plugins/Effect/ladspa/settingsdialog.cpp
@@ -102,9 +102,9 @@ void SettingsDialog::on_configureButton_clicked()
QDialog *dialog = new QDialog(this);
dialog->setWindowTitle(effect->plugin->desc->Name);
QFormLayout *formLayout = new QFormLayout(dialog);
- LADSPAButton *button = 0;
- LADSPASlider *slider = 0;
- QLabel *label = 0;
+ LADSPAButton *button = nullptr;
+ LADSPASlider *slider = nullptr;
+ QLabel *label = nullptr;
foreach(LADSPAControl *c, effect->controls)
{
diff --git a/src/plugins/Effect/ladspa/settingsdialog.h b/src/plugins/Effect/ladspa/settingsdialog.h
index fffe0e81b..3fb9eb94a 100644
--- a/src/plugins/Effect/ladspa/settingsdialog.h
+++ b/src/plugins/Effect/ladspa/settingsdialog.h
@@ -35,7 +35,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Effect/monotostereo/monotostereoplugin.cpp b/src/plugins/Effect/monotostereo/monotostereoplugin.cpp
index b043d3f65..7a852bd0e 100644
--- a/src/plugins/Effect/monotostereo/monotostereoplugin.cpp
+++ b/src/plugins/Effect/monotostereo/monotostereoplugin.cpp
@@ -24,7 +24,7 @@
MonoToStereoPlugin::MonoToStereoPlugin() : Effect()
{
- m_tmp = 0;
+ m_tmp = nullptr;
m_size = 0;
m_enabled = false;
}
@@ -34,7 +34,7 @@ MonoToStereoPlugin::~MonoToStereoPlugin()
if(m_tmp)
{
delete[] m_tmp;
- m_tmp = 0;
+ m_tmp = nullptr;
}
}
diff --git a/src/plugins/Effect/soxr/settingsdialog.h b/src/plugins/Effect/soxr/settingsdialog.h
index 278c74504..ce0979b36 100644
--- a/src/plugins/Effect/soxr/settingsdialog.h
+++ b/src/plugins/Effect/soxr/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Effect/soxr/soxresampler.cpp b/src/plugins/Effect/soxr/soxresampler.cpp
index aecbb3a0e..5a7f566fc 100644
--- a/src/plugins/Effect/soxr/soxresampler.cpp
+++ b/src/plugins/Effect/soxr/soxresampler.cpp
@@ -26,8 +26,8 @@
SoXResampler::SoXResampler() : Effect()
{
- m_soxr = 0;
- m_out = 0;
+ m_soxr = nullptr;
+ m_out = nullptr;
m_out_samples = 0;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_overSamplingFs = settings.value("SOXR/sample_rate", 48000).toInt();
@@ -44,7 +44,7 @@ void SoXResampler::applyEffect(Buffer *b)
if(m_soxr && b->samples > 0)
{
size_t done = 0;
- soxr_process(m_soxr, b->data, b->samples / channels(), 0,
+ soxr_process(m_soxr, b->data, b->samples / channels(), nullptr,
m_out, m_out_samples / channels(), &done);
b->samples = done * channels();
@@ -64,8 +64,8 @@ void SoXResampler::configure(quint32 freq, ChannelMap map)
freeSoXR();
if(freq != m_overSamplingFs)
{
- soxr_error_t error = 0;
- m_soxr = soxr_create(freq, m_overSamplingFs, map.count(), &error, 0, &m_quality, 0);
+ soxr_error_t error = nullptr;
+ m_soxr = soxr_create(freq, m_overSamplingFs, map.count(), &error, nullptr, &m_quality, nullptr);
double ratio = (double)m_overSamplingFs/freq;
m_out_samples = ratio * QMMP_BLOCK_FRAMES * map.count() * 2 + 2;
m_out = new float[m_out_samples];
@@ -78,12 +78,12 @@ void SoXResampler::freeSoXR()
if(m_soxr)
{
soxr_delete(m_soxr);
- m_soxr = 0;
+ m_soxr = nullptr;
}
if(m_out)
{
delete [] m_out;
- m_out = 0;
+ m_out = nullptr;
m_out_samples = 0;
}
}
diff --git a/src/plugins/Effect/stereo/settingsdialog.h b/src/plugins/Effect/stereo/settingsdialog.h
index 7a896d1d8..f637430f9 100644
--- a/src/plugins/Effect/stereo/settingsdialog.h
+++ b/src/plugins/Effect/stereo/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Effect/stereo/stereoplugin.cpp b/src/plugins/Effect/stereo/stereoplugin.cpp
index e0fc6ed05..e4b90aa83 100644
--- a/src/plugins/Effect/stereo/stereoplugin.cpp
+++ b/src/plugins/Effect/stereo/stereoplugin.cpp
@@ -26,7 +26,7 @@
#include <qmmp/qmmp.h>
#include "stereoplugin.h"
-StereoPlugin *StereoPlugin::m_instance = 0;
+StereoPlugin *StereoPlugin::m_instance = nullptr;
StereoPlugin::StereoPlugin() : Effect()
{
@@ -43,7 +43,7 @@ StereoPlugin::StereoPlugin() : Effect()
StereoPlugin::~StereoPlugin()
{
- m_instance = 0;
+ m_instance = nullptr;
}
void StereoPlugin::applyEffect(Buffer *b)
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp
index dbd01b871..4b1741b0d 100644
--- a/src/plugins/Engines/mplayer/mplayerengine.cpp
+++ b/src/plugins/Engines/mplayer/mplayerengine.cpp
@@ -97,7 +97,7 @@ QStringList MplayerInfo::filters()
MplayerEngine::MplayerEngine(QObject *parent)
: AbstractEngine(parent)
{
- m_source = 0;
+ m_source = nullptr;
m_bitrate = 0;
m_samplerate = 0;
m_channels = 0;
@@ -106,7 +106,7 @@ MplayerEngine::MplayerEngine(QObject *parent)
m_currentTime = 0;
m_muted = false;
m_user_stop = false;
- m_process = 0;
+ m_process = nullptr;
}
MplayerEngine::~MplayerEngine()
@@ -297,7 +297,7 @@ void MplayerEngine::startMplayerProcess()
StateHandler::instance()->dispatch(*info);
delete info;
m_source->deleteLater();
- m_source = 0;
+ m_source = nullptr;
m_currentTime = 0;
if(m_muted)
setMuted(true);
diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.h b/src/plugins/Engines/mplayer/mplayerenginefactory.h
index 19d822d5e..d57081d0e 100644
--- a/src/plugins/Engines/mplayer/mplayerenginefactory.h
+++ b/src/plugins/Engines/mplayer/mplayerenginefactory.h
@@ -31,7 +31,7 @@ Q_INTERFACES(EngineFactory)
public:
EngineProperties properties() const;
bool supports(const QString &source) const;
- AbstractEngine *create(QObject *parent = 0);
+ AbstractEngine *create(QObject *parent = nullptr);
QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *);
MetaDataModel* createMetaDataModel(const QString &path, bool readOnly);
void showSettings(QWidget *parent);
diff --git a/src/plugins/Engines/mplayer/settingsdialog.h b/src/plugins/Engines/mplayer/settingsdialog.h
index 4f4559e49..902e55f63 100644
--- a/src/plugins/Engines/mplayer/settingsdialog.h
+++ b/src/plugins/Engines/mplayer/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
index 7c3388c7d..a433ded9e 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.cpp
@@ -90,7 +90,7 @@ QmmpFileDialogImpl::QmmpFileDialogImpl(QWidget * parent, Qt::WindowFlags f) : QD
QCompleter* dir_completer = new QCompleter (m_model, this);
lookInComboBox->setCompleter (dir_completer);
- if(qApp->style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, 0, this))
+ if(qApp->style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, nullptr, this))
{
addPushButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogOpenButton));
closePushButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogCloseButton));
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h
index 6b3463fdc..60fe51d85 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialogimpl.h
@@ -33,7 +33,7 @@ class QmmpFileDialogImpl : public QDialog , private Ui::QmmpFileDialog
{
Q_OBJECT
public:
- QmmpFileDialogImpl(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ QmmpFileDialogImpl(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
~QmmpFileDialogImpl();
@@ -76,7 +76,7 @@ class PathCompleter : public QCompleter
{
Q_OBJECT
public:
- PathCompleter(QAbstractItemModel *model, QAbstractItemView *itemView, QObject *parent = 0) : QCompleter(model, parent)
+ PathCompleter(QAbstractItemModel *model, QAbstractItemView *itemView, QObject *parent = nullptr) : QCompleter(model, parent)
{
m_itemView = itemView;
};
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp
index 09828fc11..8ae32f3ac 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.cpp
@@ -80,7 +80,7 @@ TwoPanelFileDialogImpl::TwoPanelFileDialogImpl(QWidget * parent) : QDialog(paren
QCompleter* dirCompleter = new QCompleter (m_dirModel, this);
m_ui.lookInComboBox->setCompleter (dirCompleter);
- if(qApp->style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, 0, this))
+ if(qApp->style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, nullptr, this))
{
m_ui.playButton->setIcon(qApp->style()->standardIcon(QStyle::SP_MediaPlay));
m_ui.addButton->setIcon(qApp->style()->standardIcon(QStyle::SP_DialogOpenButton));
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h
index e42ae3b87..09f3c0e5f 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/twopanelfiledialogimpl.h
@@ -35,7 +35,7 @@ class TwoPanelFileDialogImpl : public QDialog
{
Q_OBJECT
public:
- TwoPanelFileDialogImpl(QWidget *parent = 0);
+ TwoPanelFileDialogImpl(QWidget *parent = nullptr);
~TwoPanelFileDialogImpl();
@@ -73,7 +73,7 @@ class PathCompleter : public QCompleter
{
Q_OBJECT
public:
- PathCompleter(QAbstractItemModel *model, QAbstractItemView *itemView, QObject *parent = 0) : QCompleter(model, parent)
+ PathCompleter(QAbstractItemModel *model, QAbstractItemView *itemView, QObject *parent = nullptr) : QCompleter(model, parent)
{
m_itemView = itemView;
}
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp
index d5e39c8a0..b4e693211 100644
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -36,8 +36,8 @@
Converter::Converter(QObject *parent) : QObject(parent), QRunnable()
{
m_user_stop = false;
- m_decoder = 0;
- m_input = 0;
+ m_decoder = nullptr;
+ m_input = nullptr;
m_row = -1;
}
@@ -47,12 +47,12 @@ Converter::~Converter()
if(m_decoder)
{
delete m_decoder;
- m_decoder = 0;
+ m_decoder = nullptr;
}
if(m_input)
{
delete m_input;
- m_input = 0;
+ m_input = nullptr;
}
}
@@ -78,7 +78,7 @@ bool Converter::prepare(const QString &url, int row, const QVariantMap &preset)
}
}
- DecoderFactory *factory = 0;
+ DecoderFactory *factory = nullptr;
if(!source->path().contains("://"))
factory = Decoder::findByFilePath(source->path());
diff --git a/src/plugins/General/converter/converter.h b/src/plugins/General/converter/converter.h
index 94571f11b..f35a4251c 100644
--- a/src/plugins/General/converter/converter.h
+++ b/src/plugins/General/converter/converter.h
@@ -38,7 +38,7 @@ class Converter : public QObject, public QRunnable
{
Q_OBJECT
public:
- explicit Converter(QObject *parent = 0);
+ explicit Converter(QObject *parent = nullptr);
virtual ~Converter();
bool prepare(const QString &url, int row, const QVariantMap &preset);
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index edde11558..6bc6f066e 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -37,7 +37,7 @@ class ConverterDialog : public QDialog
{
Q_OBJECT
public:
- explicit ConverterDialog(QList <PlayListTrack *> items, QWidget *parent = 0);
+ explicit ConverterDialog(QList <PlayListTrack *> items, QWidget *parent = nullptr);
virtual ~ConverterDialog();
public slots:
diff --git a/src/plugins/General/converter/converterfactory.cpp b/src/plugins/General/converter/converterfactory.cpp
index c48deae30..dc37f53e8 100644
--- a/src/plugins/General/converter/converterfactory.cpp
+++ b/src/plugins/General/converter/converterfactory.cpp
@@ -41,7 +41,7 @@ QObject *ConverterFactory::create(QObject *parent)
QDialog *ConverterFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void ConverterFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/converter/converterhelper.h b/src/plugins/General/converter/converterhelper.h
index a75ad6426..a9f3c5fcd 100644
--- a/src/plugins/General/converter/converterhelper.h
+++ b/src/plugins/General/converter/converterhelper.h
@@ -33,7 +33,7 @@ class ConverterHelper : public QObject
{
Q_OBJECT
public:
- ConverterHelper(QObject *parent = 0);
+ ConverterHelper(QObject *parent = nullptr);
~ConverterHelper();
diff --git a/src/plugins/General/converter/preseteditor.h b/src/plugins/General/converter/preseteditor.h
index c9dabc8f7..98786747c 100644
--- a/src/plugins/General/converter/preseteditor.h
+++ b/src/plugins/General/converter/preseteditor.h
@@ -36,7 +36,7 @@ class PresetEditor : public QDialog
Q_OBJECT
public:
- explicit PresetEditor(const QVariantMap &data, QWidget *parent = 0);
+ explicit PresetEditor(const QVariantMap &data, QWidget *parent = nullptr);
virtual ~PresetEditor();
const QVariantMap data() const;
diff --git a/src/plugins/General/copypaste/copypaste.h b/src/plugins/General/copypaste/copypaste.h
index 3ac153da4..1935c8bd5 100644
--- a/src/plugins/General/copypaste/copypaste.h
+++ b/src/plugins/General/copypaste/copypaste.h
@@ -36,7 +36,7 @@ class CopyPaste : public QObject
{
Q_OBJECT
public:
- CopyPaste(QObject *parent = 0);
+ CopyPaste(QObject *parent = nullptr);
~CopyPaste();
diff --git a/src/plugins/General/copypaste/copypastefactory.cpp b/src/plugins/General/copypaste/copypastefactory.cpp
index 5c15895de..3b5403db6 100644
--- a/src/plugins/General/copypaste/copypastefactory.cpp
+++ b/src/plugins/General/copypaste/copypastefactory.cpp
@@ -41,7 +41,7 @@ QObject *CopyPasteFactory::create(QObject *parent)
QDialog *CopyPasteFactory::createConfigDialog(QWidget *)
{
- return 0;
+ return nullptr;
}
void CopyPasteFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/covermanager/covermanager.h b/src/plugins/General/covermanager/covermanager.h
index 729d79a40..773eb1034 100644
--- a/src/plugins/General/covermanager/covermanager.h
+++ b/src/plugins/General/covermanager/covermanager.h
@@ -33,7 +33,7 @@ class CoverManager : public QObject
{
Q_OBJECT
public:
- CoverManager(QObject *parent = 0);
+ CoverManager(QObject *parent = nullptr);
private slots:
void showWindow();
diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp
index caae162f5..8ea7c8c6c 100644
--- a/src/plugins/General/covermanager/covermanagerfactory.cpp
+++ b/src/plugins/General/covermanager/covermanagerfactory.cpp
@@ -42,7 +42,7 @@ QObject *CoverManagerFactory::create(QObject *parent)
QDialog *CoverManagerFactory::createConfigDialog(QWidget *)
{
- return 0;
+ return nullptr;
}
void CoverManagerFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/covermanager/coverwidget.h b/src/plugins/General/covermanager/coverwidget.h
index d56404585..55ee9a2eb 100644
--- a/src/plugins/General/covermanager/coverwidget.h
+++ b/src/plugins/General/covermanager/coverwidget.h
@@ -34,7 +34,7 @@ class CoverWidget : public QWidget
{
Q_OBJECT
public:
- CoverWidget(QWidget *parent = 0);
+ CoverWidget(QWidget *parent = nullptr);
~CoverWidget();
diff --git a/src/plugins/General/fileops/fileops.h b/src/plugins/General/fileops/fileops.h
index f5a542f3a..0ad1fa27e 100644
--- a/src/plugins/General/fileops/fileops.h
+++ b/src/plugins/General/fileops/fileops.h
@@ -37,7 +37,7 @@ class FileOps : public QObject
{
Q_OBJECT
public:
- FileOps(QObject *parent = 0);
+ FileOps(QObject *parent = nullptr);
~FileOps();
diff --git a/src/plugins/General/fileops/hotkeydialog.h b/src/plugins/General/fileops/hotkeydialog.h
index ba63c7ce5..d68da11b6 100644
--- a/src/plugins/General/fileops/hotkeydialog.h
+++ b/src/plugins/General/fileops/hotkeydialog.h
@@ -33,7 +33,7 @@ class HotkeyDialog : public QDialog
{
Q_OBJECT
public:
- HotkeyDialog(const QString &key, QWidget *parent = 0);
+ HotkeyDialog(const QString &key, QWidget *parent = nullptr);
~HotkeyDialog();
diff --git a/src/plugins/General/fileops/settingsdialog.h b/src/plugins/General/fileops/settingsdialog.h
index 15d657802..41f4e4575 100644
--- a/src/plugins/General/fileops/settingsdialog.h
+++ b/src/plugins/General/fileops/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp
index e22d2d9e9..af50b9e3f 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp
+++ b/src/plugins/General/gnomehotkey/gnomehotkeyfactory.cpp
@@ -42,7 +42,7 @@ QObject *GnomeHotkeyFactory::create(QObject *parent)
QDialog *GnomeHotkeyFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void GnomeHotkeyFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/gnomehotkey/mediakeys.cpp b/src/plugins/General/gnomehotkey/mediakeys.cpp
index 495380173..e4ae96155 100644
--- a/src/plugins/General/gnomehotkey/mediakeys.cpp
+++ b/src/plugins/General/gnomehotkey/mediakeys.cpp
@@ -33,7 +33,7 @@ MediaKeys::MediaKeys(QObject *parent) :
QObject(parent)
{
m_isRegistered = false;
- m_interface = 0;
+ m_interface = nullptr;
if(!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.gnome.SettingsDaemon"))
{
qWarning("MediaKeys: gnome settings daemon is not running");
diff --git a/src/plugins/General/gnomehotkey/mediakeys.h b/src/plugins/General/gnomehotkey/mediakeys.h
index 6533b3443..4fb0028fe 100644
--- a/src/plugins/General/gnomehotkey/mediakeys.h
+++ b/src/plugins/General/gnomehotkey/mediakeys.h
@@ -33,7 +33,7 @@ class MediaKeys : public QObject
{
Q_OBJECT
public:
- explicit MediaKeys(QObject *parent = 0);
+ explicit MediaKeys(QObject *parent = nullptr);
virtual ~MediaKeys();
private slots:
diff --git a/src/plugins/General/hal/haldevice.h b/src/plugins/General/hal/haldevice.h
index 934d7f8a1..08583fe0e 100644
--- a/src/plugins/General/hal/haldevice.h
+++ b/src/plugins/General/hal/haldevice.h
@@ -46,7 +46,7 @@ class HalDevice : public QObject
{
Q_OBJECT
public:
- HalDevice(const QString &udi, QObject *parent = 0);
+ HalDevice(const QString &udi, QObject *parent = nullptr);
~HalDevice();
diff --git a/src/plugins/General/hal/halmanager.h b/src/plugins/General/hal/halmanager.h
index ef81feab9..6c2eb2b8e 100644
--- a/src/plugins/General/hal/halmanager.h
+++ b/src/plugins/General/hal/halmanager.h
@@ -32,7 +32,7 @@ class HalManager : public QObject
{
Q_OBJECT
public:
- HalManager(QObject *parent = 0);
+ HalManager(QObject *parent = nullptr);
~HalManager();
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index cd4ee96de..d3477fec9 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -210,7 +210,7 @@ QAction *HalPlugin::findAction(const QString &dev_path)
if (action->data().toString() == dev_path)
return action;
}
- return 0;
+ return nullptr;
}
HalDevice *HalPlugin::findDevice(QAction *action)
@@ -232,7 +232,7 @@ HalDevice *HalPlugin::findDevice(QAction *action)
return device;
}
}
- return 0;
+ return nullptr;
}
void HalPlugin::addPath(const QString &path)
diff --git a/src/plugins/General/hal/halplugin.h b/src/plugins/General/hal/halplugin.h
index e618a1e76..9a2169f3a 100644
--- a/src/plugins/General/hal/halplugin.h
+++ b/src/plugins/General/hal/halplugin.h
@@ -36,7 +36,7 @@ class HalPlugin : public QObject
{
Q_OBJECT
public:
- HalPlugin(QObject *parent = 0);
+ HalPlugin(QObject *parent = nullptr);
~HalPlugin();
diff --git a/src/plugins/General/hal/settingsdialog.h b/src/plugins/General/hal/settingsdialog.h
index 6bd6b602f..604483326 100644
--- a/src/plugins/General/hal/settingsdialog.h
+++ b/src/plugins/General/hal/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/history/dateinputdialog.h b/src/plugins/General/history/dateinputdialog.h
index 2259de255..1bcb64e68 100644
--- a/src/plugins/General/history/dateinputdialog.h
+++ b/src/plugins/General/history/dateinputdialog.h
@@ -33,7 +33,7 @@ class DateInputDialog : public QDialog
Q_OBJECT
public:
- explicit DateInputDialog(QWidget *parent = 0);
+ explicit DateInputDialog(QWidget *parent = nullptr);
~DateInputDialog();
QDate selectedDate() const;
diff --git a/src/plugins/General/history/history.h b/src/plugins/General/history/history.h
index 07d65be0c..d044bc0ae 100644
--- a/src/plugins/General/history/history.h
+++ b/src/plugins/General/history/history.h
@@ -36,7 +36,7 @@ class History : public QObject
{
Q_OBJECT
public:
- explicit History(QObject *parent = 0);
+ explicit History(QObject *parent = nullptr);
~History();
private slots:
diff --git a/src/plugins/General/history/historysettingsdialog.h b/src/plugins/General/history/historysettingsdialog.h
index b21e03cd7..f9efef1b5 100644
--- a/src/plugins/General/history/historysettingsdialog.h
+++ b/src/plugins/General/history/historysettingsdialog.h
@@ -32,7 +32,7 @@ class HistorySettingsDialog : public QDialog
Q_OBJECT
public:
- explicit HistorySettingsDialog(QWidget *parent = 0);
+ explicit HistorySettingsDialog(QWidget *parent = nullptr);
~HistorySettingsDialog();
public slots:
diff --git a/src/plugins/General/history/historywindow.h b/src/plugins/General/history/historywindow.h
index 7736b5e7d..88d81e887 100644
--- a/src/plugins/General/history/historywindow.h
+++ b/src/plugins/General/history/historywindow.h
@@ -35,7 +35,7 @@ class HistoryWindow : public QWidget
{
Q_OBJECT
public:
- explicit HistoryWindow(QSqlDatabase db, QWidget *parent = 0);
+ explicit HistoryWindow(QSqlDatabase db, QWidget *parent = nullptr);
~HistoryWindow();
private slots:
diff --git a/src/plugins/General/history/progressbaritemdelegate.h b/src/plugins/General/history/progressbaritemdelegate.h
index 9e8cf8e50..2eef87b91 100644
--- a/src/plugins/General/history/progressbaritemdelegate.h
+++ b/src/plugins/General/history/progressbaritemdelegate.h
@@ -35,7 +35,7 @@ class ProgressBarItemDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
- explicit ProgressBarItemDelegate(QObject *parent = 0);
+ explicit ProgressBarItemDelegate(QObject *parent = nullptr);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
diff --git a/src/plugins/General/hotkey/hotkeydialog.h b/src/plugins/General/hotkey/hotkeydialog.h
index 4124e8c8f..4bae2d01b 100644
--- a/src/plugins/General/hotkey/hotkeydialog.h
+++ b/src/plugins/General/hotkey/hotkeydialog.h
@@ -33,7 +33,7 @@ class HotkeyDialog : public QDialog
{
Q_OBJECT
public:
- HotkeyDialog(quint32 key, quint32 mod, QWidget *parent = 0);
+ HotkeyDialog(quint32 key, quint32 mod, QWidget *parent = nullptr);
~HotkeyDialog();
diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h
index ec5278982..45692cf1e 100644
--- a/src/plugins/General/hotkey/hotkeymanager.h
+++ b/src/plugins/General/hotkey/hotkeymanager.h
@@ -70,7 +70,7 @@ class HotkeyManager : public QObject, public QAbstractNativeEventFilter
{
Q_OBJECT
public:
- HotkeyManager(QObject *parent = 0);
+ HotkeyManager(QObject *parent = nullptr);
~HotkeyManager();
diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp
index 2830e58ee..7a5bd612d 100644
--- a/src/plugins/General/hotkey/settingsdialog.cpp
+++ b/src/plugins/General/hotkey/settingsdialog.cpp
@@ -86,7 +86,7 @@ void SettingsDialog::accept()
void SettingsDialog::on_tableWidget_itemDoubleClicked (QTableWidgetItem *item)
{
- Hotkey *k = 0;
+ Hotkey *k = nullptr;
foreach(k, m_hotkeys)
{
if (k->action == item->type())
diff --git a/src/plugins/General/hotkey/settingsdialog.h b/src/plugins/General/hotkey/settingsdialog.h
index e1fde23ec..da947e681 100644
--- a/src/plugins/General/hotkey/settingsdialog.h
+++ b/src/plugins/General/hotkey/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/kdenotify/kdenotify.h b/src/plugins/General/kdenotify/kdenotify.h
index c75696443..b82dd1e5d 100644
--- a/src/plugins/General/kdenotify/kdenotify.h
+++ b/src/plugins/General/kdenotify/kdenotify.h
@@ -36,7 +36,7 @@ class KdeNotify : public QObject
{
Q_OBJECT
public:
- KdeNotify(QObject *parent = 0);
+ KdeNotify(QObject *parent = nullptr);
~KdeNotify();
private:
diff --git a/src/plugins/General/kdenotify/settingsdialog.h b/src/plugins/General/kdenotify/settingsdialog.h
index 3ec2baf8a..835a39ad0 100644
--- a/src/plugins/General/kdenotify/settingsdialog.h
+++ b/src/plugins/General/kdenotify/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
public slots:
diff --git a/src/plugins/General/lyrics/lyrics.h b/src/plugins/General/lyrics/lyrics.h
index 663fe4af5..16523a30e 100644
--- a/src/plugins/General/lyrics/lyrics.h
+++ b/src/plugins/General/lyrics/lyrics.h
@@ -37,7 +37,7 @@ class Lyrics : public QObject
{
Q_OBJECT
public:
- Lyrics(QObject *parent = 0);
+ Lyrics(QObject *parent = nullptr);
~Lyrics();
diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index 1b5cac3e2..aef4322f9 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -42,7 +42,7 @@ QObject *LyricsFactory::create(QObject *parent)
QDialog *LyricsFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void LyricsFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index 39626c1ec..fa26ca049 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -37,7 +37,7 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget
setWindowFlags(Qt::Dialog);
setAttribute(Qt::WA_DeleteOnClose);
setAttribute(Qt::WA_QuitOnClose, false);
- m_requestReply = 0;
+ m_requestReply = nullptr;
m_cachePath = Qmmp::configDir() + "/lyrics/";
m_ui.artistLineEdit->setText(artist);
m_ui.titleLineEdit->setText(title);
@@ -78,7 +78,7 @@ void LyricsWindow::showText(QNetworkReply *reply)
{
m_ui.stateLabel->setText(tr("Error"));
m_ui.textBrowser->setText(reply->errorString());
- m_requestReply = 0;
+ m_requestReply = nullptr;
reply->deleteLater();
return;
}
@@ -87,7 +87,7 @@ void LyricsWindow::showText(QNetworkReply *reply)
if(m_requestReply == reply)
{
- m_requestReply = 0;
+ m_requestReply = nullptr;
reply->deleteLater();
QRegExp artist_regexp("<artist>(.*)</artist>");
artist_regexp.setMinimal(true);
diff --git a/src/plugins/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h
index 7ccec881f..564fb5a10 100644
--- a/src/plugins/General/lyrics/lyricswindow.h
+++ b/src/plugins/General/lyrics/lyricswindow.h
@@ -34,7 +34,7 @@ class LyricsWindow : public QWidget
{
Q_OBJECT
public:
- LyricsWindow(const QString &artist, const QString &title, QWidget *parent = 0);
+ LyricsWindow(const QString &artist, const QString &title, QWidget *parent = nullptr);
~LyricsWindow();
diff --git a/src/plugins/General/mpris/mpris.h b/src/plugins/General/mpris/mpris.h
index c6bffef50..a13ce2d96 100644
--- a/src/plugins/General/mpris/mpris.h
+++ b/src/plugins/General/mpris/mpris.h
@@ -33,7 +33,7 @@ class MPRIS : public QObject
{
Q_OBJECT
public:
- MPRIS(QObject *parent = 0);
+ MPRIS(QObject *parent = nullptr);
~MPRIS();
};
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index 962d8a618..aae3cdda6 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -32,7 +32,7 @@
Player2Object::Player2Object(QObject *parent) : QDBusAbstractAdaptor(parent)
{
- m_prev_track = 0;
+ m_prev_track = nullptr;
m_previous_pos = 0;
m_core = SoundCore::instance();
m_player = MediaPlayer::instance();
@@ -49,7 +49,7 @@ Player2Object::Player2Object(QObject *parent) : QDBusAbstractAdaptor(parent)
connect(m_ui_settings, SIGNAL(shuffleChanged(bool)), SLOT(emitPropertiesChanged()));
connect(m_pl_manager, SIGNAL(currentPlayListChanged(PlayListModel*,PlayListModel*)),
SLOT(setModel(PlayListModel*,PlayListModel*)));
- setModel(m_pl_manager->currentPlayList(), 0);
+ setModel(m_pl_manager->currentPlayList(), nullptr);
updateId();
syncProperties();
}
@@ -64,7 +64,7 @@ bool Player2Object::canControl() const
bool Player2Object::canGoNext() const
{
- return m_pl_manager->currentPlayList()->nextTrack() != 0;
+ return m_pl_manager->currentPlayList()->nextTrack() != nullptr;
}
bool Player2Object::canGoPrevious() const
@@ -371,7 +371,7 @@ void Player2Object::disconnectPl()
void Player2Object::setModel(PlayListModel *selected, PlayListModel *previous)
{
if(previous)
- disconnect(previous, 0, this, 0); //disconnect previous model
+ disconnect(previous, nullptr, this, nullptr); //disconnect previous model
connect(selected, SIGNAL(listChanged(int)), SLOT(emitPropertiesChanged()));
}
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h
index 901364181..af69844a4 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/mpris2/player2object.h
@@ -58,7 +58,7 @@ Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
Q_PROPERTY(double Volume READ volume WRITE setVolume)
public:
- Player2Object(QObject *parent = 0);
+ Player2Object(QObject *parent = nullptr);
virtual ~Player2Object();
bool canControl() const;
bool canGoNext() const;
diff --git a/src/plugins/General/mpris/mpris2/root2object.h b/src/plugins/General/mpris/mpris2/root2object.h
index c7b39892b..762e04655 100644
--- a/src/plugins/General/mpris/mpris2/root2object.h
+++ b/src/plugins/General/mpris/mpris2/root2object.h
@@ -39,7 +39,7 @@ Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
public:
- Root2Object(QObject *parent = 0);
+ Root2Object(QObject *parent = nullptr);
virtual ~Root2Object();
bool canQuit() const;
diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp
index a43139505..338b8f302 100644
--- a/src/plugins/General/mpris/mprisfactory.cpp
+++ b/src/plugins/General/mpris/mprisfactory.cpp
@@ -42,7 +42,7 @@ QObject *MPRISFactory::create(QObject *parent)
QDialog *MPRISFactory::createConfigDialog(QWidget *)
{
- return 0;
+ return nullptr;
}
void MPRISFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp
index 20b5b6195..127d9adf6 100644
--- a/src/plugins/General/notifier/notifier.cpp
+++ b/src/plugins/General/notifier/notifier.cpp
@@ -41,7 +41,7 @@
Notifier::Notifier(QObject *parent) : QObject(parent)
{
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
m_l = -1;
m_r = -1;
m_isPaused = false;
diff --git a/src/plugins/General/notifier/notifier.h b/src/plugins/General/notifier/notifier.h
index 6b0317b30..c612711e7 100644
--- a/src/plugins/General/notifier/notifier.h
+++ b/src/plugins/General/notifier/notifier.h
@@ -36,7 +36,7 @@ class Notifier : public QObject
{
Q_OBJECT
public:
- Notifier(QObject *parent = 0);
+ Notifier(QObject *parent = nullptr);
virtual~Notifier();
diff --git a/src/plugins/General/notifier/popupwidget.h b/src/plugins/General/notifier/popupwidget.h
index f06b4c4d3..6c685c482 100644
--- a/src/plugins/General/notifier/popupwidget.h
+++ b/src/plugins/General/notifier/popupwidget.h
@@ -36,7 +36,7 @@ class PopupWidget : public QFrame
{
Q_OBJECT
public:
- PopupWidget(QWidget *parent = 0);
+ PopupWidget(QWidget *parent = nullptr);
~PopupWidget();
diff --git a/src/plugins/General/notifier/settingsdialog.h b/src/plugins/General/notifier/settingsdialog.h
index fda8434c4..80a7284f2 100644
--- a/src/plugins/General/notifier/settingsdialog.h
+++ b/src/plugins/General/notifier/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
virtual ~SettingsDialog();
diff --git a/src/plugins/General/rdetect/settingsdialog.h b/src/plugins/General/rdetect/settingsdialog.h
index 85ab9ed4b..ff033adcc 100644
--- a/src/plugins/General/rdetect/settingsdialog.h
+++ b/src/plugins/General/rdetect/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp
index c2814b60c..0818ee26d 100644
--- a/src/plugins/General/rgscan/rgscandialog.cpp
+++ b/src/plugins/General/rgscan/rgscandialog.cpp
@@ -270,7 +270,7 @@ RGScanner *RGScanDialog::findScannerByUrl(const QString &url)
if(scanner->url() == url)
return scanner;
}
- return 0;
+ return nullptr;
}
QString RGScanDialog::getAlbumName(const QString &url)
diff --git a/src/plugins/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h
index 18dcda9ad..22f5e457b 100644
--- a/src/plugins/General/rgscan/rgscandialog.h
+++ b/src/plugins/General/rgscan/rgscandialog.h
@@ -61,7 +61,7 @@ class RGScanDialog : public QDialog
{
Q_OBJECT
public:
- explicit RGScanDialog(QList <PlayListTrack *> tracks, QWidget *parent = 0);
+ explicit RGScanDialog(QList <PlayListTrack *> tracks, QWidget *parent = nullptr);
virtual ~RGScanDialog();
private slots:
diff --git a/src/plugins/General/rgscan/rgscanfactory.cpp b/src/plugins/General/rgscan/rgscanfactory.cpp
index 9e68e89a9..18998ac2c 100644
--- a/src/plugins/General/rgscan/rgscanfactory.cpp
+++ b/src/plugins/General/rgscan/rgscanfactory.cpp
@@ -41,7 +41,7 @@ QObject *RGScanFactory::create(QObject *parent)
QDialog *RGScanFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void RGScanFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/rgscan/rgscanhelper.h b/src/plugins/General/rgscan/rgscanhelper.h
index bc67a700b..e68f857a0 100644
--- a/src/plugins/General/rgscan/rgscanhelper.h
+++ b/src/plugins/General/rgscan/rgscanhelper.h
@@ -33,7 +33,7 @@ class RGScanHelper : public QObject
{
Q_OBJECT
public:
- RGScanHelper(QObject *parent = 0);
+ RGScanHelper(QObject *parent = nullptr);
~RGScanHelper();
private slots:
diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp
index e1311bd97..13ff79cdf 100644
--- a/src/plugins/General/rgscan/rgscanner.cpp
+++ b/src/plugins/General/rgscan/rgscanner.cpp
@@ -35,9 +35,9 @@ RGScanner::RGScanner()
m_is_running = false;
m_is_pending = false;
m_has_values = false;
- m_handle = 0;
- m_decoder = 0;
- m_source = 0;
+ m_handle = nullptr;
+ m_decoder = nullptr;
+ m_source = nullptr;
}
RGScanner::~RGScanner()
@@ -47,7 +47,7 @@ RGScanner::~RGScanner()
if(m_handle)
{
DeinitGainAnalysis(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
}
}
@@ -57,7 +57,7 @@ bool RGScanner::prepare(const QString &url)
deinit();
m_url = url;
QString name = m_url.section("/", -1);
- InputSource *source = InputSource::create(url, 0);
+ InputSource *source = InputSource::create(url, nullptr);
if(!source->initialize())
{
delete source;
@@ -273,11 +273,11 @@ void RGScanner::deinit()
if(m_decoder)
{
delete m_decoder;
- m_decoder = 0;
+ m_decoder = nullptr;
}
if(m_source)
{
delete m_source;
- m_source = 0;
+ m_source = nullptr;
}
}
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index 468a88bd6..6082b237a 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -82,9 +82,9 @@ void ScrobblerResponse::parse(QIODevice *device)
Scrobbler::Scrobbler(const QString &scrobblerUrl, const QString &name, QObject *parent)
: QObject(parent)
{
- m_notificationReply = 0;
+ m_notificationReply = nullptr;
m_submitedSongs = 0;
- m_submitReply = 0;
+ m_submitReply = nullptr;
m_previousState = Qmmp::Stopped;
m_elapsed = 0;
m_scrobblerUrl = scrobblerUrl;
@@ -211,7 +211,7 @@ void Scrobbler::processResponse(QNetworkReply *reply)
if (reply == m_submitReply)
{
- m_submitReply = 0;
+ m_submitReply = nullptr;
if (response.status == "ok")
{
qDebug("Scrobbler[%s]: submited %d song(s)", qPrintable(m_name), m_submitedSongs);
@@ -248,7 +248,7 @@ void Scrobbler::processResponse(QNetworkReply *reply)
}
else if (reply == m_notificationReply)
{
- m_notificationReply = 0;
+ m_notificationReply = nullptr;
if(response.status == "ok")
{
qDebug("Scrobbler[%s]: Now-Playing notification done", qPrintable(m_name));
@@ -386,8 +386,8 @@ void Scrobbler::sendNotification(const SongInfo &info)
ScrobblerAuth::ScrobblerAuth(const QString &scrobblerUrl, const QString &authUrl,
const QString &name, QObject *parent) : QObject(parent)
{
- m_getTokenReply = 0;
- m_getSessionReply = 0;
+ m_getTokenReply = nullptr;
+ m_getSessionReply = nullptr;
m_scrobblerUrl = scrobblerUrl;
m_authUrl = authUrl;
m_name = name;
@@ -522,7 +522,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply)
if (reply == m_getTokenReply)
{
- m_getTokenReply = 0;
+ m_getTokenReply = nullptr;
if(response.status == "ok")
{
m_token = response.token;
@@ -548,7 +548,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply)
}
else if(reply == m_getSessionReply)
{
- m_getSessionReply = 0;
+ m_getSessionReply = nullptr;
m_session.clear();
if(response.status == "ok")
{
@@ -586,7 +586,7 @@ void ScrobblerAuth::processResponse(QNetworkReply *reply)
}
else if(reply == m_checkSessionReply)
{
- m_checkSessionReply = 0;
+ m_checkSessionReply = nullptr;
if(response.status == "ok")
{
qDebug("ScrobblerAuth[%s]: session ok", qPrintable(m_name));
diff --git a/src/plugins/General/scrobbler/scrobbler.h b/src/plugins/General/scrobbler/scrobbler.h
index d87a92778..8efb39098 100644
--- a/src/plugins/General/scrobbler/scrobbler.h
+++ b/src/plugins/General/scrobbler/scrobbler.h
@@ -56,7 +56,7 @@ class Scrobbler : public QObject
{
Q_OBJECT
public:
- Scrobbler(const QString &scrobblerUrl, const QString &name,QObject *parent = 0);
+ Scrobbler(const QString &scrobblerUrl, const QString &name,QObject *parent = nullptr);
~Scrobbler();
private slots:
@@ -93,7 +93,7 @@ class ScrobblerAuth : public QObject
Q_OBJECT
public:
explicit ScrobblerAuth(const QString &scrobblerUrl, const QString &authUrl,
- const QString &name, QObject *parent = 0);
+ const QString &name, QObject *parent = nullptr);
void getToken();
void getSession();
void checkSession(const QString &session);
diff --git a/src/plugins/General/scrobbler/scrobblerhandler.h b/src/plugins/General/scrobbler/scrobblerhandler.h
index b9eb37aa4..9a923bf87 100644
--- a/src/plugins/General/scrobbler/scrobblerhandler.h
+++ b/src/plugins/General/scrobbler/scrobblerhandler.h
@@ -33,7 +33,7 @@ class ScrobblerHandler : public QObject
Q_OBJECT
public:
- ScrobblerHandler(QObject *parent = 0);
+ ScrobblerHandler(QObject *parent = nullptr);
~ScrobblerHandler();
};
diff --git a/src/plugins/General/scrobbler/settingsdialog.h b/src/plugins/General/scrobbler/settingsdialog.h
index 953bc330f..b82af0029 100644
--- a/src/plugins/General/scrobbler/settingsdialog.h
+++ b/src/plugins/General/scrobbler/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/statusicon/coverwidget.h b/src/plugins/General/statusicon/coverwidget.h
index 36888062c..7434b5ea4 100644
--- a/src/plugins/General/statusicon/coverwidget.h
+++ b/src/plugins/General/statusicon/coverwidget.h
@@ -31,7 +31,7 @@ class CoverWidget : public QWidget
{
Q_OBJECT
public:
- CoverWidget(QWidget *parent = 0);
+ CoverWidget(QWidget *parent = nullptr);
~CoverWidget();
diff --git a/src/plugins/General/statusicon/qmmptrayicon.h b/src/plugins/General/statusicon/qmmptrayicon.h
index 220b59929..190d52a73 100644
--- a/src/plugins/General/statusicon/qmmptrayicon.h
+++ b/src/plugins/General/statusicon/qmmptrayicon.h
@@ -36,7 +36,7 @@ class QmmpTrayIcon : public QSystemTrayIcon
{
Q_OBJECT
public:
- QmmpTrayIcon(QObject *parent = 0);
+ QmmpTrayIcon(QObject *parent = nullptr);
~QmmpTrayIcon();
void setToolTip(const QString &tip);
diff --git a/src/plugins/General/statusicon/settingsdialog.h b/src/plugins/General/statusicon/settingsdialog.h
index afb2f0327..776172129 100644
--- a/src/plugins/General/statusicon/settingsdialog.h
+++ b/src/plugins/General/statusicon/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h
index f40cbcb5a..6225b977d 100644
--- a/src/plugins/General/statusicon/statusicon.h
+++ b/src/plugins/General/statusicon/statusicon.h
@@ -40,7 +40,7 @@ class StatusIcon : public QObject
{
Q_OBJECT
public:
- StatusIcon(QObject *parent = 0);
+ StatusIcon(QObject *parent = nullptr);
~StatusIcon();
diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.h b/src/plugins/General/statusicon/statusiconpopupwidget.h
index 7a9aaa7a4..906435933 100644
--- a/src/plugins/General/statusicon/statusiconpopupwidget.h
+++ b/src/plugins/General/statusicon/statusiconpopupwidget.h
@@ -43,7 +43,7 @@ class StatusIconPopupWidget : public QFrame
Q_OBJECT
public:
- StatusIconPopupWidget(QWidget * parent = 0);
+ StatusIconPopupWidget(QWidget *parent = nullptr);
~StatusIconPopupWidget();
void showInfo(int x, int y, const QString &message); //x,y are tray icon position
@@ -75,7 +75,7 @@ class TimeBar : public QProgressBar
{
Q_OBJECT
public:
- TimeBar(QWidget *parent = 0);
+ TimeBar(QWidget *parent = nullptr);
virtual QString text() const;
};
diff --git a/src/plugins/General/streambrowser/editstreamdialog.h b/src/plugins/General/streambrowser/editstreamdialog.h
index a0e24ce3a..4f6ddc500 100644
--- a/src/plugins/General/streambrowser/editstreamdialog.h
+++ b/src/plugins/General/streambrowser/editstreamdialog.h
@@ -33,7 +33,7 @@ class EditStreamDialog : public QDialog
Q_OBJECT
public:
- explicit EditStreamDialog(QWidget *parent = 0);
+ explicit EditStreamDialog(QWidget *parent = nullptr);
~EditStreamDialog();
enum Key
diff --git a/src/plugins/General/streambrowser/streambrowser.h b/src/plugins/General/streambrowser/streambrowser.h
index 0f23644d8..7ea50e575 100644
--- a/src/plugins/General/streambrowser/streambrowser.h
+++ b/src/plugins/General/streambrowser/streambrowser.h
@@ -35,7 +35,7 @@ class StreamBrowser : public QObject
{
Q_OBJECT
public:
- StreamBrowser(QObject *parent = 0);
+ StreamBrowser(QObject *parent = nullptr);
~StreamBrowser();
diff --git a/src/plugins/General/streambrowser/streambrowserfactory.cpp b/src/plugins/General/streambrowser/streambrowserfactory.cpp
index 655a7adfb..4b2fc70c3 100644
--- a/src/plugins/General/streambrowser/streambrowserfactory.cpp
+++ b/src/plugins/General/streambrowser/streambrowserfactory.cpp
@@ -42,7 +42,7 @@ QObject *StreamBrowserFactory::create(QObject *parent)
QDialog *StreamBrowserFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void StreamBrowserFactory::showAbout(QWidget *parent)
diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp
index 6bf73f6d4..e5dadd958 100644
--- a/src/plugins/General/streambrowser/streamwindow.cpp
+++ b/src/plugins/General/streambrowser/streamwindow.cpp
@@ -47,7 +47,7 @@ StreamWindow::StreamWindow(QWidget *parent)
setWindowFlags(Qt::Window);
setAttribute(Qt::WA_DeleteOnClose);
setAttribute(Qt::WA_QuitOnClose, false);
- m_requestReply = 0;
+ m_requestReply = nullptr;
//buttons
m_ui->addPushButton->setIcon(QIcon::fromTheme("list-add"));
m_ui->updatePushButton->setIcon(QIcon::fromTheme("view-refresh"));
@@ -153,13 +153,13 @@ void StreamWindow::showText(QNetworkReply *reply)
{
m_ui->statusLabel->setText(tr("Error"));
QMessageBox::warning (this, tr("Error"), reply->errorString());
- m_requestReply = 0;
+ m_requestReply = nullptr;
reply->deleteLater();
return;
}
if(m_requestReply == reply)
{
- m_requestReply = 0;
+ m_requestReply = nullptr;
readXml(reply, m_iceCastModel);
}
reply->deleteLater();
diff --git a/src/plugins/General/streambrowser/streamwindow.h b/src/plugins/General/streambrowser/streamwindow.h
index c36c54b69..58512c9c1 100644
--- a/src/plugins/General/streambrowser/streamwindow.h
+++ b/src/plugins/General/streambrowser/streamwindow.h
@@ -42,7 +42,7 @@ class StreamWindow : public QWidget
{
Q_OBJECT
public:
- StreamWindow(QWidget *parent = 0);
+ StreamWindow(QWidget *parent = nullptr);
~StreamWindow();
diff --git a/src/plugins/General/taskbar/taskbarhelper.h b/src/plugins/General/taskbar/taskbarhelper.h
index d139f848f..db4082c12 100644
--- a/src/plugins/General/taskbar/taskbarhelper.h
+++ b/src/plugins/General/taskbar/taskbarhelper.h
@@ -36,7 +36,7 @@ class TaskbarHelper : public QObject
{
Q_OBJECT
public:
- TaskbarHelper(QObject *parent = 0);
+ TaskbarHelper(QObject *parent = nullptr);
~TaskbarHelper();
private slots:
diff --git a/src/plugins/General/trackchange/settingsdialog.h b/src/plugins/General/trackchange/settingsdialog.h
index dfb022577..57b9a350f 100644
--- a/src/plugins/General/trackchange/settingsdialog.h
+++ b/src/plugins/General/trackchange/settingsdialog.h
@@ -33,7 +33,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/trackchange/trackchange.h b/src/plugins/General/trackchange/trackchange.h
index 0ea02ad43..5cfba8e9d 100644
--- a/src/plugins/General/trackchange/trackchange.h
+++ b/src/plugins/General/trackchange/trackchange.h
@@ -36,7 +36,7 @@ class TrackChange : public QObject
{
Q_OBJECT
public:
- TrackChange(QObject *parent = 0);
+ TrackChange(QObject *parent = nullptr);
~TrackChange();
diff --git a/src/plugins/General/udisks2/settingsdialog.h b/src/plugins/General/udisks2/settingsdialog.h
index 8a6f1cc5b..c8191f380 100644
--- a/src/plugins/General/udisks2/settingsdialog.h
+++ b/src/plugins/General/udisks2/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/General/udisks2/udisks2device.h b/src/plugins/General/udisks2/udisks2device.h
index 8fcca4c6f..4b0e9543c 100644
--- a/src/plugins/General/udisks2/udisks2device.h
+++ b/src/plugins/General/udisks2/udisks2device.h
@@ -65,7 +65,7 @@ class UDisks2Device : public QObject
{
Q_OBJECT
public:
- UDisks2Device(QDBusObjectPath o, QObject *parent = 0);
+ UDisks2Device(QDBusObjectPath o, QObject *parent = nullptr);
~UDisks2Device();
diff --git a/src/plugins/General/udisks2/udisks2manager.h b/src/plugins/General/udisks2/udisks2manager.h
index cbd1e2fe1..2b4e705fe 100644
--- a/src/plugins/General/udisks2/udisks2manager.h
+++ b/src/plugins/General/udisks2/udisks2manager.h
@@ -37,7 +37,7 @@ class UDisks2Manager : public QObject
{
Q_OBJECT
public:
- UDisks2Manager(QObject *parent = 0);
+ UDisks2Manager(QObject *parent = nullptr);
~UDisks2Manager();
diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp
index 84327f866..fdae8b923 100644
--- a/src/plugins/General/udisks2/udisks2plugin.cpp
+++ b/src/plugins/General/udisks2/udisks2plugin.cpp
@@ -184,7 +184,7 @@ QAction *UDisks2Plugin::findAction(const QString &dev_path)
if (action->data().toString() == dev_path)
return action;
}
- return 0;
+ return nullptr;
}
UDisks2Device *UDisks2Plugin::findDevice(QAction *action)
@@ -205,7 +205,7 @@ UDisks2Device *UDisks2Plugin::findDevice(QAction *action)
return device;
}
}
- return 0;
+ return nullptr;
}
void UDisks2Plugin::addPath(const QString &path)
diff --git a/src/plugins/General/udisks2/udisks2plugin.h b/src/plugins/General/udisks2/udisks2plugin.h
index ed3130da0..a5d428220 100644
--- a/src/plugins/General/udisks2/udisks2plugin.h
+++ b/src/plugins/General/udisks2/udisks2plugin.h
@@ -36,7 +36,7 @@ class UDisks2Plugin : public QObject
{
Q_OBJECT
public:
- UDisks2Plugin(QObject *parent = 0);
+ UDisks2Plugin(QObject *parent = nullptr);
~UDisks2Plugin();
diff --git a/src/plugins/Input/aac/decoder_aac.cpp b/src/plugins/Input/aac/decoder_aac.cpp
index bd6708b6e..6a4c3740c 100644
--- a/src/plugins/Input/aac/decoder_aac.cpp
+++ b/src/plugins/Input/aac/decoder_aac.cpp
@@ -36,10 +36,10 @@ DecoderAAC::DecoderAAC(QIODevice *i)
{
m_bitrate = 0;
m_totalTime = 0;
- m_data = 0;
- m_input_buf = 0;
+ m_data = nullptr;
+ m_input_buf = nullptr;
m_input_at = 0;
- m_sample_buf = 0;
+ m_sample_buf = nullptr;
m_sample_buf_at = 0;
m_sample_buf_size = 0;
}
@@ -52,11 +52,11 @@ DecoderAAC::~DecoderAAC()
if (data()->handle)
NeAACDecClose (data()->handle);
delete data();
- m_data = 0;
+ m_data = nullptr;
}
if (m_input_buf)
delete [] m_input_buf;
- m_input_buf = 0;
+ m_input_buf = nullptr;
m_bitrate = 0;
}
diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp
index eca457612..6ceca28ee 100644
--- a/src/plugins/Input/aac/decoderaacfactory.cpp
+++ b/src/plugins/Input/aac/decoderaacfactory.cpp
@@ -92,7 +92,7 @@ MetaDataModel* DecoderAACFactory::createMetaDataModel(const QString &path, bool
{
Q_UNUSED(path);
Q_UNUSED(readOnly);
- return 0;
+ return nullptr;
}
void DecoderAACFactory::showSettings(QWidget *)
diff --git a/src/plugins/Input/archive/archiveinputdevice.cpp b/src/plugins/Input/archive/archiveinputdevice.cpp
index 6056dca98..8d10647ab 100644
--- a/src/plugins/Input/archive/archiveinputdevice.cpp
+++ b/src/plugins/Input/archive/archiveinputdevice.cpp
@@ -23,8 +23,8 @@
ArchiveInputDevice::ArchiveInputDevice(const QString &url, QObject *parent) : QIODevice(parent)
{
- m_archive = 0;
- m_entry = 0;
+ m_archive = nullptr;
+ m_entry = nullptr;
QString filePath = url.section("#", -1);
QString archivePath = url;
archivePath.remove(QRegExp("^.+://"));
@@ -74,7 +74,7 @@ ArchiveInputDevice::~ArchiveInputDevice()
{
archive_read_close(m_archive);
archive_read_free(m_archive);
- m_archive = 0;
+ m_archive = nullptr;
}
}
diff --git a/src/plugins/Input/archive/archiveinputdevice.h b/src/plugins/Input/archive/archiveinputdevice.h
index eab4747eb..e6c31fdda 100644
--- a/src/plugins/Input/archive/archiveinputdevice.h
+++ b/src/plugins/Input/archive/archiveinputdevice.h
@@ -30,8 +30,8 @@ class ArchiveInputDevice : public QIODevice
{
Q_OBJECT
public:
- ArchiveInputDevice(const QString &url, QObject *parent = 0);
- ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = 0);
+ ArchiveInputDevice(const QString &url, QObject *parent = nullptr);
+ ArchiveInputDevice(struct archive *a, struct archive_entry *e, QObject *parent = nullptr);
virtual ~ArchiveInputDevice();
bool seek(qint64 pos);
diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp
index d4cd7933d..fa5bcf292 100644
--- a/src/plugins/Input/archive/decoder_archive.cpp
+++ b/src/plugins/Input/archive/decoder_archive.cpp
@@ -27,8 +27,8 @@
DecoderArchive::DecoderArchive(const QString &url)
{
m_url = url;
- m_decoder = 0;
- m_input = 0;
+ m_decoder = nullptr;
+ m_input = nullptr;
}
DecoderArchive::~DecoderArchive()
@@ -36,12 +36,12 @@ DecoderArchive::~DecoderArchive()
if(m_decoder)
{
delete m_decoder;
- m_decoder = 0;
+ m_decoder = nullptr;
}
if(m_input)
{
delete m_input;
- m_input = 0;
+ m_input = nullptr;
}
}
@@ -80,7 +80,7 @@ bool DecoderArchive::initialize()
return false;
}
- DecoderFactory *factory = 0;
+ DecoderFactory *factory = nullptr;
if(filtered.size() == 1)
factory = filtered.first();
else
diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp
index 50a994229..2b0f6ce25 100644
--- a/src/plugins/Input/archive/decoderarchivefactory.cpp
+++ b/src/plugins/Input/archive/decoderarchivefactory.cpp
@@ -56,7 +56,7 @@ Decoder *DecoderArchiveFactory::create(const QString &url, QIODevice *)
QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *)
{
QList<TrackInfo *> list;
- struct archive_entry *entry = 0;
+ struct archive_entry *entry = nullptr;
struct archive *a = archive_read_new();
archive_read_support_filter_all(a);
@@ -109,7 +109,7 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr
.arg(archivePath)
.arg(filePath));
- ArchiveInputDevice dev(a, entry, 0);
+ ArchiveInputDevice dev(a, entry, nullptr);
ArchiveTagReader reader(&dev, list.last()->path());
if(parts & TrackInfo::MetaData)
@@ -140,7 +140,7 @@ MetaDataModel* DecoderArchiveFactory::createMetaDataModel(const QString &path, b
{
Q_UNUSED(path);
Q_UNUSED(readOnly);
- return 0;
+ return nullptr;
}
void DecoderArchiveFactory::showSettings(QWidget *)
diff --git a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
index 1eda15805..11e8119ab 100644
--- a/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
+++ b/src/plugins/Input/cdaudio/decoder_cdaudio.cpp
@@ -87,7 +87,7 @@ DecoderCDAudio::DecoderCDAudio(const QString &url) : Decoder()
m_last_sector = -1;
m_current_sector = -1;
m_url = url;
- m_cdio = 0;
+ m_cdio = nullptr;
m_buffer_at = 0;
m_buffer = new char[CDDA_BUFFER_SIZE];
}
@@ -98,7 +98,7 @@ DecoderCDAudio::~DecoderCDAudio()
if (m_cdio)
{
cdio_destroy(m_cdio);
- m_cdio = 0;
+ m_cdio = nullptr;
}
delete [] m_buffer;
}
@@ -111,13 +111,13 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
bool use_cd_text = settings.value("cdaudio/cdtext", true).toBool();
QList <CDATrack> tracks;
cdio_log_set_handler(log_handler); //setup cdio log handler
- CdIo_t *cdio = 0;
+ CdIo_t *cdio = nullptr;
QString device_path = device;
if (device_path.isEmpty() || device_path == "/")
device_path = settings.value("cdaudio/device").toString();
if (device_path.isEmpty() || device_path == "/")
{
- char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, true); //get drive list with CDA disks
+ char **cd_drives = cdio_get_devices_with_cap(nullptr, CDIO_FS_AUDIO, true); //get drive list with CDA disks
// open first audio capable cd drive
if (cd_drives && *cd_drives)
{
@@ -164,7 +164,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
qWarning("DecoderCDAudio: unable to set drive speed to %dX.", cd_speed);
}
- cdrom_drive_t *pcdrom_drive = cdio_cddap_identify_cdio(cdio, 1, 0); //create paranoya CD-ROM object
+ cdrom_drive_t *pcdrom_drive = cdio_cddap_identify_cdio(cdio, 1, nullptr); //create paranoya CD-ROM object
//get first and last track numbers
int first_track_number = cdio_get_first_track_num(pcdrom_drive->p_cdio);
int last_track_number = cdio_get_last_track_num(pcdrom_drive->p_cdio);
@@ -173,7 +173,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
{
qWarning("DecoderCDAudio: invalid first (last) track number.");
cdio_destroy(cdio);
- cdio = 0;
+ cdio = nullptr;
return tracks;
}
bool use_cddb = true;
@@ -201,12 +201,12 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
qWarning("DecoderCDAudio: invalid stard(end) lsn for the track %d.", i);
tracks.clear();
cdio_destroy(cdio);
- cdio = 0;
+ cdio = nullptr;
return tracks;
}
//cd text
#if LIBCDIO_VERSION_NUM <= 83
- cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio, i) : 0;
+ cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio, i) : nullptr;
if (cdtext && cdtext->field[CDTEXT_TITLE])
{
t.info.setValue(Qmmp::TITLE, QString::fromLocal8Bit(cdtext->field[CDTEXT_TITLE]));
@@ -215,7 +215,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
use_cddb = false;
}
#else
- cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio) : 0;
+ cdtext_t *cdtext = use_cd_text ? cdio_get_cdtext(pcdrom_drive->p_cdio) : nullptr;
if (cdtext)
{
t.info.setValue(Qmmp::TITLE, QString::fromUtf8(cdtext_get_const(cdtext,CDTEXT_FIELD_TITLE,i)));
@@ -329,7 +329,7 @@ QList<CDATrack> DecoderCDAudio::generateTrackList(const QString &device, TrackIn
}
cdio_destroy(cdio);
- cdio = 0;
+ cdio = nullptr;
m_track_cache = tracks;
return tracks;
}
@@ -425,7 +425,7 @@ bool DecoderCDAudio::initialize()
if (device_path.isEmpty() || device_path == "/")
{
- char **cd_drives = cdio_get_devices_with_cap(0, CDIO_FS_AUDIO, true); //get drive list with CDA disks
+ char **cd_drives = cdio_get_devices_with_cap(nullptr, CDIO_FS_AUDIO, true); //get drive list with CDA disks
// open first audio capable cd drive
if (cd_drives && *cd_drives)
{
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index 9fca3c1fe..f79ba96be 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -72,7 +72,7 @@ MetaDataModel* DecoderCDAudioFactory::createMetaDataModel(const QString &path, b
{
Q_UNUSED(readOnly);
Q_UNUSED(path);
- return 0;
+ return nullptr;
}
void DecoderCDAudioFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/cdaudio/settingsdialog.h b/src/plugins/Input/cdaudio/settingsdialog.h
index 7eb53d5a9..ff784a6db 100644
--- a/src/plugins/Input/cdaudio/settingsdialog.h
+++ b/src/plugins/Input/cdaudio/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp
index 350d6f76e..b50eda92d 100644
--- a/src/plugins/Input/cue/cueparser.cpp
+++ b/src/plugins/Input/cue/cueparser.cpp
@@ -49,9 +49,9 @@ CUEParser::CUEParser(const QString &path)
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("CUE");
m_dirty = settings.value("dirty_cue", false).toBool();
- QTextCodec *codec = 0;
+ QTextCodec *codec = nullptr;
#ifdef WITH_ENCA
- EncaAnalyser analyser = 0;
+ EncaAnalyser analyser = nullptr;
if(settings.value("use_enca", false).toBool())
{
analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp
index e21dfdca5..ae7f06edc 100644
--- a/src/plugins/Input/cue/decoder_cue.cpp
+++ b/src/plugins/Input/cue/decoder_cue.cpp
@@ -33,27 +33,27 @@ DecoderCUE::DecoderCUE(const QString &url)
: Decoder()
{
m_path = url;
- m_decoder = 0;
- m_parser = 0;
+ m_decoder = nullptr;
+ m_parser = nullptr;
m_track = 0;
- m_buf = 0;
- m_input = 0;
+ m_buf = nullptr;
+ m_input = nullptr;
}
DecoderCUE::~DecoderCUE()
{
if(m_decoder)
delete m_decoder;
- m_decoder = 0;
+ m_decoder = nullptr;
if(m_parser)
delete m_parser;
- m_parser = 0;
+ m_parser = nullptr;
if(m_buf)
delete [] m_buf;
- m_buf = 0;
+ m_buf = nullptr;
if(m_input)
m_input->deleteLater();
- m_input = 0;
+ m_input = nullptr;
}
bool DecoderCUE::initialize()
@@ -134,7 +134,7 @@ qint64 DecoderCUE::read(unsigned char *data, qint64 size)
if(size >= m_buf_size)
{
delete[] m_buf;
- m_buf = 0;
+ m_buf = nullptr;
m_buf_size = 0;
}
else
diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp
index 103f4b597..35d66e1dd 100644
--- a/src/plugins/Input/cue/decodercuefactory.cpp
+++ b/src/plugins/Input/cue/decodercuefactory.cpp
@@ -77,7 +77,7 @@ QList<TrackInfo *> DecoderCUEFactory::createPlayList(const QString &path, TrackI
MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, bool readOnly)
{
Q_UNUSED(readOnly);
- return path.startsWith("cue://") ? new CUEMetaDataModel(path) : 0;
+ return path.startsWith("cue://") ? new CUEMetaDataModel(path) : nullptr;
}
void DecoderCUEFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/cue/settingsdialog.h b/src/plugins/Input/cue/settingsdialog.h
index 60bdc6c07..158be59dd 100644
--- a/src/plugins/Input/cue/settingsdialog.h
+++ b/src/plugins/Input/cue/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 99ff7c402..9548970fa 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -71,17 +71,17 @@ DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i)
{
m_bitrate = 0;
m_totalTime = 0;
- ic = 0;
+ ic = nullptr;
m_path = path;
m_temp_pkt.size = 0;
m_pkt.size = 0;
- m_pkt.data = 0;
+ m_pkt.data = nullptr;
m_output_at = 0;
m_skipBytes = 0;
- m_stream = 0;
- m_decoded_frame = 0;
+ m_stream = nullptr;
+ m_decoded_frame = nullptr;
m_channels = 0;
- c = 0;
+ c = nullptr;
audioIndex = 0;
m_seekTime = -1;
av_init_packet(&m_pkt);
@@ -145,7 +145,7 @@ bool DecoderFFmpeg::initialize()
qDebug("DecoderFFmpeg: detected format: %s", fmt->long_name);
qDebug("=%s=", fmt->name);
- m_stream = avio_alloc_context(m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, NULL, ffmpeg_seek);
+ m_stream = avio_alloc_context(m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, nullptr, ffmpeg_seek);
if(!m_stream)
{
qWarning("DecoderFFmpeg: unable to initialize I/O callbacks");
@@ -155,37 +155,37 @@ bool DecoderFFmpeg::initialize()
m_stream->max_packet_size = INPUT_BUFFER_SIZE;
ic->pb = m_stream;
- if(avformat_open_input(&ic, 0, fmt, 0) != 0)
+ if(avformat_open_input(&ic, nullptr, fmt, nullptr) != 0)
{
qDebug("DecoderFFmpeg: avformat_open_input() failed");
return false;
}
- avformat_find_stream_info(ic, 0);
+ avformat_find_stream_info(ic, nullptr);
if(ic->pb)
ic->pb->eof_reached = 0;
if (input()->isSequential())
{
QMap<Qmmp::MetaData, QString> metaData;
- AVDictionaryEntry *album = av_dict_get(ic->metadata,"album",0,0);
+ AVDictionaryEntry *album = av_dict_get(ic->metadata,"album",nullptr,0);
if(!album)
- album = av_dict_get(ic->metadata,"WM/AlbumTitle",0,0);
- AVDictionaryEntry *artist = av_dict_get(ic->metadata,"artist",0,0);
+ album = av_dict_get(ic->metadata,"WM/AlbumTitle",nullptr,0);
+ AVDictionaryEntry *artist = av_dict_get(ic->metadata,"artist",nullptr,0);
if(!artist)
- artist = av_dict_get(ic->metadata,"author",0,0);
- AVDictionaryEntry *comment = av_dict_get(ic->metadata,"comment",0,0);
- AVDictionaryEntry *genre = av_dict_get(ic->metadata,"genre",0,0);
- AVDictionaryEntry *title = av_dict_get(ic->metadata,"title",0,0);
- AVDictionaryEntry *year = av_dict_get(ic->metadata,"WM/Year",0,0);
+ artist = av_dict_get(ic->metadata,"author",nullptr,0);
+ AVDictionaryEntry *comment = av_dict_get(ic->metadata,"comment",nullptr,0);
+ AVDictionaryEntry *genre = av_dict_get(ic->metadata,"genre",nullptr,0);
+ AVDictionaryEntry *title = av_dict_get(ic->metadata,"title",nullptr,0);
+ AVDictionaryEntry *year = av_dict_get(ic->metadata,"WM/Year",nullptr,0);
if(!year)
- year = av_dict_get(ic->metadata,"year",0,0);
+ year = av_dict_get(ic->metadata,"year",nullptr,0);
if(!year)
- year = av_dict_get(ic->metadata,"date",0,0);
- AVDictionaryEntry *track = av_dict_get(ic->metadata,"track",0,0);
+ year = av_dict_get(ic->metadata,"date",nullptr,0);
+ AVDictionaryEntry *track = av_dict_get(ic->metadata,"track",nullptr,0);
if(!track)
- track = av_dict_get(ic->metadata,"WM/Track",0,0);
+ track = av_dict_get(ic->metadata,"WM/Track",nullptr,0);
if(!track)
- track = av_dict_get(ic->metadata,"WM/TrackNumber",0,0);
+ track = av_dict_get(ic->metadata,"WM/TrackNumber",nullptr,0);
if(album)
metaData.insert(Qmmp::ALBUM, QString::fromUtf8(album->value).trimmed());
@@ -209,12 +209,12 @@ bool DecoderFFmpeg::initialize()
setReplayGainInfo(rg.replayGainInfo());
#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,4,0)) //ffmpeg-3.1: 57.48.101
- c = avcodec_alloc_context3(NULL);
+ c = avcodec_alloc_context3(nullptr);
#endif
ic->flags |= AVFMT_FLAG_GENPTS;
av_read_play(ic);
- audioIndex = av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0);
+ audioIndex = av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
if(audioIndex < 0)
{
qWarning("DecoderFFmpeg: unable to find audio stream");
@@ -246,7 +246,7 @@ bool DecoderFFmpeg::initialize()
m_channels = c->request_channels;
#endif
- av_dump_format(ic,0,0,0);
+ av_dump_format(ic,0,nullptr,0);
AVCodec *codec = avcodec_find_decoder(c->codec_id);
@@ -256,7 +256,7 @@ bool DecoderFFmpeg::initialize()
return false;
}
- if (avcodec_open2(c, codec, 0) < 0)
+ if (avcodec_open2(c, codec, nullptr) < 0)
{
qWarning("DecoderFFmpeg: error while opening codec for output stream");
return false;
@@ -393,7 +393,7 @@ qint64 DecoderFFmpeg::ffmpeg_decode()
#endif
if(got_frame)
- out_size = av_samples_get_buffer_size(0, c->channels, m_decoded_frame->nb_samples,
+ out_size = av_samples_get_buffer_size(nullptr, c->channels, m_decoded_frame->nb_samples,
c->sample_fmt, 1);
else
out_size = 0;
@@ -517,7 +517,7 @@ void DecoderFFmpeg::fillBuffer()
#else
av_free_packet(&m_pkt);
#endif
- m_pkt.data = 0;
+ m_pkt.data = nullptr;
m_temp_pkt.size = 0;
break;
}
@@ -531,7 +531,7 @@ void DecoderFFmpeg::fillBuffer()
#else
av_free_packet(&m_pkt);
#endif
- m_pkt.data = 0;
+ m_pkt.data = nullptr;
m_temp_pkt.size = 0;
continue;
}
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index f10186c69..abca4bfb6 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -165,12 +165,12 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
if(parts == TrackInfo::NoParts)
return QList<TrackInfo*>() << info;
- AVFormatContext *in = 0;
+ AVFormatContext *in = nullptr;
#ifdef Q_OS_WIN
- if(avformat_open_input(&in, path.toUtf8().constData(), 0, 0) < 0)
+ if(avformat_open_input(&in, path.toUtf8().constData(), nullptr, nullptr) < 0)
#else
- if(avformat_open_input(&in, path.toLocal8Bit().constData(), 0, 0) < 0)
+ if(avformat_open_input(&in, path.toLocal8Bit().constData(), nullptr, nullptr) < 0)
#endif
{
qDebug("DecoderFFmpegFactory: unable to open file");
@@ -178,29 +178,29 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
return QList<TrackInfo*>();
}
- avformat_find_stream_info(in, 0);
+ avformat_find_stream_info(in, nullptr);
if(parts & TrackInfo::MetaData)
{
- AVDictionaryEntry *album = av_dict_get(in->metadata,"album",0,0);
+ AVDictionaryEntry *album = av_dict_get(in->metadata,"album",nullptr,0);
if(!album)
- album = av_dict_get(in->metadata,"WM/AlbumTitle",0,0);
- AVDictionaryEntry *artist = av_dict_get(in->metadata,"artist",0,0);
+ album = av_dict_get(in->metadata,"WM/AlbumTitle",nullptr,0);
+ AVDictionaryEntry *artist = av_dict_get(in->metadata,"artist",nullptr,0);
if(!artist)
- artist = av_dict_get(in->metadata,"author",0,0);
- AVDictionaryEntry *comment = av_dict_get(in->metadata,"comment",0,0);
- AVDictionaryEntry *genre = av_dict_get(in->metadata,"genre",0,0);
- AVDictionaryEntry *title = av_dict_get(in->metadata,"title",0,0);
- AVDictionaryEntry *year = av_dict_get(in->metadata,"WM/Year",0,0);
+ artist = av_dict_get(in->metadata,"author",nullptr,0);
+ AVDictionaryEntry *comment = av_dict_get(in->metadata,"comment",nullptr,0);
+ AVDictionaryEntry *genre = av_dict_get(in->metadata,"genre",nullptr,0);
+ AVDictionaryEntry *title = av_dict_get(in->metadata,"title",nullptr,0);
+ AVDictionaryEntry *year = av_dict_get(in->metadata,"WM/Year",nullptr,0);
if(!year)
- year = av_dict_get(in->metadata,"year",0,0);
+ year = av_dict_get(in->metadata,"year",nullptr,0);
if(!year)
- year = av_dict_get(in->metadata,"date",0,0);
- AVDictionaryEntry *track = av_dict_get(in->metadata,"track",0,0);
+ year = av_dict_get(in->metadata,"date",nullptr,0);
+ AVDictionaryEntry *track = av_dict_get(in->metadata,"track",nullptr,0);
if(!track)
- track = av_dict_get(in->metadata,"WM/Track",0,0);
+ track = av_dict_get(in->metadata,"WM/Track",nullptr,0);
if(!track)
- track = av_dict_get(in->metadata,"WM/TrackNumber",0,0);
+ track = av_dict_get(in->metadata,"WM/TrackNumber",nullptr,0);
if(album)
info->setValue(Qmmp::ALBUM, QString::fromUtf8(album->value));
@@ -220,7 +220,7 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
if(parts & TrackInfo::Properties)
{
- int idx = av_find_best_stream(in, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0);
+ int idx = av_find_best_stream(in, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
if(idx >= 0)
{
#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index d3b725744..17907d0cd 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -23,14 +23,14 @@
FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true)
{
- m_in = 0;
+ m_in = nullptr;
#ifdef Q_OS_WIN
- if (avformat_open_input(&m_in, path.toUtf8().constData(), 0, 0) < 0)
+ if (avformat_open_input(&m_in, path.toUtf8().constData(), nullptr, nullptr) < 0)
#else
- if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), 0, 0) < 0)
+ if (avformat_open_input(&m_in, path.toLocal8Bit().constData(), nullptr, nullptr) < 0)
#endif
return;
- avformat_find_stream_info(m_in, 0);
+ avformat_find_stream_info(m_in, nullptr);
av_read_play(m_in);
}
@@ -45,9 +45,9 @@ QPixmap FFmpegMetaDataModel::cover() const
if(!m_in)
return QPixmap();
#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,48,0)) //ffmpeg-3.1: 57.48.101
- AVCodecParameters *c = 0;
+ AVCodecParameters *c = nullptr;
#else
- AVCodecContext *c = 0;
+ AVCodecContext *c = nullptr;
#endif
for (uint idx = 0; idx < m_in->nb_streams; idx++)
diff --git a/src/plugins/Input/ffmpeg/replaygainreader.cpp b/src/plugins/Input/ffmpeg/replaygainreader.cpp
index 13c796614..3d4a11d22 100644
--- a/src/plugins/Input/ffmpeg/replaygainreader.cpp
+++ b/src/plugins/Input/ffmpeg/replaygainreader.cpp
@@ -22,7 +22,7 @@
ReplayGainReader::ReplayGainReader(AVFormatContext *ic)
{
- AVDictionaryEntry *t = 0;
+ AVDictionaryEntry *t = nullptr;
while((t = av_dict_get(ic->metadata, "", t, AV_DICT_IGNORE_SUFFIX)))
{
if(!strcmp(t->key, "replaygain_album_gain"))
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.h b/src/plugins/Input/ffmpeg/settingsdialog.h
index be1bbf22b..599c3481e 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.h
+++ b/src/plugins/Input/ffmpeg/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index 29bd4b119..0f2c14df2 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -266,13 +266,13 @@ DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i)
{
m_path = path;
m_data = new flac_data;
- m_data->decoder = NULL;
+ m_data->decoder = nullptr;
m_data->input = i;
- m_parser = 0;
+ m_parser = nullptr;
length_in_bytes = 0;
m_totalBytes = 0;
m_sz = 0;
- m_buf = 0;
+ m_buf = nullptr;
m_offset = 0;
m_track = 0;
}
@@ -286,11 +286,11 @@ DecoderFLAC::~DecoderFLAC()
if (m_data->decoder)
FLAC__stream_decoder_delete(m_data->decoder);
delete m_data;
- m_data = 0;
+ m_data = nullptr;
}
if(m_buf)
delete[] m_buf;
- m_buf = 0;
+ m_buf = nullptr;
}
bool DecoderFLAC::initialize()
@@ -506,7 +506,7 @@ qint64 DecoderFLAC::read(unsigned char *buf, qint64 size)
if(size >= m_buf_size)
{
delete[] m_buf;
- m_buf = 0;
+ m_buf = nullptr;
m_buf_size = 0;
}
else
@@ -547,11 +547,11 @@ void DecoderFLAC::deinit()
{
m_data->input->close();
delete m_data->input;
- m_data->input = 0;
+ m_data->input = nullptr;
};
if(m_parser)
delete m_parser;
- m_parser = 0;
+ m_parser = nullptr;
}
const QString DecoderFLAC::nextURL() const
diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index 02ae1f6bf..28aec227a 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -91,11 +91,11 @@ QList<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI
if(parts == TrackInfo::NoParts)
return QList<TrackInfo *>() << info;
- TagLib::Ogg::XiphComment *tag = 0;
- TagLib::FLAC::Properties *ap = 0;
+ TagLib::Ogg::XiphComment *tag = nullptr;
+ TagLib::FLAC::Properties *ap = nullptr;
- TagLib::FLAC::File *flacFile = 0;
- TagLib::Ogg::FLAC::File *oggFlacFile = 0;
+ TagLib::FLAC::File *flacFile = nullptr;
+ TagLib::Ogg::FLAC::File *oggFlacFile = nullptr;
TagLib::FileStream stream(QStringToFileName(path), true);
@@ -200,7 +200,7 @@ MetaDataModel* DecoderFLACFactory::createMetaDataModel(const QString &path, bool
if (!path.contains("://") || path.startsWith("flac://"))
return new FLACMetaDataModel(path, readOnly);
else
- return 0;
+ return nullptr;
}
void DecoderFLACFactory::showSettings(QWidget *)
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index ca06512b9..0457d22ef 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -38,9 +38,9 @@ FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly)
: MetaDataModel(true)
#endif
{
- m_file = 0;
- m_stream = 0;
- m_tag = 0;
+ m_file = nullptr;
+ m_stream = nullptr;
+ m_tag = nullptr;
if(path.startsWith("flac://"))
{
@@ -81,7 +81,7 @@ FLACMetaDataModel::~FLACMetaDataModel()
if(m_file)
{
delete m_file;
- m_file = 0;
+ m_file = nullptr;
}
if(m_stream)
delete m_stream;
diff --git a/src/plugins/Input/gme/decoder_gme.cpp b/src/plugins/Input/gme/decoder_gme.cpp
index 3eca96348..4de43f802 100644
--- a/src/plugins/Input/gme/decoder_gme.cpp
+++ b/src/plugins/Input/gme/decoder_gme.cpp
@@ -26,7 +26,7 @@
DecoderGme::DecoderGme(const QString &path) : Decoder()
{
m_path = path;
- m_emu = 0;
+ m_emu = nullptr;
}
DecoderGme::~DecoderGme()
@@ -44,7 +44,7 @@ bool DecoderGme::initialize()
{
qWarning("DecoderGme: track number is out of range");
gme_delete(m_emu);
- m_emu = 0;
+ m_emu = nullptr;
return false;
}
gme_start_track(m_emu, track - 1);
diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp
index cbd7fed44..50fee26a1 100644
--- a/src/plugins/Input/gme/decodergmefactory.cpp
+++ b/src/plugins/Input/gme/decodergmefactory.cpp
@@ -89,7 +89,7 @@ MetaDataModel* DecoderGmeFactory::createMetaDataModel(const QString &path, bool
{
Q_UNUSED(path);
Q_UNUSED(readOnly);
- return 0;
+ return nullptr;
}
void DecoderGmeFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/gme/gmehelper.cpp b/src/plugins/Input/gme/gmehelper.cpp
index 04a335701..fad5274f5 100644
--- a/src/plugins/Input/gme/gmehelper.cpp
+++ b/src/plugins/Input/gme/gmehelper.cpp
@@ -25,7 +25,7 @@
GmeHelper::GmeHelper()
{
- m_emu = 0;
+ m_emu = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_fade_length = settings.value("GME/fadeout_length", 7000).toInt();
@@ -37,41 +37,41 @@ GmeHelper::~GmeHelper()
{
if(m_emu)
gme_delete(m_emu);
- m_emu = 0;
+ m_emu = nullptr;
}
Music_Emu *GmeHelper::load(const QString &url, int sample_rate)
{
if(m_emu)
gme_delete(m_emu);
- m_emu = 0;
+ m_emu = nullptr;
QString path = url;
if(url.contains("://"))
{
path.remove("gme://");
path.remove(QRegExp("#\\d+$"));
}
- const char *err = 0;
+ const char *err = nullptr;
gme_type_t file_type;
if((err = gme_identify_file(qPrintable(path),&file_type)))
{
qWarning("GmeHelper: %s", err);
- return 0;
+ return nullptr;
}
if(!file_type)
{
qWarning("DecoderGme: unsupported music type");
- return 0;
+ return nullptr;
}
if(!(m_emu = gme_new_emu(file_type, sample_rate)))
{
qWarning("GmeHelper: out of memory");
- return 0;
+ return nullptr;
}
if((err = gme_load_file(m_emu, qPrintable(path))))
{
qWarning("GmeHelper: %s", err);
- return 0;
+ return nullptr;
}
QString m3u_path = path.left(path.lastIndexOf("."));
m3u_path.append(".m3u");
diff --git a/src/plugins/Input/gme/settingsdialog.h b/src/plugins/Input/gme/settingsdialog.h
index c320153b7..5b4df41da 100644
--- a/src/plugins/Input/gme/settingsdialog.h
+++ b/src/plugins/Input/gme/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
Q_OBJECT
public:
- explicit SettingsDialog(QWidget *parent = 0);
+ explicit SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
public slots:
diff --git a/src/plugins/Input/modplug/archivereader.h b/src/plugins/Input/modplug/archivereader.h
index 3357e1142..7a714e385 100644
--- a/src/plugins/Input/modplug/archivereader.h
+++ b/src/plugins/Input/modplug/archivereader.h
@@ -32,7 +32,7 @@ class ArchiveReader : public QObject
{
Q_OBJECT
public:
- ArchiveReader(QObject *parent = 0);
+ ArchiveReader(QObject *parent = nullptr);
~ArchiveReader();
diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp
index 2c386e7ee..a2924c183 100644
--- a/src/plugins/Input/modplug/decoder_modplug.cpp
+++ b/src/plugins/Input/modplug/decoder_modplug.cpp
@@ -39,16 +39,16 @@
// Decoder class
-DecoderModPlug* DecoderModPlug::m_instance = 0;
+DecoderModPlug* DecoderModPlug::m_instance = nullptr;
-DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(0)
+DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(nullptr)
{
m_path = path;
m_freq = 0;
m_bitrate = 0;
m_totalTime = 0;
m_chan = 0;
- m_soundFile = 0;
+ m_soundFile = nullptr;
m_sampleSize = 0;
m_instance = this;
m_bps = 0;
@@ -60,7 +60,7 @@ DecoderModPlug::~DecoderModPlug()
{
deinit();
if(m_instance == this)
- m_instance = 0;
+ m_instance = nullptr;
}
bool DecoderModPlug::initialize()
@@ -166,7 +166,7 @@ void DecoderModPlug::deinit()
{
m_soundFile->Destroy();
delete m_soundFile;
- m_soundFile = 0;
+ m_soundFile = nullptr;
}
m_input_buf.clear();
}
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp
index 1e3174e88..bcba93e9c 100644
--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
@@ -73,7 +73,7 @@ QList<TrackInfo *> DecoderModPlugFactory::createPlayList(const QString &path, Tr
QByteArray buffer;
- ArchiveReader reader(0);
+ ArchiveReader reader(nullptr);
if (reader.isSupported(path))
{
buffer = reader.unpack(path);
diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp
index 059901e71..9d4248dd6 100644
--- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp
+++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp
@@ -31,7 +31,7 @@
ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path) : MetaDataModel(true)
{
- m_soundFile = 0;
+ m_soundFile = nullptr;
m_path = path;
ArchiveReader reader(nullptr);
if(reader.isSupported(m_path))
diff --git a/src/plugins/Input/modplug/settingsdialog.h b/src/plugins/Input/modplug/settingsdialog.h
index e154aaa32..bbd73129f 100644
--- a/src/plugins/Input/modplug/settingsdialog.h
+++ b/src/plugins/Input/modplug/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp
index 3df2165b3..714ed0d89 100644
--- a/src/plugins/Input/mpc/decoder_mpc.cpp
+++ b/src/plugins/Input/mpc/decoder_mpc.cpp
@@ -66,7 +66,7 @@ DecoderMPC::DecoderMPC(QIODevice *i)
m_len = 0;
m_bitrate = 0;
m_totalTime = 0.0;
- m_data = 0;
+ m_data = nullptr;
}
DecoderMPC::~DecoderMPC()
@@ -77,7 +77,7 @@ DecoderMPC::~DecoderMPC()
if(m_data->demuxer)
mpc_demux_exit(m_data->demuxer);
delete m_data;
- m_data = 0;
+ m_data = nullptr;
}
}
diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp
index fd7b56481..3326bba6e 100644
--- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp
+++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp
@@ -174,7 +174,7 @@ void MPCFileTagModel::setValue(Qmmp::MetaData key, const QString &value)
bool MPCFileTagModel::exists() const
{
- return (m_tag != 0);
+ return (m_tag != nullptr);
}
void MPCFileTagModel::create()
@@ -189,7 +189,7 @@ void MPCFileTagModel::create()
void MPCFileTagModel::remove()
{
- m_tag = 0;
+ m_tag = nullptr;
}
void MPCFileTagModel::save()
diff --git a/src/plugins/Input/mpeg/decoder_mad.cpp b/src/plugins/Input/mpeg/decoder_mad.cpp
index d7625fc70..4e984db58 100644
--- a/src/plugins/Input/mpeg/decoder_mad.cpp
+++ b/src/plugins/Input/mpeg/decoder_mad.cpp
@@ -41,7 +41,7 @@ DecoderMAD::DecoderMAD(QIODevice *i) : Decoder(i)
m_bitrate = 0;
m_freq = 0;
m_len = 0;
- m_input_buf = 0;
+ m_input_buf = nullptr;
m_input_bytes = 0;
m_skip_frames = 0;
m_eof = false;
@@ -56,7 +56,7 @@ DecoderMAD::~DecoderMAD()
{
qDebug("DecoderMAD: deleting input_buf");
delete [] m_input_buf;
- m_input_buf = 0;
+ m_input_buf = nullptr;
}
}
@@ -98,7 +98,7 @@ bool DecoderMAD::initialize()
mad_stream_buffer(&m_stream, (unsigned char *) m_input_buf, m_input_bytes);
m_stream.error = MAD_ERROR_BUFLEN;
mad_frame_mute (&m_frame);
- m_stream.next_frame = 0;
+ m_stream.next_frame = nullptr;
m_stream.sync = 0;
ChannelMap map;
if(m_channels == 1)
@@ -131,7 +131,7 @@ void DecoderMAD::deinit()
if(m_xing.lame)
{
delete m_xing.lame;
- m_xing.lame = 0;
+ m_xing.lame = nullptr;
}
}
@@ -204,17 +204,17 @@ bool DecoderMAD::findXingHeader(struct mad_bitptr ptr, unsigned int bitlen)
DecoderMAD::LameHeader* DecoderMAD::findLameHeader(mad_bitptr ptr, unsigned int bitlen)
{
if(bitlen < 272)
- return 0;
+ return nullptr;
if(mad_bit_read (&ptr, 32) != LAME_MAGIC)
- return 0;
+ return nullptr;
LameHeader header;
mad_bit_skip (&ptr, 40); //version
header.revision = mad_bit_read (&ptr, 4);
if (header.revision == 15)
- return 0;
+ return nullptr;
mad_bit_skip(&ptr, 12); //VBR,Lowpass filter value
header.peak = mad_bit_read(&ptr, 32) << 5; //Peak amplitude
@@ -428,7 +428,7 @@ void DecoderMAD::seek(qint64 pos)
m_stream.error = MAD_ERROR_BUFLEN;
m_stream.sync = 0;
m_input_bytes = 0;
- m_stream.next_frame = 0;
+ m_stream.next_frame = nullptr;
m_skip_frames = 2;
m_skip_bytes = 0;
m_play_bytes = -1;
diff --git a/src/plugins/Input/mpeg/decoder_mad.h b/src/plugins/Input/mpeg/decoder_mad.h
index 9768213a1..8980f1768 100644
--- a/src/plugins/Input/mpeg/decoder_mad.h
+++ b/src/plugins/Input/mpeg/decoder_mad.h
@@ -89,7 +89,7 @@ private:
frames = 0;
bytes = 0;
scale = 0;
- lame = 0;
+ lame = nullptr;
}
};
XingHeader m_xing;
diff --git a/src/plugins/Input/mpeg/decoder_mpg123.cpp b/src/plugins/Input/mpeg/decoder_mpg123.cpp
index 8c6c0cf27..9a1a5f18b 100644
--- a/src/plugins/Input/mpeg/decoder_mpg123.cpp
+++ b/src/plugins/Input/mpeg/decoder_mpg123.cpp
@@ -66,14 +66,14 @@ DecoderMPG123::DecoderMPG123(QIODevice *i) : Decoder(i)
m_rate = 0;
m_frame_info.bitrate = 0;
m_mpg123_encoding = MPG123_ENC_SIGNED_16;
- m_handle = 0;
+ m_handle = nullptr;
m_errors = 0;
}
DecoderMPG123::~DecoderMPG123()
{
cleanup(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
}
bool DecoderMPG123::initialize()
@@ -94,7 +94,7 @@ bool DecoderMPG123::initialize()
}
int channels = 0;
- if(!(m_handle = mpg123_new(0, &err)))
+ if(!(m_handle = mpg123_new(nullptr, &err)))
{
qWarning("DecoderMPG123: basic setup goes wrong: %s", mpg123_plain_strerror(err));
return false;
@@ -102,11 +102,11 @@ bool DecoderMPG123::initialize()
mpg123_param (m_handle, MPG123_ADD_FLAGS, MPG123_SEEKBUFFER | MPG123_FUZZY, 0);
- if((err = mpg123_replace_reader_handle(m_handle, mpg123_read_cb, mpg123_seek_cb, 0)) != MPG123_OK)
+ if((err = mpg123_replace_reader_handle(m_handle, mpg123_read_cb, mpg123_seek_cb, nullptr)) != MPG123_OK)
{
qWarning("DecoderMPG123: mpg123 error: %s", mpg123_plain_strerror(err));
cleanup(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
return false;
}
setMPG123Format(MPG123_ENC_FLOAT_32);
@@ -115,7 +115,7 @@ bool DecoderMPG123::initialize()
{
qWarning("DecoderMPG123: mpg123 error: %s", mpg123_plain_strerror(err));
cleanup(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
return false;
}
@@ -123,7 +123,7 @@ bool DecoderMPG123::initialize()
{
qWarning("DecoderMPG123: mpg123 error: %s", mpg123_plain_strerror(err));
cleanup(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
return false;
}
//check format
@@ -131,7 +131,7 @@ bool DecoderMPG123::initialize()
{
cleanup(m_handle);
qWarning("DecoderMPG123: bad encoding: 0x%x!\n", m_mpg123_encoding);
- m_handle = 0;
+ m_handle = nullptr;
return false;
}
diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp
index 0c1356262..a251fc750 100644
--- a/src/plugins/Input/mpeg/decodermpegfactory.cpp
+++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp
@@ -136,7 +136,7 @@ bool DecoderMPEGFactory::canDecode(QIODevice *input) const
if (decoderName != "mpg123")
{
mpg123_init();
- mpg123_handle *handle = mpg123_new(0, 0);
+ mpg123_handle *handle = mpg123_new(nullptr, nullptr);
if (!handle)
return false;
if(mpg123_open_feed(handle) != MPG123_OK)
@@ -151,7 +151,7 @@ bool DecoderMPEGFactory::canDecode(QIODevice *input) const
return false;
}
size_t out_size = 0;
- int ret = mpg123_decode(handle, (unsigned char*) buf, dataSize, 0, 0, &out_size);
+ int ret = mpg123_decode(handle, (unsigned char*) buf, dataSize, nullptr, 0, &out_size);
mpg123_close(handle);
mpg123_delete(handle);
return ret == MPG123_DONE || ret == MPG123_NEW_FORMAT;
@@ -175,7 +175,7 @@ DecoderProperties DecoderMPEGFactory::properties() const
Decoder *DecoderMPEGFactory::create(const QString &, QIODevice *input)
{
- Decoder *d = 0;
+ Decoder *d = nullptr;
#if defined(WITH_MAD) && defined(WITH_MPG123)
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
if(settings.value("MPEG/decoder", "mad").toString() == "mpg123")
@@ -203,7 +203,7 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track
if(parts == TrackInfo::NoParts)
return QList<TrackInfo*>() << info;
- TagLib::Tag *tag = 0;
+ TagLib::Tag *tag = nullptr;
TagLib::FileStream stream(QStringToFileName(path), true);
TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
@@ -212,7 +212,7 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("MPEG");
- QTextCodec *codec = 0;
+ QTextCodec *codec = nullptr;
uint tag_array[3];
tag_array[0] = settings.value("tag_1", SettingsDialog::ID3v2).toInt();
@@ -324,7 +324,7 @@ QList<TrackInfo *> DecoderMPEGFactory::createPlayList(const QString &path, Track
if(fileRef.ID3v2Tag() && !fileRef.ID3v2Tag()->isEmpty())
{
TagLib::ID3v2::Tag *tag = fileRef.ID3v2Tag();
- TagLib::ID3v2::UserTextIdentificationFrame* frame = 0;
+ TagLib::ID3v2::UserTextIdentificationFrame *frame = nullptr;
TagLib::ID3v2::FrameList frames = tag->frameList("TXXX");
for(TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it)
{
diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
index d4760ea88..a960a15a3 100644
--- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
+++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
@@ -380,7 +380,7 @@ void MpegFileTagModel::setValue(Qmmp::MetaData key, const QString &value)
bool MpegFileTagModel::exists() const
{
- return (m_tag != 0);
+ return (m_tag != nullptr);
}
void MpegFileTagModel::create()
@@ -397,7 +397,7 @@ void MpegFileTagModel::create()
void MpegFileTagModel::remove()
{
- m_tag = 0;
+ m_tag = nullptr;
}
void MpegFileTagModel::save()
diff --git a/src/plugins/Input/mpeg/settingsdialog.h b/src/plugins/Input/mpeg/settingsdialog.h
index cdebaa15a..1a08d76f3 100644
--- a/src/plugins/Input/mpeg/settingsdialog.h
+++ b/src/plugins/Input/mpeg/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(bool using_rusxmms, QWidget *parent = 0);
+ SettingsDialog(bool using_rusxmms, QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/mpeg/tagextractor.cpp b/src/plugins/Input/mpeg/tagextractor.cpp
index 1e1557947..948b57f67 100644
--- a/src/plugins/Input/mpeg/tagextractor.cpp
+++ b/src/plugins/Input/mpeg/tagextractor.cpp
@@ -59,7 +59,7 @@ const QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag()
settings.beginGroup("MPEG");
QByteArray name = settings.value("ID3v2_encoding","UTF-8").toByteArray ();
bool utf = false;
- QTextCodec *codec = 0;
+ QTextCodec *codec = nullptr;
if (name.contains("UTF"))
{
codec = QTextCodec::codecForName ("UTF-8");
diff --git a/src/plugins/Input/opus/decoder_opus.cpp b/src/plugins/Input/opus/decoder_opus.cpp
index 1c68f7e55..92852afef 100644
--- a/src/plugins/Input/opus/decoder_opus.cpp
+++ b/src/plugins/Input/opus/decoder_opus.cpp
@@ -67,7 +67,7 @@ static opus_int64 opustell(void *src)
DecoderOpus::DecoderOpus(const QString &url, QIODevice *i) : Decoder(i)
{
m_totalTime = 0;
- m_opusfile = 0;
+ m_opusfile = nullptr;
m_chan = 0;
m_bitrate = 0;
m_url = url;
@@ -77,7 +77,7 @@ DecoderOpus::~DecoderOpus()
{
if (m_opusfile)
op_free(m_opusfile);
- m_opusfile = 0;
+ m_opusfile = nullptr;
}
bool DecoderOpus::initialize()
@@ -97,9 +97,9 @@ bool DecoderOpus::initialize()
opusread,
opusseek,
opustell,
- 0,
+ nullptr,
};
- m_opusfile = op_open_callbacks(this, &opuscb, 0, 0, 0);
+ m_opusfile = op_open_callbacks(this, &opuscb, nullptr, 0, nullptr);
if (!m_opusfile)
{
@@ -150,7 +150,7 @@ void DecoderOpus::seek(qint64 time)
qint64 DecoderOpus::read(unsigned char *data, qint64 maxSize)
{
- int frames = op_read_float(m_opusfile, (float*) data, maxSize / sizeof(float), 0);
+ int frames = op_read_float(m_opusfile, (float*) data, maxSize / sizeof(float), nullptr);
m_bitrate = op_bitrate_instant(m_opusfile) / 1000;
return frames * m_chan * sizeof(float);
}
diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp
index 6fa67f577..889c762d3 100644
--- a/src/plugins/Input/sid/decoder_sid.cpp
+++ b/src/plugins/Input/sid/decoder_sid.cpp
@@ -32,7 +32,7 @@
#include "decoder_sid.h"
// Decoder class
-DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(0)
+DecoderSID::DecoderSID(SidDatabase *db, const QString &url) : Decoder(), m_tune(nullptr)
{
m_db = db;
m_url = url;
@@ -102,7 +102,7 @@ bool DecoderSID::initialize()
qDebug("DecoderSID: song length: %d", m_length);
- sidbuilder *rs = 0;
+ sidbuilder *rs = nullptr;
if(settings.value("engine", "residfp").toString() == "residfp")
{
rs = new ReSIDfpBuilder("ReSIDfp builder");
diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp
index fa54057d8..c30c7ff6b 100644
--- a/src/plugins/Input/sid/decodersidfactory.cpp
+++ b/src/plugins/Input/sid/decodersidfactory.cpp
@@ -100,7 +100,7 @@ MetaDataModel* DecoderSIDFactory::createMetaDataModel(const QString &path, bool
{
Q_UNUSED(path);
Q_UNUSED(readOnly);
- return 0;
+ return nullptr;
}
void DecoderSIDFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/sid/settingsdialog.h b/src/plugins/Input/sid/settingsdialog.h
index 8bbdf3fec..01f784692 100644
--- a/src/plugins/Input/sid/settingsdialog.h
+++ b/src/plugins/Input/sid/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(SidDatabase *db, QWidget *parent = 0);
+ SettingsDialog(SidDatabase *db, QWidget *parent = nullptr);
virtual ~SettingsDialog();
diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp
index 999edcbcf..9700b671f 100644
--- a/src/plugins/Input/sid/sidhelper.cpp
+++ b/src/plugins/Input/sid/sidhelper.cpp
@@ -24,7 +24,7 @@
SIDHelper::SIDHelper(SidDatabase *db)
{
- m_tune = 0;
+ m_tune = nullptr;
m_db = db;
}
@@ -32,7 +32,7 @@ SIDHelper::~SIDHelper()
{
if(m_tune)
delete m_tune;
- m_tune = 0;
+ m_tune = nullptr;
}
SidTune *SIDHelper::load(const QString &url)
@@ -40,7 +40,7 @@ SidTune *SIDHelper::load(const QString &url)
if(m_tune)
{
delete m_tune;
- m_tune = 0;
+ m_tune = nullptr;
}
QString path = url;
int track = 1;
diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp
index d90859454..45607cb24 100644
--- a/src/plugins/Input/sndfile/decoder_sndfile.cpp
+++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp
@@ -79,7 +79,7 @@ DecoderSndFile::DecoderSndFile(QIODevice *input) : Decoder(input)
//m_path = input;
m_bitrate = 0;
m_totalTime = 0;
- m_sndfile = 0;
+ m_sndfile = nullptr;
m_freq = 0;
}
@@ -118,7 +118,7 @@ bool DecoderSndFile::initialize()
m_bitrate = input()->size () * 8.0 / m_totalTime + 0.5;
if((snd_info.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT)
- sf_command (m_sndfile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE);
+ sf_command (m_sndfile, SFC_SET_SCALE_FLOAT_INT_READ, nullptr, SF_TRUE);
configure(m_freq, chan, Qmmp::PCM_S16LE);
qDebug("DecoderSndFile: detected format: %08X", snd_info.format);
@@ -133,7 +133,7 @@ void DecoderSndFile::deinit()
m_freq = 0;
if (m_sndfile)
sf_close(m_sndfile);
- m_sndfile = 0;
+ m_sndfile = nullptr;
}
qint64 DecoderSndFile::totalTime() const
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
index f786e091a..23084bb63 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
@@ -141,7 +141,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr
return QList<TrackInfo*>() << info;
SF_INFO snd_info;
- SNDFILE *sndfile = 0;
+ SNDFILE *sndfile = nullptr;
memset(&snd_info, 0, sizeof(snd_info));
snd_info.format = 0;
#ifdef Q_OS_WIN
@@ -201,7 +201,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr
SF_FORMAT_INFO format_info;
memset(&format_info, 0, sizeof(format_info));
format_info.format = (snd_info.format & SF_FORMAT_TYPEMASK);
- sf_command(0, SFC_GET_FORMAT_INFO, &format_info, sizeof(format_info));
+ sf_command(nullptr, SFC_GET_FORMAT_INFO, &format_info, sizeof(format_info));
info->setValue(Qmmp::FORMAT_NAME, QString::fromLatin1(format_info.name));
info->setDuration(int(snd_info.frames * 1000 / snd_info.samplerate));
}
@@ -212,7 +212,7 @@ QList<TrackInfo *> DecoderSndFileFactory::createPlayList(const QString &path, Tr
MetaDataModel* DecoderSndFileFactory::createMetaDataModel(const QString&, bool)
{
- return 0;
+ return nullptr;
}
void DecoderSndFileFactory::showSettings(QWidget *)
@@ -221,7 +221,7 @@ void DecoderSndFileFactory::showSettings(QWidget *)
void DecoderSndFileFactory::showAbout(QWidget *parent)
{
char version [128] = { 0 };
- sf_command (NULL, SFC_GET_LIB_VERSION, version, sizeof (version)) ;
+ sf_command (nullptr, SFC_GET_LIB_VERSION, version, sizeof (version)) ;
QMessageBox::about (parent, tr("About Sndfile Audio Plugin"),
tr("Qmmp Sndfile Audio Plugin")+"\n"+
tr("Compiled against")+" "+QString(version)+"\n" +
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index 063398500..37f795192 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -103,7 +103,7 @@ bool DecoderVorbis::initialize()
oggclose,
oggtell
};
- if (ov_open_callbacks(this, &oggfile, NULL, 0, oggcb) < 0)
+ if (ov_open_callbacks(this, &oggfile, nullptr, 0, oggcb) < 0)
{
qWarning("DecoderVorbis: cannot open stream");
@@ -285,7 +285,7 @@ void DecoderVorbis::seek(qint64 time)
qint64 DecoderVorbis::read(unsigned char *data, qint64 maxSize)
{
len = -1;
- float **pcm = 0;
+ float **pcm = nullptr;
int section = 0;
while (len < 0)
len = ov_read_float(&oggfile, &pcm, maxSize/sizeof(float), &section);
diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp
index e97e1b95b..5ca7a1c50 100644
--- a/src/plugins/Input/wavpack/decoder_wavpack.cpp
+++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp
@@ -38,9 +38,9 @@ DecoderWavPack::DecoderWavPack(const QString &path)
m_path = path;
m_totalTime = 0.0;
m_chan = 0;
- m_context = 0;
- m_parser = 0;
- m_output_buf = 0;
+ m_context = nullptr;
+ m_parser = nullptr;
+ m_output_buf = nullptr;
m_length_in_bytes = 0;
m_totalBytes = 0;
m_frame_size = 0;
@@ -54,7 +54,7 @@ DecoderWavPack::~DecoderWavPack()
deinit();
if (m_output_buf)
delete [] m_output_buf;
- m_output_buf = 0;
+ m_output_buf = nullptr;
}
bool DecoderWavPack::initialize()
@@ -79,7 +79,7 @@ bool DecoderWavPack::initialize()
qWarning("DecoderWavPack: error: %s", err);
return false;
}
- int cue_len = WavpackGetTagItem (m_context, "cuesheet", NULL, 0);
+ int cue_len = WavpackGetTagItem (m_context, "cuesheet", nullptr, 0);
char *value;
if (cue_len)
{
@@ -173,10 +173,10 @@ void DecoderWavPack::deinit()
m_chan = 0;
if (m_context)
WavpackCloseFile (m_context);
- m_context = 0;
+ m_context = nullptr;
if(m_parser)
delete m_parser;
- m_parser = 0;
+ m_parser = nullptr;
}
void DecoderWavPack::seek(qint64 time)
diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
index f63ccc54d..139fe7494 100644
--- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
+++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
@@ -96,7 +96,7 @@ QList<TrackInfo *> DecoderWavPackFactory::createPlayList(const QString &path, Tr
if(parts & TrackInfo::MetaData)
{
- cue_len = WavpackGetTagItem (ctx, "cuesheet", NULL, 0);
+ cue_len = WavpackGetTagItem (ctx, "cuesheet", nullptr, 0);
if (cue_len)
{
delete info;
@@ -165,7 +165,7 @@ MetaDataModel* DecoderWavPackFactory::createMetaDataModel(const QString &path, b
if (!path.contains("://") || path.startsWith("wvpack://"))
return new WavPackMetaDataModel(path, readOnly);
else
- return 0;
+ return nullptr;
}
void DecoderWavPackFactory::showSettings(QWidget *)
diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
index 198175d4c..f3c2e459c 100644
--- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
+++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
@@ -26,7 +26,7 @@
DecoderWildMidi::DecoderWildMidi(const QString &path) : Decoder()
{
m_path = path;
- midi_ptr = 0;
+ midi_ptr = nullptr;
m_sample_rate = 0;
}
diff --git a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
index c57d14c49..540846af5 100644
--- a/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
+++ b/src/plugins/Input/wildmidi/decoderwildmidifactory.cpp
@@ -92,7 +92,7 @@ MetaDataModel* DecoderWildMidiFactory::createMetaDataModel(const QString &path,
{
Q_UNUSED(path);
Q_UNUSED(readOnly);
- return 0;
+ return nullptr;
}
void DecoderWildMidiFactory::showSettings(QWidget *parent)
diff --git a/src/plugins/Input/wildmidi/settingsdialog.h b/src/plugins/Input/wildmidi/settingsdialog.h
index 2b706f1f3..d190ebe7d 100644
--- a/src/plugins/Input/wildmidi/settingsdialog.h
+++ b/src/plugins/Input/wildmidi/settingsdialog.h
@@ -31,7 +31,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp
index 612e544f7..812930561 100644
--- a/src/plugins/Input/wildmidi/wildmidihelper.cpp
+++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp
@@ -26,7 +26,7 @@ extern "C"{
#include <qmmp/qmmp.h>
#include "wildmidihelper.h"
-WildMidiHelper *WildMidiHelper::m_instance = 0;
+WildMidiHelper *WildMidiHelper::m_instance = nullptr;
WildMidiHelper::WildMidiHelper(QObject *parent) :
QObject(parent)
@@ -40,7 +40,7 @@ WildMidiHelper::~WildMidiHelper()
{
if(m_inited)
WildMidi_Shutdown();
- m_instance = 0;
+ m_instance = nullptr;
}
bool WildMidiHelper::initialize()
diff --git a/src/plugins/Input/wildmidi/wildmidihelper.h b/src/plugins/Input/wildmidi/wildmidihelper.h
index 9c4141ecd..7d50775c7 100644
--- a/src/plugins/Input/wildmidi/wildmidihelper.h
+++ b/src/plugins/Input/wildmidi/wildmidihelper.h
@@ -29,7 +29,7 @@ class WildMidiHelper : public QObject
{
Q_OBJECT
public:
- explicit WildMidiHelper(QObject *parent = 0);
+ explicit WildMidiHelper(QObject *parent = nullptr);
~WildMidiHelper();
bool initialize();
void readSettings();
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 92f3ede32..3499097ea 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -39,8 +39,8 @@ OutputALSA::OutputALSA() : m_inited(false)
QString dev_name = settings.value("ALSA/device","default").toString();
m_use_mmap = settings.value("ALSA/use_mmap", false).toBool();
pcm_name = strdup(dev_name.toLatin1().data());
- pcm_handle = 0;
- m_prebuf = 0;
+ pcm_handle = nullptr;
+ m_prebuf = nullptr;
m_prebuf_size = 0;
m_prebuf_fill = 0;
m_can_pause = false;
@@ -90,8 +90,8 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
bool use_pause = settings.value("use_snd_pcm_pause", false).toBool();
settings.endGroup();
- snd_pcm_hw_params_t *hwparams = 0;
- snd_pcm_sw_params_t *swparams = 0;
+ snd_pcm_hw_params_t *hwparams = nullptr;
+ snd_pcm_sw_params_t *swparams = nullptr;
int err; //alsa error code
//hw params
@@ -143,7 +143,7 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
}
exact_rate = rate;
- if ((err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, 0)) < 0)
+ if ((err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, nullptr)) < 0)
{
qWarning("OutputALSA: Error setting rate: %s", snd_strerror(err));
return false;
@@ -164,12 +164,12 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
qWarning("OutputALSA: The channel number %d is not supported by your hardware", map.count());
qWarning("==> Using %d instead.", c);
}
- if ((err = snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_time ,0)) < 0)
+ if ((err = snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_time, nullptr)) < 0)
{
qWarning("OutputALSA: Error setting period time: %s", snd_strerror(err));
return false;
}
- if ((err = snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time ,0)) < 0)
+ if ((err = snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams, &buffer_time, nullptr)) < 0)
{
qWarning("OutputALSA: Error setting buffer time: %s", snd_strerror(err));
return false;
@@ -187,7 +187,7 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
qWarning("OutputALSA: Error reading buffer size: %s", snd_strerror(err));
return false;
}
- if ((err = snd_pcm_hw_params_get_period_size(hwparams, &period_size, 0)) < 0)
+ if ((err = snd_pcm_hw_params_get_period_size(hwparams, &period_size, nullptr)) < 0)
{
qWarning("OutputALSA: Error reading period size: %s", snd_strerror(err));
return false;
@@ -389,18 +389,18 @@ void OutputALSA::uninitialize()
snd_pcm_drop(pcm_handle);
qDebug("OutputALSA: closing pcm_handle");
snd_pcm_close(pcm_handle);
- pcm_handle = 0;
+ pcm_handle = nullptr;
}
if (m_prebuf)
free(m_prebuf);
- m_prebuf = 0;
+ m_prebuf = nullptr;
}
/* ****** MIXER ******* */
VolumeALSA::VolumeALSA()
{
//alsa mixer
- m_mixer = 0;
+ m_mixer = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
QString card = settings.value("ALSA/mixer_card","hw:0").toString();
QString dev = settings.value("ALSA/mixer_device", "PCM").toString();
@@ -443,7 +443,7 @@ int VolumeALSA::setupMixer(QString card, QString device)
{
char *name;
int err, index;
- pcm_element = 0;
+ pcm_element = nullptr;
qDebug("OutputALSA: setupMixer()");
@@ -543,7 +543,7 @@ int VolumeALSA::getMixer(snd_mixer_t **mixer, QString card)
qPrintable(card), snd_strerror(-err));
return -1;
}
- if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+ if ((err = snd_mixer_selem_register(*mixer, nullptr, nullptr)) < 0)
{
qWarning("OutputALSA: Failed to register mixer: %s",
snd_strerror(-err));
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index df46925f3..c6e9a82e7 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -90,7 +90,7 @@ void SettingsDialog::getCards()
void SettingsDialog::getSoftDevices()
{
- void **hints = 0;
+ void **hints = nullptr;
int i = 0;
if(snd_device_name_hint(-1, "pcm", &hints) < 0)
@@ -247,7 +247,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
"Attaching to mixer %s failed: %s", qPrintable(card), snd_strerror(-err));
return -1;
}
- if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+ if ((err = snd_mixer_selem_register(*mixer, nullptr, nullptr)) < 0)
{
qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
"Failed to register mixer: %s", snd_strerror(-err));
@@ -260,7 +260,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
return -1;
}
- return (*mixer != NULL);
+ return (*mixer != nullptr);
}
void SettingsDialog::showMixerDevices(int d)
diff --git a/src/plugins/Output/alsa/settingsdialog.h b/src/plugins/Output/alsa/settingsdialog.h
index f71912599..60b85d99c 100644
--- a/src/plugins/Output/alsa/settingsdialog.h
+++ b/src/plugins/Output/alsa/settingsdialog.h
@@ -35,7 +35,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 2995e4290..a388980ea 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -41,7 +41,7 @@ Output* OutputJACKFactory::create()
Volume *OutputJACKFactory::createVolume()
{
- return 0;
+ return nullptr;
}
void OutputJACKFactory::showSettings(QWidget*)
diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp
index b7a96921b..9f2e8a9ac 100644
--- a/src/plugins/Output/null/outputnullfactory.cpp
+++ b/src/plugins/Output/null/outputnullfactory.cpp
@@ -41,7 +41,7 @@ Output* OutputNullFactory::create()
Volume *OutputNullFactory::createVolume()
{
- return 0;
+ return nullptr;
}
void OutputNullFactory::showSettings(QWidget* parent)
diff --git a/src/plugins/Output/oss/settingsdialog.h b/src/plugins/Output/oss/settingsdialog.h
index b68767f46..36f088f1e 100644
--- a/src/plugins/Output/oss/settingsdialog.h
+++ b/src/plugins/Output/oss/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp
index b353e16b5..291243d68 100644
--- a/src/plugins/Output/oss4/outputoss4.cpp
+++ b/src/plugins/Output/oss4/outputoss4.cpp
@@ -44,8 +44,8 @@ extern "C"
#include <qmmp/visual.h>
#include "outputoss4.h"
-OutputOSS4 *OutputOSS4::m_instance = 0;
-VolumeOSS4 *OutputOSS4::m_vc = 0;
+OutputOSS4 *OutputOSS4::m_instance = nullptr;
+VolumeOSS4 *OutputOSS4::m_vc = nullptr;
Qmmp::ChannelPosition OutputOSS4::m_oss_pos[16] =
{
Qmmp::CHAN_NULL, //0 = null
@@ -83,7 +83,7 @@ OutputOSS4::~OutputOSS4()
close(m_audio_fd);
m_audio_fd = -1;
}
- m_instance = 0;
+ m_instance = nullptr;
}
int OutputOSS4::fd()
@@ -108,7 +108,7 @@ void OutputOSS4::sync()
bool OutputOSS4::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
{
- m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY);
+ m_audio_fd = open(m_audio_device.toLatin1().constData(), O_WRONLY);
if (m_audio_fd < 0)
{
@@ -209,7 +209,7 @@ VolumeOSS4::~VolumeOSS4()
{
VolumeSettings vol = volume();
m_volume = (vol.right << 8) | vol.left;
- OutputOSS4::m_vc = 0;
+ OutputOSS4::m_vc = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.setValue("OSS4/volume", m_volume);
}
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index a243ca877..938b49caf 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -25,14 +25,14 @@ extern "C"{
#include <QSettings>
#include "outputpulseaudio.h"
-OutputPulseAudio *OutputPulseAudio::instance = 0;
-VolumePulseAudio *OutputPulseAudio::volumeControl = 0;
+OutputPulseAudio *OutputPulseAudio::instance = nullptr;
+VolumePulseAudio *OutputPulseAudio::volumeControl = nullptr;
OutputPulseAudio::OutputPulseAudio(): Output()
{
- m_loop = 0;
- m_ctx = 0;
- m_stream = 0;
+ m_loop = nullptr;
+ m_ctx = nullptr;
+ m_stream = nullptr;
m_pa_channels[Qmmp::CHAN_NULL] = PA_CHANNEL_POSITION_INVALID;
m_pa_channels[Qmmp::CHAN_FRONT_CENTER] = PA_CHANNEL_POSITION_MONO;
@@ -52,7 +52,7 @@ OutputPulseAudio::OutputPulseAudio(): Output()
OutputPulseAudio::~OutputPulseAudio()
{
uninitialize();
- instance = 0;
+ instance = nullptr;
}
bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
@@ -69,7 +69,7 @@ bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForma
return false;
}
- if(pa_context_connect(m_ctx, 0, (pa_context_flags_t)0, 0) < 0)
+ if(pa_context_connect(m_ctx, nullptr, (pa_context_flags_t)0, nullptr) < 0)
{
qWarning("OutputPulseAudio: unable to connect the context: %s", pa_strerror(pa_context_errno(m_ctx)));
return false;
@@ -129,14 +129,14 @@ bool OutputPulseAudio::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForma
attr.fragsize = attr.tlength;
pa_stream_flags_t flags = pa_stream_flags_t(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE);
- pa_cvolume *pvol = 0;
+ pa_cvolume *pvol = nullptr;
pa_cvolume vol;
if(volumeControl)
{
vol = VolumePulseAudio::volumeSettingsToCvolume(volumeControl->volume(), map.count());
pvol = &vol;
}
- if(pa_stream_connect_playback(m_stream, 0, &attr, flags, pvol, 0) < 0)
+ if(pa_stream_connect_playback(m_stream, nullptr, &attr, flags, pvol, nullptr) < 0)
{
qWarning("OutputPulseAudio: unable to connect playback: %s", pa_strerror(pa_context_errno(m_ctx)));
return false;
@@ -191,7 +191,7 @@ qint64 OutputPulseAudio::writeAudio(unsigned char *data, qint64 maxSize)
}
size_t length = qMin(size_t(maxSize), pa_stream_writable_size(m_stream));
- if(pa_stream_write(m_stream, data, length, 0, 0, PA_SEEK_RELATIVE) < 0)
+ if(pa_stream_write(m_stream, data, length, nullptr, 0, PA_SEEK_RELATIVE) < 0)
{
qWarning("OutputPulseAudio: pa_stream_write failed: %s", pa_strerror(pa_context_errno(m_ctx)));
return -1;
@@ -201,25 +201,25 @@ qint64 OutputPulseAudio::writeAudio(unsigned char *data, qint64 maxSize)
void OutputPulseAudio::drain()
{
- pa_operation *op = pa_stream_drain(m_stream, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_drain(m_stream, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
void OutputPulseAudio::reset()
{
- pa_operation *op = pa_stream_flush(m_stream, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_flush(m_stream, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
void OutputPulseAudio::suspend()
{
- pa_operation *op = pa_stream_cork(m_stream, 1, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_cork(m_stream, 1, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
void OutputPulseAudio::resume()
{
- pa_operation *op = pa_stream_cork(m_stream, 0, OutputPulseAudio::stream_success_cb, 0);
+ pa_operation *op = pa_stream_cork(m_stream, 0, OutputPulseAudio::stream_success_cb, nullptr);
process(op);
}
@@ -227,7 +227,7 @@ void OutputPulseAudio::setVolume(const VolumeSettings &v)
{
pa_cvolume volume = VolumePulseAudio::volumeSettingsToCvolume(v, audioParameters().channels());
pa_operation *op = pa_context_set_sink_input_volume(m_ctx, pa_stream_get_index(m_stream), &volume,
- OutputPulseAudio::context_success_cb, 0);
+ OutputPulseAudio::context_success_cb, nullptr);
pa_operation_unref(op);
}
@@ -237,20 +237,20 @@ void OutputPulseAudio::uninitialize()
{
pa_stream_disconnect(m_stream);
pa_stream_unref(m_stream);
- m_stream = 0;
+ m_stream = nullptr;
}
if(m_ctx)
{
pa_context_disconnect(m_ctx);
pa_context_unref(m_ctx);
- m_ctx = 0;
+ m_ctx = nullptr;
}
if(m_loop)
{
pa_mainloop_free(m_loop);
- m_loop = 0;
+ m_loop = nullptr;
}
}
@@ -291,7 +291,7 @@ void OutputPulseAudio::subscribe_cb(pa_context *ctx, pa_subscription_event_type
t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_CHANGE)))
return;
- if(!(op = pa_context_get_sink_input_info (ctx, index, OutputPulseAudio::info_cb, 0)))
+ if(!(op = pa_context_get_sink_input_info (ctx, index, OutputPulseAudio::info_cb, nullptr)))
{
qWarning("OutputPulseAudio: pa_context_get_sink_input_info failed: %s", pa_strerror(pa_context_errno(ctx)));
return;
@@ -338,7 +338,7 @@ VolumePulseAudio::~VolumePulseAudio()
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.setValue("PulseAudio/left_volume", m_volume.left);
settings.setValue("PulseAudio/right_volume", m_volume.right);
- OutputPulseAudio::volumeControl = 0;
+ OutputPulseAudio::volumeControl = nullptr;
}
void VolumePulseAudio::updateVolume(const pa_cvolume &v)
diff --git a/src/plugins/Output/shout/outputshoutfactory.cpp b/src/plugins/Output/shout/outputshoutfactory.cpp
index 47937a7a9..07d3e44e8 100644
--- a/src/plugins/Output/shout/outputshoutfactory.cpp
+++ b/src/plugins/Output/shout/outputshoutfactory.cpp
@@ -50,7 +50,7 @@ Output* OutputShoutFactory::create()
Volume *OutputShoutFactory::createVolume()
{
- return 0;
+ return nullptr;
}
void OutputShoutFactory::showSettings(QWidget* parent)
@@ -63,7 +63,7 @@ void OutputShoutFactory::showAbout(QWidget *parent)
{
QMessageBox::about (parent, tr("About Icecast Output Plugin"),
tr("Qmmp Icecast Output Plugin")+"\n"+
- tr("Compiled against libshout-%1").arg(shout_version(0,0,0))+"\n"+
+ tr("Compiled against libshout-%1").arg(shout_version(nullptr,nullptr,nullptr))+"\n"+
tr("Written by: Ilya Kotov <forkotov02@ya.ru>"));
}
diff --git a/src/plugins/Output/shout/settingsdialog.h b/src/plugins/Output/shout/settingsdialog.h
index 0228a4abf..4e44cfd2a 100644
--- a/src/plugins/Output/shout/settingsdialog.h
+++ b/src/plugins/Output/shout/settingsdialog.h
@@ -32,7 +32,7 @@ class SettingsDialog : public QDialog
Q_OBJECT
public:
- explicit SettingsDialog(QWidget *parent = 0);
+ explicit SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
public slots:
diff --git a/src/plugins/Output/shout/shoutoutput.cpp b/src/plugins/Output/shout/shoutoutput.cpp
index 6be627357..9ca6e9a95 100644
--- a/src/plugins/Output/shout/shoutoutput.cpp
+++ b/src/plugins/Output/shout/shoutoutput.cpp
@@ -28,11 +28,11 @@
ShoutOutput::ShoutOutput(ShoutClient *m)
{
m_client = m;
- m_soxr = 0;
+ m_soxr = nullptr;
m_ratio = 0;
- m_soxr_buf = 0;
+ m_soxr_buf = nullptr;
m_soxr_buf_frames = 0;
- qsrand(time(NULL));
+ qsrand(time(nullptr));
}
ShoutOutput::~ShoutOutput()
@@ -46,12 +46,12 @@ ShoutOutput::~ShoutOutput()
if(m_soxr)
{
soxr_delete(m_soxr);
- m_soxr = 0;
+ m_soxr = nullptr;
}
if(m_soxr_buf)
{
free(m_soxr_buf);
- m_soxr_buf = 0;
+ m_soxr_buf = nullptr;
}
}
@@ -63,7 +63,7 @@ bool ShoutOutput::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat)
if(freq != outFreq)
{
- m_soxr = soxr_create(freq, outFreq, map.size(), 0, 0, 0, 0);
+ m_soxr = soxr_create(freq, outFreq, map.size(), nullptr, nullptr, nullptr, nullptr);
m_ratio = (double)outFreq/freq;
}
@@ -90,7 +90,7 @@ qint64 ShoutOutput::writeAudio(unsigned char *data, qint64 maxSize)
{
int chan = channels();
int frames = maxSize / chan / sizeof(float);
- float *input_data = 0;
+ float *input_data = nullptr;
if(m_soxr)
{
@@ -102,7 +102,7 @@ qint64 ShoutOutput::writeAudio(unsigned char *data, qint64 maxSize)
}
size_t done = 0;
- soxr_process(m_soxr, data, frames, 0, m_soxr_buf, m_soxr_buf_frames, &done);
+ soxr_process(m_soxr, data, frames, nullptr, m_soxr_buf, m_soxr_buf_frames, &done);
input_data = m_soxr_buf;
if(done == 0) //soxr requires more data
return maxSize;
@@ -136,7 +136,7 @@ qint64 ShoutOutput::writeAudio(unsigned char *data, qint64 maxSize)
while(ok && vorbis_analysis_blockout(&m_vd, &m_vb) == 1)
{
// analysis, assume we want to use bitrate management
- vorbis_analysis(&m_vb, NULL);
+ vorbis_analysis(&m_vb, nullptr);
vorbis_bitrate_addblock(&m_vb);
while(ok && vorbis_bitrate_flushpacket(&m_vd, &m_op))
@@ -214,7 +214,7 @@ void ShoutOutput::setTrackInfo(const QMap<Qmmp::MetaData, QString> &metaData)
{ Qmmp::YEAR, "date"},
{ Qmmp::COMPOSER, "composer"},
{ Qmmp::DISCNUMBER, "discnumber"},
- { Qmmp::UNKNOWN, 0}
+ { Qmmp::UNKNOWN, nullptr}
};
int i = 0;
diff --git a/src/plugins/Output/wasapi/settingsdialog.h b/src/plugins/Output/wasapi/settingsdialog.h
index 491f7e917..61dadeebb 100644
--- a/src/plugins/Output/wasapi/settingsdialog.h
+++ b/src/plugins/Output/wasapi/settingsdialog.h
@@ -28,7 +28,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- explicit SettingsDialog(QWidget *parent = 0);
+ explicit SettingsDialog(QWidget *parent = nullptr);
public slots:
void accept();
diff --git a/src/plugins/Transports/http/httpinputfactory.h b/src/plugins/Transports/http/httpinputfactory.h
index 215bacb56..5e5e37d52 100644
--- a/src/plugins/Transports/http/httpinputfactory.h
+++ b/src/plugins/Transports/http/httpinputfactory.h
@@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0")
Q_INTERFACES(InputSourceFactory)
public:
InputSourceProperties properties() const;
- InputSource *create(const QString &url, QObject *parent = 0);
+ InputSource *create(const QString &url, QObject *parent = nullptr);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h
index d109589f3..809b27ac5 100644
--- a/src/plugins/Transports/http/httpinputsource.h
+++ b/src/plugins/Transports/http/httpinputsource.h
@@ -32,7 +32,7 @@ class HTTPInputSource : public InputSource
{
Q_OBJECT
public:
- HTTPInputSource(const QString &path, QObject *parent = 0);
+ HTTPInputSource(const QString &path, QObject *parent = nullptr);
QIODevice *ioDevice();
bool initialize();
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index 258d8c035..eb54bfeb8 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -142,11 +142,11 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent)
curl_global_init(CURL_GLOBAL_ALL);
m_stream.buf_fill = 0;
m_stream.buf_size = 0;
- m_stream.buf = 0;
+ m_stream.buf = nullptr;
m_stream.icy_meta_data = false;
m_stream.aborted = true;
m_stream.icy_metaint = 0;
- m_handle = 0;
+ m_handle = nullptr;
m_metacount = 0;
m_meta_sent = false;
m_ready = false;
@@ -162,8 +162,8 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent)
if (!m_codec)
m_codec = QTextCodec::codecForName ("UTF-8");
#ifdef WITH_ENCA
- m_analyser = 0;
- m_prevCodec = 0;
+ m_analyser = nullptr;
+ m_prevCodec = nullptr;
if(settings.value("use_enca", false).toBool())
m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
if(m_analyser)
@@ -182,7 +182,7 @@ HttpStreamReader::~HttpStreamReader()
if (m_stream.buf)
free(m_stream.buf);
- m_stream.buf = 0;
+ m_stream.buf = nullptr;
#ifdef WITH_ENCA
if(m_analyser)
enca_analyser_free(m_analyser);
@@ -307,7 +307,7 @@ void HttpStreamReader::abort()
if (m_handle)
{
curl_easy_cleanup(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
}
QIODevice::close();
}
@@ -368,15 +368,15 @@ void HttpStreamReader::run()
// error message
curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, errorBuffer);
- struct curl_slist *http200_aliases = curl_slist_append(NULL, "ICY");
- struct curl_slist *http_headers = curl_slist_append(NULL, "Icy-MetaData: 1");
+ struct curl_slist *http200_aliases = curl_slist_append(nullptr, "ICY");
+ struct curl_slist *http_headers = curl_slist_append(nullptr, "Icy-MetaData: 1");
curl_easy_setopt(m_handle, CURLOPT_HTTP200ALIASES, http200_aliases);
curl_easy_setopt(m_handle, CURLOPT_HTTPHEADER, http_headers);
m_mutex.lock();
if(m_stream.buf)
{
free(m_stream.buf);
- m_stream.buf = 0;
+ m_stream.buf = nullptr;
}
m_stream.buf_fill = 0;
m_stream.buf_size = m_prebuffer_size * 2;
diff --git a/src/plugins/Transports/http/settingsdialog.h b/src/plugins/Transports/http/settingsdialog.h
index ae6c66f1b..d85dc2d69 100644
--- a/src/plugins/Transports/http/settingsdialog.h
+++ b/src/plugins/Transports/http/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h
index d9f083262..da9698eb6 100644
--- a/src/plugins/Transports/mms/mmsinputfactory.h
+++ b/src/plugins/Transports/mms/mmsinputfactory.h
@@ -35,7 +35,7 @@ Q_PLUGIN_METADATA(IID "org.qmmp.qmmp.InputSourceFactoryInterface.1.0")
Q_INTERFACES(InputSourceFactory)
public:
InputSourceProperties properties() const;
- InputSource *create(const QString &url, QObject *parent = 0);
+ InputSource *create(const QString &url, QObject *parent = nullptr);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
QString translation() const;
diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h
index c7105a6c5..d125a2c45 100644
--- a/src/plugins/Transports/mms/mmsinputsource.h
+++ b/src/plugins/Transports/mms/mmsinputsource.h
@@ -32,7 +32,7 @@ class MMSInputSource : public InputSource
{
Q_OBJECT
public:
- MMSInputSource(const QString &path, QObject *parent = 0);
+ MMSInputSource(const QString &path, QObject *parent = nullptr);
QIODevice *ioDevice();
bool initialize();
diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp
index 73bb1bdbb..1acbbdb4c 100644
--- a/src/plugins/Transports/mms/mmsstreamreader.cpp
+++ b/src/plugins/Transports/mms/mmsstreamreader.cpp
@@ -31,7 +31,7 @@ MMSStreamReader::MMSStreamReader(const QString &url, MMSInputSource *parent) : Q
{
m_parent = parent;
m_url = url;
- m_handle = 0;
+ m_handle = nullptr;
m_aborted = false;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_prebuf_size = settings.value("MMS/buffer_size",384).toInt() * 1024;
@@ -47,7 +47,7 @@ MMSStreamReader::~MMSStreamReader()
qDebug("%s", Q_FUNC_INFO);
abort();
free(m_buffer);
- m_buffer = 0;
+ m_buffer = nullptr;
m_buffer_at = 0;
m_buffer_size = 0;
}
@@ -128,7 +128,7 @@ void MMSStreamReader::abort()
m_ready = false;
if (m_handle)
mmsx_close(m_handle);
- m_handle = 0;
+ m_handle = nullptr;
}
qint64 MMSStreamReader::bytesAvailable() const
@@ -140,7 +140,7 @@ void MMSStreamReader::run()
{
int to_read = 1024;
char prebuf[to_read];
- m_handle = mmsx_connect (0, 0, m_url.toLocal8Bit().constData(), 128 * 1024);
+ m_handle = mmsx_connect (nullptr, nullptr, m_url.toLocal8Bit().constData(), 128 * 1024);
if(!m_handle)
{
qWarning("MMSStreamReader: connection failed");
@@ -168,7 +168,7 @@ void MMSStreamReader::run()
m_buffer = (char *)realloc(m_buffer, m_buffer_size);
}
m_mutex.unlock();
- len = mmsx_read (0, m_handle, prebuf, to_read);
+ len = mmsx_read (nullptr, m_handle, prebuf, to_read);
m_mutex.lock();
if(len < 0)
{
diff --git a/src/plugins/Transports/mms/settingsdialog.h b/src/plugins/Transports/mms/settingsdialog.h
index cbf94c84d..8d109b132 100644
--- a/src/plugins/Transports/mms/settingsdialog.h
+++ b/src/plugins/Transports/mms/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Ui/qsui/aboutqsuidialog.h b/src/plugins/Ui/qsui/aboutqsuidialog.h
index a93e894a3..192ce37b1 100644
--- a/src/plugins/Ui/qsui/aboutqsuidialog.h
+++ b/src/plugins/Ui/qsui/aboutqsuidialog.h
@@ -31,7 +31,7 @@ class AboutQSUIDialog : public QDialog
{
Q_OBJECT
public:
- explicit AboutQSUIDialog(QWidget *parent = 0);
+ explicit AboutQSUIDialog(QWidget *parent = nullptr);
virtual ~AboutQSUIDialog();
private:
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index c3ae20fc5..03d900624 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -28,7 +28,7 @@
#include <qmmp/qmmp.h>
#include "actionmanager.h"
-ActionManager *ActionManager::m_instance = 0;
+ActionManager *ActionManager::m_instance = nullptr;
ActionManager::ActionManager(QObject *parent) :
QObject(parent)
@@ -59,10 +59,10 @@ ActionManager::ActionManager(QObject *parent) :
//view
m_actions[WM_ALLWAYS_ON_TOP] = createAction2(tr("Always on Top"), "always_on_top", "");
m_actions[WM_STICKY] = createAction2(tr("Put on All Workspaces"), "sticky", "");
- m_actions[UI_ANALYZER] = 0; //external action
- m_actions[UI_FILEBROWSER] = 0; //external action
- m_actions[UI_COVER] = 0; //external action
- m_actions[UI_PLAYLISTBROWSER] = 0; //external action
+ m_actions[UI_ANALYZER] = nullptr; //external action
+ m_actions[UI_FILEBROWSER] = nullptr; //external action
+ m_actions[UI_COVER] = nullptr; //external action
+ m_actions[UI_PLAYLISTBROWSER] = nullptr; //external action
m_actions[UI_SHOW_TABS] = createAction2(tr("Show Tabs"), "show_tabs", "");
m_actions[UI_SHOW_TITLEBARS] = createAction2(tr("Show Title Bars"), "show_titlebars", "");
m_actions[UI_BLOCK_TOOLBARS] = createAction2(tr("Block Toolbars"), "block_toolbars", "");
@@ -112,14 +112,14 @@ ActionManager::ActionManager(QObject *parent) :
m_settings->endGroup();
readStates();
delete m_settings;
- m_settings = 0;
+ m_settings = nullptr;
m_actions[ABOUT]->setIcon(qApp->windowIcon());
}
ActionManager::~ActionManager()
{
saveStates();
- m_instance = 0;
+ m_instance = nullptr;
}
QAction *ActionManager::action(int type)
diff --git a/src/plugins/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h
index 163443b84..a33b0fed2 100644
--- a/src/plugins/Ui/qsui/actionmanager.h
+++ b/src/plugins/Ui/qsui/actionmanager.h
@@ -40,7 +40,7 @@ class ActionManager : public QObject
{
Q_OBJECT
public:
- explicit ActionManager(QObject *parent = 0);
+ explicit ActionManager(QObject *parent = nullptr);
~ActionManager();
enum Type
diff --git a/src/plugins/Ui/qsui/colorwidget.h b/src/plugins/Ui/qsui/colorwidget.h
index 86d915a09..1f8049ef5 100644
--- a/src/plugins/Ui/qsui/colorwidget.h
+++ b/src/plugins/Ui/qsui/colorwidget.h
@@ -30,7 +30,7 @@ class ColorWidget : public QFrame
{
Q_OBJECT
public:
- ColorWidget(QWidget *parent = 0);
+ ColorWidget(QWidget *parent = nullptr);
~ColorWidget();
diff --git a/src/plugins/Ui/qsui/coverwidget.h b/src/plugins/Ui/qsui/coverwidget.h
index 92a324de1..e66dfad35 100644
--- a/src/plugins/Ui/qsui/coverwidget.h
+++ b/src/plugins/Ui/qsui/coverwidget.h
@@ -32,7 +32,7 @@ class CoverWidget : public QWidget
{
Q_OBJECT
public:
- CoverWidget(QWidget *parent = 0);
+ CoverWidget(QWidget *parent = nullptr);
~CoverWidget();
diff --git a/src/plugins/Ui/qsui/elidinglabel.h b/src/plugins/Ui/qsui/elidinglabel.h
index 70e35fd2f..f348bcfc1 100644
--- a/src/plugins/Ui/qsui/elidinglabel.h
+++ b/src/plugins/Ui/qsui/elidinglabel.h
@@ -41,8 +41,8 @@ class /*QTCREATOR_UTILS_EXPORT*/ ElidingLabel : public QLabel
Q_PROPERTY(Qt::TextElideMode elideMode READ elideMode WRITE setElideMode DESIGNABLE true)
public:
- explicit ElidingLabel(QWidget *parent = 0);
- explicit ElidingLabel(const QString &text, QWidget *parent = 0);
+ explicit ElidingLabel(QWidget *parent = nullptr);
+ explicit ElidingLabel(const QString &text, QWidget *parent = nullptr);
Qt::TextElideMode elideMode() const;
void setElideMode(const Qt::TextElideMode &elideMode);
diff --git a/src/plugins/Ui/qsui/equalizer.h b/src/plugins/Ui/qsui/equalizer.h
index 86434b40a..5ee8f5c6c 100644
--- a/src/plugins/Ui/qsui/equalizer.h
+++ b/src/plugins/Ui/qsui/equalizer.h
@@ -38,7 +38,7 @@ class Equalizer : public QDialog
{
Q_OBJECT
public:
- explicit Equalizer(QWidget *parent = 0);
+ explicit Equalizer(QWidget *parent = nullptr);
~Equalizer();
diff --git a/src/plugins/Ui/qsui/filesystembrowser.h b/src/plugins/Ui/qsui/filesystembrowser.h
index 802204620..1a01cfcad 100644
--- a/src/plugins/Ui/qsui/filesystembrowser.h
+++ b/src/plugins/Ui/qsui/filesystembrowser.h
@@ -42,7 +42,7 @@ class FileSystemBrowser : public QWidget
{
Q_OBJECT
public:
- explicit FileSystemBrowser(QWidget *parent = 0);
+ explicit FileSystemBrowser(QWidget *parent = nullptr);
~FileSystemBrowser();
void readSettings();
diff --git a/src/plugins/Ui/qsui/hotkeyeditor.h b/src/plugins/Ui/qsui/hotkeyeditor.h
index 91fe490a0..786e4d7f7 100644
--- a/src/plugins/Ui/qsui/hotkeyeditor.h
+++ b/src/plugins/Ui/qsui/hotkeyeditor.h
@@ -35,7 +35,7 @@ class HotkeyEditor : public QWidget
Q_OBJECT
public:
- explicit HotkeyEditor(QWidget *parent = 0);
+ explicit HotkeyEditor(QWidget *parent = nullptr);
virtual ~HotkeyEditor();
private slots:
diff --git a/src/plugins/Ui/qsui/keyboardmanager.cpp b/src/plugins/Ui/qsui/keyboardmanager.cpp
index 9820984b8..b1c447258 100644
--- a/src/plugins/Ui/qsui/keyboardmanager.cpp
+++ b/src/plugins/Ui/qsui/keyboardmanager.cpp
@@ -30,7 +30,7 @@
KeyboardManager::KeyboardManager(QObject *parent) :
QObject(parent)
{
- m_listWidget = 0;
+ m_listWidget = nullptr;
addAction(Qt::Key_Up, SLOT(processUp()));
addAction(Qt::Key_Up + Qt::ShiftModifier, SLOT(processUp()));
diff --git a/src/plugins/Ui/qsui/keyboardmanager.h b/src/plugins/Ui/qsui/keyboardmanager.h
index 903036095..6aac5d228 100644
--- a/src/plugins/Ui/qsui/keyboardmanager.h
+++ b/src/plugins/Ui/qsui/keyboardmanager.h
@@ -34,7 +34,7 @@ class KeyboardManager : public QObject
{
Q_OBJECT
public:
- explicit KeyboardManager(QObject *parent = 0);
+ explicit KeyboardManager(QObject *parent = nullptr);
QList<QAction*> actions();
void setListWidget(ListWidget *listWidget);
diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp
index ac28992da..0841b5062 100644
--- a/src/plugins/Ui/qsui/listwidget.cpp
+++ b/src/plugins/Ui/qsui/listwidget.cpp
@@ -45,9 +45,9 @@ ListWidget::ListWidget(PlayListModel *model, QWidget *parent)
: QWidget(parent)
{
setFocusPolicy(Qt::StrongFocus);
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
m_ui_settings = QmmpUiSettings::instance();
- m_menu = 0;
+ m_menu = nullptr;
m_filterMode = false;
m_model = model;
m_timer = new QTimer(this);
@@ -67,7 +67,7 @@ ListWidget::ListWidget(PlayListModel *model, QWidget *parent)
m_row_count = 0;
m_select_on_release = false;
m_count = 0;
- m_firstItem = 0;
+ m_firstItem = nullptr;
setAcceptDrops(true);
setMouseTracking(true);
@@ -108,7 +108,7 @@ void ListWidget::readSettings()
if(m_popupWidget)
{
m_popupWidget->deleteLater();
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
}
}
else
@@ -174,13 +174,13 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous)
if(previous)
{
previous->setProperty("first_visible", m_first);
- disconnect(previous, 0, this, 0); //disconnect previous model
- disconnect(previous,0,m_header,0);
+ disconnect(previous, nullptr, this, nullptr); //disconnect previous model
+ disconnect(previous,nullptr,m_header,nullptr);
}
qApp->processEvents();
m_model = selected;
m_count = m_model->count();
- m_firstItem = 0;
+ m_firstItem = nullptr;
if(m_model->property("first_visible").isValid())
{
@@ -436,7 +436,7 @@ void ListWidget::updateList(int flags)
if(!m_filterMode)
{
- m_firstItem = m_model->isEmpty() ? 0 : m_model->item(m_first);
+ m_firstItem = m_model->isEmpty() ? nullptr : m_model->item(m_first);
m_count = m_model->count();
}
items = m_filterMode ? m_filteredItems.mid(m_first, m_row_count) : m_model->mid(m_first, m_row_count);
diff --git a/src/plugins/Ui/qsui/listwidget.h b/src/plugins/Ui/qsui/listwidget.h
index ab981f4d5..1ac01cddf 100644
--- a/src/plugins/Ui/qsui/listwidget.h
+++ b/src/plugins/Ui/qsui/listwidget.h
@@ -47,7 +47,7 @@ class ListWidget : public QWidget
{
Q_OBJECT
public:
- ListWidget(PlayListModel *model, QWidget *parent = 0);
+ ListWidget(PlayListModel *model, QWidget *parent = nullptr);
~ListWidget();
diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.cpp b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
index 5481a21a4..000965152 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.cpp
@@ -41,9 +41,9 @@ ListWidgetDrawer::ListWidgetDrawer()
m_row_height = 0;
m_number_width = 0;
m_padding = 0;
- m_metrics = 0;
- m_extra_metrics = 0;
- m_bold_metrics = 0;
+ m_metrics = nullptr;
+ m_extra_metrics = nullptr;
+ m_bold_metrics = nullptr;
readSettings();
}
@@ -312,7 +312,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row, bool rtl
painter->setFont(m_font);
painter->setPen(row->flags & ListWidgetRow::SELECTED ? m_highlighted : m_normal);
- QFontMetrics *metrics = 0;
+ QFontMetrics *metrics = nullptr;
if(row->flags & ListWidgetRow::CURRENT)
{
m_font.setBold(true);
diff --git a/src/plugins/Ui/qsui/logo.h b/src/plugins/Ui/qsui/logo.h
index afbff5947..d8a478125 100644
--- a/src/plugins/Ui/qsui/logo.h
+++ b/src/plugins/Ui/qsui/logo.h
@@ -38,7 +38,7 @@ class Logo : public Visual
{
Q_OBJECT
public:
- explicit Logo(QWidget *parent = 0);
+ explicit Logo(QWidget *parent = nullptr);
virtual ~Logo();
public slots:
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index d523aa041..fe1932269 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -778,7 +778,7 @@ void MainWindow::readSettings()
else
{
m_addListButton->setVisible(false);
- m_tabWidget->setCornerWidget(0, Qt::TopLeftCorner);
+ m_tabWidget->setCornerWidget(nullptr, Qt::TopLeftCorner);
}
if(settings.value("pl_show_tab_list_menu", false).toBool())
{
@@ -789,7 +789,7 @@ void MainWindow::readSettings()
else
{
m_tabListMenuButton->setVisible(false);
- m_tabWidget->setCornerWidget(0, Qt::TopRightCorner);
+ m_tabWidget->setCornerWidget(nullptr, Qt::TopRightCorner);
}
settings.endGroup();
@@ -878,25 +878,25 @@ void MainWindow::setTitleBarsVisible(bool visible)
{
if(visible)
{
- QWidget *widget = 0;
+ QWidget *widget = nullptr;
if((widget = m_ui.analyzerDockWidget->titleBarWidget()))
{
- m_ui.analyzerDockWidget->setTitleBarWidget(0);
+ m_ui.analyzerDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
if((widget = m_ui.fileSystemDockWidget->titleBarWidget()))
{
- m_ui.fileSystemDockWidget->setTitleBarWidget(0);
+ m_ui.fileSystemDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
if((widget = m_ui.coverDockWidget->titleBarWidget()))
{
- m_ui.coverDockWidget->setTitleBarWidget(0);
+ m_ui.coverDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
if((widget = m_ui.playlistsDockWidget->titleBarWidget()))
{
- m_ui.playlistsDockWidget->setTitleBarWidget(0);
+ m_ui.playlistsDockWidget->setTitleBarWidget(nullptr);
delete widget;
}
}
diff --git a/src/plugins/Ui/qsui/mainwindow.h b/src/plugins/Ui/qsui/mainwindow.h
index cf51dc826..90d9a9174 100644
--- a/src/plugins/Ui/qsui/mainwindow.h
+++ b/src/plugins/Ui/qsui/mainwindow.h
@@ -52,7 +52,7 @@ class MainWindow : public QMainWindow
{
Q_OBJECT
public:
- MainWindow(QWidget *parent = 0);
+ MainWindow(QWidget *parent = nullptr);
~MainWindow();
private slots:
diff --git a/src/plugins/Ui/qsui/playlistbrowser.h b/src/plugins/Ui/qsui/playlistbrowser.h
index 07aa5b71b..5f5d38df9 100644
--- a/src/plugins/Ui/qsui/playlistbrowser.h
+++ b/src/plugins/Ui/qsui/playlistbrowser.h
@@ -38,7 +38,7 @@ class PlayListBrowser : public QWidget
{
Q_OBJECT
public:
- PlayListBrowser(PlayListManager *manager, QWidget *parent = 0);
+ PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
~PlayListBrowser();
private slots:
diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp
index b6f8a4a43..2ce470fcc 100644
--- a/src/plugins/Ui/qsui/playlistheader.cpp
+++ b/src/plugins/Ui/qsui/playlistheader.cpp
@@ -55,7 +55,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
m_scrollbar_width = 0;
m_reverted = false;
m_auto_resize = false;
- m_metrics = 0;
+ m_metrics = nullptr;
m_task = NO_TASK;
m_model = PlayListManager::instance()->headerModel();
@@ -96,7 +96,7 @@ PlayListHeader::~PlayListHeader()
{
if (m_metrics)
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
void PlayListHeader::readSettings()
@@ -104,7 +104,7 @@ void PlayListHeader::readSettings()
if (m_metrics)
{
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
diff --git a/src/plugins/Ui/qsui/playlistheader.h b/src/plugins/Ui/qsui/playlistheader.h
index fce8248e3..fa5cafb71 100644
--- a/src/plugins/Ui/qsui/playlistheader.h
+++ b/src/plugins/Ui/qsui/playlistheader.h
@@ -40,7 +40,7 @@ class PlayListHeader : public QWidget
{
Q_OBJECT
public:
- explicit PlayListHeader(QWidget *parent = 0);
+ explicit PlayListHeader(QWidget *parent = nullptr);
~PlayListHeader();
void readSettings();
diff --git a/src/plugins/Ui/qsui/popupsettings.h b/src/plugins/Ui/qsui/popupsettings.h
index 15fd24922..3be5c6daa 100644
--- a/src/plugins/Ui/qsui/popupsettings.h
+++ b/src/plugins/Ui/qsui/popupsettings.h
@@ -30,7 +30,7 @@ class PopupSettings : public QDialog
{
Q_OBJECT
public:
- PopupSettings(QWidget *parent = 0);
+ PopupSettings(QWidget *parent = nullptr);
~PopupSettings();
diff --git a/src/plugins/Ui/qsui/popupwidget.h b/src/plugins/Ui/qsui/popupwidget.h
index f341f819d..00f3751f1 100644
--- a/src/plugins/Ui/qsui/popupwidget.h
+++ b/src/plugins/Ui/qsui/popupwidget.h
@@ -37,7 +37,7 @@ class PopupWidget : public QWidget
{
Q_OBJECT
public:
- PopupWidget(QWidget *parent = 0);
+ PopupWidget(QWidget *parent = nullptr);
~PopupWidget();
diff --git a/src/plugins/Ui/qsui/positionslider.h b/src/plugins/Ui/qsui/positionslider.h
index 350c62ea5..ebb3db302 100644
--- a/src/plugins/Ui/qsui/positionslider.h
+++ b/src/plugins/Ui/qsui/positionslider.h
@@ -33,7 +33,7 @@ class PositionSlider : public QSlider
{
Q_OBJECT
public:
- explicit PositionSlider(QWidget *parent = 0);
+ explicit PositionSlider(QWidget *parent = nullptr);
virtual ~PositionSlider(){}
protected:
diff --git a/src/plugins/Ui/qsui/qsuianalyzer.cpp b/src/plugins/Ui/qsui/qsuianalyzer.cpp
index e24301ea1..e510c6bc7 100644
--- a/src/plugins/Ui/qsui/qsuianalyzer.cpp
+++ b/src/plugins/Ui/qsui/qsuianalyzer.cpp
@@ -33,9 +33,9 @@
QSUiAnalyzer::QSUiAnalyzer(QWidget *parent) : Visual (parent)
{
- m_intern_vis_data = 0;
- m_peaks = 0;
- m_x_scale = 0;
+ m_intern_vis_data = nullptr;
+ m_peaks = nullptr;
+ m_x_scale = nullptr;
m_rows = 0;
m_cols = 0;
m_offset = 0;
diff --git a/src/plugins/Ui/qsui/qsuianalyzer.h b/src/plugins/Ui/qsui/qsuianalyzer.h
index 6abb6ad11..b75e9569a 100644
--- a/src/plugins/Ui/qsui/qsuianalyzer.h
+++ b/src/plugins/Ui/qsui/qsuianalyzer.h
@@ -34,7 +34,7 @@ class QSUiAnalyzer : public Visual
{
Q_OBJECT
public:
- QSUiAnalyzer(QWidget *parent = 0);
+ QSUiAnalyzer(QWidget *parent = nullptr);
virtual ~QSUiAnalyzer();
void setCover(const QPixmap &pixmap);
diff --git a/src/plugins/Ui/qsui/qsuiquicksearch.h b/src/plugins/Ui/qsui/qsuiquicksearch.h
index 96e96cd29..ec04e3b89 100644
--- a/src/plugins/Ui/qsui/qsuiquicksearch.h
+++ b/src/plugins/Ui/qsui/qsuiquicksearch.h
@@ -35,7 +35,7 @@ class QSUIQuickSearch : public QWidget
{
Q_OBJECT
public:
- explicit QSUIQuickSearch(ListWidget *listWidget, QWidget *parent = 0);
+ explicit QSUIQuickSearch(ListWidget *listWidget, QWidget *parent = nullptr);
private:
QLineEdit *m_lineEdit;
diff --git a/src/plugins/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h
index 85a718d9e..26a7935e4 100644
--- a/src/plugins/Ui/qsui/qsuisettings.h
+++ b/src/plugins/Ui/qsui/qsuisettings.h
@@ -32,7 +32,7 @@ class QSUISettings : public QWidget
{
Q_OBJECT
public:
- explicit QSUISettings(QWidget *parent = 0);
+ explicit QSUISettings(QWidget *parent = nullptr);
virtual ~QSUISettings();
void writeSettings();
diff --git a/src/plugins/Ui/qsui/qsuitabbar.h b/src/plugins/Ui/qsui/qsuitabbar.h
index 3be74a688..955e73c81 100644
--- a/src/plugins/Ui/qsui/qsuitabbar.h
+++ b/src/plugins/Ui/qsui/qsuitabbar.h
@@ -30,7 +30,7 @@ class QSUiTabBar : public QTabBar
{
Q_OBJECT
public:
- explicit QSUiTabBar(QWidget *parent = 0);
+ explicit QSUiTabBar(QWidget *parent = nullptr);
private:
void mouseReleaseEvent(QMouseEvent *e);
diff --git a/src/plugins/Ui/qsui/qsuitabwidget.cpp b/src/plugins/Ui/qsui/qsuitabwidget.cpp
index 3e4b56456..19f2e78e4 100644
--- a/src/plugins/Ui/qsui/qsuitabwidget.cpp
+++ b/src/plugins/Ui/qsui/qsuitabwidget.cpp
@@ -42,8 +42,8 @@ QSUiTabWidget::QSUiTabWidget(QWidget *parent) : QWidget(parent)
setFocusPolicy(Qt::TabFocus);
setFocusProxy(m_tabBar);
- m_rightCornerWidget = 0;
- m_leftCornerWidget = 0;
+ m_rightCornerWidget = nullptr;
+ m_leftCornerWidget = nullptr;
m_menu = new QMenu(this);
m_group = new QActionGroup(this);
@@ -184,9 +184,9 @@ void QSUiTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
return;
option->initFrom(this);
- option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, this);
+ option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, this);
- int exth = style()->pixelMetric(QStyle::PM_TabBarBaseHeight, 0, this);
+ int exth = style()->pixelMetric(QStyle::PM_TabBarBaseHeight, nullptr, this);
QSize t(0, 0);
if (m_tabBar->isVisibleTo(const_cast<QSUiTabWidget *>(this)))
t = m_tabBar->sizeHint();
@@ -328,7 +328,7 @@ void QSUiTabWidget::tabRemoved(int index)
void QSUiTabWidget::mousePressEvent(QMouseEvent *e)
{
if((e->button() == Qt::MidButton) &&
- (childAt(e->pos()) == 0))
+ (childAt(e->pos()) == nullptr))
{
e->accept();
emit createPlayListRequested();
@@ -339,7 +339,7 @@ void QSUiTabWidget::mousePressEvent(QMouseEvent *e)
void QSUiTabWidget::mouseDoubleClickEvent(QMouseEvent *e)
{
if((e->button() == Qt::LeftButton) &&
- (childAt(e->pos()) == 0))
+ (childAt(e->pos()) == nullptr))
{
e->accept();
emit createPlayListRequested();
diff --git a/src/plugins/Ui/qsui/qsuitabwidget.h b/src/plugins/Ui/qsui/qsuitabwidget.h
index 64f03b197..85988e7a4 100644
--- a/src/plugins/Ui/qsui/qsuitabwidget.h
+++ b/src/plugins/Ui/qsui/qsuitabwidget.h
@@ -35,7 +35,7 @@ class QSUiTabWidget : public QWidget
{
Q_OBJECT
public:
- QSUiTabWidget(QWidget *parent = 0);
+ QSUiTabWidget(QWidget *parent = nullptr);
QSUiTabBar *tabBar() const;
ListWidget *listWidget() const;
diff --git a/src/plugins/Ui/qsui/shortcutdialog.h b/src/plugins/Ui/qsui/shortcutdialog.h
index 92c549ac7..5d9a13469 100644
--- a/src/plugins/Ui/qsui/shortcutdialog.h
+++ b/src/plugins/Ui/qsui/shortcutdialog.h
@@ -32,7 +32,7 @@ class ShortcutDialog : public QDialog
{
Q_OBJECT
public:
- ShortcutDialog(const QString &key, QWidget *parent = 0);
+ ShortcutDialog(const QString &key, QWidget *parent = nullptr);
~ShortcutDialog();
diff --git a/src/plugins/Ui/qsui/visualmenu.cpp b/src/plugins/Ui/qsui/visualmenu.cpp
index 6548a642f..0defc96fe 100644
--- a/src/plugins/Ui/qsui/visualmenu.cpp
+++ b/src/plugins/Ui/qsui/visualmenu.cpp
@@ -26,7 +26,7 @@
VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent)
{
- VisualFactory *factory = 0;
+ VisualFactory *factory = nullptr;
foreach(factory, Visual::factories())
{
VisualAction *act = new VisualAction(factory, this);
diff --git a/src/plugins/Ui/qsui/visualmenu.h b/src/plugins/Ui/qsui/visualmenu.h
index 301ce4e4e..2994e40dd 100644
--- a/src/plugins/Ui/qsui/visualmenu.h
+++ b/src/plugins/Ui/qsui/visualmenu.h
@@ -32,7 +32,7 @@ class VisualMenu : public QMenu
{
Q_OBJECT
public:
- VisualMenu(QWidget *parent = 0);
+ VisualMenu(QWidget *parent = nullptr);
~VisualMenu();
@@ -44,7 +44,7 @@ class VisualAction : public QAction
{
Q_OBJECT
public:
- VisualAction(VisualFactory *factory, QWidget *parent = 0);
+ VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
private slots:
void select(bool);
diff --git a/src/plugins/Ui/qsui/volumeslider.h b/src/plugins/Ui/qsui/volumeslider.h
index ea3f9a7e2..344c08000 100644
--- a/src/plugins/Ui/qsui/volumeslider.h
+++ b/src/plugins/Ui/qsui/volumeslider.h
@@ -33,7 +33,7 @@ class VolumeSlider : public QSlider
{
Q_OBJECT
public:
- explicit VolumeSlider(QWidget *parent = 0);
+ explicit VolumeSlider(QWidget *parent = nullptr);
virtual ~VolumeSlider(){}
protected:
diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp
index b88206aba..02158089c 100644
--- a/src/plugins/Ui/skinned/actionmanager.cpp
+++ b/src/plugins/Ui/skinned/actionmanager.cpp
@@ -26,7 +26,7 @@
#include <qmmp/qmmp.h>
#include "actionmanager.h"
-ActionManager *ActionManager::m_instance = 0;
+ActionManager *ActionManager::m_instance = nullptr;
ActionManager::ActionManager(QObject *parent) :
QObject(parent)
@@ -104,14 +104,14 @@ ActionManager::ActionManager(QObject *parent) :
m_settings->endGroup();
readStates();
delete m_settings;
- m_settings = 0;
+ m_settings = nullptr;
m_actions[ABOUT]->setIcon(qApp->windowIcon());
}
ActionManager::~ActionManager()
{
saveStates();
- m_instance = 0;
+ m_instance = nullptr;
}
QAction *ActionManager::action(int type)
diff --git a/src/plugins/Ui/skinned/actionmanager.h b/src/plugins/Ui/skinned/actionmanager.h
index bbe9a1f95..d4d0f18f0 100644
--- a/src/plugins/Ui/skinned/actionmanager.h
+++ b/src/plugins/Ui/skinned/actionmanager.h
@@ -38,7 +38,7 @@ class ActionManager : public QObject
{
Q_OBJECT
public:
- explicit ActionManager(QObject *parent = 0);
+ explicit ActionManager(QObject *parent = nullptr);
~ActionManager();
enum Type
diff --git a/src/plugins/Ui/skinned/balancebar.h b/src/plugins/Ui/skinned/balancebar.h
index 50d7b7397..23628163f 100644
--- a/src/plugins/Ui/skinned/balancebar.h
+++ b/src/plugins/Ui/skinned/balancebar.h
@@ -31,7 +31,7 @@ class BalanceBar : public PixmapWidget
{
Q_OBJECT
public:
- BalanceBar(QWidget *parent = 0);
+ BalanceBar(QWidget *parent = nullptr);
~BalanceBar();
diff --git a/src/plugins/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h
index 95781eb94..796630bb8 100644
--- a/src/plugins/Ui/skinned/display.h
+++ b/src/plugins/Ui/skinned/display.h
@@ -51,7 +51,7 @@ class MainDisplay : public PixmapWidget
{
Q_OBJECT
public:
- MainDisplay(MainWindow *parent = 0);
+ MainDisplay(MainWindow *parent = nullptr);
~MainDisplay();
diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp
index 09249be58..0cd867493 100644
--- a/src/plugins/Ui/skinned/dock.cpp
+++ b/src/plugins/Ui/skinned/dock.cpp
@@ -25,7 +25,7 @@
#include <QApplication>
#include "dock.h"
-Dock *Dock::m_instance = 0;
+Dock *Dock::m_instance = nullptr;
Dock *Dock::instance()
{
@@ -38,12 +38,12 @@ Dock::Dock (QObject *parent)
: QObject (parent)
{
m_instance = this;
- m_mainWidget = 0;
+ m_mainWidget = nullptr;
}
Dock::~Dock()
{
- m_instance = 0;
+ m_instance = nullptr;
}
void Dock::setMainWidget (QWidget *widget)
diff --git a/src/plugins/Ui/skinned/dock.h b/src/plugins/Ui/skinned/dock.h
index 74a64c9fa..e8e39fc16 100644
--- a/src/plugins/Ui/skinned/dock.h
+++ b/src/plugins/Ui/skinned/dock.h
@@ -32,7 +32,7 @@ class Dock : public QObject
{
Q_OBJECT
public:
- Dock(QObject *parent = 0);
+ Dock(QObject *parent = nullptr);
~Dock();
diff --git a/src/plugins/Ui/skinned/eqgraph.h b/src/plugins/Ui/skinned/eqgraph.h
index 898575af0..6373243ba 100644
--- a/src/plugins/Ui/skinned/eqgraph.h
+++ b/src/plugins/Ui/skinned/eqgraph.h
@@ -30,7 +30,7 @@ class EQGraph : public PixmapWidget
{
Q_OBJECT
public:
- EQGraph (QWidget *parent = 0);
+ EQGraph (QWidget *parent = nullptr);
~EQGraph();
diff --git a/src/plugins/Ui/skinned/eqslider.h b/src/plugins/Ui/skinned/eqslider.h
index 70873d3c1..eb1d53116 100644
--- a/src/plugins/Ui/skinned/eqslider.h
+++ b/src/plugins/Ui/skinned/eqslider.h
@@ -33,7 +33,7 @@ class EqSlider : public PixmapWidget
{
Q_OBJECT
public:
- EqSlider(QWidget *parent = 0);
+ EqSlider(QWidget *parent = nullptr);
~EqSlider();
diff --git a/src/plugins/Ui/skinned/eqtitlebar.cpp b/src/plugins/Ui/skinned/eqtitlebar.cpp
index 17a3b3b2f..a6d202bfe 100644
--- a/src/plugins/Ui/skinned/eqtitlebar.cpp
+++ b/src/plugins/Ui/skinned/eqtitlebar.cpp
@@ -32,9 +32,9 @@
EqTitleBar::EqTitleBar(QWidget *parent)
: PixmapWidget(parent)
{
- m_volumeBar = 0;
- m_balanceBar = 0;
- m_shade2 = 0;
+ m_volumeBar = nullptr;
+ m_balanceBar = nullptr;
+ m_shade2 = nullptr;
m_left = 0;
m_right = 0;
m_shaded = false;
@@ -159,9 +159,9 @@ void EqTitleBar::shade()
m_shade2->deleteLater();
m_volumeBar->deleteLater();
m_balanceBar->deleteLater();
- m_volumeBar = 0;
- m_balanceBar = 0;
- m_shade2 = 0;
+ m_volumeBar = nullptr;
+ m_balanceBar = nullptr;
+ m_shade2 = nullptr;
m_shade->show();
}
qobject_cast<EqWidget *>(m_eq)->setMimimalMode(m_shaded);
diff --git a/src/plugins/Ui/skinned/eqtitlebar.h b/src/plugins/Ui/skinned/eqtitlebar.h
index 2c4e01f7b..1db1af2ab 100644
--- a/src/plugins/Ui/skinned/eqtitlebar.h
+++ b/src/plugins/Ui/skinned/eqtitlebar.h
@@ -35,7 +35,7 @@ class EqTitleBar : public PixmapWidget
{
Q_OBJECT
public:
- EqTitleBar(QWidget *parent = 0);
+ EqTitleBar(QWidget *parent = nullptr);
~EqTitleBar();
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 46765c67f..f9cabdfc1 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -396,7 +396,7 @@ EQPreset *EqWidget::findPreset(const QString &name)
if (preset->text() == name)
return preset;
}
- return 0;
+ return nullptr;
}
void EqWidget::importWinampEQF()
diff --git a/src/plugins/Ui/skinned/eqwidget.h b/src/plugins/Ui/skinned/eqwidget.h
index 43783df6a..b05c608b4 100644
--- a/src/plugins/Ui/skinned/eqwidget.h
+++ b/src/plugins/Ui/skinned/eqwidget.h
@@ -42,7 +42,7 @@ class EqWidget : public PixmapWidget
{
Q_OBJECT
public:
- EqWidget(QWidget *parent = 0);
+ EqWidget(QWidget *parent = nullptr);
~EqWidget();
diff --git a/src/plugins/Ui/skinned/horizontalslider.h b/src/plugins/Ui/skinned/horizontalslider.h
index 7ccaeacf8..19ddfae8d 100644
--- a/src/plugins/Ui/skinned/horizontalslider.h
+++ b/src/plugins/Ui/skinned/horizontalslider.h
@@ -32,7 +32,7 @@ class HorizontalSlider : public QWidget
{
Q_OBJECT
public:
- HorizontalSlider(QWidget *parent = 0);
+ HorizontalSlider(QWidget *parent = nullptr);
~HorizontalSlider();
diff --git a/src/plugins/Ui/skinned/hotkeyeditor.h b/src/plugins/Ui/skinned/hotkeyeditor.h
index 91fe490a0..786e4d7f7 100644
--- a/src/plugins/Ui/skinned/hotkeyeditor.h
+++ b/src/plugins/Ui/skinned/hotkeyeditor.h
@@ -35,7 +35,7 @@ class HotkeyEditor : public QWidget
Q_OBJECT
public:
- explicit HotkeyEditor(QWidget *parent = 0);
+ explicit HotkeyEditor(QWidget *parent = nullptr);
virtual ~HotkeyEditor();
private slots:
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 264273568..dc2c2d41d 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -46,7 +46,7 @@
ListWidget::ListWidget(QWidget *parent)
: QWidget(parent)
{
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
m_skin = Skin::instance();
m_ui_settings = QmmpUiSettings::instance();
@@ -65,7 +65,7 @@ ListWidget::ListWidget(QWidget *parent)
m_first = 0;
m_row_count = 0;
m_count = 0;
- m_firstItem = 0;
+ m_firstItem = nullptr;
m_select_on_release = false;
setAcceptDrops(true);
@@ -104,7 +104,7 @@ void ListWidget::readSettings()
if(m_popupWidget)
{
m_popupWidget->deleteLater();
- m_popupWidget = 0;
+ m_popupWidget = nullptr;
}
}
else
@@ -340,7 +340,7 @@ void ListWidget::updateList(int flags)
emit positionChanged(m_first, m_model->count() - m_row_count);
}
- m_firstItem = m_model->isEmpty() ? 0 : m_model->item(m_first);
+ m_firstItem = m_model->isEmpty() ? nullptr : m_model->item(m_first);
m_count = m_model->count();
items = m_model->mid(m_first, m_row_count);
@@ -459,13 +459,13 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous)
if(previous)
{
previous->setProperty("first_visible", m_first);
- disconnect(previous, 0, this, 0); //disconnect previous model
- disconnect(previous,0,m_header,0);
+ disconnect(previous, nullptr, this, nullptr); //disconnect previous model
+ disconnect(previous,nullptr,m_header,nullptr);
}
qApp->processEvents();
m_model = selected;
m_count = m_model->count();
- m_firstItem = 0;
+ m_firstItem = nullptr;
if(m_model->property("first_visible").isValid())
{
diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h
index abaa5fec8..9f4b95bc7 100644
--- a/src/plugins/Ui/skinned/listwidget.h
+++ b/src/plugins/Ui/skinned/listwidget.h
@@ -48,7 +48,7 @@ class ListWidget : public QWidget
{
Q_OBJECT
public:
- ListWidget(QWidget *parent = 0);
+ ListWidget(QWidget *parent = nullptr);
~ListWidget();
@@ -70,7 +70,7 @@ public slots:
void readSettings();
void updateList(int flags);
void setViewPosition(int sc);
- void setModel(PlayListModel *selected, PlayListModel *previous = 0);
+ void setModel(PlayListModel *selected, PlayListModel *previous = nullptr);
signals:
void doubleClicked();
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 0418f9938..7293dc8a0 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -41,8 +41,8 @@ ListWidgetDrawer::ListWidgetDrawer()
m_show_splitters = false;
m_alternate_splitter_color = false;
m_padding = 0;
- m_metrics = 0;
- m_extra_metrics = 0;
+ m_metrics = nullptr;
+ m_extra_metrics = nullptr;
readSettings();
loadColors();
}
diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp
index 4b71c660f..05b2855c9 100644
--- a/src/plugins/Ui/skinned/mainvisual.cpp
+++ b/src/plugins/Ui/skinned/mainvisual.cpp
@@ -31,7 +31,7 @@
#include "inlines.h"
#include "mainvisual.h"
-MainVisual *MainVisual::m_instance = 0;
+MainVisual *MainVisual::m_instance = nullptr;
MainVisual *MainVisual::instance()
{
@@ -40,7 +40,7 @@ MainVisual *MainVisual::instance()
return m_instance;
}
-MainVisual::MainVisual (QWidget *parent) : Visual (parent), m_vis (0)
+MainVisual::MainVisual (QWidget *parent) : Visual (parent), m_vis (nullptr)
{
m_skin = Skin::instance();
m_ratio = m_skin->ratio();
@@ -60,9 +60,9 @@ MainVisual::~MainVisual()
if (m_vis)
{
delete m_vis;
- m_vis = 0;
+ m_vis = nullptr;
}
- m_instance = 0;
+ m_instance = nullptr;
}
void MainVisual::setVisual (VisualBase *newvis)
@@ -129,7 +129,7 @@ void MainVisual::mousePressEvent (QMouseEvent *e)
else if (m_vis->name() == "Analyzer")
setVisual(new mainvisual::Scope);
else if (m_vis->name() == "Scope")
- setVisual(0);
+ setVisual(nullptr);
QString str = m_vis ? m_vis->name() : "Off";
foreach(QAction *act, m_visModeGroup->actions ())
@@ -358,7 +358,7 @@ void MainVisual::readSettings()
else if (vis_name == "Scope")
setVisual(new mainvisual::Scope);
else
- setVisual(0);
+ setVisual(nullptr);
resize(76 * m_ratio, 16 * m_ratio);
update();
}
@@ -395,7 +395,7 @@ void Analyzer::clear()
bool Analyzer::process (float *l)
{
- static fft_state *state = 0;
+ static fft_state *state = nullptr;
if (!state)
state = fft_init();
short dest[256];
diff --git a/src/plugins/Ui/skinned/mainvisual.h b/src/plugins/Ui/skinned/mainvisual.h
index 8ae0b0995..e5b5e300e 100644
--- a/src/plugins/Ui/skinned/mainvisual.h
+++ b/src/plugins/Ui/skinned/mainvisual.h
@@ -45,7 +45,7 @@ class MainVisual : public Visual
Q_OBJECT
public:
- MainVisual(QWidget *parent = 0);
+ MainVisual(QWidget *parent = nullptr);
virtual ~MainVisual();
static MainVisual *instance();
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index f12109a17..2074bdc9b 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -58,7 +58,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
#ifdef QMMP_WS_X11
qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName()));
#endif
- m_vis = 0;
+ m_vis = nullptr;
m_update = false;
#ifdef QMMP_WS_X11
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index db8c684c7..cf4f1bb9b 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -50,7 +50,7 @@ class MainWindow : public QMainWindow
{
Q_OBJECT
public:
- MainWindow(QWidget *parent = 0);
+ MainWindow(QWidget *parent = nullptr);
~MainWindow();
diff --git a/src/plugins/Ui/skinned/monostereo.h b/src/plugins/Ui/skinned/monostereo.h
index 8779ca741..b038a4759 100644
--- a/src/plugins/Ui/skinned/monostereo.h
+++ b/src/plugins/Ui/skinned/monostereo.h
@@ -31,7 +31,7 @@ class MonoStereo : public PixmapWidget
{
Q_OBJECT
public:
- MonoStereo(QWidget *parent = 0);
+ MonoStereo(QWidget *parent = nullptr);
~MonoStereo();
diff --git a/src/plugins/Ui/skinned/number.h b/src/plugins/Ui/skinned/number.h
index 8b44b790d..5c89406ed 100644
--- a/src/plugins/Ui/skinned/number.h
+++ b/src/plugins/Ui/skinned/number.h
@@ -31,7 +31,7 @@ class Number : public PixmapWidget
{
Q_OBJECT
public:
- Number(QWidget *parent = 0);
+ Number(QWidget *parent = nullptr);
~Number();
diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h
index 73aff2613..9b37feec7 100644
--- a/src/plugins/Ui/skinned/pixmapwidget.h
+++ b/src/plugins/Ui/skinned/pixmapwidget.h
@@ -31,7 +31,7 @@ class PixmapWidget : public QWidget
{
Q_OBJECT
public:
- PixmapWidget(QWidget *parent = 0);
+ PixmapWidget(QWidget *parent = nullptr);
virtual ~PixmapWidget();
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 67a5b3d93..8f280907e 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -60,8 +60,8 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent)
m_skin = Skin::instance();
m_ratio = m_skin->ratio();
m_shaded = false;
- m_pl_browser = 0;
- m_pl_selector = 0;
+ m_pl_browser = nullptr;
+ m_pl_selector = nullptr;
#ifdef QMMP_WS_X11
QString wm_name = WindowSystem::netWindowManagerName();
@@ -455,7 +455,7 @@ void PlayList::readSettings()
m_pl_selector->deleteLater();
m_listWidget->menu()->removeAction(m_copySelectedMenu->menuAction());
}
- m_pl_selector = 0;
+ m_pl_selector = nullptr;
}
if (m_update)
@@ -621,7 +621,7 @@ void PlayList::generateCopySelectedMenu()
void PlayList::copySelectedMenuActionTriggered(QAction *action)
{
- PlayListModel *targetPlayList = 0;
+ PlayListModel *targetPlayList = nullptr;
QString actionText=action->text();
if(action == m_copySelectedMenu->actions().at(0))//actionText == tr ("&New PlayList"))
{
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index d960255c7..67570da88 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -49,7 +49,7 @@ class PlayList : public QWidget
{
Q_OBJECT
public:
- PlayList (PlayListManager *manager, QWidget *parent = 0);
+ PlayList (PlayListManager *manager, QWidget *parent = nullptr);
virtual ~PlayList();
void readSettings();
diff --git a/src/plugins/Ui/skinned/playlistbrowser.h b/src/plugins/Ui/skinned/playlistbrowser.h
index 65d01155b..5cfe21508 100644
--- a/src/plugins/Ui/skinned/playlistbrowser.h
+++ b/src/plugins/Ui/skinned/playlistbrowser.h
@@ -36,7 +36,7 @@ class PlayListBrowser : public QDialog
{
Q_OBJECT
public:
- PlayListBrowser(PlayListManager *manager, QWidget *parent = 0);
+ PlayListBrowser(PlayListManager *manager, QWidget *parent = nullptr);
~PlayListBrowser();
private slots:
diff --git a/src/plugins/Ui/skinned/playlistcontrol.h b/src/plugins/Ui/skinned/playlistcontrol.h
index 8f85d0344..d661f09a8 100644
--- a/src/plugins/Ui/skinned/playlistcontrol.h
+++ b/src/plugins/Ui/skinned/playlistcontrol.h
@@ -34,7 +34,7 @@ class PlaylistControl : public PixmapWidget
{
Q_OBJECT
public:
- PlaylistControl(QWidget* parent = 0);
+ PlaylistControl(QWidget* parent = nullptr);
signals:
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 4ad6bac03..442aab3cf 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -69,7 +69,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
QWidget(parent)
{
setMouseTracking(true);
- m_metrics = 0;
+ m_metrics = nullptr;
m_padding = 0;
m_pl_padding = 0;
m_number_width = 0;
@@ -118,7 +118,7 @@ PlayListHeader::~PlayListHeader()
{
if (m_metrics)
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
writeSettings();
}
@@ -131,7 +131,7 @@ void PlayListHeader::readSettings()
if (m_metrics)
{
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
m_metrics = new QFontMetrics(m_font);
diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h
index 3f57ee6d0..f5622b955 100644
--- a/src/plugins/Ui/skinned/playlistheader.h
+++ b/src/plugins/Ui/skinned/playlistheader.h
@@ -41,7 +41,7 @@ class PlayListHeader : public QWidget
{
Q_OBJECT
public:
- explicit PlayListHeader(QWidget *parent = 0);
+ explicit PlayListHeader(QWidget *parent = nullptr);
~PlayListHeader();
void readSettings();
diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp
index f0fb9a6b3..37ac13eb5 100644
--- a/src/plugins/Ui/skinned/playlistselector.cpp
+++ b/src/plugins/Ui/skinned/playlistselector.cpp
@@ -40,7 +40,7 @@ PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) :
m_moving = false;
m_offset = 0;
m_offset_max = 0;
- m_metrics = 0;
+ m_metrics = nullptr;
m_pressed_button = BUTTON_UNKNOWN;
m_skin = Skin::instance();
m_pl_manager = manager;
@@ -60,7 +60,7 @@ PlayListSelector::~PlayListSelector()
{
if (m_metrics)
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
void PlayListSelector::readSettings()
@@ -70,7 +70,7 @@ void PlayListSelector::readSettings()
if (m_metrics)
{
delete m_metrics;
- m_metrics = 0;
+ m_metrics = nullptr;
}
m_metrics = new QFontMetrics(m_font);
m_pl_separator = settings.value("Skinned/pl_separator", "::").toString();
diff --git a/src/plugins/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h
index 61a1ca972..63d000e8f 100644
--- a/src/plugins/Ui/skinned/playlistselector.h
+++ b/src/plugins/Ui/skinned/playlistselector.h
@@ -40,7 +40,7 @@ class PlayListSelector : public QWidget
{
Q_OBJECT
public:
- PlayListSelector(PlayListManager *manager, QWidget *parent = 0);
+ PlayListSelector(PlayListManager *manager, QWidget *parent = nullptr);
~PlayListSelector();
void readSettings();
diff --git a/src/plugins/Ui/skinned/playlistslider.h b/src/plugins/Ui/skinned/playlistslider.h
index 9e2172eb2..8e3b267ca 100644
--- a/src/plugins/Ui/skinned/playlistslider.h
+++ b/src/plugins/Ui/skinned/playlistslider.h
@@ -30,7 +30,7 @@ class PlayListSlider : public QWidget
{
Q_OBJECT
public:
- PlayListSlider(QWidget *parent = 0);
+ PlayListSlider(QWidget *parent = nullptr);
~PlayListSlider();
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index 1c4b3d98f..3450a5bc5 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -38,8 +38,8 @@ PlayListTitleBar::PlayListTitleBar(QWidget *parent)
m_active = false;
m_resize = false;
m_formatter.setPattern(TITLE_FORMAT);
- m_shade2 = 0;
- m_model = 0;
+ m_shade2 = nullptr;
+ m_model = nullptr;
m_shaded = false;
m_align = false;
m_skin = Skin::instance();
@@ -221,7 +221,7 @@ void PlayListTitleBar::setActive(bool a)
void PlayListTitleBar::setModel(PlayListModel *selected, PlayListModel *previous)
{
if(previous)
- disconnect(previous, 0, this, 0); //disconnect previous model
+ disconnect(previous, nullptr, this, nullptr); //disconnect previous model
m_model = selected;
connect (m_model, SIGNAL(listChanged(int)), SLOT(showCurrent()));
showCurrent();
@@ -262,7 +262,7 @@ void PlayListTitleBar::shade()
else
{
m_shade2->deleteLater();
- m_shade2 = 0;
+ m_shade2 = nullptr;
m_shade->show();
}
m_pl->setMinimalMode(m_shaded);
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.h b/src/plugins/Ui/skinned/playlisttitlebar.h
index f1de7a3cb..6e2a48cf5 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.h
+++ b/src/plugins/Ui/skinned/playlisttitlebar.h
@@ -37,14 +37,14 @@ class PlayListTitleBar : public PixmapWidget
{
Q_OBJECT
public:
- PlayListTitleBar(QWidget *parent = 0);
+ PlayListTitleBar(QWidget *parent = nullptr);
~PlayListTitleBar();
void setActive(bool);
void readSettings();
public slots:
void showCurrent();
- void setModel(PlayListModel *selected, PlayListModel *previous = 0);
+ void setModel(PlayListModel *selected, PlayListModel *previous = nullptr);
private slots:
void updateSkin();
diff --git a/src/plugins/Ui/skinned/playstatus.h b/src/plugins/Ui/skinned/playstatus.h
index 819568fa4..85deb480e 100644
--- a/src/plugins/Ui/skinned/playstatus.h
+++ b/src/plugins/Ui/skinned/playstatus.h
@@ -31,7 +31,7 @@ class PlayStatus : public PixmapWidget
{
Q_OBJECT
public:
- PlayStatus(QWidget *parent = 0);
+ PlayStatus(QWidget *parent = nullptr);
~PlayStatus();
diff --git a/src/plugins/Ui/skinned/popupsettings.h b/src/plugins/Ui/skinned/popupsettings.h
index c669629e4..b79f1609b 100644
--- a/src/plugins/Ui/skinned/popupsettings.h
+++ b/src/plugins/Ui/skinned/popupsettings.h
@@ -30,7 +30,7 @@ class PopupSettings : public QDialog
{
Q_OBJECT
public:
- PopupSettings(QWidget *parent = 0);
+ PopupSettings(QWidget *parent = nullptr);
~PopupSettings();
public slots:
diff --git a/src/plugins/Ui/skinned/popupwidget.h b/src/plugins/Ui/skinned/popupwidget.h
index fd855dfec..84d00d4f4 100644
--- a/src/plugins/Ui/skinned/popupwidget.h
+++ b/src/plugins/Ui/skinned/popupwidget.h
@@ -37,7 +37,7 @@ class PopupWidget : public QWidget
{
Q_OBJECT
public:
- PopupWidget(QWidget *parent = 0);
+ PopupWidget(QWidget *parent = nullptr);
~PopupWidget();
diff --git a/src/plugins/Ui/skinned/positionbar.h b/src/plugins/Ui/skinned/positionbar.h
index bf16c83d6..2b0261fb9 100644
--- a/src/plugins/Ui/skinned/positionbar.h
+++ b/src/plugins/Ui/skinned/positionbar.h
@@ -33,7 +33,7 @@ class PositionBar : public PixmapWidget
{
Q_OBJECT
public:
- PositionBar(QWidget *parent = 0);
+ PositionBar(QWidget *parent = nullptr);
virtual ~PositionBar();
public slots:
diff --git a/src/plugins/Ui/skinned/preseteditor.cpp b/src/plugins/Ui/skinned/preseteditor.cpp
index 0d241b603..87e29f869 100644
--- a/src/plugins/Ui/skinned/preseteditor.cpp
+++ b/src/plugins/Ui/skinned/preseteditor.cpp
@@ -61,7 +61,7 @@ void PresetEditor::addAutoPresets(const QList<EQPreset*> &presets)
void PresetEditor::loadPreset()
{
- EQPreset* preset = 0;
+ EQPreset* preset = nullptr;
if (ui.tabWidget->currentIndex () == 0)
preset = (EQPreset *) ui.presetListWidget->currentItem ();
if (ui.tabWidget->currentIndex () == 1)
@@ -72,7 +72,7 @@ void PresetEditor::loadPreset()
void PresetEditor::deletePreset()
{
- EQPreset* preset = 0;
+ EQPreset* preset = nullptr;
if (ui.tabWidget->currentIndex () == 0)
preset = (EQPreset *) ui.presetListWidget->currentItem ();
if (ui.tabWidget->currentIndex () == 1)
diff --git a/src/plugins/Ui/skinned/preseteditor.h b/src/plugins/Ui/skinned/preseteditor.h
index b77932ce3..842122506 100644
--- a/src/plugins/Ui/skinned/preseteditor.h
+++ b/src/plugins/Ui/skinned/preseteditor.h
@@ -34,7 +34,7 @@ class PresetEditor : public QDialog
{
Q_OBJECT
public:
- PresetEditor(QWidget *parent = 0);
+ PresetEditor(QWidget *parent = nullptr);
~PresetEditor();
diff --git a/src/plugins/Ui/skinned/shadedbar.h b/src/plugins/Ui/skinned/shadedbar.h
index f5e3a9d8d..1a5f96fd3 100644
--- a/src/plugins/Ui/skinned/shadedbar.h
+++ b/src/plugins/Ui/skinned/shadedbar.h
@@ -33,7 +33,7 @@ class ShadedBar : public QWidget
{
Q_OBJECT
public:
- ShadedBar(QWidget *parent = 0, uint slider1 = 0, uint slider2 = 0, uint slider3 = 0);
+ ShadedBar(QWidget *parent = nullptr, uint slider1 = 0, uint slider2 = 0, uint slider3 = 0);
~ShadedBar();
int value()
diff --git a/src/plugins/Ui/skinned/shadedvisual.h b/src/plugins/Ui/skinned/shadedvisual.h
index 04b92b671..a74c6f693 100644
--- a/src/plugins/Ui/skinned/shadedvisual.h
+++ b/src/plugins/Ui/skinned/shadedvisual.h
@@ -35,7 +35,7 @@ class ShadedVisual : public Visual
{
Q_OBJECT
public:
- ShadedVisual(QWidget *parent = 0);
+ ShadedVisual(QWidget *parent = nullptr);
~ShadedVisual();
diff --git a/src/plugins/Ui/skinned/shortcutdialog.h b/src/plugins/Ui/skinned/shortcutdialog.h
index 92c549ac7..5d9a13469 100644
--- a/src/plugins/Ui/skinned/shortcutdialog.h
+++ b/src/plugins/Ui/skinned/shortcutdialog.h
@@ -32,7 +32,7 @@ class ShortcutDialog : public QDialog
{
Q_OBJECT
public:
- ShortcutDialog(const QString &key, QWidget *parent = 0);
+ ShortcutDialog(const QString &key, QWidget *parent = nullptr);
~ShortcutDialog();
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index fa38278fe..cc619a7bc 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -37,7 +37,7 @@
#include "skin.h"
#include "cursorimage.h"
-Skin *Skin::m_instance = 0;
+Skin *Skin::m_instance = nullptr;
Skin *Skin::instance()
{
@@ -858,7 +858,7 @@ QPixmap * Skin::getDummyPixmap(const QString &name, const QString &fallback)
}
qFatal("Skin: default skin is corrupted");
- return 0;
+ return nullptr;
}
QPixmap Skin::scalePixmap(const QPixmap &pix, int ratio)
diff --git a/src/plugins/Ui/skinned/skin.h b/src/plugins/Ui/skinned/skin.h
index 6a6509aa3..3077f2f07 100644
--- a/src/plugins/Ui/skinned/skin.h
+++ b/src/plugins/Ui/skinned/skin.h
@@ -35,7 +35,7 @@ class Skin : public QObject
{
Q_OBJECT
public:
- Skin(QObject *parent = 0);
+ Skin(QObject *parent = nullptr);
~Skin();
diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h
index ec8e30467..4f2c0c757 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.h
+++ b/src/plugins/Ui/skinned/skinnedsettings.h
@@ -32,7 +32,7 @@ class SkinnedSettings : public QWidget
{
Q_OBJECT
public:
- explicit SkinnedSettings(QWidget *parent = 0);
+ explicit SkinnedSettings(QWidget *parent = nullptr);
virtual ~SkinnedSettings();
void writeSettings();
diff --git a/src/plugins/Ui/skinned/skinreader.h b/src/plugins/Ui/skinned/skinreader.h
index ce76075f2..cebda0cb7 100644
--- a/src/plugins/Ui/skinned/skinreader.h
+++ b/src/plugins/Ui/skinned/skinreader.h
@@ -33,7 +33,7 @@ class SkinReader : public QObject
{
Q_OBJECT
public:
- SkinReader(QObject *parent = 0);
+ SkinReader(QObject *parent = nullptr);
~SkinReader();
diff --git a/src/plugins/Ui/skinned/symboldisplay.h b/src/plugins/Ui/skinned/symboldisplay.h
index 50761d08c..4f232ae01 100644
--- a/src/plugins/Ui/skinned/symboldisplay.h
+++ b/src/plugins/Ui/skinned/symboldisplay.h
@@ -32,7 +32,7 @@ class SymbolDisplay : public PixmapWidget
{
Q_OBJECT
public:
- SymbolDisplay(QWidget *parent = 0, int digits = 3);
+ SymbolDisplay(QWidget *parent = nullptr, int digits = 3);
virtual ~SymbolDisplay();
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index 078455588..9167cc0fa 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -42,7 +42,7 @@ TextScroller::TextScroller (QWidget *parent) : QWidget (parent)
{
m_pressed = false;
m_press_pos = 0;
- m_metrics = 0;
+ m_metrics = nullptr;
m_defautText = QString("Qmmp ") + Qmmp::strVersion();
m_formater.setPattern(TITLE_FORMAT);
m_core = SoundCore::instance();
@@ -234,14 +234,14 @@ void TextScroller::processState(Qmmp::State state)
}
case Qmmp::Playing:
{
- disconnect(m_core, SIGNAL(bufferingProgress(int)), this, 0);
+ disconnect(m_core, SIGNAL(bufferingProgress(int)), this, nullptr);
m_bufferText.clear();
updateText();
break;
}
case Qmmp::Stopped:
{
- disconnect(m_core, SIGNAL(bufferingProgress(int)), this, 0);
+ disconnect(m_core, SIGNAL(bufferingProgress(int)), this, nullptr);
break;
}
default:
diff --git a/src/plugins/Ui/skinned/textscroller.h b/src/plugins/Ui/skinned/textscroller.h
index 5dbf523be..2785b18ba 100644
--- a/src/plugins/Ui/skinned/textscroller.h
+++ b/src/plugins/Ui/skinned/textscroller.h
@@ -37,7 +37,7 @@ class TextScroller : public QWidget
{
Q_OBJECT
public:
- TextScroller(QWidget *parent = 0);
+ TextScroller(QWidget *parent = nullptr);
virtual ~TextScroller();
void setText(const QString &text);
diff --git a/src/plugins/Ui/skinned/timeindicator.h b/src/plugins/Ui/skinned/timeindicator.h
index 7f3721405..82ca728fd 100644
--- a/src/plugins/Ui/skinned/timeindicator.h
+++ b/src/plugins/Ui/skinned/timeindicator.h
@@ -35,7 +35,7 @@ class Skin;
class TimeIndicatorModel : public QObject {
Q_OBJECT
public:
- TimeIndicatorModel(QObject *parent = 0);
+ TimeIndicatorModel(QObject *parent = nullptr);
~TimeIndicatorModel();
int position() { return m_position; }
@@ -77,7 +77,7 @@ class TimeIndicator : public PixmapWidget
{
Q_OBJECT
public:
- TimeIndicator(TimeIndicatorModel *model, QWidget *parent = 0);
+ TimeIndicator(TimeIndicatorModel *model, QWidget *parent = nullptr);
~TimeIndicator();
protected:
diff --git a/src/plugins/Ui/skinned/titlebar.cpp b/src/plugins/Ui/skinned/titlebar.cpp
index 3b0f47a44..81ba910a7 100644
--- a/src/plugins/Ui/skinned/titlebar.cpp
+++ b/src/plugins/Ui/skinned/titlebar.cpp
@@ -45,10 +45,10 @@ TitleBar::TitleBar(TimeIndicatorModel *model, QWidget *parent)
setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A));
m_mw = qobject_cast<MainWindow*>(parent->parent());
m_shaded = false;
- m_shade2 = 0;
- m_currentTime = 0;
- m_control = 0;
- m_visual = 0;
+ m_shade2 = nullptr;
+ m_currentTime = nullptr;
+ m_control = nullptr;
+ m_visual = nullptr;
//buttons
m_menu = new Button(this,Skin::BT_MENU_N,Skin::BT_MENU_P, Skin::CUR_MAINMENU);
connect(m_menu,SIGNAL(clicked()),this,SLOT(showMainMenu()));
@@ -184,10 +184,10 @@ void TitleBar::shade()
m_control->deleteLater();
Visual::remove(m_visual);
m_visual->deleteLater();
- m_shade2 = 0;
- m_currentTime = 0;
- m_control = 0;
- m_visual = 0;
+ m_shade2 = nullptr;
+ m_currentTime = nullptr;
+ m_control = nullptr;
+ m_visual = nullptr;
m_shade->show();
}
qobject_cast<MainDisplay *> (parent())->setMinimalMode(m_shaded);
diff --git a/src/plugins/Ui/skinned/titlebar.h b/src/plugins/Ui/skinned/titlebar.h
index a2c7b98d3..284ee12d1 100644
--- a/src/plugins/Ui/skinned/titlebar.h
+++ b/src/plugins/Ui/skinned/titlebar.h
@@ -42,7 +42,7 @@ class TitleBar : public PixmapWidget
{
Q_OBJECT
public:
- TitleBar(TimeIndicatorModel *model, QWidget *parent = 0);
+ TitleBar(TimeIndicatorModel *model, QWidget *parent = nullptr);
~TitleBar();
diff --git a/src/plugins/Ui/skinned/titlebarcontrol.h b/src/plugins/Ui/skinned/titlebarcontrol.h
index a2fd5a051..46c3a7975 100644
--- a/src/plugins/Ui/skinned/titlebarcontrol.h
+++ b/src/plugins/Ui/skinned/titlebarcontrol.h
@@ -31,7 +31,7 @@ class TitleBarControl : public QWidget
{
Q_OBJECT
public:
- TitleBarControl(QWidget *parent = 0);
+ TitleBarControl(QWidget *parent = nullptr);
~TitleBarControl();
signals:
diff --git a/src/plugins/Ui/skinned/visualmenu.cpp b/src/plugins/Ui/skinned/visualmenu.cpp
index ba6409c55..cf99d361a 100644
--- a/src/plugins/Ui/skinned/visualmenu.cpp
+++ b/src/plugins/Ui/skinned/visualmenu.cpp
@@ -25,7 +25,7 @@
VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent)
{
- VisualFactory *factory = 0;
+ VisualFactory *factory = nullptr;
foreach(factory, Visual::factories())
{
VisualAction *act = new VisualAction(factory, this);
diff --git a/src/plugins/Ui/skinned/visualmenu.h b/src/plugins/Ui/skinned/visualmenu.h
index 301ce4e4e..2994e40dd 100644
--- a/src/plugins/Ui/skinned/visualmenu.h
+++ b/src/plugins/Ui/skinned/visualmenu.h
@@ -32,7 +32,7 @@ class VisualMenu : public QMenu
{
Q_OBJECT
public:
- VisualMenu(QWidget *parent = 0);
+ VisualMenu(QWidget *parent = nullptr);
~VisualMenu();
@@ -44,7 +44,7 @@ class VisualAction : public QAction
{
Q_OBJECT
public:
- VisualAction(VisualFactory *factory, QWidget *parent = 0);
+ VisualAction(VisualFactory *factory, QWidget *parent = nullptr);
private slots:
void select(bool);
diff --git a/src/plugins/Ui/skinned/volumebar.h b/src/plugins/Ui/skinned/volumebar.h
index 96a2315c7..7e8d83ecd 100644
--- a/src/plugins/Ui/skinned/volumebar.h
+++ b/src/plugins/Ui/skinned/volumebar.h
@@ -32,7 +32,7 @@ class VolumeBar : public PixmapWidget
{
Q_OBJECT
public:
- VolumeBar(QWidget *parent = 0);
+ VolumeBar(QWidget *parent = nullptr);
~VolumeBar();
diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp
index 5a409142b..e8ccf7ccb 100644
--- a/src/plugins/Visual/analyzer/analyzer.cpp
+++ b/src/plugins/Visual/analyzer/analyzer.cpp
@@ -33,9 +33,9 @@
Analyzer::Analyzer (QWidget *parent) : Visual (parent)
{
- m_intern_vis_data = 0;
- m_peaks = 0;
- m_x_scale = 0;
+ m_intern_vis_data = nullptr;
+ m_peaks = nullptr;
+ m_x_scale = nullptr;
m_rows = 0;
m_cols = 0;
m_update = false;
@@ -202,7 +202,7 @@ void Analyzer::mousePressEvent(QMouseEvent *e)
void Analyzer::process()
{
- static fft_state *state = 0;
+ static fft_state *state = nullptr;
if (!state)
state = fft_init();
diff --git a/src/plugins/Visual/analyzer/analyzer.h b/src/plugins/Visual/analyzer/analyzer.h
index c44e99aee..df090de8b 100644
--- a/src/plugins/Visual/analyzer/analyzer.h
+++ b/src/plugins/Visual/analyzer/analyzer.h
@@ -37,7 +37,7 @@ class Analyzer : public Visual
Q_OBJECT
public:
- Analyzer( QWidget *parent = 0);
+ Analyzer( QWidget *parent = nullptr);
virtual ~Analyzer();
public slots:
diff --git a/src/plugins/Visual/analyzer/colorwidget.h b/src/plugins/Visual/analyzer/colorwidget.h
index 86d915a09..1f8049ef5 100644
--- a/src/plugins/Visual/analyzer/colorwidget.h
+++ b/src/plugins/Visual/analyzer/colorwidget.h
@@ -30,7 +30,7 @@ class ColorWidget : public QFrame
{
Q_OBJECT
public:
- ColorWidget(QWidget *parent = 0);
+ ColorWidget(QWidget *parent = nullptr);
~ColorWidget();
diff --git a/src/plugins/Visual/analyzer/settingsdialog.h b/src/plugins/Visual/analyzer/settingsdialog.h
index 1ad4e632e..dd2df6cd7 100644
--- a/src/plugins/Visual/analyzer/settingsdialog.h
+++ b/src/plugins/Visual/analyzer/settingsdialog.h
@@ -30,7 +30,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
- SettingsDialog(QWidget *parent = 0);
+ SettingsDialog(QWidget *parent = nullptr);
~SettingsDialog();
diff --git a/src/plugins/Visual/projectm/projectmplugin.h b/src/plugins/Visual/projectm/projectmplugin.h
index 76847a72d..84800f7ca 100644
--- a/src/plugins/Visual/projectm/projectmplugin.h
+++ b/src/plugins/Visual/projectm/projectmplugin.h
@@ -33,7 +33,7 @@ class ProjectMPlugin : public Visual
{
Q_OBJECT
public:
- ProjectMPlugin(QWidget *parent = 0);
+ ProjectMPlugin(QWidget *parent = nullptr);
virtual ~ProjectMPlugin();
public slots:
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index 95c2ea61d..2f5a87dd6 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -42,7 +42,7 @@ ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
{
setMouseTracking(true);
m_listWidget = listWidget;
- m_projectM = 0;
+ m_projectM = nullptr;
m_menu = new QMenu(this);
connect(SoundCore::instance(), SIGNAL(trackInfoChanged()), SLOT(updateTitle()));
createActions();
diff --git a/src/plugins/Visual/projectm/projectmwidget.h b/src/plugins/Visual/projectm/projectmwidget.h
index 561aa1658..596180e84 100644
--- a/src/plugins/Visual/projectm/projectmwidget.h
+++ b/src/plugins/Visual/projectm/projectmwidget.h
@@ -35,7 +35,7 @@ class ProjectMWidget : public QOpenGLWidget
{
Q_OBJECT
public:
- ProjectMWidget(QListWidget *listWidget, QWidget *parent = 0);
+ ProjectMWidget(QListWidget *listWidget, QWidget *parent = nullptr);
~ProjectMWidget();
diff --git a/src/plugins/Visual/projectm/projectmwrapper.h b/src/plugins/Visual/projectm/projectmwrapper.h
index 530ee0fee..95f76f5ea 100644
--- a/src/plugins/Visual/projectm/projectmwrapper.h
+++ b/src/plugins/Visual/projectm/projectmwrapper.h
@@ -28,8 +28,8 @@ class ProjectMWrapper : public QObject, public projectM
{
Q_OBJECT
public:
- explicit ProjectMWrapper(std::string config_file, int flags, QObject *parent = 0);
- explicit ProjectMWrapper(Settings settings, int flags, QObject *parent = 0);
+ explicit ProjectMWrapper(std::string config_file, int flags, QObject *parent = nullptr);
+ explicit ProjectMWrapper(Settings settings, int flags, QObject *parent = nullptr);
virtual ~ProjectMWrapper();
diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp
index 60698c067..e0f092c94 100644
--- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp
+++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp
@@ -41,7 +41,7 @@ Visual *VisualProjectMFactory::create(QWidget *parent)
QDialog *VisualProjectMFactory::createConfigDialog(QWidget *parent)
{
Q_UNUSED(parent);
- return 0;
+ return nullptr;
}
void VisualProjectMFactory::showAbout(QWidget *parent)