From 8a5ba90d0109022c7378ba1d7b53e9d9542eb51f Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Sat, 3 Oct 2020 16:00:24 +0200 Subject: [PATCH] QT6: std::min needs further tweaking --- .../qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp index 25093b9ad..496108948 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp @@ -436,7 +436,7 @@ void QetGraphicsTableItem::setPreviousTable(QetGraphicsTableItem *table) setModel(m_previous_table->m_model); } else //Copie the model of old previous table - { + { setModel(new ProjectDBModel(*static_cast(old_previous_table->model()))); } @@ -657,7 +657,7 @@ bool QetGraphicsTableItem::toDXF(const QString &filepath) //QRectF rect = boundingRect(); QRectF rect(0,0, m_header_item->rect().width(), m_current_size.height()); QPolygonF poly(rect); - Createdxf::drawPolygon(filepath,mapToScene(poly),0); + Createdxf::drawPolygon(filepath,mapToScene(poly),0); //Draw vertical lines auto offset= 0; @@ -970,6 +970,7 @@ void QetGraphicsTableItem::adjustColumnsWidth() int sum_=0; for(auto i= 0 ; icolumnCount() ; ++i) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove auto at_a = std::min(m_minimum_column_width.size()-1, i); //In case of the I is higher than m_minimum_column_width or auto at_b = std::min(m_header_item->minimumSectionWidth().size()-1, i); //m_header_item->minimumSectionWidth().size() m_header_item->resizeSection( @@ -978,6 +979,12 @@ void QetGraphicsTableItem::adjustColumnsWidth() m_minimum_column_width.at(at_a), m_header_item->minimumSectionWidth().at(at_b))+b); sum_+= m_header_item->sectionSize(i); +#else +#if TODO_LIST +#pragma message("@TODO remove code for QT 6 or later") +#endif + qDebug()<<"Help code for QT 6 or later"; +#endif }