Changeset 85307 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 13, 2020 12:38:15 PM (5 years ago)

Author:

vboxsync

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

139285

Message:

Main/comimpl.xsl,++: Try use the Utf8Str versions of the event stuff where possible. bugref:9790

Location:

trunk/src/VBox/Main/src-server

Files:

• NATNetworkImpl.cpp (modified) (6 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)

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

@@ -171 +171 @@
     data = m->s;
 
-    m->pVirtualBox->i_onNATNetworkSetting(Bstr(m->s.strNetworkName).raw(),
+    m->pVirtualBox->i_onNATNetworkSetting(m->s.strNetworkName,
                                           m->s.fEnabled,
-                                          Bstr(m->s.strIPv4NetworkCidr).raw(),
-                                          Bstr(m->IPv4Gateway).raw(),
+                                          m->s.strIPv4NetworkCidr,
+                                          m->IPv4Gateway,
                                           m->s.fAdvertiseDefaultIPv6Route,
                                           m->s.fNeedDhcpServer);
@@ -180 +180 @@
     /* Notify listerners listening on this network only */
     ::FireNATNetworkSettingEvent(m->pEventSource,
-                                 Bstr(m->s.strNetworkName).raw(),
+                                 m->s.strNetworkName,
                                  m->s.fEnabled,
-                                 Bstr(m->s.strIPv4NetworkCidr).raw(),
-                                 Bstr(m->IPv4Gateway).raw(),
+                                 m->s.strIPv4NetworkCidr,
+                                 m->IPv4Gateway,
                                  m->s.fAdvertiseDefaultIPv6Route,
                                  m->s.fNeedDhcpServer);
@@ -584 +584 @@
     }
 
-    m->pVirtualBox->i_onNATNetworkPortForward(Bstr(m->s.strNetworkName).raw(), TRUE, aIsIpv6,
-                                              Bstr(aPortForwardRuleName).raw(), aProto,
-                                              Bstr(aHostIp).raw(), aHostPort,
-                                              Bstr(aGuestIp).raw(), aGuestPort);
+    m->pVirtualBox->i_onNATNetworkPortForward(m->s.strNetworkName, TRUE, aIsIpv6,
+                                              aPortForwardRuleName, aProto,
+                                              aHostIp, aHostPort,
+                                              aGuestIp, aGuestPort);
 
     /* Notify listerners listening on this network only */
-    ::FireNATNetworkPortForwardEvent(m->pEventSource, Bstr(m->s.strNetworkName).raw(), TRUE,
-                                     aIsIpv6, Bstr(aPortForwardRuleName).raw(), aProto,
-                                     Bstr(aHostIp).raw(), aHostPort,
-                                     Bstr(aGuestIp).raw(), aGuestPort);
+    ::FireNATNetworkPortForwardEvent(m->pEventSource, m->s.strNetworkName, TRUE,
+                                     aIsIpv6, aPortForwardRuleName, aProto,
+                                     aHostIp, aHostPort,
+                                     aGuestIp, aGuestPort);
 
     return S_OK;
@@ -629 +629 @@
     }
 
-    m->pVirtualBox->i_onNATNetworkPortForward(Bstr(m->s.strNetworkName).raw(), FALSE, aIsIpv6,
-                                              Bstr(aPortForwardRuleName).raw(), proto,
-                                              Bstr(strHostIP).raw(), u16HostPort,
-                                              Bstr(strGuestIP).raw(), u16GuestPort);
+    m->pVirtualBox->i_onNATNetworkPortForward(m->s.strNetworkName, FALSE, aIsIpv6, aPortForwardRuleName, proto,
+                                              strHostIP, u16HostPort, strGuestIP, u16GuestPort);
 
     /* Notify listerners listening on this network only */
-    ::FireNATNetworkPortForwardEvent(m->pEventSource, Bstr(m->s.strNetworkName).raw(), FALSE,
-                                     aIsIpv6, Bstr(aPortForwardRuleName).raw(), proto,
-                                     Bstr(strHostIP).raw(), u16HostPort,
-                                     Bstr(strGuestIP).raw(), u16GuestPort);
+    ::FireNATNetworkPortForwardEvent(m->pEventSource, m->s.strNetworkName, FALSE, aIsIpv6, aPortForwardRuleName, proto,
+                                     strHostIP, u16HostPort, strGuestIP, u16GuestPort);
     return S_OK;
 }
@@ -854 +850 @@
     if (RT_SUCCESS(m->NATRunner.start(false /* KillProcOnStop */)))
     {
-        m->pVirtualBox->i_onNATNetworkStartStop(Bstr(m->s.strNetworkName).raw(), TRUE);
+        m->pVirtualBox->i_onNATNetworkStartStop(m->s.strNetworkName, TRUE);
         return S_OK;
     }
@@ -867 +863 @@
 {
 #ifdef VBOX_WITH_NAT_SERVICE
-    m->pVirtualBox->i_onNATNetworkStartStop(Bstr(m->s.strNetworkName).raw(), FALSE);
+    m->pVirtualBox->i_onNATNetworkStartStop(m->s.strNetworkName, FALSE);
 
     if (!m->dhcpServer.isNull())

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

@@ -3732 +3732 @@
 
 /** @todo Unused!!  */
-void VirtualBox::i_onNATNetworkChanged(IN_BSTR aName)
+void VirtualBox::i_onNATNetworkChanged(const Utf8Str &aName)
 {
     ::FireNATNetworkChangedEvent(m->pEventSource, aName);
 }
 
-void VirtualBox::i_onNATNetworkStartStop(IN_BSTR aName, BOOL fStart)
+void VirtualBox::i_onNATNetworkStartStop(const Utf8Str &aName, BOOL fStart)
 {
     ::FireNATNetworkStartStopEvent(m->pEventSource, aName, fStart);
 }
 
-void VirtualBox::i_onNATNetworkSetting(IN_BSTR aNetworkName, BOOL aEnabled,
-                                       IN_BSTR aNetwork, IN_BSTR aGateway,
+void VirtualBox::i_onNATNetworkSetting(const Utf8Str &aNetworkName, BOOL aEnabled,
+                                       const Utf8Str &aNetwork, const Utf8Str &aGateway,
                                        BOOL aAdvertiseDefaultIpv6RouteEnabled,
                                        BOOL fNeedDhcpServer)
@@ -3751 +3751 @@
 }
 
-void VirtualBox::i_onNATNetworkPortForward(IN_BSTR aNetworkName, BOOL create, BOOL fIpv6,
-                                           IN_BSTR aRuleName, NATProtocol_T proto,
-                                           IN_BSTR aHostIp, LONG aHostPort,
-                                           IN_BSTR aGuestIp, LONG aGuestPort)
+void VirtualBox::i_onNATNetworkPortForward(const Utf8Str &aNetworkName, BOOL create, BOOL fIpv6,
+                                           const Utf8Str &aRuleName, NATProtocol_T proto,
+                                           const Utf8Str &aHostIp, LONG aHostPort,
+                                           const Utf8Str &aGuestIp, LONG aGuestPort)
 {
     ::FireNATNetworkPortForwardEvent(m->pEventSource, aNetworkName, create, fIpv6, aRuleName, proto,
@@ -5919 +5919 @@
     natNetwork.queryInterfaceTo(aNetwork.asOutParam());
 
-    ::FireNATNetworkCreationDeletionEvent(m->pEventSource, Bstr(aNetworkName).raw(), TRUE);
+    ::FireNATNetworkCreationDeletionEvent(m->pEventSource, aNetworkName, TRUE);
 
     return rc;