Changeset 46649 in vbox for trunk/src/VBox/Frontends/VBoxAutostart
- Timestamp:
- Jun 19, 2013 11:47:32 AM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 86538
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/VBox-4.1 merged: 82579,85941 /branches/VBox-4.2 merged: 86229-86230,86234,86529 /branches/andy/guestctrl20 (added) merged: 78916,78930
- Property svn:mergeinfo changed
-
trunk/src/VBox
- Property svn:mergeinfo changed
/branches/VBox-4.1/src/VBox merged: 85941 /branches/VBox-4.2/src/VBox merged: 86529
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends
- Property svn:mergeinfo changed
/branches/VBox-4.1/src/VBox/Frontends merged: 85941 /branches/VBox-4.2/src/VBox/Frontends (added) merged: 86529
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp
r43967 r46649 5 5 6 6 /* 7 * Copyright (C) 2012 Oracle Corporation7 * Copyright (C) 2012-2013 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 27 27 #include <VBox/com/errorprint.h> 28 28 29 #include <VBox/com/ EventQueue.h>29 #include <VBox/com/NativeEventQueue.h> 30 30 #include <VBox/com/listeners.h> 31 31 #include <VBox/com/VirtualBox.h> … … 136 136 Bstr bstrOperationDescription; 137 137 138 EventQueue::getMainEventQueue()->processEventQueue(0);138 NativeEventQueue::getMainEventQueue()->processEventQueue(0); 139 139 140 140 ULONG cOperations = 1; … … 205 205 progress->WaitForCompletion(100); 206 206 207 EventQueue::getMainEventQueue()->processEventQueue(0);207 NativeEventQueue::getMainEventQueue()->processEventQueue(0); 208 208 hrc = progress->COMGETTER(Completed(&fCompleted)); 209 209 } … … 560 560 561 561 autostartConfigAstDestroy(pCfgAst); 562 EventQueue::getMainEventQueue()->processEventQueue(0);562 NativeEventQueue::getMainEventQueue()->processEventQueue(0); 563 563 564 564 autostartShutdown(); -
trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp
r44528 r46649 5 5 6 6 /* 7 * Copyright (C) 2012 Oracle Corporation7 * Copyright (C) 2012-2013 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 28 28 #include <VBox/com/errorprint.h> 29 29 30 #include <VBox/com/ EventQueue.h>30 #include <VBox/com/NativeEventQueue.h> 31 31 #include <VBox/com/listeners.h> 32 32 #include <VBox/com/VirtualBox.h> … … 93 93 Bstr bstrOperationDescription; 94 94 95 EventQueue::getMainEventQueue()->processEventQueue(0);95 NativeEventQueue::getMainEventQueue()->processEventQueue(0); 96 96 97 97 ULONG cOperations = 1; … … 126 126 progress->WaitForCompletion(100); 127 127 128 EventQueue::getMainEventQueue()->processEventQueue(0);128 NativeEventQueue::getMainEventQueue()->processEventQueue(0); 129 129 hrc = progress->COMGETTER(Completed(&fCompleted)); 130 130 }
Note:
See TracChangeset
for help on using the changeset viewer.