summaryrefslogtreecommitdiff
path: root/src/gui/windows/updaterwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-08 22:46:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-08 22:46:48 +0300
commit6d4da51f0fdcecc2d4398f60dbca43f499fdbe16 (patch)
treec71c7c6e49ed36a55c6b6a2b1ba70073300634dd /src/gui/windows/updaterwindow.cpp
parent4125ac707288a244a7175b755d74dd963e762f56 (diff)
downloadmanaverse-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.tar.gz
manaverse-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.tar.bz2
manaverse-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.tar.xz
manaverse-6d4da51f0fdcecc2d4398f60dbca43f499fdbe16.zip
Fix code style in gui.
Diffstat (limited to 'src/gui/windows/updaterwindow.cpp')
-rw-r--r--src/gui/windows/updaterwindow.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index dab1a6ebc..249748d43 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -512,7 +512,7 @@ size_t UpdaterWindow::memoryWrite(void *ptr, size_t size,
UpdaterWindow *const uw = reinterpret_cast<UpdaterWindow *>(stream);
const size_t totalMem = size * nmemb;
uw->mMemoryBuffer = static_cast<char*>(realloc(uw->mMemoryBuffer,
- uw->mDownloadedBytes + totalMem));
+ static_cast<size_t>(uw->mDownloadedBytes) + totalMem));
if (uw->mMemoryBuffer)
{
memcpy(&(uw->mMemoryBuffer[uw->mDownloadedBytes]), ptr, totalMem);
@@ -757,7 +757,8 @@ void UpdaterWindow::logic()
}
mProgressBar->setProgress(mDownloadProgress);
- if (mUpdateFiles.size() && mUpdateIndex <= mUpdateFiles.size())
+ if (mUpdateFiles.size()
+ && static_cast<size_t>(mUpdateIndex) <= mUpdateFiles.size())
{
mProgressBar->setText(strprintf("%u/%u", mUpdateIndex
+ mUpdateIndexOffset + 1, static_cast<unsigned>(
@@ -853,7 +854,7 @@ void UpdaterWindow::logic()
case UPDATE_RESOURCES:
if (mDownloadComplete)
{
- if (mUpdateIndex < mUpdateFiles.size())
+ if (static_cast<size_t>(mUpdateIndex) < mUpdateFiles.size())
{
UpdateFile thisFile = mUpdateFiles[mUpdateIndex];
if (thisFile.type == "music"
@@ -918,7 +919,8 @@ void UpdaterWindow::logic()
if (mDownloadComplete)
{
mValidateXml = false;
- if (mUpdateIndex < mTempUpdateFiles.size())
+ if (static_cast<size_t>(mUpdateIndex)
+ < mTempUpdateFiles.size())
{
const UpdateFile thisFile = mTempUpdateFiles[mUpdateIndex];
mCurrentFile = thisFile.name;