Changeset 36120 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Mar 1, 2011 3:04:10 PM (14 years ago)

Author:

vboxsync

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

70284

Message:

FE/BFE: fix some warnings

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• VBoxBFE.h (modified) (1 diff)
• VirtualBoxBase.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.h

@@ -28 +28 @@
 {
  NetworkAdapterCount = 4,
- MaxSharedFolders = 16,
+ MaxSharedFolders = 16
 };
 

trunk/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h

@@ -307 +307 @@
         }
     };
-};
+}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -519 +519 @@
 
     // sets the ready state of the object
-    void setReady(bool isReady)
-    {
-        mReady = isReady;
+    void setReady(bool ready)
+    {
+        mReady = ready;
     }
     // get the ready state of the object
@@ -586 +586 @@
     }
 
-    void attach (D *data) {
-        AssertMsg (data, ("new data must not be NULL"));
-        if (data && mData != data) {
+    void attach (D *pData) {
+        AssertMsg (pData, ("new data must not be NULL"));
+        if (pData && mData != pData) {
             if (mData && !mIsShared)
                 delete mData;
-            mData = data;
+            mData = pData;
             mIsShared = false;
         }
     }
 
-    void attach (Shareable &data) {
+    void attach (Shareable &Data) {
         AssertMsg (
-            data.mData == mData || !data.mIsShared,
+            Data.mData == mData || !Data.mIsShared,
             ("new data must not be shared")
         );
-        if (this != &data && !data.mIsShared) {
-            attach (data.mData);
-            data.mIsShared = true;
-        }
-    }
-
-    void share (D *data) {
-        AssertMsg (data, ("new data must not be NULL"));
-        if (mData != data) {
+        if (this != &Data && !Data.mIsShared) {
+            attach (Data.mData);
+            Data.mIsShared = true;
+        }
+    }
+
+    void share (D *pData) {
+        AssertMsg (pData, ("new data must not be NULL"));
+        if (mData != pData) {
             if (mData && !mIsShared)
                 delete mData;
-            mData = data;
+            mData = pData;
             mIsShared = true;
         }
     }
 
-    void share (const Shareable &data) { share (data.mData); }
-
-    void attachCopy (const D *data) {
-        AssertMsg (data, ("data to copy must not be NULL"));
-        if (data)
-            attach (new D (*data));
-    }
-
-    void attachCopy (const Shareable &data) {
-        attachCopy (data.mData);
+    void share (const Shareable &Data) { share (Data.mData); }
+
+    void attachCopy (const D *pData) {
+        AssertMsg (pData, ("data to copy must not be NULL"));
+        if (pData)
+            attach (new D (*pData));
+    }
+
+    void attachCopy (const Shareable &Data) {
+        attachCopy (Data.mData);
     }