Changeset 85559 in vbox for trunk/src

Timestamp:

Jul 30, 2020 1:37:36 PM (4 years ago)

Author:

vboxsync

Message:

DnD/Main: Return boolean as return value for GuestDnDBase::i_isFormatSupported().

Location:

trunk/src/VBox/Main

Files:

• include/GuestDnDPrivate.h (modified) (1 diff)
• src-client/GuestDnDPrivate.cpp (modified) (1 diff)
• src-client/GuestDnDSourceImpl.cpp (modified) (1 diff)
• src-client/GuestDnDTargetImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -998 +998 @@
     /** Shared (internal) IDnDBase method implementations.
      * @{ */
-    HRESULT i_isFormatSupported(const com::Utf8Str &aFormat, BOOL *aSupported);
+    bool i_isFormatSupported(const com::Utf8Str &aFormat) const;
     const GuestDnDMIMEList &i_getFormats(void) const;
     HRESULT i_addFormats(const GuestDnDMIMEList &aFormats);

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -1164 +1164 @@
  * Checks whether a given DnD format is supported or not.
  *
- * @returns HRESULT
+ * @returns \c true if supported, \c false if not.
  * @param   aFormat             DnD format to check.
- * @param   aSupported          Where to return \c TRUE if supported, or \c FALSE if not.
- */
-HRESULT GuestDnDBase::i_isFormatSupported(const com::Utf8Str &aFormat, BOOL *aSupported)
-{
-    *aSupported = std::find(m_lstFmtSupported.begin(),
-                            m_lstFmtSupported.end(), aFormat) != m_lstFmtSupported.end()
-                ? TRUE : FALSE;
-    return S_OK;
+ */
+bool GuestDnDBase::i_isFormatSupported(const com::Utf8Str &aFormat) const
+{
+    return std::find(m_lstFmtSupported.begin(), m_lstFmtSupported.end(), aFormat) != m_lstFmtSupported.end();
 }
 

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -186 +186 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    return GuestDnDBase::i_isFormatSupported(aFormat, aSupported);
+    *aSupported = GuestDnDBase::i_isFormatSupported(aFormat) ? TRUE : FALSE;
+
+    return S_OK;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -184 +184 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    return GuestDnDBase::i_isFormatSupported(aFormat, aSupported);
+    *aSupported = GuestDnDBase::i_isFormatSupported(aFormat) ? TRUE : FALSE;
+
+    return S_OK;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }