From 7ba295a339cfb03661fbc0a5af5178cff67c127f Mon Sep 17 00:00:00 2001 From: Andre Rummler Date: Thu, 13 Aug 2026 15:45:15 +0200 Subject: [PATCH] Remove all Qt version checks and branches for <5.14.0 as such versions are no longer supported. --- .../elementscollectionwidget.cpp | 7 ------ .../ElementsCollection/elementstreeview.cpp | 4 ---- sources/conductorproperties.cpp | 7 ------ sources/diagram.cpp | 9 ------- sources/diagramevent/diagrameventaddmacro.cpp | 8 ------- .../graphicspart/customelementgraphicpart.cpp | 7 ------ sources/factory/elementpicturefactory.cpp | 7 ------ sources/main.cpp | 11 +-------- sources/qet.cpp | 24 ++++--------------- sources/qetgraphicsitem/conductor.cpp | 8 +------ sources/richtext/richtexteditor.cpp | 12 +--------- sources/titleblocktemplate.cpp | 16 ------------- .../configpage/generalconfigurationpage.cpp | 7 +----- sources/ui/configpage/projectconfigpages.cpp | 12 ---------- sources/utils/qetsettings.cpp | 2 -- sources/utils/qetsettings.h | 2 -- 16 files changed, 8 insertions(+), 135 deletions(-) diff --git a/sources/ElementsCollection/elementscollectionwidget.cpp b/sources/ElementsCollection/elementscollectionwidget.cpp index 2d0cf1693..605489430 100644 --- a/sources/ElementsCollection/elementscollectionwidget.cpp +++ b/sources/ElementsCollection/elementscollectionwidget.cpp @@ -949,14 +949,7 @@ void ElementsCollectionWidget::search() } hideCollection(true); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - const QStringList text_list = text.split("+", QString::SkipEmptyParts); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif const QStringList text_list = text.split("+", Qt::SkipEmptyParts); -#endif QModelIndexList match_index; for (QString txt : text_list) { match_index << m_model->match(m_showed_index.isValid() diff --git a/sources/ElementsCollection/elementstreeview.cpp b/sources/ElementsCollection/elementstreeview.cpp index eb62e2d1f..39fe4a70b 100644 --- a/sources/ElementsCollection/elementstreeview.cpp +++ b/sources/ElementsCollection/elementstreeview.cpp @@ -143,11 +143,7 @@ void ElementsTreeView::startElementDrag(const ElementsLocation &location) QString file_name = (last_slash != -1) ? path.mid(last_slash + 1) : path; if (!dir_path.isEmpty()) { - #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - QStringList parts = dir_path.split('/', QString::SkipEmptyParts); - #else QStringList parts = dir_path.split('/', Qt::SkipEmptyParts); - #endif QString current_path = ""; for (const QString &part : parts) { QString parent_path = current_path; diff --git a/sources/conductorproperties.cpp b/sources/conductorproperties.cpp index 71e552ea4..da3f849d5 100644 --- a/sources/conductorproperties.cpp +++ b/sources/conductorproperties.cpp @@ -811,14 +811,7 @@ void ConductorProperties::readStyle(const QString &style_string) { if (style_string.isEmpty()) return; // recupere la liste des couples style / valeur -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - QStringList styles = style_string.split(";", QString::SkipEmptyParts); -#else -#if TODO_LIST -#pragma message("@TODO remove code QString::SkipEmptyParts for QT 5.14 or later") -#endif QStringList styles = style_string.split(";", Qt::SkipEmptyParts); -#endif QRegularExpression Rx("^(?[a-z-]+): (?[a-z-]+)$"); if (!Rx.isValid()) diff --git a/sources/diagram.cpp b/sources/diagram.cpp index d0e3127fb..fa707e4a5 100644 --- a/sources/diagram.cpp +++ b/sources/diagram.cpp @@ -1556,14 +1556,6 @@ bool Diagram::fromXml(QDomElement &document, if (content_ptr) { content_ptr -> m_elements = added_elements; content_ptr -> m_conductors_to_move = added_conductors; -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - content_ptr -> m_text_fields = added_texts.toSet(); - content_ptr -> m_images = added_images.toSet(); - content_ptr -> m_shapes = added_shapes.toSet(); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif content_ptr -> m_text_fields = QSet( added_texts.begin(), added_texts.end()); @@ -1574,7 +1566,6 @@ bool Diagram::fromXml(QDomElement &document, added_shapes.begin(), added_shapes.end()); content_ptr->m_terminal_strip.swap(added_strips); -#endif content_ptr->m_tables.swap(added_tables); } diff --git a/sources/diagramevent/diagrameventaddmacro.cpp b/sources/diagramevent/diagrameventaddmacro.cpp index 556a5e42d..81a0387e0 100644 --- a/sources/diagramevent/diagrameventaddmacro.cpp +++ b/sources/diagramevent/diagrameventaddmacro.cpp @@ -43,11 +43,7 @@ m_preview_item(nullptr) QString file_name = (last_slash != -1) ? path.mid(last_slash + 1) : path; if (!dir_path.isEmpty()) { - #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - QStringList parts = dir_path.split('/', QString::SkipEmptyParts); - #else QStringList parts = dir_path.split('/', Qt::SkipEmptyParts); - #endif QString current_path = ""; for (const QString &part : parts) { QString parent_path = current_path; @@ -202,11 +198,7 @@ bool DiagramEventAddMacro::loadMacro() QString file_name = (last_slash != -1) ? path.mid(last_slash + 1) : path; if (!dir_path.isEmpty()) { - #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - QStringList parts = dir_path.split('/', QString::SkipEmptyParts); - #else QStringList parts = dir_path.split('/', Qt::SkipEmptyParts); - #endif QString current_path = ""; for (const QString &part : parts) { QString parent_path = current_path; diff --git a/sources/editor/graphicspart/customelementgraphicpart.cpp b/sources/editor/graphicspart/customelementgraphicpart.cpp index 4c4200dac..f19717eae 100644 --- a/sources/editor/graphicspart/customelementgraphicpart.cpp +++ b/sources/editor/graphicspart/customelementgraphicpart.cpp @@ -521,14 +521,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde) resetStyles(); //Get the list of pair style/value -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - QStringList styles = qde.attribute("style").split(";", QString::SkipEmptyParts); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif QStringList styles = qde.attribute("style").split(";", Qt::SkipEmptyParts); -#endif //Check each pair of style QRegularExpression rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$"); diff --git a/sources/factory/elementpicturefactory.cpp b/sources/factory/elementpicturefactory.cpp index 99d21ca10..a5f0f2d51 100644 --- a/sources/factory/elementpicturefactory.cpp +++ b/sources/factory/elementpicturefactory.cpp @@ -612,14 +612,7 @@ void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &pa pen.setCapStyle(Qt::SquareCap); //Get the couples style/value -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - const QStringList styles = dom.attribute("style").split(";", QString::SkipEmptyParts); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif const QStringList styles = dom.attribute("style").split(";", Qt::SkipEmptyParts); -#endif QRegularExpression rx("^(?[a-z-]+):(?[a-zA-Z-]+)$"); if (!rx.isValid()) diff --git a/sources/main.cpp b/sources/main.cpp index 4932b17b9..b0f32a237 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -103,24 +103,15 @@ int main(int argc, char **argv) QDomImplementation::ReturnNullNode); //Creation and execution of the application //HighDPI -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 6 or later") -#endif -#endif -#if QT_VERSION > QT_VERSION_CHECK(5, 7, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) qputenv("QT_ENABLE_HIGHDPI_SCALING", "1"); QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy()); -#endif // Headless command-line export: render a project to PDF/PNG/SVG without diff --git a/sources/qet.cpp b/sources/qet.cpp index 7d57f2999..0f0a5a8ee 100644 --- a/sources/qet.cpp +++ b/sources/qet.cpp @@ -184,16 +184,8 @@ bool QET::orthogonalProjection( // determine le point d'intersection des deux droites = le projete orthogonal QPointF intersection_point; -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif - QLineF::IntersectType it = line. -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - intersect // ### Qt 6: remove -#else - intersects -#endif - (perpendicular_line, &intersection_point); + + QLineF::IntersectType it = line.intersects(perpendicular_line, &intersection_point); // ne devrait pas arriver (mais bon...) if (it == QLineF::NoIntersection) return(false); @@ -546,16 +538,8 @@ QString QET::joinWithSpaces(const QStringList &string_list) { QStringList QET::splitWithSpaces(const QString &string) { // les chaines sont separees par des espaces non echappes // = avec un nombre nul ou pair de backslashes devant -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif - QStringList escaped_strings = string.split(QRegularExpression("[^\\]?(?:\\\\)* "), -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - QString -#else - Qt -#endif - ::SkipEmptyParts); + + QStringList escaped_strings = string.split(QRegularExpression("[^\\]?(?:\\\\)* "),Qt::SkipEmptyParts); QStringList returned_list; foreach(QString escaped_string, escaped_strings) { diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index 291608620..0b105a9c0 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -1725,14 +1725,8 @@ QSet Conductor::relatedPotentialConductors(const bool all_diagram, for (Conductor *c : other_conductors_list_t) { other_conductors += c->relatedPotentialConductors(all_diagram, t_list); } -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - other_conductors += other_conductors_list_t.toSet(); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif + other_conductors += QSet(other_conductors_list_t.begin(),other_conductors_list_t.end()); -#endif } } diff --git a/sources/richtext/richtexteditor.cpp b/sources/richtext/richtexteditor.cpp index 41515d02b..e8055fc08 100644 --- a/sources/richtext/richtexteditor.cpp +++ b/sources/richtext/richtexteditor.cpp @@ -78,11 +78,7 @@ #include #include -#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) #include -#else -#define QStringView QStringRef -#endif QT_BEGIN_NAMESPACE @@ -744,14 +740,8 @@ QString RichTextEditor::text(Qt::TextFormat format) const return m_simplifyRichText ? simplifyRichTextFilter(toHtml()) : toHtml(); case Qt::AutoText: break; -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif - case Qt::MarkdownText: //This enum value was added in Qt 5.14. + case Qt::MarkdownText: break; -#endif default: qInfo("(RichTextEditor::text) no valid switch: %d",format); break; diff --git a/sources/titleblocktemplate.cpp b/sources/titleblocktemplate.cpp index 4379605c1..b42806408 100644 --- a/sources/titleblocktemplate.cpp +++ b/sources/titleblocktemplate.cpp @@ -396,16 +396,8 @@ void TitleBlockTemplate::parseRows(const QString &rows_string) { QRegularExpression::CaseInsensitiveOption); bool conv_ok; -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - QStringList rows_descriptions = - rows_string.split(QChar(';'), QString::SkipEmptyParts); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif QStringList rows_descriptions = rows_string.split(QChar(';'), Qt::SkipEmptyParts); -#endif foreach (QString rows_description, rows_descriptions) { QRegularExpressionMatch match; match = row_size_format.match(rows_description); @@ -438,16 +430,8 @@ void TitleBlockTemplate::parseColumns(const QString &cols_string) { bool conv_ok; qDebug() <<"is QRegularExpression ok?"; -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ### Qt 6: remove - QStringList cols_descriptions = - cols_string.split(QChar(';'), QString::SkipEmptyParts); -#else -#if TODO_LIST -#pragma message("@TODO remove code for QT 5.14 or later") -#endif QStringList cols_descriptions = cols_string.split(QChar(';'), Qt::SkipEmptyParts); -#endif foreach (QString cols_description, cols_descriptions) { QRegularExpressionMatch match_abc,match_rel; match_abc = abs_col_size_format.match(cols_description); diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 2a7b48ae1..70ad81599 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -40,9 +40,6 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : QSettings settings; //Appearance tab -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // ###Qt 6:remove - ui->m_hdpi_round_policy_widget->setDisabled(true); -#else ui->m_hdpi_round_policy_cb->addItem(tr("Arrondi supérieur pour 0.5 et plus"), QLatin1String("Round")); ui->m_hdpi_round_policy_cb->addItem(tr("Toujours arrondi supérieur"), QLatin1String("Ceil")); ui->m_hdpi_round_policy_cb->addItem(tr("Toujours arrondi inférieur"), QLatin1String("Floor")); @@ -65,7 +62,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->m_hdpi_round_policy_cb->setCurrentIndex(4); break; } -#endif + ui->grid_startup_cb->setChecked(settings.value("diagrameditor/grid_display_startup", true).toBool()); ui->guides_startup_cb->setChecked(settings.value("diagrameditor/guides_display_startup", false).toBool()); ui->DiagramEditor_xGrid_sb->setValue(settings.value("diagrameditor/Xgrid", 10).toInt()); @@ -215,10 +212,8 @@ void GeneralConfigurationPage::applyConf() settings.setValue("lang", ui->m_lang_cb->itemData(ui->m_lang_cb->currentIndex()).toString()); //hdpi -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QetSettings::setHdpiScaleFactorRoundingPolicy(ui->m_hdpi_round_policy_cb->currentData().toString()); QGuiApplication::setHighDpiScaleFactorRoundingPolicy(QetSettings::hdpiScaleFactorRoundingPolicy()); -#endif //ELEMENT EDITOR settings.setValue("elementeditor/default-informations", ui->m_default_elements_info->toPlainText()); diff --git a/sources/ui/configpage/projectconfigpages.cpp b/sources/ui/configpage/projectconfigpages.cpp index 183b16f38..e1e404bb1 100644 --- a/sources/ui/configpage/projectconfigpages.cpp +++ b/sources/ui/configpage/projectconfigpages.cpp @@ -396,29 +396,17 @@ void ProjectAutoNumConfigPage::buildConnections() //Conductor Tab connect(m_saw_conductor, &SelectAutonumW::applyPressed, this, &ProjectAutoNumConfigPage::saveContextConductor); connect(m_saw_conductor, &SelectAutonumW::removeClicked, this, &ProjectAutoNumConfigPage::removeContextConductor); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // TODO Qt6 only: remove, textActivated() always available - connect(m_saw_conductor->contextComboBox(), &QComboBox::activated, this, &ProjectAutoNumConfigPage::updateContextConductor); -#else connect(m_saw_conductor->contextComboBox(), &QComboBox::textActivated, this, &ProjectAutoNumConfigPage::updateContextConductor); -#endif //Element Tab connect(m_saw_element, &SelectAutonumW::applyPressed, this, &ProjectAutoNumConfigPage::saveContextElement); connect(m_saw_element, &SelectAutonumW::removeClicked, this, &ProjectAutoNumConfigPage::removeContextElement); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // TODO Qt6 only: remove, textActivated() always available - connect(m_saw_element->contextComboBox(), &QComboBox::activated, this, &ProjectAutoNumConfigPage::updateContextElement); -#else connect(m_saw_element->contextComboBox(), &QComboBox::textActivated, this, &ProjectAutoNumConfigPage::updateContextElement); -#endif //Folio Tab connect(m_saw_folio, &SelectAutonumW::applyPressed, this, &ProjectAutoNumConfigPage::saveContextFolio); connect(m_saw_folio, &SelectAutonumW::removeClicked, this, &ProjectAutoNumConfigPage::removeContextFolio); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) // TODO Qt6 only: remove, textActivated() always available - connect(m_saw_folio->contextComboBox(), &QComboBox::activated, this, &ProjectAutoNumConfigPage::updateContextFolio); -#else connect(m_saw_folio->contextComboBox(), &QComboBox::textActivated, this, &ProjectAutoNumConfigPage::updateContextFolio); -#endif // Auto Folio Numbering connect(m_faw, &FolioAutonumberingW::applyPressed, this, &ProjectAutoNumConfigPage::applyAutoNum); diff --git a/sources/utils/qetsettings.cpp b/sources/utils/qetsettings.cpp index 7d5fb43b3..3b2e7a5ac 100644 --- a/sources/utils/qetsettings.cpp +++ b/sources/utils/qetsettings.cpp @@ -22,7 +22,6 @@ namespace QetSettings { -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) /** * @brief setHdpiScaleFactorRoundingPolicy * Write the value of HdpiScaleFactorRoundingPolicy in @@ -106,5 +105,4 @@ namespace QetSettings return default_policy; } } -#endif } diff --git a/sources/utils/qetsettings.h b/sources/utils/qetsettings.h index b145df15d..857c37796 100644 --- a/sources/utils/qetsettings.h +++ b/sources/utils/qetsettings.h @@ -28,12 +28,10 @@ */ namespace QetSettings { -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) void setHdpiScaleFactorRoundingPolicy(const QString &policy_str); void setHdpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy policy); Qt::HighDpiScaleFactorRoundingPolicy hdpiScaleFactorRoundingPolicy( Qt::HighDpiScaleFactorRoundingPolicy default_policy = Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); -#endif } #endif // QETSETTINGS_H