diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Frontends/VBoxManage/VBoxManage.cpp | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Frontends/VBoxManage/VBoxManage.cpp')
| -rw-r--r-- | src/VBox/Frontends/VBoxManage/VBoxManage.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp index 1d881aac..533b30fc 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -26,7 +26,7 @@ # include <VBox/com/array.h> # include <VBox/com/ErrorInfo.h> # include <VBox/com/errorprint.h> -# include <VBox/com/EventQueue.h> +# include <VBox/com/NativeEventQueue.h> # include <VBox/com/VirtualBox.h> #endif /* !VBOX_ONLY_DOCS */ @@ -90,7 +90,7 @@ HRESULT showProgress(ComPtr<IProgress> progress) ULONG ulLastOperation = (ULONG)-1; Bstr bstrOperationDescription; - EventQueue::getMainEventQueue()->processEventQueue(0); + NativeEventQueue::getMainEventQueue()->processEventQueue(0); ULONG cOperations = 1; HRESULT hrc = progress->COMGETTER(OperationCount)(&cOperations); @@ -159,7 +159,8 @@ HRESULT showProgress(ComPtr<IProgress> progress) LONG lSecsRem = 0; progress->COMGETTER(TimeRemaining)(&lSecsRem); - RTStrmPrintf(g_pStdErr, "(%u/%u) %ls %02u%% => %02u%% (%d s remaining)\n", ulOperation + 1, cOperations, bstrOperationDescription.raw(), ulCurrentOperationPercent, ulCurrentPercent, lSecsRem); + RTStrmPrintf(g_pStdErr, "(%u/%u) %ls %02u%% => %02u%% (%d s remaining)\n", ulOperation + 1, cOperations, + bstrOperationDescription.raw(), ulCurrentOperationPercent, ulCurrentPercent, lSecsRem); ulLastPercent = ulCurrentPercent; ulLastOperationPercent = ulCurrentOperationPercent; } @@ -197,7 +198,7 @@ HRESULT showProgress(ComPtr<IProgress> progress) /* make sure the loop is not too tight */ progress->WaitForCompletion(100); - EventQueue::getMainEventQueue()->processEventQueue(0); + NativeEventQueue::getMainEventQueue()->processEventQueue(0); hrc = progress->COMGETTER(Completed(&fCompleted)); } @@ -331,7 +332,7 @@ int main(int argc, char *argv[]) if (i >= argc - 1) { showLogo(g_pStdOut); - printUsage(USAGE_ALL, g_pStdOut); + printUsage(USAGE_ALL, ~0U, g_pStdOut); return 0; } fShowLogo = true; @@ -355,7 +356,7 @@ int main(int argc, char *argv[]) { /* Special option to dump really all commands, * even the ones not understood on this platform. */ - printUsage(USAGE_DUMPOPTS, g_pStdOut); + printUsage(USAGE_DUMPOPTS, ~0U, g_pStdOut); return 0; } @@ -514,6 +515,9 @@ int main(int argc, char *argv[]) { "hostonlyif", USAGE_HOSTONLYIFS, handleHostonlyIf }, #endif { "dhcpserver", USAGE_DHCPSERVER, handleDHCPServer}, +#ifdef VBOX_WITH_NAT_SERVICE + { "natnetwork", USAGE_NATNETWORK, handleNATNetwork}, +#endif { "extpack", USAGE_EXTPACK, handleExtPack}, { "bandwidthctl", USAGE_BANDWIDTHCONTROL, handleBandwidthControl}, { "debugvm", USAGE_DEBUGVM, handleDebugVM}, @@ -550,7 +554,7 @@ int main(int argc, char *argv[]) || ( argc - iCmdArg == 0 && s_commandHandlers[commandIndex].help)) { - printUsage(s_commandHandlers[commandIndex].help, g_pStdOut); + printUsage(s_commandHandlers[commandIndex].help, ~0U, g_pStdOut); rcExit = RTEXITCODE_FAILURE; /* error */ } else @@ -580,7 +584,7 @@ int main(int argc, char *argv[]) * state file (if the machine was in the Saved state before). */ session->UnlockMachine(); - EventQueue::getMainEventQueue()->processEventQueue(0); + NativeEventQueue::getMainEventQueue()->processEventQueue(0); // end "all-stuff" scope /////////////////////////////////////////////////////////////////////////// |