summaryrefslogtreecommitdiff
path: root/src/gui/serverdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-12 18:39:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-12 18:39:00 +0300
commit351821c1f18f9285be58df0a05339936311f6490 (patch)
tree47a60cad4f61f63c5ac2faf98dcae24760d7fe11 /src/gui/serverdialog.cpp
parente50632a83a3c679cffd372656277a304d5d853f8 (diff)
downloadmanaplus-351821c1f18f9285be58df0a05339936311f6490.tar.gz
manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.bz2
manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.xz
manaplus-351821c1f18f9285be58df0a05339936311f6490.zip
first part of style fixed after cpplint checks.
Diffstat (limited to 'src/gui/serverdialog.cpp')
-rw-r--r--src/gui/serverdialog.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 4a9960beb..29189c12b 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -324,7 +324,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
loadServers(true);
- mServersList->setSelected(0); // Do this after for the Delete button
+ mServersList->setSelected(0); // Do this after for the Delete button
if (needUpdateServers())
downloadServerList();
@@ -530,7 +530,8 @@ void ServerDialog::downloadServerList()
if (listFile.empty())
listFile = config.getStringValue("onlineServerList");
- // Fall back to manaplus.evolonline.org when neither branding nor config set it
+ // Fall back to manaplus.evolonline.org when neither branding
+ // nor config set it
if (listFile.empty())
listFile = "http://manaplus.evolonline.org/serverlist.xml";
@@ -780,12 +781,12 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
if (progress != progress)
{
- progress = 0.0f; // check for NaN
+ progress = 0.0f; // check for NaN
}
else if (progress < 0.0f)
{
- progress = 0.0f; // no idea how this could ever happen,
- // but why not check for it anyway.
+ progress = 0.0f; // no idea how this could ever happen,
+ // but why not check for it anyway.
}
else if (progress > 1.0f)
{