Merge pull request #1962 from DarthGandalf/modernize

Apply several fixes of clang-tidy

5 files changed, 27 insertions, 36 deletions

diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 487681942..5ffd5466c 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -91,9 +91,9 @@ namespace AddonFunctions
 			return notAValidAddonPackage(szError);
 
 		// make sure the default fields exist
-		for(int i = 0; i < 6; i++)
+		for(auto & check_field : check_fields)
 		{
-			pValue = pInfoFields->find(check_fields[i]);
+			pValue = pInfoFields->find(check_field);
 			if(!pValue)
 				return notAValidAddonPackage(szError);
 		}
@@ -102,7 +102,7 @@ namespace AddonFunctions
 		// load its picture
 		pByteArray = r.binaryInfoFields()->find("Image");
 		if(pByteArray)
-			pix.loadFromData(*pByteArray, 0, 0);
+			pix.loadFromData(*pByteArray, nullptr, nullptr);
 
 		if(pix.isNull())
 		{
@@ -241,7 +241,7 @@ namespace AddonFunctions
 		}
 
 		if(!KviFileUtils::deleteDir(szUnpackPath))
-			QMessageBox::warning(NULL, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath));
+			QMessageBox::warning(nullptr, __tr2qs_ctx("Warning While Unpacking Addon - KVIrc", "addon"), __tr2qs_ctx("Failed to delete the directory '%1'", "addon").arg(szUnpackPath));
 
 		return true;
 	}
@@ -323,7 +323,7 @@ namespace AddonFunctions
 			}
 
 			QByteArray * pba = new QByteArray();
-			QBuffer bufferz(pba, 0);
+			QBuffer bufferz(pba, nullptr);
 
 			bufferz.open(QIODevice::WriteOnly);
 			pix.save(&bufferz, "PNG");
@@ -340,10 +340,8 @@ namespace AddonFunctions
 			return false;
 		}
 
-		for(QFileInfoList::Iterator it = ls.begin(); it != ls.end(); ++it)
+		for(auto & inf : ls)
 		{
-			const QFileInfo & inf = *it;
-
 			if(inf.isDir())
 			{
 				if(!pw.addDirectory(inf.absoluteFilePath(), QString("%1/").arg(inf.fileName())))
diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp
index 3b96e47c4..754ef6ad7 100644
--- a/src/modules/addon/AddonManagementDialog.cpp
+++ b/src/modules/addon/AddonManagementDialog.cpp
@@ -60,7 +60,7 @@
 #include "WebAddonInterfaceDialog.h"
 #endif //COMPILE_WEBKIT_SUPPORT
 
-AddonManagementDialog * AddonManagementDialog::m_pInstance = 0;
+AddonManagementDialog * AddonManagementDialog::m_pInstance = nullptr;
 extern QRect g_rectManagementDialogGeometry;
 
 AddonListViewItem::AddonListViewItem(KviTalListWidget * v, KviKvsScriptAddon * a)
@@ -99,7 +99,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p)
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Addons)));
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-	m_pWebInterfaceDialog = NULL;
+	m_pWebInterfaceDialog = nullptr;
 #endif //COMPILE_WEBKIT_SUPPORT
 
 	m_pInstance = this;
@@ -172,7 +172,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p)
 
 	fillListView();
 
-	currentChanged(0, 0);
+	currentChanged(nullptr, nullptr);
 	connect(m_pListWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(currentChanged(QListWidgetItem *, QListWidgetItem *)));
 	m_pListWidget->setCurrentItem(m_pListWidget->item(0));
 
@@ -205,7 +205,7 @@ AddonManagementDialog::~AddonManagementDialog()
 		delete m_pWebInterfaceDialog;
 #endif //COMPILE_WEBKIT_SUPPORT
 	g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height());
-	m_pInstance = NULL;
+	m_pInstance = nullptr;
 }
 
 void AddonManagementDialog::fillListView()
@@ -280,14 +280,14 @@ void AddonManagementDialog::uninstallScript()
 	if(QMessageBox::question(
 	       this,
 	       __tr2qs_ctx("Confirm Addon Uninstallation - KVIrc", "addon"),
-	       txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), 0, 1)
+	       txt, __tr2qs_ctx("Yes", "addon"), __tr2qs_ctx("No", "addon"), nullptr, 1)
 	    != 0)
 		return;
 
 	KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(), g_pActiveWindow);
 
 	fillListView();
-	currentChanged(0, 0);
+	currentChanged(nullptr, nullptr);
 }
 
 void AddonManagementDialog::getMoreScripts()
@@ -344,7 +344,7 @@ void AddonManagementDialog::installScript()
 	}
 
 	fillListView();
