Changeset 7829 in vbox
- Timestamp:
- Apr 9, 2008 12:29:58 PM (17 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/USBControllerImpl.cpp
r7466 r7829 481 481 ///////////////////////////////////////////////////////////////////////////// 482 482 483 /** 483 /** 484 484 * Loads settings from the given machine node. 485 485 * May be called once right after this object creation. 486 * 486 * 487 487 * @param aMachineNode <Machine> node. 488 * 489 * @note Locks this object for writing. 488 * 489 * @note Locks this object for writing. 490 490 */ 491 491 HRESULT USBController::loadSettings (const settings::Key &aMachineNode) … … 509 509 * place when a setting of a newly created object must default to A while 510 510 * the same setting of an object loaded from the old settings file must 511 * default to B. */ 511 * default to B. */ 512 512 513 513 /* USB Controller node (required) */ … … 557 557 } 558 558 559 /** 559 /** 560 560 * Saves settings to the given machine node. 561 * 561 * 562 562 * @param aMachineNode <Machine> node. 563 * 563 * 564 564 * @note Locks this object for reading. 565 565 */ … … 1245 1245 continue; 1246 1246 1247 # if !defined (RT_OS_WINDOWS)1248 /* these filters are temporarilyignored on Win32 */1247 # if !defined (RT_OS_WINDOWS) 1248 /* these filters are 'temporarily' ignored on Win32 */ 1249 1249 if (!aData.mManufacturer.isMatch (manufacturer)) 1250 1250 continue; … … 1255 1255 if (!aData.mPort.isMatch (port)) 1256 1256 continue; 1257 # endif1257 # endif 1258 1258 1259 1259 #else /* VBOX_WITH_USBFILTER */ -
trunk/src/VBox/Main/include/USBDeviceFilterImpl.h
r7207 r7829 65 65 typedef matching::Matchable 66 66 <matching::ParsedRegexpFilter <ConvForRegexp, false> > BstrFilter; 67 #endif /* VBOX_WITH_USBFILTER */67 #endif /* !VBOX_WITH_USBFILTER */ 68 68 69 69 typedef matching::Matchable <matching::ParsedBoolFilter> BOOLFilter;
Note:
See TracChangeset
for help on using the changeset viewer.