Fix Qt 6.8 deprecations

silicon-heaven · Oct 21, 2024 · 9086eed · 9086eed
1 parent 5d49c61
commit 9086eed
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/libshvcoreqt/src/rpc.cpp b/libshvcoreqt/src/rpc.cpp
@@ -3,6 +3,7 @@
 #include <shv/coreqt/log.h>
 
 #include <QVariant>
+#include <QTimeZone>
 
 namespace shv::coreqt::rpc {
 
@@ -33,7 +34,11 @@ QVariant rpcValueToQVariant(const chainpack::RpcValue &v, bool *ok)
 	}
 	case chainpack::RpcValue::Type::DateTime: {
 		chainpack::RpcValue::DateTime cdt = v.toDateTime();
+#if QT_VERSION_MAJOR >= 6
+		QDateTime dt = QDateTime::fromMSecsSinceEpoch(cdt.msecsSinceEpoch(), QTimeZone::fromSecondsAheadOfUtc(cdt.utcOffsetMin() * 60));
+#else
 		QDateTime dt = QDateTime::fromMSecsSinceEpoch(cdt.msecsSinceEpoch(), Qt::OffsetFromUTC, cdt.utcOffsetMin() * 60);
+#endif
 		return dt;
 	}
 	case chainpack::RpcValue::Type::List: {
@@ -175,7 +180,12 @@ template<> QDateTime shv::chainpack::RpcValue::to<QDateTime>() const
 	if (!isValid() || !isDateTime()) {
 		return QDateTime();
 	}
-	return QDateTime::fromMSecsSinceEpoch(toDateTime().msecsSinceEpoch(), Qt::TimeSpec::UTC);
+	auto dt = toDateTime();
+#if QT_VERSION_MAJOR >= 6
+	return QDateTime::fromMSecsSinceEpoch(dt.msecsSinceEpoch(), QTimeZone::fromSecondsAheadOfUtc(dt.utcOffsetMin() * 60));
+#else
+	return QDateTime::fromMSecsSinceEpoch(dt.msecsSinceEpoch(), Qt::OffsetFromUTC, dt.utcOffsetMin() * 60);
+#endif
 }
 #ifdef __GNUC__
 #pragma GCC diagnostic pop

diff --git a/libshvvisu/src/logview/dlgloginspector.cpp b/libshvvisu/src/logview/dlgloginspector.cpp
@@ -44,6 +44,13 @@ DlgLogInspector::DlgLogInspector(const QString &shv_path, QWidget *parent) :
 	ui(new Ui::DlgLogInspector)
 {
 	ui->setupUi(this);
+#if QT_VERSION_MAJOR >= 6
+	ui->edSince->setTimeZone(QTimeZone::UTC);
+	ui->edUntil->setTimeZone(QTimeZone::UTC);
+#else
+	ui->edSince->setTimeSpec(Qt::UTC);
+	ui->edUntil->setTimeSpec(Qt::UTC);
+#endif
 	setShvPath(shv_path);
 	{
 		auto *m = new QMenu(this);

diff --git a/libshvvisu/src/logview/dlgloginspector.ui b/libshvvisu/src/logview/dlgloginspector.ui
@@ -56,7 +56,7 @@
        <item>
         <widget class="QDateTimeEdit" name="edSince">
          <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
          <property name="specialValueText">
           <string>Not defined</string>
@@ -74,9 +74,6 @@
          <property name="calendarPopup">
           <bool>true</bool>
          </property>
-         <property name="timeSpec">
-          <enum>Qt::UTC</enum>
-         </property>
         </widget>
        </item>
        <item>
@@ -107,7 +104,7 @@
        <item>
         <widget class="QDateTimeEdit" name="edUntil">
          <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
          <property name="specialValueText">
           <string>Not defined</string>
@@ -125,9 +122,6 @@
          <property name="calendarPopup">
           <bool>true</bool>
          </property>
-         <property name="timeSpec">
-          <enum>Qt::UTC</enum>
-         </property>
         </widget>
        </item>
        <item>
@@ -166,7 +160,7 @@
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -212,7 +206,7 @@
       <item row="2" column="1">
        <widget class="QSpinBox" name="edMaxRecordCount">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
         </property>
         <property name="minimum">
          <number>0</number>
@@ -234,7 +228,7 @@
       <item row="2" column="5">
        <spacer name="horizontalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Orientation::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -247,7 +241,7 @@
       <item row="3" column="1">
        <widget class="QSpinBox" name="edTimeout">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
         </property>
         <property name="suffix">
          <string> sec</string>
@@ -353,10 +347,10 @@
    <item>
     <widget class="QFrame" name="frame_2">
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Shape::NoFrame</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Shadow::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <property name="leftMargin">
@@ -416,7 +410,7 @@
       <item>
        <spacer name="horizontalSpacer_4">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Orientation::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -465,7 +459,7 @@
             <x>0</x>
             <y>0</y>
             <width>1152</width>
-            <height>354</height>
+            <height>295</height>
            </rect>
           </property>
          </widget>
@@ -492,7 +486,7 @@
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+            <enum>Qt::Orientation::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>