remove remaining QT_VERSION_CHECK

This commit is contained in:
Sébastien Loriot 2024-08-19 13:01:09 +02:00
parent 2bc86f90ca
commit a1a7b65275
7 changed files with 1 additions and 43 deletions

View File

@ -2644,17 +2644,10 @@ void MainWindow::resetHeader()
sceneView->header()->setSectionResizeMode(Scene::RenderingModeColumn, QHeaderView::ResizeToContents); sceneView->header()->setSectionResizeMode(Scene::RenderingModeColumn, QHeaderView::ResizeToContents);
sceneView->header()->setSectionResizeMode(Scene::ABColumn, QHeaderView::Fixed); sceneView->header()->setSectionResizeMode(Scene::ABColumn, QHeaderView::Fixed);
sceneView->header()->setSectionResizeMode(Scene::VisibleColumn, QHeaderView::Fixed); sceneView->header()->setSectionResizeMode(Scene::VisibleColumn, QHeaderView::Fixed);
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
sceneView->header()->resizeSection(Scene::ColorColumn, sceneView->header()->fontMetrics().horizontalAdvance("_#_")); sceneView->header()->resizeSection(Scene::ColorColumn, sceneView->header()->fontMetrics().horizontalAdvance("_#_"));
sceneView->resizeColumnToContents(Scene::RenderingModeColumn); sceneView->resizeColumnToContents(Scene::RenderingModeColumn);
sceneView->header()->resizeSection(Scene::ABColumn, sceneView->header()->fontMetrics().horizontalAdvance(QString("_AB_"))); sceneView->header()->resizeSection(Scene::ABColumn, sceneView->header()->fontMetrics().horizontalAdvance(QString("_AB_")));
sceneView->header()->resizeSection(Scene::VisibleColumn, sceneView->header()->fontMetrics().horizontalAdvance(QString("_View_"))); sceneView->header()->resizeSection(Scene::VisibleColumn, sceneView->header()->fontMetrics().horizontalAdvance(QString("_View_")));
#else
sceneView->header()->resizeSection(Scene::ColorColumn, sceneView->header()->fontMetrics().width("_#_"));
sceneView->resizeColumnToContents(Scene::RenderingModeColumn);
sceneView->header()->resizeSection(Scene::ABColumn, sceneView->header()->fontMetrics().width(QString("_AB_")));
sceneView->header()->resizeSection(Scene::VisibleColumn, sceneView->header()->fontMetrics().width(QString("_View_")));
#endif
} }
void MainWindow::reset_default_loaders() void MainWindow::reset_default_loaders()

View File

@ -705,11 +705,7 @@ private:
// Find the right width for the label to accommodate at least 9999 // Find the right width for the label to accommodate at least 9999
QFontMetrics metric = x_cubeLabel->fontMetrics(); QFontMetrics metric = x_cubeLabel->fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
x_cubeLabel->setFixedWidth(metric.horizontalAdvance(QString(".9999."))); x_cubeLabel->setFixedWidth(metric.horizontalAdvance(QString(".9999.")));
#else
x_cubeLabel->setFixedWidth(metric.width(QString(".9999.")));
#endif
x_cubeLabel->setText("0"); x_cubeLabel->setText("0");
x_cubeLabel->setValidator(validator); x_cubeLabel->setValidator(validator);
@ -735,11 +731,7 @@ private:
// Find the right width for the label to accommodate at least 9999 // Find the right width for the label to accommodate at least 9999
QFontMetrics metric = y_cubeLabel->fontMetrics(); QFontMetrics metric = y_cubeLabel->fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
y_cubeLabel->setFixedWidth(metric.horizontalAdvance(QString(".9999."))); y_cubeLabel->setFixedWidth(metric.horizontalAdvance(QString(".9999.")));
#else
y_cubeLabel->setFixedWidth(metric.width(QString(".9999.")));
#endif
y_cubeLabel->setText("0"); y_cubeLabel->setText("0");
y_cubeLabel->setValidator(validator); y_cubeLabel->setValidator(validator);
y_slider = new QSlider(mw); y_slider = new QSlider(mw);
@ -764,11 +756,7 @@ private:
// Find the right width for the label to accommodate at least 9999 // Find the right width for the label to accommodate at least 9999
QFontMetrics metric = z_cubeLabel->fontMetrics(); QFontMetrics metric = z_cubeLabel->fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
z_cubeLabel->setFixedWidth(metric.horizontalAdvance(QString(".9999."))); z_cubeLabel->setFixedWidth(metric.horizontalAdvance(QString(".9999.")));
#else
z_cubeLabel->setFixedWidth(metric.width(QString(".9999.")));
#endif
z_cubeLabel->setText("0"); z_cubeLabel->setText("0");
z_cubeLabel->setValidator(validator); z_cubeLabel->setValidator(validator);
z_slider = new QSlider(mw); z_slider = new QSlider(mw);

