Changeset 21436 in vbox for trunk/src/VBox/Main/include/HostHardwareLinux.h

Timestamp:

Jul 9, 2009 12:24:28 PM (15 years ago)

Author:

vboxsync

Message:

Main: make HostHardwareLinux use MiniString instead of std::string; add exception handling to HostImpl bits

File:

• trunk/src/VBox/Main/include/HostHardwareLinux.h (modified) (5 diffs)

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

@@ -26 +26 @@
 
 #include <iprt/err.h>
-#include <string>
+#include <iprt/ministring_cpp.h>
 #include <vector>
 
@@ -48 +48 @@
     {
         /** The device node of the drive. */
-        std::string mDevice;
+        iprt::MiniString mDevice;
         /** The hal unique device identifier, if available. */
-        std::string mUdi;
+        iprt::MiniString mUdi;
         /** A textual description of the drive. */
-        std::string mDescription;
+        iprt::MiniString mDescription;
 
         /** Constructors */
-        DriveInfo (std::string aDevice, std::string aUdi, std::string aDescription)
-            : mDevice (aDevice), mUdi (aUdi), mDescription (aDescription) {}
-        DriveInfo (std::string aDevice, std::string aUdi,
-                   const char *aDescription = NULL)
-            : mDevice (aDevice), mUdi (aUdi),
-            mDescription (aDescription != NULL ? aDescription : std::string ()) {}
-        DriveInfo (std::string aDevice, const char *aUdi = NULL,
-                   const char *aDescription = NULL)
-            : mDevice (aDevice), mUdi (aUdi != NULL ? aUdi : std::string ()),
-            mDescription (aDescription != NULL ? aDescription : std::string ()) {}
+        DriveInfo(const iprt::MiniString &aDevice,
+                  const iprt::MiniString &aUdi = "",
+                  const iprt::MiniString &aDescription = "")
+            : mDevice(aDevice),
+              mUdi(aUdi),
+              mDescription(aDescription)
+        { }
     };
-    
+
     /** List (resp vector) holding drive information */
-    typedef std::vector <DriveInfo> DriveInfoList;
+    typedef std::vector<DriveInfo> DriveInfoList;
 
     /**
@@ -75 +72 @@
      * @returns iprt status code
      */
-    int updateFloppies ();
+    int updateFloppies();
 
     /**
@@ -82 +79 @@
      * @returns iprt status code
      */
-    int updateDVDs ();
+    int updateDVDs();
 
     /** Get the first element in the list of floppy drives. */
@@ -131 +128 @@
     {
         /** The device node of the device. */
-        std::string mDevice;
+        iprt::MiniString mDevice;
         /** The sysfs path of the device. */
-        std::string mSysfsPath;
+        iprt::MiniString mSysfsPath;
         /** Type for the list of interfaces. */
-        typedef std::vector <std::string> InterfaceList;
+        typedef std::vector<iprt::MiniString> InterfaceList;
         /** The sysfs paths of the device's interfaces. */
         InterfaceList mInterfaces;
 
         /** Constructors */
-        USBDeviceInfo (std::string aDevice, std::string aSysfsPath)
-            : mDevice (aDevice), mSysfsPath (aSysfsPath) {}
-        USBDeviceInfo () {}
+        USBDeviceInfo(const iprt::MiniString &aDevice,
+                      const iprt::MiniString &aSysfsPath)
+            : mDevice(aDevice),
+              mSysfsPath(aSysfsPath)
+        { }
     };
-    
+
     /** List (resp vector) holding drive information */
-    typedef std::vector <USBDeviceInfo> DeviceInfoList;
+    typedef std::vector<USBDeviceInfo> DeviceInfoList;
 
     /**