Changeset 101567 in vbox

Timestamp:

Oct 24, 2023 12:25:14 AM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10450: Get rid of Qt5 stuff; This one is about type changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/COMDefs.cpp (modified) (2 diffs)
• globals/COMDefs.h (modified) (2 diffs)
• manager/UICloudEntityKey.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (1 diff)
• settings/editors/UIHostComboEditor.cpp (modified) (3 diffs)
• settings/editors/UIHostComboEditor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp

@@ -204 +204 @@
     aVec.resize (static_cast <int> (aArr.size()));
     for (int i = 0; i < aVec.size(); ++ i)
-#ifndef VBOX_IS_QT6_OR_LATER
-        aVec [i] = QString::fromUtf16 ((const ushort *)aArr [i]);
-#else
         aVec [i] = QString::fromUtf16 ((const char16_t *)aArr [i]);
-#endif
 }
 
@@ -256 +252 @@
     aVec.resize (static_cast <int> (aArr.size()));
     for (int i = 0; i < aVec.size(); ++ i)
-#ifndef VBOX_IS_QT6_OR_LATER
-        aVec [i] = QUuid(QString::fromUtf16 ((const ushort *)aArr [i]));
-#else
         aVec [i] = QUuid(QString::fromUtf16 ((const char16_t *)aArr [i]));
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -399 +399 @@
         {
             if (bstr) {
-#ifndef VBOX_IS_QT6_OR_LATER
-                str = QString::fromUtf16((const ushort *)bstr);
-#else
                 str = QString::fromUtf16((const char16_t *)bstr);
-#endif
                 SysFreeString(bstr);
             }
@@ -447 +443 @@
         {
             if (bstr) {
-#ifndef VBOX_IS_QT6_OR_LATER
-                uuid = QUuid(QString::fromUtf16((const ushort *)bstr));
-#else
                 uuid = QUuid(QString::fromUtf16((const char16_t *)bstr));
-#endif
                 SysFreeString(bstr);
             }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UICloudEntityKey.h

@@ -68 +68 @@
 };
 
-#ifdef VBOX_IS_QT6_OR_LATER /* uint replaced with size_t since 6.0 */
 inline size_t qHash(const UICloudEntityKey &key, size_t uSeed)
-#else
-inline uint qHash(const UICloudEntityKey &key, uint uSeed)
-#endif
 {
     return qHash(key.toString(), uSeed);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -114 +114 @@
 
     /** Redirects all the native events to parent. */
-#ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
     bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr*)
-#else
-    bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long*)
-#endif
     {
         return m_pParent->nativeEventPreprocessor(eventType, pMessage);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.cpp

@@ -93 +93 @@
 
     /** Handles all native events. */
-# ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
     virtual bool nativeEventFilter(const QByteArray &eventType, void *pMessage, qintptr *pResult) RT_OVERRIDE
-# else
-    virtual bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pResult) RT_OVERRIDE
-# endif
     {
         /* Redirect event to parent: */
@@ -190 +186 @@
     WCHAR wszKeyName[256];
     if (::GetKeyNameTextW(iScan, wszKeyName, RT_ELEMENTS(wszKeyName)))
-#ifndef VBOX_IS_QT6_OR_LATER
-        strKeyName = QString::fromUtf16((const ushort *)wszKeyName);
-#else
         strKeyName = QString::fromUtf16((const char16_t *)wszKeyName);
-#endif
     else
     {
@@ -636 +628 @@
 }
 
-#ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
 bool UIHostComboEditorPrivate::nativeEvent(const QByteArray &eventType, void *pMessage, qintptr *pResult)
-#else
-bool UIHostComboEditorPrivate::nativeEvent(const QByteArray &eventType, void *pMessage, long *pResult)
-#endif
 {
 # if defined(VBOX_WS_MAC)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.h

@@ -201 +201 @@
 
     /** Handles native events. */
-#ifdef VBOX_IS_QT6_OR_LATER /* long replaced with qintptr since 6.0 */
     virtual bool nativeEvent(const QByteArray &eventType, void *pMessage, qintptr *pResult) RT_OVERRIDE;
-#else
-    virtual bool nativeEvent(const QByteArray &eventType, void *pMessage, long *pResult) RT_OVERRIDE;
-#endif
 
     /** Handles key-press @a pEvent. */