Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-03-04 13:23:10 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-03-04 16:03:53 (GMT) |
| commit | ca7a45a25c2fe332fad1ee3f7a2822415c249206 (patch) | |
| tree | 268c6d37f087935a307061f9d5ef507ddd5162cf /Swiften/Network | |
| parent | 836925a5cdc7017da7fb84416c803e652b48e399 (diff) | |
| download | swift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.zip swift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.tar.bz2 | |
Qt5 support & warning fixes.
Change-Id: I62c7d5ca44c915e36c797c798294b7c34b465514
Diffstat (limited to 'Swiften/Network')
| -rw-r--r-- | Swiften/Network/ChainedConnector.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/Connector.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Network/Connector.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/NATPortMapping.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/NATTraversalRemovePortForwardingRequest.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/SOCKS5ProxiedConnection.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Network/ChainedConnector.h b/Swiften/Network/ChainedConnector.h index 4110522..03462bc 100644 --- a/Swiften/Network/ChainedConnector.h +++ b/Swiften/Network/ChainedConnector.h @@ -49,4 +49,4 @@ namespace Swift { boost::shared_ptr<Connector> currentConnector; boost::shared_ptr<Error> lastError; }; -}; +} diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp index 5ab3b92..a0155cf 100644 --- a/Swiften/Network/Connector.cpp +++ b/Swiften/Network/Connector.cpp @@ -183,4 +183,4 @@ void Connector::handleTimeout() { handleConnectionConnectFinished(true); } -}; +} diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h index 26a98b8..49ac271 100644 --- a/Swiften/Network/Connector.h +++ b/Swiften/Network/Connector.h @@ -71,4 +71,4 @@ namespace Swift { boost::shared_ptr<Connection> currentConnection; bool foundSomeDNS; }; -}; +} diff --git a/Swiften/Network/NATPortMapping.h b/Swiften/Network/NATPortMapping.h index db14500..a7982d6 100644 --- a/Swiften/Network/NATPortMapping.h +++ b/Swiften/Network/NATPortMapping.h @@ -13,7 +13,7 @@ namespace Swift { public: enum Protocol { TCP, - UDP, + UDP }; NATPortMapping(int localPort, int publicPort, Protocol protocol = TCP, int leaseInSeconds = 60 * 60 * 24) : publicPort(publicPort), localPort(localPort), protocol(protocol), leaseInSeconds(leaseInSeconds) { diff --git a/Swiften/Network/NATTraversalRemovePortForwardingRequest.h b/Swiften/Network/NATTraversalRemovePortForwardingRequest.h index cf349b1..c82ae03 100644 --- a/Swiften/Network/NATTraversalRemovePortForwardingRequest.h +++ b/Swiften/Network/NATTraversalRemovePortForwardingRequest.h @@ -15,7 +15,7 @@ namespace Swift { struct PortMapping { enum Protocol { TCP, - UDP, + UDP }; unsigned int publicPort; diff --git a/Swiften/Network/SOCKS5ProxiedConnection.h b/Swiften/Network/SOCKS5ProxiedConnection.h index 61092e0..7906879 100644 --- a/Swiften/Network/SOCKS5ProxiedConnection.h +++ b/Swiften/Network/SOCKS5ProxiedConnection.h @@ -30,7 +30,7 @@ namespace Swift { private: enum { ProxyAuthenticating = 0, - ProxyConnecting, + ProxyConnecting } proxyState_; }; } |