summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-30 04:58:32 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-30 04:58:32 +0300
commit009da07cef098a4ab07cb757950c2a53d6b1ba1a (patch)
treeac04406db58d9bb70838fbddb25a02a423a4ab4f /src
parentb7b44e238bb9802ce5d0ea6a8dec1ea6c9c8e0b8 (diff)
downloadplus-009da07cef098a4ab07cb757950c2a53d6b1ba1a.tar.gz
plus-009da07cef098a4ab07cb757950c2a53d6b1ba1a.tar.bz2
plus-009da07cef098a4ab07cb757950c2a53d6b1ba1a.tar.xz
plus-009da07cef098a4ab07cb757950c2a53d6b1ba1a.zip
Fix code style and compilation warnings.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp4
-rw-r--r--src/gui/updaterwindow.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp
index bf9e34b00..843f7c961 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -544,7 +544,7 @@ Client::Client(const Options &options):
loginData.username = mOptions.username;
loginData.password = mOptions.password;
- loginData.remember = serverConfig.getValue("remember", true);
+ loginData.remember = serverConfig.getValue("remember", 1);
loginData.registerLogin = false;
if (mCurrentServer.hostname.empty())
@@ -790,7 +790,7 @@ int Client::exec()
else
loginData.username = mOptions.username;
- loginData.remember = serverConfig.getValue("remember", true);
+ loginData.remember = serverConfig.getValue("remember", 1);
Net::connectToServer(mCurrentServer);
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index ba482919e..4ba1c9179 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -54,7 +54,8 @@
const std::string xmlUpdateFile = "resources.xml";
const std::string txtUpdateFile = "resources2.txt";
-const std::string updateServer2 = "http://download.evolonline.org/manaplus/updates/";
+const std::string updateServer2
+ = "http://download.evolonline.org/manaplus/updates/";
std::vector<updateFile> loadXMLFile(const std::string &fileName);
std::vector<updateFile> loadTxtFile(const std::string &fileName);
@@ -186,7 +187,6 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
mUpdateServerPath = mUpdateHost;
removeProtocol(mUpdateServerPath);
- logger->log("mUpdateServerPath: %s, %s", mUpdateHost.c_str(), mUpdateServerPath.c_str());
// Try to download the updates list
download();