summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-11 17:32:57 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-11 17:32:57 +0300
commit86b8c903900a59f99b2e1f02232476d600ae5a12 (patch)
tree6cb05135934459df645e4e82119536bc579980a2 /src/net
parentfdfe2900f11958b7851f6c57a15ad0dc80334a11 (diff)
downloadmv-86b8c903900a59f99b2e1f02232476d600ae5a12.tar.gz
mv-86b8c903900a59f99b2e1f02232476d600ae5a12.tar.bz2
mv-86b8c903900a59f99b2e1f02232476d600ae5a12.tar.xz
mv-86b8c903900a59f99b2e1f02232476d600ae5a12.zip
Improve a bit variables order in some classes.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/download.cpp4
-rw-r--r--src/net/download.h2
-rw-r--r--src/net/serverinfo.h7
3 files changed, 6 insertions, 7 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 141a7772f..6d127d0a4 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -148,11 +148,11 @@ unsigned long Download::fadler32(FILE *const file)
return adler;
}
-unsigned long Download::adlerBuffer(char *buffer, int size)
+unsigned long Download::adlerBuffer(char *const buffer, int size)
{
unsigned long adler = adler32(0L, Z_NULL, 0);
return adler32(static_cast<uInt>(adler),
- reinterpret_cast<Bytef*>(buffer), size);
+ reinterpret_cast<const Bytef*>(buffer), size);
}
void Download::addHeader(const std::string &header)
diff --git a/src/net/download.h b/src/net/download.h
index bc06f1974..7dae8913f 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -104,7 +104,7 @@ class Download final
static void secureCurl(CURL *const curl);
- static unsigned long adlerBuffer(char *buffer, int size);
+ static unsigned long adlerBuffer(char *const buffer, int size);
static std::string getUploadResponse()
{ return mUploadResponse; }
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 48f216855..899400598 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -49,12 +49,11 @@ public:
std::string name;
std::string hostname;
std::string althostname;
- uint16_t port;
-
std::string description;
std::string registerUrl;
std::string onlineListUrl;
std::string supportUrl;
+ uint16_t port;
VersionString version;
bool save;
@@ -64,11 +63,11 @@ public:
name(),
hostname(),
althostname(),
- port(6901),
description(),
registerUrl(),
onlineListUrl(),
supportUrl(),
+ port(6901),
version(),
save(false)
{
@@ -80,11 +79,11 @@ public:
name(info.name),
hostname(info.hostname),
althostname(info.althostname),
- port(info.port),
description(info.description),
registerUrl(info.registerUrl),
onlineListUrl(info.onlineListUrl),
supportUrl(info.supportUrl),
+ port(info.port),
version(),
save(info.save)
{