libshell|Refactor|AbstractLink: Made virtual connection and disconnec…

…tion methods
skyjake · Feb 21, 2013 · 16280db · 16280db
1 parent 2e19178
commit 16280db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/doomsday/libshell/include/de/shell/abstractlink.h b/doomsday/libshell/include/de/shell/abstractlink.h
@@ -57,26 +57,26 @@ class LIBSHELL_PUBLIC AbstractLink : public QObject, public Transmitter
      * @param domain   Domain/IP address of the server.
      * @param timeout  Keep trying until this much time has passed.
      */
-    void connect(String const &domain, TimeDelta const &timeout = 0);
+    virtual void connectDomain(String const &domain, TimeDelta const &timeout = 0);
 
     /**
      * Opens a connection to a server over the network.
      *
      * @param address  Address of the server.
      */
-    void connect(Address const &address);
+    virtual void connectHost(Address const &address);
 
     /**
      * Takes over an existing socket.
      *
      * @param openSocket  Socket. AbstractLink takes ownership.
      */
-    void takeOver(Socket *openSocket);
+    virtual void takeOver(Socket *openSocket);
 
     /**
      * Closes the connection.
      */
-    void disconnect();
+    virtual void disconnect();
 
     /**
      * Peer address of the link. The address may be a null address if the IP

diff --git a/doomsday/libshell/src/abstractlink.cpp b/doomsday/libshell/src/abstractlink.cpp
@@ -51,16 +51,16 @@ AbstractLink::~AbstractLink()
     delete d;
 }
 
-void AbstractLink::connect(String const &domain, TimeDelta const &timeout)
+void AbstractLink::connectDomain(String const &domain, TimeDelta const &timeout)
 {
     disconnect();
 
     d->socket.reset(new Socket);
 
-    QObject::connect(d->socket.get(), SIGNAL(addressResolved()), this, SIGNAL(addressResolved()));
-    QObject::connect(d->socket.get(), SIGNAL(connected()), this, SLOT(socketConnected()));
-    QObject::connect(d->socket.get(), SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
-    QObject::connect(d->socket.get(), SIGNAL(messagesReady()), this, SIGNAL(packetsReady()));
+    connect(d->socket.get(), SIGNAL(addressResolved()), this, SIGNAL(addressResolved()));
+    connect(d->socket.get(), SIGNAL(connected()), this, SLOT(socketConnected()));
+    connect(d->socket.get(), SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(d->socket.get(), SIGNAL(messagesReady()), this, SIGNAL(packetsReady()));
 
     // Fallback to default port.
     d->tryingToConnectToHost = domain;
@@ -72,16 +72,16 @@ void AbstractLink::connect(String const &domain, TimeDelta const &timeout)
     d->timeout = timeout;
 }
 
-void AbstractLink::connect(Address const &address)
+void AbstractLink::connectHost(Address const &address)
 {
     disconnect();
 
     d->peerAddress = address;
     d->socket.reset(new Socket);
 
-    QObject::connect(d->socket.get(), SIGNAL(connected()), this, SLOT(socketConnected()));
-    QObject::connect(d->socket.get(), SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
-    QObject::connect(d->socket.get(), SIGNAL(messagesReady()), this, SIGNAL(packetsReady()));
+    connect(d->socket.get(), SIGNAL(connected()), this, SLOT(socketConnected()));
+    connect(d->socket.get(), SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(d->socket.get(), SIGNAL(messagesReady()), this, SIGNAL(packetsReady()));
 
     // Fallback to default port.
     if(!d->peerAddress.port()) d->peerAddress.setPort(13209);
@@ -101,8 +101,8 @@ void AbstractLink::takeOver(Socket *openSocket)
     d->socket.reset(openSocket);
 
     // Note: socketConnected() not used because the socket is already open.
-    QObject::connect(d->socket.get(), SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
-    QObject::connect(d->socket.get(), SIGNAL(messagesReady()), this, SIGNAL(packetsReady()));
+    connect(d->socket.get(), SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(d->socket.get(), SIGNAL(messagesReady()), this, SIGNAL(packetsReady()));
 
     d->status = Connected;
     d->connectedAt = Time();

diff --git a/doomsday/libshell/src/link.cpp b/doomsday/libshell/src/link.cpp
@@ -38,12 +38,12 @@ DENG2_PIMPL(Link)
 
 Link::Link(String const &domain, TimeDelta const &timeout) : d(new Instance(this))
 {
-    connect(domain, timeout);
+    connectDomain(domain, timeout);
 }
 
 Link::Link(Address const &address) : d(new Instance(this))
 {
-    connect(address);
+    connectHost(address);
 }
 
 Link::Link(Socket *openSocket) : d(new Instance(this))