fixed build with -Werror=zero-as-null-pointer-constant

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8573 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 64 insertions, 64 deletions

diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp
index 5769cc48c..5dd8632f3 100644
--- a/src/plugins/General/hotkey/hotkeymanager_win.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp
@@ -65,7 +65,7 @@ static struct
     { VK_MEDIA_PREV_TRACK, 0x110,  "Media Previous Track"},

     { VK_MEDIA_STOP, 0x124,  "Media Stop"},

     { VK_MEDIA_PLAY_PAUSE, 0x122,  "Media Play/Pause"},

-{ 0, 0, 0 }

+{ 0, 0, nullptr }

 };

 

 quint32 Hotkey::defaultKey()

diff --git a/src/plugins/General/taskbar/taskbarfactory.cpp b/src/plugins/General/taskbar/taskbarfactory.cpp
index a3ab76ce2..fcdd88f34 100644
--- a/src/plugins/General/taskbar/taskbarfactory.cpp
+++ b/src/plugins/General/taskbar/taskbarfactory.cpp
@@ -41,7 +41,7 @@ QObject *TaskbarFactory::create(QObject *parent)
 QDialog *TaskbarFactory::createConfigDialog(QWidget *parent)

 {

     Q_UNUSED(parent);

-    return 0;

+    return nullptr;

 }

 

 void TaskbarFactory::showAbout(QWidget *parent)

diff --git a/src/plugins/Output/directsound/outputdirectsound.cpp b/src/plugins/Output/directsound/outputdirectsound.cpp
index b04d8467f..b9781dd11 100644
--- a/src/plugins/Output/directsound/outputdirectsound.cpp
+++ b/src/plugins/Output/directsound/outputdirectsound.cpp
@@ -30,8 +30,8 @@
 

 #define DS_BUFSIZE (128*1024)

 

-OutputDirectSound *OutputDirectSound::instance = 0;

-VolumeDirectSound *OutputDirectSound::volumeControl = 0;

+OutputDirectSound *OutputDirectSound::instance = nullptr;

+VolumeDirectSound *OutputDirectSound::volumeControl = nullptr;

 OutputDirectSound::DSoundChannels OutputDirectSound::m_dsound_pos[10]  = {

    {Qmmp::CHAN_FRONT_LEFT, SPEAKER_FRONT_LEFT},

    {Qmmp::CHAN_FRONT_RIGHT, SPEAKER_FRONT_RIGHT},

@@ -47,9 +47,9 @@ OutputDirectSound::DSoundChannels OutputDirectSound::m_dsound_pos[10]  = {
 

 OutputDirectSound::OutputDirectSound() : Output()

 {

-    m_ds = 0;

-    m_primaryBuffer = 0;

-    m_dsBuffer = 0;

+    m_ds = nullptr;

+    m_primaryBuffer = nullptr;

+    m_dsBuffer = nullptr;

     m_dsBufferAt = 0;

     m_latency = 0;

     m_bytesPerSecond = 0;

@@ -59,7 +59,7 @@ OutputDirectSound::OutputDirectSound() : Output()
 

 OutputDirectSound::~OutputDirectSound()

 {

-    instance = 0;

+    instance = nullptr;

     uninitialize();

 }

 

@@ -69,11 +69,11 @@ bool OutputDirectSound::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForm
     DSBUFFERDESC bufferDesc;

 

 

-    HRESULT result = DirectSoundCreate8(0, &m_ds, 0);

+    HRESULT result = DirectSoundCreate8(nullptr, &m_ds, nullptr);

     if(result != DS_OK)

     {

         qWarning("OutputDirectSound: DirectSoundCreate8 failed, error code = 0x%lx", result);

-        m_ds = 0;

+        m_ds = nullptr;

         return false;

     }

 

@@ -91,7 +91,7 @@ bool OutputDirectSound::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForm
 

     if((result = m_ds->CreateSoundBuffer(&bufferDesc, &m_primaryBuffer, NULL)) != DS_OK)

     {

-        m_primaryBuffer = 0;

+        m_primaryBuffer = nullptr;

         qWarning("OutputDirectSound: CreateSoundBuffer failed, error code = 0x%lx", result);

         return false;

     }

@@ -172,7 +172,7 @@ bool OutputDirectSound::initialize(quint32 freq, ChannelMap map, Qmmp::AudioForm
 

     if((result = pDSB->QueryInterface(IID_IDirectSoundBuffer8, (void**)&m_dsBuffer)) != DS_OK)

     {

-        m_dsBuffer = 0;

+        m_dsBuffer = nullptr;

         qWarning("OutputDirectSound: QueryInterface failed, error code = 0x%lx", result);

         pDSB->Release();

         return false;

@@ -195,7 +195,7 @@ qint64 OutputDirectSound::latency()
 

 qint64 OutputDirectSound::writeAudio(unsigned char *data, qint64 len)

 {

-    unsigned char *ptr = 0, *ptr2 = 0;

+    unsigned char *ptr = nullptr, *ptr2 = nullptr;

     DWORD size = 0, size2 = 0;

     DWORD available = bytesToWrite(); //available bytes

     m_latency = (DS_BUFSIZE - available) * 1000 / m_bytesPerSecond;

@@ -255,15 +255,15 @@ qint64 OutputDirectSound::writeAudio(unsigned char *data, qint64 len)
 void OutputDirectSound::drain()

 {

     DWORD dsCurrentPlayCursor = 0;

-    m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, 0);

+    m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, nullptr);

 

     while(dsCurrentPlayCursor >= m_dsBufferAt)

     {

-        m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, 0);

+        m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, nullptr);

     }

     while (dsCurrentPlayCursor <= m_dsBufferAt)

     {

-        m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, 0);

+        m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, nullptr);

     }

 }

 

