Changeset 30777 in vbox for trunk/src/VBox/Main/GuestImpl.cpp

Timestamp:

Jul 12, 2010 8:25:15 AM (15 years ago)

Author:

vboxsync

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

63576

Message:

Main: Cancelled -> Canceled.

File:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -565 +565 @@
         Utf8Str errMsg;
 
-        /* Was progress cancelled before? */
-        BOOL fCancelled;
+        /* Was progress canceled before? */
+        BOOL fCanceled;
         ComAssert(!it->second.pProgress.isNull());
-        if (   SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCancelled))
-            && !fCancelled)
+        if (   SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCanceled))
+            && !fCanceled)
         {
             /* Do progress handling. */
@@ -643 +643 @@
         }
         else
-            errMsg = Utf8StrFmt(Guest::tr("Process execution cancelled"));
+            errMsg = Utf8StrFmt(Guest::tr("Process execution canceled"));
 
         if (!it->second.pProgress->getCompleted())
         {
             if (   errMsg.length()
-                || fCancelled) /* If cancelled we have to report E_FAIL! */
+                || fCanceled) /* If canceled we have to report E_FAIL! */
             {
                 HRESULT hr2 = it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR,
@@ -702 +702 @@
         }
 
-        /* Was progress cancelled before? */
-        BOOL fCancelled;
+        /* Was progress canceled before? */
+        BOOL fCanceled;
         ComAssert(!it->second.pProgress.isNull());
-        if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCancelled)) && fCancelled)
+        if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCanceled)) && fCanceled)
         {
             it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR,
                                                  COM_IIDOF(IGuest),
                                                  Guest::getStaticComponentName(),
-                                                 Guest::tr("The output operation was cancelled"));
+                                                 Guest::tr("The output operation was canceled"));
         }
         else
@@ -775 +775 @@
             LogFlowFunc(("Progress of CID=%u *not* completed, cancelling ...\n", it->first));
 
-            /* Only cancel if not cancelled before! */
-            BOOL fCancelled;
-            if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCancelled)) && !fCancelled)
+            /* Only cancel if not canceled before! */
+            BOOL fCanceled;
+            if (SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCanceled)) && !fCanceled)
                 it->second.pProgress->Cancel();
 
@@ -790 +790 @@
                                                  COM_IIDOF(IGuest),
                                                  Guest::getStaticComponentName(),
-                                                 Guest::tr("The operation was cancelled because client is shutting down"));
+                                                 Guest::tr("The operation was canceled because client is shutting down"));
         }
         /*
@@ -1021 +1021 @@
                  */
                 CallbackMapIter it = getCtrlCallbackContextByID(uContextID);
-                BOOL fCancelled = FALSE;
+                BOOL fCanceled = FALSE;
                 if (it != mCallbackMap.end())
                 {
@@ -1033 +1033 @@
                     if (SUCCEEDED(rc))
                     {
-                        /* Was the operation cancelled by one of the parties? */
-                        rc = it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
+                        /* Was the operation canceled by one of the parties? */
+                        rc = it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
                         if (FAILED(rc)) throw rc;
 
-                        if (!fCancelled)
+                        if (!fCanceled)
                         {
                             AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1081 +1081 @@
                             }
                         }
-                        else /* Operation was cancelled. */
+                        else /* Operation was canceled. */
                             vrc = VERR_CANCELLED;
                     }
@@ -1121 +1121 @@
                         {
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The execution operation was cancelled"));
+                                          tr("The execution operation was canceled"));
                         }
                         else if (vrc == VERR_PERMISSION_DENIED)
@@ -1204 +1204 @@
          * This progress object, compared to the one in executeProgress() above,
          * is only local and is used to determine whether the operation finished
-         * or got cancelled.
+         * or got canceled.
          */
         ComObjPtr <Progress> progress;
@@ -1270 +1270 @@
              */
             CallbackMapIter it = getCtrlCallbackContextByID(uContextID);
-            BOOL fCancelled = FALSE;
+            BOOL fCanceled = FALSE;
             if (it != mCallbackMap.end())
             {
@@ -1279 +1279 @@
                 if (FAILED(rc)) throw rc;
 
-                /* Was the operation cancelled by one of the parties? */
-                rc = it->second.pProgress->COMGETTER(Canceled)(&fCancelled);
+                /* Was the operation canceled by one of the parties? */
+                rc = it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
                 if (FAILED(rc)) throw rc;
 
-                if (!fCancelled)
+                if (!fCanceled)
                 {
                     BOOL fCompleted;
@@ -1312 +1312 @@
                         vrc = VERR_TIMEOUT;
                 }
-                else /* Operation was cancelled. */
+                else /* Operation was canceled. */
                 {
                     vrc = VERR_CANCELLED;
@@ -1332 +1332 @@
                     {
                         rc = setError(VBOX_E_IPRT_ERROR,
-                                      tr("The output operation was cancelled"));
+                                      tr("The output operation was canceled"));
                     }
                     else