Changeset 104594 in vbox

Timestamp:

May 13, 2024 12:40:24 PM (7 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10450: Get rid of pre-Qt6 code related to time/date stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManagerHostTable.cpp (modified) (1 diff)
• manager/UIVirtualMachineItemLocal.cpp (modified) (2 diffs)
• snapshots/UISnapshotPane.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp

@@ -387 +387 @@
         propertyStringList << UIFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
         /* Creation Date: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
         propertyStringList << UIFileManager::tr("<b>Created:</b> %1<br/>").arg(fileInfo.birthTime().toString());
-#else
-        propertyStringList << UIFileManager::tr("<b>Created:</b> %1<br/>").arg(fileInfo.created().toString());
-#endif
         /* Last Modification Date: */
         propertyStringList << UIFileManager::tr("<b>Modified:</b> %1<br/>").arg(fileInfo.lastModified().toString());

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

@@ -86 +86 @@
         CSnapshot comSnapshot = m_comMachine.GetCurrentSnapshot();
         m_strSnapshotName = comSnapshot.isNull() ? QString() : comSnapshot.GetName();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
         m_lastStateChange.setSecsSinceEpoch(m_comMachine.GetLastStateChange() / 1000);
-#else
-        m_lastStateChange.setTime_t(m_comMachine.GetLastStateChange() / 1000);
-#endif
         m_cSnaphot = m_comMachine.GetSnapshotCount();
 
@@ -269 +265 @@
 {
     /* 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/snapshots/UISnapshotPane.cpp

@@ -391 +391 @@
         setIcon(Column_Name, *m_pSnapshotWidget->snapshotItemIcon(m_fOnline));
         m_strDescription = m_comSnapshot.GetDescription();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
         m_timestamp.setSecsSinceEpoch(m_comSnapshot.GetTimeStamp() / 1000);
-#else
-        m_timestamp.setTime_t(m_comSnapshot.GetTimeStamp() / 1000);
-#endif
         m_fCurrentStateModified = false;
     }
@@ -424 +420 @@
     setIcon(Column_Name, gpConverter->toIcon(m_enmMachineState));
     /* Update timestamp: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
     m_timestamp.setSecsSinceEpoch(m_comMachine.GetLastStateChange() / 1000);
-#else
-    m_timestamp.setTime_t(m_comMachine.GetLastStateChange() / 1000);
-#endif
 }