Revert "Try Clazy fix-its"

Segfault on old Qt versions!
This reverts commit dba7caed30.
This commit is contained in:
Laurent Trinques
2025-02-14 16:17:58 +01:00
parent dba7caed30
commit 43f0107eb1
88 changed files with 409 additions and 512 deletions

View File

@@ -160,8 +160,7 @@ void projectDataBase::removeElement(Element *element)
void projectDataBase::elementInfoChanged(Element *element)
{
auto hash = elementInfoToString(element);
for (const auto& str : QETInformation::elementInfoKeys())
{
for (auto str : QETInformation::elementInfoKeys()) {
m_update_element_query.bindValue(":" + str, hash.value(str));
}
m_update_element_query.bindValue(":uuid", element->uuid().toString());
@@ -541,8 +540,7 @@ void projectDataBase::prepareQuery()
//UPDATE DIAGRAM INFO
QString update_diagram_str("UPDATE diagram_info SET ");
for (const auto& str : QETInformation::diagramInfoKeys())
{
for (auto str : QETInformation::diagramInfoKeys()) {
update_diagram_str.append(str + " = :" + str + ", ");
}
update_diagram_str.remove(update_diagram_str.length()-2, 2); //Remove the last ", "
@@ -582,8 +580,7 @@ void projectDataBase::prepareQuery()
//UPDATE ELEMENT INFO
QString update_str("UPDATE element_info SET ");
for (const auto& string : QETInformation::elementInfoKeys())
{
for (auto string : QETInformation::elementInfoKeys()) {
update_str.append(string + " = :" + string + ", ");
}
update_str.remove(update_str.length()-2, 2); //Remove the last ", "
@@ -600,7 +597,7 @@ void projectDataBase::prepareQuery()
QHash<QString, QString> projectDataBase::elementInfoToString(Element *elmt)
{
QHash<QString, QString> hash; //Store the value for each columns
for (const auto& key : QETInformation::elementInfoKeys())
for (auto key : QETInformation::elementInfoKeys())
{
if (key == "label") {
hash.insert(key, elmt->actualLabel());

View File

@@ -130,9 +130,9 @@ void ElementQueryWidget::setQuery(const QString &query)
//Get the select -> the item in the right list
QStringList split = select.split(",");
for (const auto& str : std::as_const(split))
for (auto str : split)
{
for (auto item : std::as_const(m_items_list))
for (auto item : m_items_list)
{
if (item->data(Qt::UserRole).toString() == str) {
ui->m_var_list->takeItem(ui->m_var_list->row(item));
@@ -209,8 +209,7 @@ void ElementQueryWidget::setQuery(const QString &query)
//Filter for selected data
QStringList strl;
for (auto item : std::as_const(m_items_list))
{
for (auto item : m_items_list) {
strl.append(item->data(Qt::UserRole).toString());
}
@@ -237,7 +236,7 @@ void ElementQueryWidget::setQuery(const QString &query)
QRegularExpressionMatch rxm;
for (const auto& str : split_where)
for (auto str : split_where)
{
rxm = rx_is_not_null.match(str);
if (rxm.hasMatch()) {
@@ -298,8 +297,7 @@ QString ElementQueryWidget::queryStr() const
QString column;
bool first = true;
for (auto key : std::as_const(keys))
{
for (auto key: keys) {
if (first) {
first = false;
} else {
@@ -456,7 +454,7 @@ QStringList ElementQueryWidget::selectedKeys() const
*/
void ElementQueryWidget::setUpItems()
{
for (const QString& key : QETInformation::elementInfoKeys())
for(QString key : QETInformation::elementInfoKeys())
{
if (key == "formula")
continue;
@@ -466,7 +464,8 @@ void ElementQueryWidget::setUpItems()
m_items_list << item;
}
for (const auto& key : m_export_info.keys())
for (auto key : m_export_info.keys())
{
auto item = new QListWidgetItem(m_export_info.value(key), ui->m_var_list);
item->setData(Qt::UserRole, key);

View File

@@ -67,8 +67,7 @@ QString SummaryQueryWidget::queryStr() const
QString column;
bool first = true;
for (const auto& key : std::as_const(keys))
{
for (auto key: keys) {
if (first) {
first = false;
} else {
@@ -105,9 +104,9 @@ void SummaryQueryWidget::setQuery(const QString &query)
//Get the select -> the item in the right list
QStringList split = select.split(",");
for (const auto& str : std::as_const(split))
for (auto str : split)
{
for (auto item : std::as_const(m_items_list))
for (auto item : m_items_list)
{
if (item->data(Qt::UserRole).toString() == str) {
ui->m_available_list->takeItem(ui->m_available_list->row(item));
@@ -124,7 +123,7 @@ void SummaryQueryWidget::setQuery(const QString &query)
*/
void SummaryQueryWidget::setUpItems()
{
for (const auto& key : QETInformation::diagramInfoKeys())
for (auto key : QETInformation::diagramInfoKeys())
{
if (key == "filename" || key == "display_folio") {
continue;