View File

@ -250,11 +250,7 @@ protected:
} }
case QEvent::Wheel: { case QEvent::Wheel: {
QWheelEvent* event = static_cast<QWheelEvent*>(ev); QWheelEvent* event = static_cast<QWheelEvent*>(ev);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QPoint pos = event->pos();
#else
QPointF pos = event->position(); QPointF pos = event->position();
#endif
QPointF old_pos = v->mapToScene(pos.x(), pos.y()); QPointF old_pos = v->mapToScene(pos.x(), pos.y());
if(event->angleDelta().y() <0) if(event->angleDelta().y() <0)
v->scale(1.2, 1.2); v->scale(1.2, 1.2);

View File

@ -142,11 +142,7 @@ protected:
} }
case QEvent::Wheel: { case QEvent::Wheel: {
QWheelEvent* event = static_cast<QWheelEvent*>(ev); QWheelEvent* event = static_cast<QWheelEvent*>(ev);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QPoint pos = event->pos();
#else
QPointF pos = event->position(); QPointF pos = event->position();
#endif
QPointF old_pos = v->mapToScene(pos.x(), pos.y()); QPointF old_pos = v->mapToScene(pos.x(), pos.y());
if(event->angleDelta().y() <0) if(event->angleDelta().y() <0)
v->scale(1.2, 1.2); v->scale(1.2, 1.2);

View File

@ -1152,13 +1152,7 @@ void Viewer::drawVisualHints()
//Prints the displayMessage //Prints the displayMessage
QFont font = QFont(); QFont font = QFont();
QFontMetrics fm(font); QFontMetrics fm(font);
TextItem *message_text = new TextItem(float(10 + TextItem *message_text = new TextItem(float(10 + fm.horizontalAdvance(d->message)/2),
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
fm.horizontalAdvance(d->message)/2)
#else
fm.width(d->message)/2)
#endif
,
float(height()-20), float(height()-20),
0, d->message, false, 0, d->message, false,
QFont(), Qt::gray ); QFont(), Qt::gray );

View File

@ -52,12 +52,7 @@ public :
:x(p_x), y(p_y), z(p_z),_3D(p_3D), _is_always_visible(always_visible), m_text(p_text), m_font(font), m_color(p_color) :x(p_x), y(p_y), z(p_z),_3D(p_3D), _is_always_visible(always_visible), m_text(p_text), m_font(font), m_color(p_color)
{ {
QFontMetrics fm(m_font); QFontMetrics fm(m_font);
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
_width = float(fm.horizontalAdvance(m_text)+2); _width = float(fm.horizontalAdvance(m_text)+2);
#else
_width = float(fm.width(m_text)+2);
#endif
_height = float(fm.height()); _height = float(fm.height());
} }
//!\brief Accessor for the string //!\brief Accessor for the string

View File

@ -31,11 +31,7 @@
# define THREE_EXPORT Q_DECL_IMPORT # define THREE_EXPORT Q_DECL_IMPORT
#endif #endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
#define CGAL_QT_SKIP_EMPTY_PARTS QString::SkipEmptyParts
#else
#define CGAL_QT_SKIP_EMPTY_PARTS ::Qt::SkipEmptyParts #define CGAL_QT_SKIP_EMPTY_PARTS ::Qt::SkipEmptyParts
#endif
namespace CGAL{ namespace CGAL{
namespace Three{ namespace Three{