diff options
| author |  wodim | 2019-04-01 15:01:02 +0200 |
|---|---|---|
| committer |  GitHub | 2019-04-01 15:01:02 +0200 |
| commit | 1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9 (patch) | |
| tree | 94cfdd5000b6b0d6af1272e89f8b234fd8c484d4 /src/modules/options/OptionsWidget_sound.cpp | |
| parent | Add support for Python 3 (diff) | |
| parent | uintUserListMinimumWidth: Reduce minimum due to account for certain combinati... (diff) | |
| download | KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.gz KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.bz2 KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.zip | |
Merge branch 'master' into python3
Diffstat (limited to 'src/modules/options/OptionsWidget_sound.cpp')
| -rw-r--r-- | src/modules/options/OptionsWidget_sound.cpp | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index e5c72ef1f..4b84b3e41 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -218,25 +218,18 @@ void OptionsWidget_soundGeneral::mediaAutoDetect() void OptionsWidget_soundGeneral::soundFillBox() { QStringList l; - QStringList::Iterator it; - int cnt; - int i; + unsigned int cnt, i; KviModule * m = g_pModuleManager->getModule("snd"); - if(!m) - goto disable; - - if(!m->ctrl("getAvailableSoundSystems", &l)) + if(!m || !m->ctrl("getAvailableSoundSystems", &l)) goto disable; m_pSoundSystemBox->clear(); - for(it = l.begin(); it != l.end(); ++it) - { - m_pSoundSystemBox->addItem(*it); - } - cnt = m_pSoundSystemBox->count(); + for(const auto& it : l) + m_pSoundSystemBox->addItem(it); + cnt = m_pSoundSystemBox->count(); for(i = 0; i < cnt; i++) { QString t = m_pSoundSystemBox->itemText(i); @@ -258,22 +251,18 @@ disable: void OptionsWidget_soundGeneral::mediaFillBox() { QStringList l; - QStringList::Iterator it; - int cnt; - int i; + unsigned int cnt, i; KviModule * m = g_pModuleManager->getModule("mediaplayer"); - if(!m) - goto disable; - if(!m->ctrl("getAvailableMediaPlayers", &l)) + if(!m || !m->ctrl("getAvailableMediaPlayers", &l)) goto disable; + m_pMediaPlayerBox->clear(); - for(it = l.begin(); it != l.end(); ++it) - { - m_pMediaPlayerBox->addItem(*it); - } - cnt = m_pMediaPlayerBox->count(); + for(const auto& it : l) + m_pMediaPlayerBox->addItem(it); + + cnt = m_pMediaPlayerBox->count(); for(i = 0; i < cnt; i++) { QString t = m_pMediaPlayerBox->itemText(i); |