Changeset 70061 in vbox for trunk/src/VBox/Main/src-server/MachineImpl.cpp

Timestamp:

Dec 11, 2017 3:26:46 PM (7 years ago)

Author:

vboxsync

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

119603

Message:

GuestPropertySvc.h: Working on making it usable from C (VBoxGuest, ++)

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5647 +5647 @@
                                                com::Utf8Str &aFlags) const
 {
-    using namespace guestProp;
-
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     HWData::GuestPropertyMap::const_iterator it = mHWData->mGuestProperties.find(aName);
-
     if (it != mHWData->mGuestProperties.end())
     {
@@ -5742 +5740 @@
                                              const com::Utf8Str &aFlags, bool fDelete)
 {
-    using namespace guestProp;
-
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = S_OK;
-
-    rc = i_checkStateDependency(MutableOrSavedStateDep);
+    HRESULT rc = i_checkStateDependency(MutableOrSavedStateDep);
     if (FAILED(rc)) return rc;
 
@@ -5899 +5893 @@
                                                      std::vector<com::Utf8Str> &aFlags)
 {
-    using namespace guestProp;
-
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
     Utf8Str strPatterns(aPatterns);
-
-    HWData::GuestPropertyMap propMap;
 
     /*
      * Look for matching patterns and build up a list.
      */
+    HWData::GuestPropertyMap propMap;
     for (HWData::GuestPropertyMap::const_iterator
          it = mHWData->mGuestProperties.begin();
@@ -13524 +13515 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
-    using namespace guestProp;
-
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -13534 +13523 @@
     aFlags.resize(cEntries);
 
-    size_t  i = 0;
+    size_t i = 0;
     for (HWData::GuestPropertyMap::const_iterator
          it = mHWData->mGuestProperties.begin();
@@ -13568 +13557 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
-    using namespace guestProp;
-
     try
     {