Changeset 50587 in vbox for trunk/src

Timestamp:

Feb 25, 2014 4:37:29 PM (11 years ago)

Author:

vboxsync

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

92455

Message:

NetworkServices/DHCP: use Utf8Str

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• Config.cpp (modified) (3 diffs)
• Config.h (modified) (2 diffs)
• VBoxNetDHCP.cpp (modified) (1 diff)

trunk/src/VBox/NetworkServices/DHCP/Config.cpp

@@ -144 +144 @@
     std::string          m_domainName;
     VecClient            m_clients;
-    std::string          m_leaseStorageFilename;
+    com::Utf8Str         m_leaseStorageFilename;
     bool                 fFileExists;
 };
@@ -187 +187 @@
  * </Leases>
  */
-int ConfigurationManager::loadFromFile(const std::string& leaseStorageFileName)
+int ConfigurationManager::loadFromFile(const com::Utf8Str& leaseStorageFileName)
 {
     m->m_leaseStorageFilename = leaseStorageFileName;
@@ -250 +250 @@
 int ConfigurationManager::saveToFile()
 {
-    if (m->m_leaseStorageFilename.empty())
+    if (m->m_leaseStorageFilename.isEmpty())
         return VINF_SUCCESS;
 

trunk/src/VBox/NetworkServices/DHCP/Config.h

@@ -21 +21 @@
 #include <iprt/asm-math.h>
 #include <iprt/cpp/utils.h>
+#include <VBox/com/string.h>
 
 #include "../NetLib/cpp/utils.h"
@@ -427 +428 @@
     static int extractRequestList(PCRTNETBOOTP pDhcpMsg, size_t cbDhcpMsg, RawOption& rawOpt);
 
-    int loadFromFile(const std::string&);
+    int loadFromFile(const com::Utf8Str&);
     int saveToFile();
     /**

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -538 +538 @@
     com::Bstr bstr;
     hrc = virtualbox->COMGETTER(HomeFolder)(bstr.asOutParam());
-    std::string strXmlLeaseFile(com::Utf8StrFmt("%ls%c%s.leases",
-                                                bstr.raw(), RTPATH_DELIMITER, networkName.c_str()).c_str());
+    com::Utf8StrFmt strXmlLeaseFile("%ls%c%s.leases",
+                                    bstr.raw(), RTPATH_DELIMITER, networkName.c_str());
     confManager->loadFromFile(strXmlLeaseFile);