From 35cfd460655878c9a615abc8ea1cb2f7577a7f3b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 21 Apr 2013 18:57:48 +0300 Subject: some other fixes from cpplint. --- src/gui/serverdialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/serverdialog.cpp') diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index ee879f2a8..56ce6528a 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -86,7 +86,7 @@ static std::string serverTypeToString(const ServerInfo::Type type) } } -static unsigned short defaultPortForServerType(const ServerInfo::Type type) +static uint16_t defaultPortForServerType(const ServerInfo::Type type) { switch (type) { @@ -616,7 +616,7 @@ void ServerDialog::loadServers(const bool addNew) if (xmlNameEqual(subNode, "connection")) { server.hostname = XML::getProperty(subNode, "hostname", ""); - server.port = static_cast( + server.port = static_cast( XML::getProperty(subNode, "port", 0)); if (server.port == 0) @@ -685,7 +685,7 @@ void ServerDialog::loadCustomServers() server.type = ServerInfo::parseType(config.getValue(typeKey, "")); const int defaultPort = defaultPortForServerType(server.type); - server.port = static_cast( + server.port = static_cast( config.getValue(portKey, defaultPort)); // skip invalid server -- cgit v1.2.3-70-g09d2