Changeset 41187 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 7, 2012 3:12:10 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77813

Message:

Main: cleanup - VirtualBoxSupportTranslation is long dead

Location:

trunk/src/VBox/Main/include

Files:

• FramebufferImpl.h (modified) (2 diffs)
• VirtualBoxBase.h (modified) (16 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 class ATL_NO_VTABLE Framebuffer :
     public VirtualBoxBase,
-    public VirtualBoxSupportTranslation<Framebuffer>,
     VBOX_SCRIPTABLE_IMPL(IFramebuffer)
 {

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

@@ -60 +60 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
 #include <atlcom.h>
@@ -136 +136 @@
 };
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -156 +156 @@
  *  @param   expr    Expression which should be true.
  */
-#if defined (DEBUG)
+#if defined(DEBUG)
 #define ComAssert(expr)    Assert(expr)
 #else
@@ -179 +179 @@
  *
  */
-#if defined (DEBUG)
+#if defined(DEBUG)
 #define ComAssertFailed()    AssertFailed()
 #else
@@ -199 +199 @@
  *  @param   a       printf argument list (in parenthesis).
  */
-#if defined (DEBUG)
+#if defined(DEBUG)
 #define ComAssertMsg(expr, a)  AssertMsg(expr, a)
 #else
@@ -219 +219 @@
  * @param   vrc     VBox status code.
  */
-#if defined (DEBUG)
+#if defined(DEBUG)
 #define ComAssertRC(vrc)    AssertRC(vrc)
 #else
@@ -234 +234 @@
  *  @param   msg    printf argument list (in parenthesis).
  */
-#if defined (DEBUG)
+#if defined(DEBUG)
 #define ComAssertMsgRC(vrc, msg)    AssertMsgRC(vrc, msg)
 #else
@@ -248 +248 @@
  *  @param rc   COM result code
  */
-#if defined (DEBUG)
+#if defined(DEBUG)
 #define ComAssertComRC(rc)  AssertComRC(rc)
 #else
@@ -272 +272 @@
 /** Special version of ComAssert that returns ret */
 #define ComAssertFailedRet(ret)                \
-    if (1) { ComAssertFailed(); { return (ret); } } else do {} while (0)
+    do { ComAssertFailed(); return (ret); } while (0)
 
 
@@ -280 +280 @@
 /** Special version of ComAssertMsg that evaluates eval and breaks if expr fails */
 #define ComAssertMsgBreak(expr, a, eval)          \
-    if (1)  { ComAssertMsg(expr, a); if (!(expr)) { eval; break; } } else do {} while (0)
+    if (1) { ComAssertMsg(expr, a); if (!(expr)) { eval; break; } } else do {} while (0)
 /** Special version of ComAssertRC that evaluates eval and breaks if vrc does not succeed */
 #define ComAssertRCBreak(vrc, eval)               \
-    if (1)  { ComAssertRC(vrc); if (!RT_SUCCESS(vrc)) { eval; break; } } else do {} while (0)
+    if (1) { ComAssertRC(vrc); if (!RT_SUCCESS(vrc)) { eval; break; } } else do {} while (0)
 /** Special version of ComAssertFailed that evaluates eval and breaks */
 #define ComAssertFailedBreak(eval)                \
-    if (1)  { ComAssertFailed(); { eval; break; } } else do {} while (0)
+    if (1) { ComAssertFailed(); { eval; break; } } else do {} while (0)
 /** Special version of ComAssertMsgFailed that evaluates eval and breaks */
 #define ComAssertMsgFailedBreak(msg, eval)        \
-    if (1)  { ComAssertMsgFailed (msg); { eval; break; } } else do {} while (0)
+    if (1) { ComAssertMsgFailed (msg); { eval; break; } } else do {} while (0)
 /** Special version of ComAssertComRC that evaluates eval and breaks if rc does not succeed */
 #define ComAssertComRCBreak(rc, eval)             \
-    if (1)  { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { eval; break; } } else do {} while (0)
+    if (1) { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { eval; break; } } else do {} while (0)
 /** Special version of ComAssertComRC that just breaks if rc does not succeed */
 #define ComAssertComRCBreakRC(rc)                 \
-    if (1)  { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { break; } } else do {} while (0)
+    if (1) { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { break; } } else do {} while (0)
 
 
 /** Special version of ComAssert that evaluates eval and throws it if expr fails */
 #define ComAssertThrow(expr, eval)                \
-    if (1) { ComAssert(expr); if (!(expr)) { throw (eval); } } else do {} while (0)
+    do { ComAssert(expr); if (!(expr)) { throw (eval); } } while (0)
 /** Special version of ComAssertRC that evaluates eval and throws it if vrc does not succeed */
 #define ComAssertRCThrow(vrc, eval)               \
-    if (1)  { ComAssertRC(vrc); if (!RT_SUCCESS(vrc)) { throw (eval); } } else do {} while (0)
+    do { ComAssertRC(vrc); if (!RT_SUCCESS(vrc)) { throw (eval); } } while (0)
 /** Special version of ComAssertComRC that evaluates eval and throws it if rc does not succeed */
 #define ComAssertComRCThrow(rc, eval)             \
-    if (1)  { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { throw (eval); } } else do {} while (0)
+    do { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { throw (eval); } } while (0)
 /** Special version of ComAssertComRC that just throws rc if rc does not succeed */
 #define ComAssertComRCThrowRC(rc)                 \
-    if (1)  { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { throw rc; } } else do {} while (0)
+    do { ComAssertComRC(rc); if (!SUCCEEDED(rc)) { throw rc; } } while (0)
 /** Special version of ComAssert that throws eval */
 #define ComAssertFailedThrow(eval)                \
-    if (1) { ComAssertFailed(); { throw (eval); } } else do {} while (0)
+    do { ComAssertFailed(); { throw (eval); } } while (0)
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -413 +413 @@
     do { \
         if (RT_UNLIKELY(!(expr))) \
-            return setError(E_INVALIDARG, tr ("Argument %s %s"), \
+            return setError(E_INVALIDARG, tr("Argument %s %s"), \
                             #arg, Utf8StrFmt msg .c_str()); \
     } while (0)
@@ -427 +427 @@
             return setError(E_POINTER, \
                 tr("Output argument %s points to invalid memory location (%p)"), \
-                #arg, (void *) (arg)); \
+                #arg, (void *)(arg)); \
     } while (0)
 
@@ -712 +712 @@
     /**
      * Adds a limited caller. This method is equivalent to doing
-     * <tt>addCaller (aState, true)</tt>, but it is preferred because provides
+     * <tt>addCaller(aState, true)</tt>, but it is preferred because provides
      * better self-descriptiveness. See #addCaller() for more info.
      */
@@ -829 +829 @@
  * situations. This macro needs to be present inside (better at the very
  * beginning) of the declaration of the class that inherits from
- * VirtualBoxSupportTranslation template, to make lupdate happy.
+ * VirtualBoxTranslatable, to make lupdate happy.
  */
 #define Q_OBJECT
@@ -849 +849 @@
 public:
 
-    Shareable() : mData (NULL), mIsShared(FALSE) {}
+    Shareable() : mData(NULL), mIsShared(FALSE) {}
     ~Shareable() { free(); }
 
@@ -943 +943 @@
 public:
 
-    Backupable() : Shareable<D> (), mBackupData(NULL) {}
+    Backupable() : Shareable<D>(), mBackupData(NULL) {}
 
     void free()