From 8315062d3fb5669fcbe03ce9068c640f214b4a3a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 14 Mar 2017 08:04:26 +0100 Subject: [PATCH 1/2] .gitignore: add compile - .svnignore: remove Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4bf9c74f59bc2ab327982556f16101857ee6b8d7 Author: vanhofen Date: 2017-03-14 (Tue, 14 Mar 2017) Origin message was: ------------------ - .gitignore: add compile - .svnignore: remove ------------------ This commit was generated by Migit --- .gitignore | 1 + .svnignore | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .svnignore diff --git a/.gitignore b/.gitignore index 1443eff76..43dd1585a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ Makefile autom4te.cache *.in aclocal.m4 +compile config.* configure depcomp diff --git a/.svnignore b/.svnignore deleted file mode 100644 index e44c6013e..000000000 --- a/.svnignore +++ /dev/null @@ -1,12 +0,0 @@ -autom4te.cache -*.in -aclocal.m4 -config.* -configure -depcomp -install-sh -*.pc -libtool -ltmain.sh -missing -stamp.h1 From 054d0c33bf5fb078780d983e15f9b2cdd9c8063d Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 14 Mar 2017 08:16:12 +0100 Subject: [PATCH 2/2] CColorChooser: fix compile conversion warnings Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3b5cd00bf4af7ef65fad1490c346b249d5ce2365 Author: Thilo Graf Date: 2017-03-14 (Tue, 14 Mar 2017) Origin message was: ------------------ CColorChooser: fix compile conversion warnings ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/colorchooser.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index f7b90b371..589f49fe7 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -158,6 +158,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings ::TIMING_MENU]); + int val = (*value[selected]); switch ( msg ) { case CRCInput::RC_down: { @@ -190,12 +191,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) } case CRCInput::RC_right: { - if ((*value[selected]) < 100) + if (val < 100) { - if ((*value[selected]) < 98) - (*value[selected]) += 2; + if (val < 98) + val += 2; else - (*value[selected]) = 100; + val = 100; paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true); setColor(); @@ -204,12 +205,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) } case CRCInput::RC_left: { - if ((*value[selected]) > 0) + if (val > 0) { - if ((*value[selected]) > 2) - (*value[selected]) -= 2; + if (val > 2) + val -= 2; else - (*value[selected]) = 0; + val = 0; paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true); setColor();