summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-15 22:40:40 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-15 22:40:40 +0300
commitb10c6ee0b9c8428f9ed426357a58aa42ee14cbfe (patch)
tree279df324772bbd8e69aed934940cd4aa8da58999 /src/gui
parentbc5f2bc679b7af67e652fad23f4132e212c78845 (diff)
downloadmanaverse-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.tar.gz
manaverse-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.tar.bz2
manaverse-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.tar.xz
manaverse-b10c6ee0b9c8428f9ed426357a58aa42ee14cbfe.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/palette.cpp3
-rw-r--r--src/gui/widgets/setupitem.cpp2
-rw-r--r--src/gui/windows/whoisonline.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index c7bd7612e..7fcf153fe 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -194,7 +194,6 @@ void Palette::advanceGradient()
}
}
- if (advance != 0)
- mRainbowTime = tick_time;
+ mRainbowTime = tick_time;
}
}
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 67d52ec0e..cc6ded02e 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -830,7 +830,7 @@ void SetupItemDropDownStr::fromWidget()
const int sel = mDropDown->getSelected();
// use first element in model as empty string
if (sel == 0 || sel >= mModel->getNumberOfElements())
- mValue = "";
+ mValue.clear();
else
mValue = mModel->getElementAt(sel);
}
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 0eb316197..afdb43785 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -163,7 +163,7 @@ class WhoIsOnline final : public Window,
int mDownloadedBytes;
/** Status of the current download. */
- DownloadStatus mDownloadStatus;
+ WhoIsOnline::DownloadStatus mDownloadStatus;
/** Flag that show if current download is complete. */
bool mDownloadComplete;