From 51c460939c44e7aab345b8378cb7e0af345ef17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 7 Oct 2016 13:38:40 +0200 Subject: [PATCH] [apps/graph] correct constant name inconsistency Change-Id: I2033a202d4cc425010ab57b3a088372733126ae4 --- apps/graph/function_store.cpp | 16 ++++++++-------- apps/graph/function_store.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/graph/function_store.cpp b/apps/graph/function_store.cpp index 91dcbc161..b3c6a03e2 100644 --- a/apps/graph/function_store.cpp +++ b/apps/graph/function_store.cpp @@ -4,8 +4,8 @@ extern "C" { } constexpr int Graph::FunctionStore::k_numberOfDefaultColors; -constexpr KDColor Graph::FunctionStore::defaultColors[k_numberOfDefaultColors]; -constexpr const char * Graph::FunctionStore::functionNames[k_maxNumberOfFunctions]; +constexpr KDColor Graph::FunctionStore::k_defaultColors[k_numberOfDefaultColors]; +constexpr const char * Graph::FunctionStore::k_functionNames[k_maxNumberOfFunctions]; Graph::FunctionStore::FunctionStore() : m_numberOfFunctions(0) @@ -48,30 +48,30 @@ const char * Graph::FunctionStore::firstAvailableName() { for (int k = 0; k < k_maxNumberOfFunctions; k++) { int j = 0; while (j < m_numberOfFunctions) { - if (m_functions[j].name() == functionNames[k]) { + if (m_functions[j].name() == k_functionNames[k]) { break; } j++; } if (j == m_numberOfFunctions) { - return functionNames[k]; + return k_functionNames[k]; } } - return functionNames[0]; + return k_functionNames[0]; } const KDColor Graph::FunctionStore::firstAvailableColor() { for (int k = 0; k < k_numberOfDefaultColors; k++) { int j = 0; while (j < m_numberOfFunctions) { - if (m_functions[j].color() == defaultColors[k]) { + if (m_functions[j].color() == k_defaultColors[k]) { break; } j++; } if (j == m_numberOfFunctions) { - return defaultColors[k]; + return k_defaultColors[k]; } } - return defaultColors[0]; + return k_defaultColors[0]; } diff --git a/apps/graph/function_store.h b/apps/graph/function_store.h index 659020319..c3988f506 100644 --- a/apps/graph/function_store.h +++ b/apps/graph/function_store.h @@ -19,11 +19,11 @@ private: const KDColor firstAvailableColor(); static constexpr int k_maxNumberOfFunctions = 8; static constexpr int k_numberOfDefaultColors = 8; - static constexpr KDColor defaultColors[k_numberOfDefaultColors] = { + static constexpr KDColor k_defaultColors[k_numberOfDefaultColors] = { KDColorRed, KDColorGreen, KDColorBlue, KDColorBlack, KDColor(0xBFD3EB), KDColor(0xFF00FF), KDColor(0x00FFEB), KDColor(0xBFAA00) }; - static constexpr const char * functionNames[k_maxNumberOfFunctions] = { + static constexpr const char * k_functionNames[k_maxNumberOfFunctions] = { "f", "g", "h", "i", "j", "k", "l", "m" }; int m_numberOfFunctions;