Minor cleanups

2 files changed, 15 insertions, 27 deletions

diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp
index 44b66cd7f..655b25033 100644
--- a/src/kvirc/kernel/KviIpcSentinel.cpp
+++ b/src/kvirc/kernel/KviIpcSentinel.cpp
@@ -112,7 +112,7 @@ static Window kvi_x11_findIpcSentinel(Window win)
 
 	Window root, parent;
 	Window * children;
-	unsigned int nChildren;
+	size_t nChildren;
 
 	if(!XQueryTree(kvi_ipc_get_xdisplay(), win, &root, &parent, &children, &nChildren))
 	{
@@ -123,7 +123,7 @@ static Window kvi_x11_findIpcSentinel(Window win)
 
 	Window found = 0;
 
-	for(int i = nChildren - 1; (!found) && (i >= 0); i--)
+	for(size_t i = nChildren - 1; (!found) && (i >= 0); i--)
 		found = kvi_x11_findIpcSentinel(children[i]);
 
 	if(children)
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index e5c72ef1f..463e443e9 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -218,26 +218,19 @@ void OptionsWidget_soundGeneral::mediaAutoDetect()
 void OptionsWidget_soundGeneral::soundFillBox()
 {
 	QStringList l;
-	QStringList::Iterator it;
-	int cnt;
-	int 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);
+
+	unsigned int cnt = m_pSoundSystemBox->count();
 
-	for(i = 0; i < cnt; i++)
+	for(unsigned int i = 0; i < cnt; i++)
 	{
 		QString t = m_pSoundSystemBox->itemText(i);
 		if(KviQString::equalCI(t, KVI_OPTION_STRING(KviOption_stringSoundSystem)))
@@ -258,23 +251,18 @@ disable:
 void OptionsWidget_soundGeneral::mediaFillBox()
 {
 	QStringList l;
-	QStringList::Iterator it;
-	int cnt;
-	int 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(i = 0; i < cnt; i++)
+	for(const auto& it : l)
+		m_pMediaPlayerBox->addItem(it);
+
+	unsigned int cnt = m_pMediaPlayerBox->count();
+	for(unsigned int i = 0; i < cnt; i++)
 	{
 		QString t = m_pMediaPlayerBox->itemText(i);
 		if(KviQString::equalCI(t, KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer)))