Changeset 18023 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 17, 2009 1:48:59 PM (16 years ago)

Author:

vboxsync

Message:

Dhcp->DHCP

Location:

trunk/src/VBox/Main/include

Files:

• DHCPServerImpl.h (moved) (moved from trunk/src/VBox/Main/include/DhcpServerImpl.h ) (3 diffs)
• VirtualBoxImpl.h (modified) (6 diffs)

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

@@ -29 +29 @@
 
 #ifdef VBOX_WITH_HOSTNETIF_API
-/* class DhcpServer; */
+/* class DHCPServer; */
 /* #include "netif.h" */
 struct NETIFINFO;
 #endif
 
-class ATL_NO_VTABLE DhcpServer :
+class ATL_NO_VTABLE DHCPServer :
     public VirtualBoxBaseNEXT,
-    public VirtualBoxSupportErrorInfoImpl <DhcpServer, IDhcpServer>,
-    public VirtualBoxSupportTranslation <DhcpServer>,
-    public IDhcpServer
+    public VirtualBoxSupportErrorInfoImpl <DHCPServer, IDHCPServer>,
+    public VirtualBoxSupportTranslation <DHCPServer>,
+    public IDHCPServer
 {
 public:
 
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (DhcpServer)
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (DHCPServer)
 
-    DECLARE_NOT_AGGREGATABLE (DhcpServer)
+    DECLARE_NOT_AGGREGATABLE (DHCPServer)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    BEGIN_COM_MAP (DhcpServer)
+    BEGIN_COM_MAP (DHCPServer)
         COM_INTERFACE_ENTRY (ISupportErrorInfo)
-        COM_INTERFACE_ENTRY (IDhcpServer)
+        COM_INTERFACE_ENTRY (IDHCPServer)
     END_COM_MAP()
 
     NS_DECL_ISUPPORTS
 
-    DECLARE_EMPTY_CTOR_DTOR (DhcpServer)
+    DECLARE_EMPTY_CTOR_DTOR (DHCPServer)
 
     HRESULT FinalConstruct();
@@ -66 +66 @@
     void uninit();
 
-    // IDhcpServer properties
+    // IDHCPServer properties
     STDMETHOD(COMGETTER(NetworkName)) (BSTR *aName);
     STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
@@ -78 +78 @@
 
     // for VirtualBoxSupportErrorInfoImpl
-    static const wchar_t *getComponentName() { return L"DhcpServer"; }
+    static const wchar_t *getComponentName() { return L"DHCPServer"; }
 
 private:

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

@@ -54 +54 @@
 class Host;
 class SystemProperties;
-class DhcpServer;
+class DHCPServer;
 
 #ifdef RT_OS_WINDOWS
@@ -134 +134 @@
     STDMETHOD(COMGETTER(SharedFolders)) (ComSafeArrayOut (ISharedFolder *, aSharedFolders));
     STDMETHOD(COMGETTER(PerformanceCollector)) (IPerformanceCollector **aPerformanceCollector);
-    STDMETHOD(COMGETTER(DhcpServers)) (ComSafeArrayOut (IDhcpServer *, aDhcpServers));
+    STDMETHOD(COMGETTER(DHCPServers)) (ComSafeArrayOut (IDHCPServer *, aDHCPServers));
 
     /* IVirtualBox methods */
@@ -186 +186 @@
     STDMETHOD(SaveSettingsWithBackup) (BSTR *aBakFileName);
 
-//    STDMETHOD(CreateDhcpServerForInterface) (/*IHostNetworkInterface * aIinterface, */IDhcpServer ** aServer);
-    STDMETHOD(CreateDhcpServer) (IN_BSTR aName, IDhcpServer ** aServer);
-//    STDMETHOD(FindDhcpServerForInterface) (IHostNetworkInterface * aIinterface, IDhcpServer ** aServer);
-    STDMETHOD(FindDhcpServerByName) (IN_BSTR aName, IDhcpServer ** aServer);
-    STDMETHOD(RemoveDhcpServer) (IDhcpServer * aServer);
+//    STDMETHOD(CreateDHCPServerForInterface) (/*IHostNetworkInterface * aIinterface, */IDHCPServer ** aServer);
+    STDMETHOD(CreateDHCPServer) (IN_BSTR aName, IDHCPServer ** aServer);
+//    STDMETHOD(FindDHCPServerForInterface) (IHostNetworkInterface * aIinterface, IDHCPServer ** aServer);
+    STDMETHOD(FindDHCPServerByNetworkName) (IN_BSTR aName, IDHCPServer ** aServer);
+    STDMETHOD(RemoveDHCPServer) (IDHCPServer * aServer);
 
     /* public methods only for internal purposes */
@@ -373 +373 @@
     typedef std::list <ComObjPtr <FloppyImage> > FloppyImageList;
     typedef std::list <ComObjPtr <SharedFolder> > SharedFolderList;
-    typedef std::list <ComObjPtr <DhcpServer> > DhcpServerList;
+    typedef std::list <ComObjPtr <DHCPServer> > DHCPServerList;
 
     typedef std::map <Guid, ComObjPtr<HardDisk> > HardDiskMap;
@@ -396 +396 @@
     HRESULT registerMachine (Machine *aMachine);
 
-    HRESULT registerDhcpServer(DhcpServer *aDhcpServer,
+    HRESULT registerDHCPServer(DHCPServer *aDHCPServer,
                                          bool aSaveRegistry = true);
-    HRESULT unregisterDhcpServer(DhcpServer *aDhcpServer,
+    HRESULT unregisterDHCPServer(DHCPServer *aDHCPServer,
                                          bool aSaveRegistry = true);
 
@@ -447 +447 @@
         FloppyImageList mFloppyImages;
         SharedFolderList mSharedFolders;
-        DhcpServerList mDhcpServers;
+        DHCPServerList mDHCPServers;
 
         /// @todo NEWMEDIA do we really need this map? Used only in