Changeset 30610 in vbox

Timestamp:

Jul 5, 2010 12:47:57 PM (15 years ago)

Author:

vboxsync

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

63336

Message:

Naming.

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -563 +563 @@
         /** @todo Copy void* buffer contents! */
 
-        /* Was progress canceled before? */
-        BOOL fCanceled;
+        /* Was progress cancelled before? */
+        BOOL fCancelled;
         ComAssert(it->second.pProgress.isNotNull());
-        it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
+        it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
 
         Utf8Str errMsg;
-        if (!fCanceled)
+        if (!fCancelled)
         {
             /* Do progress handling. */
@@ -642 +642 @@
         }
         else
-            errMsg = Utf8StrFmt(Guest::tr("Process execution canceled"));
+            errMsg = Utf8StrFmt(Guest::tr("Process execution cancelled"));
 
         if (!it->second.pProgress->getCompleted())
         {
             if (   errMsg.length()
-                || fCanceled) /* If cancelled we have to report E_FAIL! */
+                || fCancelled) /* If cancelled we have to report E_FAIL! */
             {
                 it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR, COM_IIDOF(IGuest),
@@ -697 +697 @@
         }
 
-        /* Was progress canceled before? */
-        BOOL fCanceled;
+        /* Was progress cancelled before? */
+        BOOL fCancelled;
         ComAssert(it->second.pProgress.isNotNull());
-        it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
-
-        if (!fCanceled)
+        it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
+
+        if (!fCancelled)
             it->second.pProgress->notifyComplete(S_OK);
         else
@@ -761 +761 @@
         if (!fCompleted)
         {
-            /* Only cancel if not canceled before! */
-            BOOL fCanceled;
-            if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCanceled)) && !fCanceled)
+            /* Only cancel if not cancelled before! */
+            BOOL fCancelled;
+            if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCancelled)) && !fCancelled)
                 it->second.pProgress->Cancel();
 
             /* To get waitForCompletion notified we have to notify it if necessary. */
             it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR, COM_IIDOF(IGuest),
-                                          (CBSTR)Guest::getComponentName(), Guest::tr("The operation was canceled during shutdown"));
+                                          (CBSTR)Guest::getComponentName(), Guest::tr("The operation was cancelled during shutdown"));
         }
         /*
@@ -999 +999 @@
                  */
                 CallbackMapIter it = getCtrlCallbackContextByID(uContextID);
-                BOOL fCanceled = FALSE;
+                BOOL fCancelled = FALSE;
                 if (it != mCallbackMap.end())
                 {
@@ -1011 +1011 @@
                     if (SUCCEEDED(rc))
                     {
-                        /* Was the operation canceled by one of the parties? */
-                        rc = it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
+                        /* Was the operation cancelled by one of the parties? */
+                        rc = it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
                         if (FAILED(rc)) throw rc;
 
-                        if (!fCanceled)
+                        if (!fCancelled)
                         {
                             AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1059 +1059 @@
                             }
                         }
-                        else /* Operation was canceled. */
+                        else /* Operation was cancelled. */
                             vrc = VERR_CANCELLED;
                     }
@@ -1099 +1099 @@
                         {
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The execution operation was canceled"));
+                                          tr("The execution operation was cancelled"));
                         }
                         else if (vrc == VERR_PERMISSION_DENIED)
@@ -1248 +1248 @@
              */
             CallbackMapIter it = getCtrlCallbackContextByID(uContextID);
-            BOOL fCanceled = FALSE;
+            BOOL fCancelled = FALSE;
             if (it != mCallbackMap.end())
             {
@@ -1257 +1257 @@
                 if (FAILED(rc)) throw rc;
 
-                /* Was the operation canceled by one of the parties? */
-                rc = it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
+                /* Was the operation cancelled by one of the parties? */
+                rc = it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
                 if (FAILED(rc)) throw rc;
 
-                if (!fCanceled)
+                if (!fCancelled)
                 {
                     BOOL fCompleted;
@@ -1290 +1290 @@
                         vrc = VERR_TIMEOUT;
                 }
-                else /* Operation was canceled. */
+                else /* Operation was cancelled. */
                 {
                     vrc = VERR_CANCELLED;
@@ -1310 +1310 @@
                     {
                         rc = setError(VBOX_E_IPRT_ERROR,
-                                      tr("The output operation was canceled"));
+                                      tr("The output operation was cancelled"));
                     }
                     else