From 08ba85888e024fa280fddaff5ca848ba1b70da84 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 31 Mar 2021 11:45:29 -0500 Subject: [PATCH] [Spreadsheet] Remove deprecated Qt < 5.9 code --- src/Mod/Spreadsheet/Gui/SheetTableView.h | 4 ---- src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.h b/src/Mod/Spreadsheet/Gui/SheetTableView.h index 8507833f58..4338fcc21e 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableView.h +++ b/src/Mod/Spreadsheet/Gui/SheetTableView.h @@ -37,11 +37,7 @@ public: SheetViewHeader(QTableView *owner, Qt::Orientation o) : QHeaderView(o),owner(owner) { -#if QT_VERSION >= 0x050000 setSectionsClickable(true); -#else - setClickable(true); -#endif } Q_SIGNALS: void resizeFinished(); diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp index 0d2db3db0b..4372ad99cb 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp @@ -64,9 +64,7 @@ #include #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -# include -#endif +#include #include "qtcolorpicker.h" @@ -316,11 +314,8 @@ void QtColorPicker::buttonPressed(bool toggled) if (!toggled) return; -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) const QRect desktop = QApplication::primaryScreen()->geometry(); -#else - const QRect desktop = QApplication::desktop()->geometry(); -#endif + // Make sure the popup is inside the desktop. QPoint pos = mapToGlobal(rect().bottomLeft()); if (pos.x() < desktop.left())