Index: /trunk/src/VBox/Main/include/GuestDnDPrivate.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestDnDPrivate.h	(revision 78092)
+++ /trunk/src/VBox/Main/include/GuestDnDPrivate.h	(revision 78093)
@@ -1122,9 +1122,6 @@
 };
 
-/** Access to the GuestDnD's singleton instance.
- * @todo r=bird: Please add a 'Get' or something to this as it currently looks
- *       like a class instantiation rather than a getter.  Alternatively, use
- *       UPPER_CASE like the coding guideline suggest for macros. */
-#define GuestDnDInst() GuestDnD::getInstance()
+/** Access to the GuestDnD's singleton instance. */
+#define GUESTDNDINST() GuestDnD::getInstance()
 
 /** List of pointers to guest DnD Messages. */
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 78092)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 78093)
@@ -3125,5 +3125,5 @@
                 rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxDragAndDropSvc",
                                                       &GuestDnD::notifyDnDDispatcher,
-                                                      GuestDnDInst());
+                                                      GUESTDNDINST());
                 if (RT_FAILURE(rc))
                     Log(("Cannot register VBoxDragAndDropSvc extension, rc=%Rrc\n", rc));
Index: /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp	(revision 78092)
+++ /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp	(revision 78093)
@@ -764,5 +764,5 @@
 {
     /* Initialize public attributes. */
-    m_lstFmtSupported = GuestDnDInst()->defaultFormats();
+    m_lstFmtSupported = GUESTDNDINST()->defaultFormats();
 
     /* Initialzie private stuff. */
@@ -929,5 +929,5 @@
     LogRel2(("DnD: Cancelling operation on guest ..."));
 
-    return GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    return GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
 }
 
Index: /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp	(revision 78092)
+++ /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp	(revision 78093)
@@ -266,8 +266,8 @@
     Msg.setNextUInt32(uScreenId);
 
-    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    int rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
     if (RT_SUCCESS(rc))
     {
-        GuestDnDResponse *pResp = GuestDnDInst()->response();
+        GuestDnDResponse *pResp = GUESTDNDINST()->response();
         AssertPtr(pResp);
 
@@ -348,5 +348,5 @@
 
     /* Dito. */
-    GuestDnDResponse *pResp = GuestDnDInst()->response();
+    GuestDnDResponse *pResp = GUESTDNDINST()->response();
     AssertPtr(pResp);
 
@@ -961,5 +961,5 @@
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
-    GuestDnD *pInst = GuestDnDInst();
+    GuestDnD *pInst = GUESTDNDINST();
     if (!pInst)
         return VERR_INVALID_POINTER;
@@ -1096,5 +1096,5 @@
     AssertPtr(pCtx->mpResp);
 
-    GuestDnD *pInst = GuestDnDInst();
+    GuestDnD *pInst = GUESTDNDINST();
     if (!pInst)
         return VERR_INVALID_POINTER;
@@ -1201,5 +1201,5 @@
     AssertPtr(pCtx->mpResp);
 
-    GuestDnD *pInst = GuestDnDInst();
+    GuestDnD *pInst = GUESTDNDINST();
     if (!pInst)
         return VERR_INVALID_POINTER;
Index: /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp	(revision 78092)
+++ /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp	(revision 78093)
@@ -307,5 +307,5 @@
 
     /* Adjust the coordinates in a multi-monitor setup. */
-    int rc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
+    int rc = GUESTDNDINST()->adjustScreenCoordinates(aScreenId, &aX, &aY);
     if (RT_SUCCESS(rc))
     {
@@ -322,8 +322,8 @@
         Msg.setNextUInt32(cbFormats);
 
-        rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(rc))
         {
-            GuestDnDResponse *pResp = GuestDnDInst()->response();
+            GuestDnDResponse *pResp = GUESTDNDINST()->response();
             if (pResp && RT_SUCCESS(pResp->waitForGuestResponse()))
                 resAction = GuestDnD::toMainAction(pResp->getActionDefault());
@@ -385,5 +385,5 @@
     HRESULT hr = S_OK;
 
-    int rc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
+    int rc = GUESTDNDINST()->adjustScreenCoordinates(aScreenId, &aX, &aY);
     if (RT_SUCCESS(rc))
     {
@@ -400,8 +400,8 @@
         Msg.setNextUInt32(cbFormats);
 
-        rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(rc))
         {
-            GuestDnDResponse *pResp = GuestDnDInst()->response();
+            GuestDnDResponse *pResp = GUESTDNDINST()->response();
             if (pResp && RT_SUCCESS(pResp->waitForGuestResponse()))
                 resAction = GuestDnD::toMainAction(pResp->getActionDefault());
@@ -440,8 +440,8 @@
         Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
 
-    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    int rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
     if (RT_SUCCESS(rc))
     {
-        GuestDnDResponse *pResp = GuestDnDInst()->response();
+        GuestDnDResponse *pResp = GUESTDNDINST()->response();
         if (pResp)
             pResp->waitForGuestResponse();
@@ -507,5 +507,5 @@
 
     /* Adjust the coordinates in a multi-monitor setup. */
-    HRESULT hr = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
+    HRESULT hr = GUESTDNDINST()->adjustScreenCoordinates(aScreenId, &aX, &aY);
     if (SUCCEEDED(hr))
     {
@@ -522,8 +522,8 @@
         Msg.setNextUInt32(cbFormats);
 
-        int vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        int vrc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(vrc))
         {
-            GuestDnDResponse *pResp = GuestDnDInst()->response();
+            GuestDnDResponse *pResp = GUESTDNDINST()->response();
             AssertPtr(pResp);
 
@@ -625,5 +625,5 @@
 
     /* Ditto. */
-    GuestDnDResponse *pResp = GuestDnDInst()->response();
+    GuestDnDResponse *pResp = GUESTDNDINST()->response();
     AssertPtr(pResp);
 
@@ -838,5 +838,5 @@
     }
 
-    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    int rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
     if (RT_SUCCESS(rc))
         rc = updateProgress(pData, pCtx->mpResp, pData->getMeta().getSize());
@@ -869,5 +869,5 @@
     Msg.setNextUInt32(0);                                                /** @todo cbChecksum; not used yet. */
 
-    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    int rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
 
     LogFlowFuncLeaveRC(rc);