@@ -299,25 +299,25 @@ void OutputDirectSound::uninitialize()
     {

         m_dsBuffer->Stop();

         m_dsBuffer->Release();

-        m_dsBuffer = 0;

+        m_dsBuffer = nullptr;

     }

     if(m_primaryBuffer)

     {

         m_primaryBuffer->Stop();

         m_primaryBuffer->Release();

-        m_primaryBuffer = 0;

+        m_primaryBuffer = nullptr;

     }

     if(m_ds)

     {

         m_ds->Release();

-        m_ds = 0;

+        m_ds = nullptr;

     }

 }

 

 DWORD OutputDirectSound::bytesToWrite()

 {

     DWORD dsCurrentPlayCursor = 0;

-    m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, 0);

+    m_dsBuffer->GetCurrentPosition((DWORD*)&dsCurrentPlayCursor, nullptr);

     long available = dsCurrentPlayCursor - m_dsBufferAt; //available bytes

 

     if(available < 0)

@@ -342,7 +342,7 @@ VolumeDirectSound::~VolumeDirectSound()
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);

     settings.setValue("DirectSound/left_volume", m_volume.left);

     settings.setValue("DirectSound/right_volume", m_volume.right);

-    OutputDirectSound::volumeControl = 0;

+    OutputDirectSound::volumeControl = nullptr;

 }

 

 void VolumeDirectSound::setVolume(const VolumeSettings &vol)

diff --git a/src/plugins/Output/wasapi/outputwasapi.cpp b/src/plugins/Output/wasapi/outputwasapi.cpp
index eaa09cb54..c40171198 100644
--- a/src/plugins/Output/wasapi/outputwasapi.cpp
+++ b/src/plugins/Output/wasapi/outputwasapi.cpp
@@ -39,8 +39,8 @@
 #define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000

 #endif

 

-OutputWASAPI *OutputWASAPI::instance = 0;

-VolumeWASAPI *OutputWASAPI::volumeControl = 0;

+OutputWASAPI *OutputWASAPI::instance = nullptr;

+VolumeWASAPI *OutputWASAPI::volumeControl = nullptr;

 OutputWASAPI::DWASAPIChannels OutputWASAPI::m_wasapi_pos[10]  = {

    {Qmmp::CHAN_FRONT_LEFT, SPEAKER_FRONT_LEFT},

    {Qmmp::CHAN_FRONT_RIGHT, SPEAKER_FRONT_RIGHT},

@@ -56,11 +56,11 @@ OutputWASAPI::DWASAPIChannels OutputWASAPI::m_wasapi_pos[10]  = {
 

 OutputWASAPI::OutputWASAPI() : Output()

 {

-    m_pEnumerator = 0;

-    m_pDevice = 0;

-    m_pAudioClient = 0;

-    m_pRenderClient = 0;

-    m_pSimpleAudioVolume = 0;

+    m_pEnumerator = nullptr;

+    m_pDevice = nullptr;

+    m_pAudioClient = nullptr;

+    m_pRenderClient = nullptr;

+    m_pSimpleAudioVolume = nullptr;

     instance = this;

     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);

     m_id = settings.value("WASAPI/device", "default").toString();

@@ -69,7 +69,7 @@ OutputWASAPI::OutputWASAPI() : Output()
 

 OutputWASAPI::~OutputWASAPI()

 {

-    instance = 0;

+    instance = nullptr;

     uninitialize();

 }

 

@@ -79,7 +79,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
     if(result != S_OK)

     {

         qWarning("OutputWASAPI: CoCreateInstance failed, error code = 0x%lx", result);

-        m_pEnumerator = 0;

+        m_pEnumerator = nullptr;

         return false;

     }

 

@@ -92,7 +92,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
         if((result = m_pEnumerator->GetDevice(id, &m_pDevice)) != S_OK)

         {

             qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDevice failed, error code = 0x%lx", result);

-            m_pDevice = 0;

+            m_pDevice = nullptr;

         }

         else

             qDebug("OutputWASAPI: using device id: %s", qPrintable(m_id));

@@ -103,7 +103,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
         if((result = m_pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &m_pDevice)) != S_OK)

         {

             qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDefaultAudioEndpoint failed, error code = 0x%lx", result);

-            m_pDevice = 0;

+            m_pDevice = nullptr;

             return false;

         }

     }

@@ -111,7 +111,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
     if((result = m_pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&m_pAudioClient)) != S_OK)

     {

         qWarning("OutputWASAPI: IMMDevice::Activate failed, error code = 0x%lx", result);

-        m_pAudioClient = 0;

+        m_pAudioClient = nullptr;

         return false;

     }

 

@@ -166,7 +166,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
     AUDCLNT_SHAREMODE mode = m_exclusive ? AUDCLNT_SHAREMODE_EXCLUSIVE :  AUDCLNT_SHAREMODE_SHARED;

     DWORD streamFlags = 0;

     //enable channel matrixer and a sample rate converter if format is unsupported

-    if(m_pAudioClient->IsFormatSupported(mode, (WAVEFORMATEX *)&wfex, 0) != S_OK)

+    if(m_pAudioClient->IsFormatSupported(mode, (WAVEFORMATEX *)&wfex, nullptr) != S_OK)

     {

         streamFlags |= AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM;

         qDebug("OutputWASAPI: format is not supported, using converter");

@@ -220,7 +220,7 @@ qint64 OutputWASAPI::latency()
 qint64 OutputWASAPI::writeAudio(unsigned char *data, qint64 len)

 {

     UINT32 frames = 0;

-    BYTE *pData = 0;

+    BYTE *pData = nullptr;

     DWORD flags = 0;

     DWORD result = 0;

     m_pAudioClient->GetCurrentPadding(&frames);

@@ -291,27 +291,27 @@ void OutputWASAPI::uninitialize()
     {

         m_pAudioClient->Stop();

         m_pAudioClient->Release();

-        m_pAudioClient = 0;

+        m_pAudioClient = nullptr;

     }

     if(m_pEnumerator)

     {

         m_pEnumerator->Release();

-        m_pEnumerator = 0;

+        m_pEnumerator = nullptr;

     }

     if(m_pDevice)

     {

         m_pDevice->Release();

-        m_pDevice = 0;

+        m_pDevice = nullptr;

     }

     if(m_pRenderClient)

     {

         m_pRenderClient->Release();

-        m_pRenderClient = 0;

+        m_pRenderClient = nullptr;

     }

     if(m_pSimpleAudioVolume)

     {

         m_pSimpleAudioVolume->Release();

-        m_pSimpleAudioVolume = 0;

+        m_pSimpleAudioVolume = nullptr;

     }

 }

 

@@ -330,14 +330,14 @@ VolumeWASAPI::~VolumeWASAPI()
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);

     settings.setValue("WASAPI/left_volume", m_volume.left);

     settings.setValue("WASAPI/right_volume", m_volume.right);

-    OutputWASAPI::volumeControl = 0;

+    OutputWASAPI::volumeControl = nullptr;

 }

 

 void VolumeWASAPI::setVolume(const VolumeSettings &vol)

 {

     if(OutputWASAPI::instance && OutputWASAPI::instance->simpleAudioVolume())

     {

-        OutputWASAPI::instance->simpleAudioVolume()->SetMasterVolume(float(qMax(vol.left, vol.right)) / 100.0f, 0);

+        OutputWASAPI::instance->simpleAudioVolume()->SetMasterVolume(float(qMax(vol.left, vol.right)) / 100.0f, nullptr);

     }

     m_volume = vol;

 }

diff --git a/src/plugins/Output/wasapi/settingsdialog.cpp b/src/plugins/Output/wasapi/settingsdialog.cpp
index 12bb0f592..910cd7782 100644
--- a/src/plugins/Output/wasapi/settingsdialog.cpp
+++ b/src/plugins/Output/wasapi/settingsdialog.cpp
@@ -57,25 +57,25 @@ void SettingsDialog::enumDevices()
     m_ui.deviceComboBox->clear();

     m_ui.deviceComboBox->addItem(tr("Default"), "default");

 

-    IMMDeviceEnumerator *pEnumerator = 0;

+    IMMDeviceEnumerator *pEnumerator = nullptr;

     HRESULT result = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);

     if(result != S_OK)

     {

         qWarning("SettingsDialog: CoCreateInstance failed, error code = 0x%lx", result);

-        pEnumerator = 0;

+        pEnumerator = nullptr;

     }

 

