From 5592548e2e4d7959e8e5ceed33f5cb5ca5c90c0a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 31 Mar 2021 10:18:58 -0500 Subject: [PATCH] [Base] Remove deprecated Qt < 5.9 code --- src/Base/TimeInfo.cpp | 10 ---------- src/Base/Tools.h | 35 ----------------------------------- src/Base/Translate.cpp | 5 ----- 3 files changed, 50 deletions(-) diff --git a/src/Base/TimeInfo.cpp b/src/Base/TimeInfo.cpp index 88c5520a08..03cbff2959 100644 --- a/src/Base/TimeInfo.cpp +++ b/src/Base/TimeInfo.cpp @@ -79,18 +79,8 @@ void TimeInfo::setTime_t (uint64_t seconds) std::string TimeInfo::currentDateTimeString() { -#if (QT_VERSION >= 0x050300) return QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC) .toString(Qt::ISODate).toStdString(); -#else - QDateTime local = QDateTime::currentDateTime(); - QDateTime utc = local.toUTC(); - utc.setTimeSpec(Qt::LocalTime); - int utcOffset = utc.secsTo(local); - local.setUtcOffset(utcOffset); - QString dm = local.toString(Qt::ISODate); - return dm.toStdString(); -#endif } std::string TimeInfo::diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd ) diff --git a/src/Base/Tools.h b/src/Base/Tools.h index e0f007f1fa..6cac42a96b 100644 --- a/src/Base/Tools.h +++ b/src/Base/Tools.h @@ -34,41 +34,6 @@ #include #include -#if (QT_VERSION < 0x050300) -class QSignalBlocker -{ -public: - QSignalBlocker(QObject *object) - : object(object) - , blocked(object && object->blockSignals(true)) - , inhibited(false) - { - } - ~QSignalBlocker() - { - if (object && !inhibited) - object->blockSignals(blocked); - } - void reblock() - { - if (object) - object->blockSignals(true); - inhibited = false; - } - void unblock() - { - if (object) - object->blockSignals(blocked); - inhibited = true; - } - -private: - QObject *object; - bool blocked; - bool inhibited; -}; -#endif - // ---------------------------------------------------------------------------- namespace Base diff --git a/src/Base/Translate.cpp b/src/Base/Translate.cpp index 5aec1da677..50eeddfed5 100644 --- a/src/Base/Translate.cpp +++ b/src/Base/Translate.cpp @@ -79,12 +79,7 @@ Py::Object Translate::translate(const Py::Tuple& args) if (!PyArg_ParseTuple(args.ptr(), "ss|si", &context, &source, &disambiguation, &n)) throw Py::Exception(); -#if (QT_VERSION >= 0x050000) QString str = QCoreApplication::translate(context, source, disambiguation, n); -#else - QString str = QCoreApplication::translate(context, source, disambiguation, - QCoreApplication::UnicodeUTF8, n); -#endif return Py::asObject(PyUnicode_FromString(str.toUtf8())); }