UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-30 04:00:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph] correct constant name inconsistency

Browse Source 
Change-Id: I2033a202d4cc425010ab57b3a088372733126ae4
This commit is contained in:
Émilie Feral
2016-10-07 13:38:40 +02:00
parent 9fd2d9e68c
commit 51c460939c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/graph/function_store.cpp
View File

@@ -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];
}