-    IMMDeviceCollection *pEndpoints = 0;

-    IMMDevice *pEndpoint = 0;

-    LPWSTR pwszID = 0;

-    IPropertyStore *pProps = 0;

+    IMMDeviceCollection *pEndpoints = nullptr;

+    IMMDevice *pEndpoint = nullptr;

+    LPWSTR pwszID = nullptr;

+    IPropertyStore *pProps = nullptr;

     UINT count = 0;

 

     result = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEndpoints);

     if(result != S_OK)

     {

         qWarning("SettingsDialog: IMMDeviceEnumerator::EnumAudioEndpoints failed, error code = 0x%lx", result);

-        pEndpoints = 0;

+        pEndpoints = nullptr;

     }

 

     if(pEndpoints)

@@ -93,7 +93,7 @@ void SettingsDialog::enumDevices()
             if(result != S_OK)

             {

                 qWarning("SettingsDialog: IMMDeviceCollection::Item failed, error code = 0x%lx", result);

-                pEndpoint = 0;

+                pEndpoint = nullptr;

                 break;

             }

 

@@ -101,7 +101,7 @@ void SettingsDialog::enumDevices()
             if(result != S_OK)

             {

                 qWarning("SettingsDialog: IMMDevice::GetId failed, error code = 0x%lx", result);

-                pwszID = 0;

+                pwszID = nullptr;

                 break;

             }

 

@@ -109,7 +109,7 @@ void SettingsDialog::enumDevices()
             if(result != S_OK)

             {

                 qWarning("SettingsDialog: IMMDevice::GetId failed, error code = 0x%lx", result);

-                pProps = 0;

+                pProps = nullptr;

                 break;

             }

 

@@ -126,42 +126,42 @@ void SettingsDialog::enumDevices()
             m_ui.deviceComboBox->addItem(QString::fromWCharArray(varName.pwszVal), QString::fromWCharArray(pwszID));

 

             CoTaskMemFree(pwszID);

-            pwszID = 0;

+            pwszID = nullptr;

             PropVariantClear(&varName);

             pProps->Release();

-            pProps = 0;

+            pProps = nullptr;

             pEndpoint->Release();

-            pEndpoint = 0;

+            pEndpoint = nullptr;

         }

     }

 

     if(pProps)

     {

         pProps->Release();

-        pProps = 0;

+        pProps = nullptr;

     }

 

     if(pwszID)

     {

         CoTaskMemFree(pwszID);

-        pwszID = 0;

+        pwszID = nullptr;

     }

 

     if(pEndpoint)

     {

         pEndpoint->Release();

-        pEndpoint = 0;

+        pEndpoint = nullptr;

     }

 

     if(pEndpoints)

     {

         pEndpoints->Release();

-        pEndpoints = 0;

+        pEndpoints = nullptr;

     }

 

     if(pEnumerator)

     {

        pEnumerator->Release();

-       pEnumerator = 0;

+       pEnumerator = nullptr;

     }

 }

diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp
index 4219649aa..12175d7f7 100644
--- a/src/plugins/Output/waveout/outputwaveout.cpp
+++ b/src/plugins/Output/waveout/outputwaveout.cpp
@@ -244,7 +244,7 @@ void OutputWaveOut::uninitialize()
 

         waveOutReset (dev);      // reset the device

         waveOutClose (dev);      // close the device

-        dev = 0;

+        dev = nullptr;

     }

 

     DeleteCriticalSection (&cs);

@@ -262,14 +262,14 @@ VolumeWaveOut::~VolumeWaveOut()
 void VolumeWaveOut::setVolume(const VolumeSettings &vol)

 {

     DWORD data = (vol.right*0xFFFF/100 << 16) | vol.left*0xFFFF/100;

-    waveOutSetVolume(0, data);

+    waveOutSetVolume(nullptr, data);

 }

 

 VolumeSettings VolumeWaveOut::volume() const

 {

     VolumeSettings vol;

     DWORD data;

-    waveOutGetVolume(0, (PDWORD)&data);

+    waveOutGetVolume(nullptr, (PDWORD)&data);

     vol.left = (long)LOWORD(data) * 100 / 0xFFFF + 1;

     vol.right = (long)HIWORD(data) * 100 / 0xFFFF + 1;

     return vol;

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index 85e4744f4..9d3a596ec 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -45,7 +45,7 @@ Volume *OutputWaveOutFactory::createVolume()
     {

         qDebug("OutputWaveOutFactory: device doesn't support volume control");

         delete vol;

-        return 0;

+        return nullptr;

     }

     return vol;

 }