Changeset 21599 in vbox for trunk/src

Timestamp:

Jul 15, 2009 10:11:36 AM (15 years ago)

Author:

vboxsync

Message:

OVF: no using in headers

Location:

trunk/src/VBox/Main

Files:

• include/ovfreader.h (modified) (6 diffs)
• xml/ovfreader.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/ovfreader.h

@@ -27 +27 @@
 #include "iprt/xml_cpp.h"
 #include <map>
-
-using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -233 +231 @@
 };
 
-typedef map<iprt::MiniString, DiskImage> DiskImagesMap;
+typedef std::map<iprt::MiniString, DiskImage> DiskImagesMap;
 
 struct VirtualSystem;
 
-typedef map<uint32_t, VirtualHardwareItem> HardwareItemsMap;
+typedef std::map<uint32_t, VirtualHardwareItem> HardwareItemsMap;
 
 struct HardDiskController
@@ -255 +253 @@
 };
 
-typedef map<uint32_t, HardDiskController> ControllersMap;
+typedef std::map<uint32_t, HardDiskController> ControllersMap;
 
 struct VirtualDisk
@@ -268 +266 @@
 };
 
-typedef map<iprt::MiniString, VirtualDisk> VirtualDisksMap;
+typedef std::map<iprt::MiniString, VirtualDisk> VirtualDisksMap;
 
 /**
@@ -280 +278 @@
 };
 
-typedef list<EthernetAdapter> EthernetAdaptersList;
+typedef std::list<EthernetAdapter> EthernetAdaptersList;
 
 /**
@@ -373 +371 @@
 
     // Data fields
-    iprt::MiniString        m_strPath;            // file name given to constructor
-    DiskImagesMap           m_mapDisks;           // map of DiskImage structs, sorted by DiskImage.strDiskId
-    list<VirtualSystem>     m_llVirtualSystems;   // list of virtual systems, created by and valid after read()
+    iprt::MiniString         m_strPath;            // file name given to constructor
+    DiskImagesMap            m_mapDisks;           // map of DiskImage structs, sorted by DiskImage.strDiskId
+    std::list<VirtualSystem> m_llVirtualSystems;   // list of virtual systems, created by and valid after read()
 };
 

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -671 +671 @@
                     }
                     break;
+                    default: break;
                 }
             }