summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-23 03:12:59 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-23 03:12:59 +0300
commita74191bc53df482ce637ba585016105673add785 (patch)
treeb9278259cb1cf9249117b80baeddaff34f7c0a91 /src/gui
parentdb39d0fd0f3487bff91fd727e87546964f0cda69 (diff)
downloadplus-a74191bc53df482ce637ba585016105673add785.tar.gz
plus-a74191bc53df482ce637ba585016105673add785.tar.bz2
plus-a74191bc53df482ce637ba585016105673add785.tar.xz
plus-a74191bc53df482ce637ba585016105673add785.zip
Fix some code style and compilation warnings.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/palette.h5
-rw-r--r--src/gui/updatewindow.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h
index f89b31fca..9409bfc06 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -158,8 +158,13 @@ class Palette
ColorElem()
{
type = 0;
+ color = 0;
+ testColor = 0;
+ committedColor = 0;
text = "";
ch = 0;
+ grad = STATIC;
+ committedGrad = STATIC;
gradientIndex = 0;
delay = 0;
committedDelay = 0;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 27718928d..eb5471e2a 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -420,8 +420,9 @@ void UpdaterWindow::download()
}
if (mDownloadStatus == UPDATE_PATCH)
{
- mDownload = new Net::Download(this, "http://manaplus.evolonline.org/update/"
- + mCurrentFile, updateProgress, true);
+ mDownload = new Net::Download(this,
+ "http://manaplus.evolonline.org/update/" + mCurrentFile,
+ updateProgress, true);
}
else
{