Changeset 94009 in vbox for trunk

Timestamp:

Mar 1, 2022 1:16:46 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: QDateTime/QTime::toString -> QLocale::toString(QDateTime/QTime) (4.x), mapping Qt::LocalDate to QLocale::ShortFormat (4.x). bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualMachineItemLocal.cpp (modified) (1 diff)
• networking/UIUpdateDefs.cpp (modified) (2 diffs)
• snapshots/UISnapshotPane.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.cpp

@@ -258 +258 @@
 {
     /* This is used in tool-tip generation: */
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QString strDateTime = m_lastStateChange.date() == QDate::currentDate()
+                              ? QLocale::system().toString(m_lastStateChange.time(), QLocale::ShortFormat)
+                              : QLocale::system().toString(m_lastStateChange, QLocale::ShortFormat);
+#else
     const QString strDateTime = (m_lastStateChange.date() == QDate::currentDate())
                               ? m_lastStateChange.time().toString(Qt::LocalDate)
                               : m_lastStateChange.toString(Qt::LocalDate);
+#endif
 
     /* If machine is accessible: */

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp

@@ -18 +18 @@
 /* Qt includes: */
 #include <QCoreApplication>
+#include <QLocale>
 #include <QStringList>
 
@@ -116 +117 @@
 QString VBoxUpdateData::date() const
 {
-    return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never") : m_date.toString(Qt::LocaleDate);
+    return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never")
+                             : QLocale::system().toString(m_date, QLocale::ShortFormat);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -361 +361 @@
     if (then.daysTo(now) > 30)
     {
-        strAge = then.toString(Qt::LocalDate);
+        strAge = QLocale::system().toString(then, QLocale::ShortFormat);
         enmAgeFormat = SnapshotAgeFormat_Max;
     }
@@ -367 +367 @@
     {
         strAge = tr("%1 (%2 ago)", "date time (how long ago)")
-                    .arg(then.toString(Qt::LocalDate), UITranslator::daysToString(then.secsTo(now) / 60 / 60 / 24));
+                    .arg(QLocale::system().toString(then, QLocale::ShortFormat),
+                         UITranslator::daysToString(then.secsTo(now) / 60 / 60 / 24));
         enmAgeFormat = SnapshotAgeFormat_InDays;
     }
@@ -373 +374 @@
     {
         strAge = tr("%1 (%2 ago)", "date time (how long ago)")
-                    .arg(then.toString(Qt::LocalDate), UITranslator::hoursToString(then.secsTo(now) / 60 / 60));
+                    .arg(QLocale::system().toString(then, QLocale::ShortFormat),
+                         UITranslator::hoursToString(then.secsTo(now) / 60 / 60));
         enmAgeFormat = SnapshotAgeFormat_InHours;
     }
@@ -379 +381 @@
     {
         strAge = tr("%1 (%2 ago)", "date time (how long ago)")
-                    .arg(then.toString(Qt::LocalDate), UITranslator::minutesToString(then.secsTo(now) / 60));
+                    .arg(QLocale::system().toString(then, QLocale::ShortFormat),
+                         UITranslator::minutesToString(then.secsTo(now) / 60));
         enmAgeFormat = SnapshotAgeFormat_InMinutes;
     }
@@ -385 +388 @@
     {
         strAge = tr("%1 (%2 ago)", "date time (how long ago)")
-                    .arg(then.toString(Qt::LocalDate), UITranslator::secondsToString(then.secsTo(now)));
+                    .arg(QLocale::system().toString(then, QLocale::ShortFormat),
+                         UITranslator::secondsToString(then.secsTo(now)));
         enmAgeFormat = SnapshotAgeFormat_InSeconds;
     }
@@ -404 +408 @@
     /* Compose date time: */
     QString strDateTime = fDateTimeToday
-                        ? m_timestamp.time().toString(Qt::LocalDate)
-                        : m_timestamp.toString(Qt::LocalDate);
+                        ? QLocale::system().toString(m_timestamp.time(), QLocale::ShortFormat)
+                        : QLocale::system().toString(m_timestamp, QLocale::ShortFormat);
 
     /* Prepare details: */