Rename SockAddr::from_sys to new_from_sys

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index 32ecc23c629bfe706e174da4ff8b9e5d61f94b90..d24ca4e1ec8ec1c10fcd11c3188da874426b053b 100644 (file)
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -38,7 +38,7 @@ bool DatagramSocket::connect(const SockAddr &addr)
        delete local_addr;
        SockAddr::SysAddr lsa;
        getsockname(priv->handle, reinterpret_cast<sockaddr *>(&lsa.addr), &lsa.size);
-       local_addr = SockAddr::from_sys(lsa);
+       local_addr = SockAddr::new_from_sys(lsa);
 
        connected = true;
 
@@ -91,7 +91,7 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&from_addr
                }
        }
 
-       from_addr = SockAddr::from_sys(sa);
+       from_addr = SockAddr::new_from_sys(sa);
 
        return ret;
 }

diff --git a/source/resolve.cpp b/source/resolve.cpp
index 076fea065dee3960abc755d03e816d9fbcac909a..8afe0fef1bfbc39a907a754871c5834add0c85c1 100644 (file)
--- a/source/resolve.cpp
+++ b/source/resolve.cpp
@@ -50,7 +50,7 @@ SockAddr *resolve(const string &s, Family family)
                const char *sptr = reinterpret_cast<const char *>(res->ai_addr);
                char *dptr = reinterpret_cast<char *>(&sa.addr);
                copy(sptr, sptr+res->ai_addrlen, dptr);
-               SockAddr *addr = SockAddr::from_sys(sa);
+               SockAddr *addr = SockAddr::new_from_sys(sa);
                freeaddrinfo(res);
                return addr;
        }

diff --git a/source/sockaddr.cpp b/source/sockaddr.cpp
index 0d14dfd34cb6899b30c60926b272c9cc85b36aa5..9b41f81b948492dc077920dbe83ea06a80ea8a67 100644 (file)
--- a/source/sockaddr.cpp
+++ b/source/sockaddr.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 namespace Net {
 
-SockAddr *SockAddr::from_sys(const SysAddr &sa)
+SockAddr *SockAddr::new_from_sys(const SysAddr &sa)
 {
        switch(sa.addr.ss_family)
        {

diff --git a/source/sockaddr.h b/source/sockaddr.h
index bf7547778dbf80cca68f85d2117bf8c74fbf2204..aad5e29065e5695ff6b8794cf5dd95f5696e2dc3 100644 (file)
--- a/source/sockaddr.h
+++ b/source/sockaddr.h
@@ -19,7 +19,7 @@ public:
 
        virtual SockAddr *copy() const = 0;
 
-       static SockAddr *from_sys(const SysAddr &);
+       static SockAddr *new_from_sys(const SysAddr &);
        virtual SysAddr to_sys() const = 0;
 
        virtual Family get_family() const = 0;

diff --git a/source/socket.cpp b/source/socket.cpp
index 2bfdecc5b07794976ddaab3d5d528081c492d9a7..5af2b4f507e34de1a3527e1c9b99b5693441eae7 100644 (file)
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -49,7 +49,7 @@ Socket::Socket(const Private &p):
 
        SockAddr::SysAddr sa;
        getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size);
-       local_addr = SockAddr::from_sys(sa);
+       local_addr = SockAddr::new_from_sys(sa);
 
 #ifdef WIN32
        *priv->event = CreateEvent(0, false, false, 0);

diff --git a/source/streamserversocket.cpp b/source/streamserversocket.cpp
index 28097425a8e0d0d932c44040ea8f1ca51a0b3bb7..bbf91bccd9b9798f311151c198b8b8ccd42e3a4c 100644 (file)
--- a/source/streamserversocket.cpp
+++ b/source/streamserversocket.cpp
@@ -43,7 +43,7 @@ StreamSocket *StreamServerSocket::accept()
        Private new_p;
        new_p.handle = ::accept(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size);
 
-       RefPtr<SockAddr> paddr = SockAddr::from_sys(sa);
+       RefPtr<SockAddr> paddr = SockAddr::new_from_sys(sa);
        return new StreamSocket(new_p, *paddr);
 }
 

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index 7919ec4d01d348c6fa1d6955588d4d84bdd26ac8..8a262454eca173dfcc6ef93f0fcd0d45c10582f7 100644 (file)
--- a/source/streamsocket.cpp
+++ b/source/streamsocket.cpp
@@ -66,7 +66,7 @@ bool StreamSocket::connect(const SockAddr &addr)
        delete local_addr;
        SockAddr::SysAddr lsa;
        getsockname(priv->handle, reinterpret_cast<sockaddr *>(&lsa.addr), &lsa.size);
-       local_addr = SockAddr::from_sys(lsa);
+       local_addr = SockAddr::new_from_sys(lsa);
 
        if(err==0)
        {