kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-14 13:29:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

QT6: std::min needs further tweaking

Browse Source
This commit is contained in:
Simon De Backer
2020-10-03 16:00:24 +02:00
parent 32605e1377
commit 8a5ba90d01
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
View File

@@ -436,7 +436,7 @@ void QetGraphicsTableItem::setPreviousTable(QetGraphicsTableItem *table)
setModel(m_previous_table->m_model); setModel(m_previous_table->m_model);
} }
else //Copie the model of old previous table else //Copie the model of old previous table
{ {
setModel(new ProjectDBModel(*static_cast<ProjectDBModel *>(old_previous_table->model()))); setModel(new ProjectDBModel(*static_cast<ProjectDBModel *>(old_previous_table->model())));
} }
@@ -657,7 +657,7 @@ bool QetGraphicsTableItem::toDXF(const QString &filepath)
//QRectF rect = boundingRect(); //QRectF rect = boundingRect();
QRectF rect(0,0, m_header_item->rect().width(), m_current_size.height()); QRectF rect(0,0, m_header_item->rect().width(), m_current_size.height());
QPolygonF poly(rect); QPolygonF poly(rect);
Createdxf::drawPolygon(filepath,mapToScene(poly),0); Createdxf::drawPolygon(filepath,mapToScene(poly),0);
//Draw vertical lines //Draw vertical lines
auto offset= 0; auto offset= 0;
@@ -970,6 +970,7 @@ void QetGraphicsTableItem::adjustColumnsWidth()
int sum_=0; int sum_=0;
for(auto i= 0 ; i<m_model->columnCount() ; ++i) for(auto i= 0 ; i<m_model->columnCount() ; ++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_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() auto at_b = std::min(m_header_item->minimumSectionWidth().size()-1, i); //m_header_item->minimumSectionWidth().size()
m_header_item->resizeSection( m_header_item->resizeSection(
@@ -978,6 +979,12 @@ void QetGraphicsTableItem::adjustColumnsWidth()
m_minimum_column_width.at(at_a), m_minimum_column_width.at(at_a),
m_header_item->minimumSectionWidth().at(at_b))+b); m_header_item->minimumSectionWidth().at(at_b))+b);
sum_+= m_header_item->sectionSize(i); 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
} }