-	currentChanged(0, 0);
+	currentChanged(nullptr, nullptr);
 
 	//m_pListWidget->publicUpdateContents();
 	//m_pListWidget->triggerUpdate();
@@ -360,7 +360,7 @@ void AddonManagementDialog::cleanup()
 	if(!m_pInstance)
 		return;
 	delete m_pInstance;
-	m_pInstance = 0;
+	m_pInstance = nullptr;
 }
 
 void AddonManagementDialog::display(bool bTopLevel)
@@ -371,7 +371,7 @@ void AddonManagementDialog::display(bool bTopLevel)
 		{
 			if(m_pInstance->parent())
 			{
-				m_pInstance->setParent(0);
+				m_pInstance->setParent(nullptr);
 			}
 		}
 		else
@@ -386,7 +386,7 @@ void AddonManagementDialog::display(bool bTopLevel)
 	{
 		if(bTopLevel)
 		{
-			m_pInstance = new AddonManagementDialog(0);
+			m_pInstance = new AddonManagementDialog(nullptr);
 		}
 		else
 		{
diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp
index b56fa3d12..cf416a4c3 100644
--- a/src/modules/addon/PackAddonDialog.cpp
+++ b/src/modules/addon/PackAddonDialog.cpp
@@ -119,8 +119,7 @@ PackAddonDialog::PackAddonDialog(QWidget * pParent)
 }
 
 PackAddonDialog::~PackAddonDialog()
-{
-}
+    = default;
 
 void PackAddonDialog::accept()
 {
@@ -250,8 +249,7 @@ PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent
 }
 
 PackAddonInfoPackageWidget::~PackAddonInfoPackageWidget()
-{
-}
+    = default;
 
 PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pParent)
     : QWizardPage(pParent)
@@ -276,8 +274,7 @@ PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pPa
 }
 
 PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget()
-{
-}
+    = default;
 
 PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pParent)
     : QWizardPage(pParent)
@@ -303,8 +300,7 @@ PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pPa
 }
 
 PackAddonSaveSelectionWidget::~PackAddonSaveSelectionWidget()
-{
-}
+    = default;
 
 void PackAddonSaveSelectionWidget::initializePage()
 {
@@ -335,8 +331,7 @@ PackAddonSummaryInfoWidget::PackAddonSummaryInfoWidget(PackAddonDialog * pParent
 }
 
 PackAddonSummaryInfoWidget::~PackAddonSummaryInfoWidget()
-{
-}
+    = default;
 
 void PackAddonSummaryInfoWidget::initializePage()
 {
@@ -417,8 +412,7 @@ PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pPare
 }
 
 PackAddonSummaryFilesWidget::~PackAddonSummaryFilesWidget()
-{
-}
+    = default;
 
 void PackAddonSummaryFilesWidget::accept()
 {
diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp
index b0f990571..ab639093c 100644
--- a/src/modules/addon/WebAddonInterfaceDialog.cpp
+++ b/src/modules/addon/WebAddonInterfaceDialog.cpp
@@ -46,8 +46,7 @@ WebAddonInterfaceDialog::WebAddonInterfaceDialog(QWidget * par)
 	        .arg(QString::fromUtf8(KviLocale::instance()->localeName().ptr())));
 }
 WebAddonInterfaceDialog::~WebAddonInterfaceDialog()
-{
-}
+    = default;
 
 bool WebAddonInterfaceDialog::installPackage(const QString & szPath, QString & szError)
 {
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 6b96a0cf0..bc3ce94e2 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -730,9 +730,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 
 	KviFileUtils::makeDir(szTargetPath);
 
-	for(QStringList::Iterator it = lExpandedEntries.begin(); it != lExpandedEntries.end(); ++it)
+	for(auto & lExpandedEntrie : lExpandedEntries)
 	{
-		QFileInfo inf(*it);
+		QFileInfo inf(lExpandedEntrie);
 		if(!inf.exists())
 		{
 			qDebug("ERROR: file %s doesn't exist, but it should...", inf.fileName().toUtf8().data());
@@ -743,9 +743,9 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 		g_pApp->getLocalKvircDirectory(szTargetPath, KviApplication::None, szEntry);
 
 		if(!bQuiet)
-			c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(*it).arg(szTargetPath));
+			c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Installing file '%1' into '%2'", "addon").arg(lExpandedEntrie).arg(szTargetPath));
 
-		KviFileUtils::copyFile(*it, szTargetPath);
+		KviFileUtils::copyFile(lExpandedEntrie, szTargetPath);
 
 		a->addInstalledFile(szEntry);
 	}