Fix clang-tidy errors

silicon-heaven · Mar 6, 2024 · 16ca9af · 16ca9af
1 parent 76601ce
commit 16ca9af
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/3rdparty/libshv b/3rdparty/libshv
diff --git a/shvspy/src/dlgaddeditmount.cpp b/shvspy/src/dlgaddeditmount.cpp
@@ -68,7 +68,7 @@ void DlgAddEditMount::accept()
 void DlgAddEditMount::checkExistingMountId(std::function<void(bool, bool)> callback)
 {
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this, callback](const shv::chainpack::RpcResponse &response) {
 		if (response.isSuccess()) {
@@ -103,7 +103,7 @@ void DlgAddEditMount::callSetMountSettings()
 		setStatusText(tr("Error: device id is empty."));
 		return;
 	}
-	else if (ui->leMountPoint->text().trimmed().isEmpty()){
+	if (ui->leMountPoint->text().trimmed().isEmpty()) {
 		setStatusText(tr("Error: mount point is empty."));
 		return;
 	}
@@ -112,7 +112,7 @@ void DlgAddEditMount::callSetMountSettings()
 		return;
 
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this](const shv::chainpack::RpcResponse &response) {
 		if (response.isValid()){
@@ -142,7 +142,7 @@ void DlgAddEditMount::callGetMountSettings()
 	}
 
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this](const shv::chainpack::RpcResponse &response) {
 		if (response.isValid()){

diff --git a/shvspy/src/dlgaddeditrole.cpp b/shvspy/src/dlgaddeditrole.cpp
@@ -69,7 +69,7 @@ void DlgAddEditRole::accept()
 		QMessageBox::critical(this, tr("Invalid data"), tr("Role name is empty."));
 		return;
 	}
-	else if (!m_accessModel.isRulesValid()){
+	if (!m_accessModel.isRulesValid()){
 		QMessageBox::critical(this, tr("Invalid data"), 	tr("Access rules are invalid."));
 		return;
 	}
@@ -98,7 +98,7 @@ void DlgAddEditRole::accept()
 void DlgAddEditRole::checkExistingRole(std::function<void(bool, bool)> callback)
 {
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this, callback](const shv::chainpack::RpcResponse &response) {
 		if (response.isSuccess()) {
@@ -133,7 +133,7 @@ void DlgAddEditRole::callSetRoleSettings()
 		return;
 
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this](const shv::chainpack::RpcResponse &response) {
 		if (response.isValid()){
@@ -168,7 +168,7 @@ void DlgAddEditRole::callGetRoleSettings()
 	}
 
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this](const shv::chainpack::RpcResponse &response) {
 		if (response.isValid()){
@@ -206,7 +206,7 @@ void DlgAddEditRole::callGetAccessRulesForRole()
 	setStatusText(tr("Getting access rules ..."));
 
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this](const shv::chainpack::RpcResponse &response) {
 		if(response.isValid()){
@@ -237,7 +237,7 @@ void DlgAddEditRole::callSetAccessRulesForRole()
 	setStatusText(tr("Updating access rules ..."));
 
 	int rqid = m_rpcConnection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_rpcConnection, rqid, this);
 
 	cb->start(this, [this](const shv::chainpack::RpcResponse &response) {
 		if(response.isValid()){

diff --git a/shvspy/src/dlgcallshvmethod.cpp b/shvspy/src/dlgcallshvmethod.cpp
@@ -71,7 +71,7 @@ void DlgCallShvMethod::callShvMethod()
 		return;
 	}
 	int rq_id = m_connection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_connection, rq_id, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(m_connection, rq_id, this);
 	cb->start(this, [this](const cp::RpcResponse &resp) {
 		if(resp.isValid()) {
 			if(resp.isError())

diff --git a/shvspy/src/rolestreemodel/rolestreemodel.cpp b/shvspy/src/rolestreemodel/rolestreemodel.cpp
@@ -35,7 +35,7 @@ void RolesTreeModel::load(shv::iotqt::rpc::ClientConnection *rpc_connection, con
 		return;
 
 	int rqid = rpc_connection->nextRequestId();
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(rpc_connection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(rpc_connection, rqid, this);
 
 	cb->start(this, [this, rpc_connection, acl_etc_roles_node_path](const shv::chainpack::RpcResponse &response) {
 		if(response.isValid()){
@@ -77,7 +77,7 @@ void RolesTreeModel::loadRoles(shv::iotqt::rpc::ClientConnection *rpc_connection
 	int rqid = rpc_connection->nextRequestId();
 	std::string role_name = not_loaded_roles.takeFirst();
 
-	shv::iotqt::rpc::RpcResponseCallBack *cb = new shv::iotqt::rpc::RpcResponseCallBack(rpc_connection, rqid, this);
+	auto *cb = new shv::iotqt::rpc::RpcResponseCallBack(rpc_connection, rqid, this);
 	std::string role_path = acl_etc_roles_node_path + "/" + role_name;
 
 	cb->start(this, [this, rpc_connection, acl_etc_roles_node_path, role_path, role_name, not_loaded_roles](const shv::chainpack::RpcResponse &response) {
@@ -104,8 +104,7 @@ void RolesTreeModel::loadRoles(shv::iotqt::rpc::ClientConnection *rpc_connection
 
 void RolesTreeModel::setSelectedRoles(const std::vector<std::string> &roles)
 {
-	for (size_t r = 0; r < roles.size(); r++){
-		std::string role = roles.at(r);
+	for (const auto &role : roles) {
 		QStandardItem *root_item = invisibleRootItem();
 
 		for(int i = 0; i < root_item->rowCount(); i++) {
@@ -148,7 +147,7 @@ void RolesTreeModel::generateTree()
 
 	for (const QString &role_name: m_shvRoles.keys()){
 		QList<QStandardItem *> row;
-		QStandardItem *it = new QStandardItem(role_name);
+		auto *it = new QStandardItem(role_name);
 		it->setData(role_name, NameRole);
 		it->setCheckable(true);
 		it->setFlags(it->flags() & ~Qt::ItemIsEditable);
@@ -158,8 +157,8 @@ void RolesTreeModel::generateTree()
 		std::vector<std::string> sub_roles = m_shvRoles.value(role_name);
 		QSet<QString> created_roles{role_name};
 
-		for (size_t i = 0; i < sub_roles.size(); i++){
-			generateSubTree(it, QString::fromStdString(sub_roles.at(i)), created_roles);
+		for (const auto &subrole : sub_roles) {
+			generateSubTree(it, QString::fromStdString(subrole), created_roles);
 		}
 	}
 }
@@ -172,20 +171,18 @@ void RolesTreeModel::generateSubTree(QStandardItem *parent_item, const QString &
 	}
 
 	QList<QStandardItem *> row;
-	QStandardItem *it = new QStandardItem(role);
+	auto *it = new QStandardItem(role);
 	it->setData(role, NameRole);
 	it->setFlags(it->flags() & ~Qt::ItemIsEditable);
 	row << it;
 	parent_item->appendRow(row);
 
-	std::vector<std::string> subRoles = m_shvRoles.value(role);
+	std::vector<std::string> sub_roles = m_shvRoles.value(role);
 
-	for (size_t j = 0; j < subRoles.size(); j++){
-		QString sub_role = QString::fromStdString(subRoles.at(j));
+	for (const auto &sub_role : sub_roles) {
 		QSet<QString> cr = created_roles;
 		cr += role;
-
-		generateSubTree(it, sub_role, cr);
+		generateSubTree(it, QString::fromStdString(sub_role), cr);
 	}
 }
+4 −0		.gitignore
+41 −3		CMakeLists.txt
+2 −2		bash-completion/shv
+1 −1		examples/cli/shvcall/src/appclioptions.cpp
+3 −0		libshvvisu/CMakeLists.txt
+639 −0		libshvvisu/libshvvisu.cs_CZ.ts
+639 −0		libshvvisu/libshvvisu.de_DE.ts
+639 −0		libshvvisu/libshvvisu.fi_FI.ts
+639 −0		libshvvisu/libshvvisu.hu_HU.ts
+639 −0		libshvvisu/libshvvisu.it_IT.ts
+639 −0		libshvvisu/libshvvisu.nl_BE.ts
+639 −0		libshvvisu/libshvvisu.pl_PL.ts
+639 −0		libshvvisu/libshvvisu.sr_RS.ts