From c34498b15d126f3123c5b1c3dbffe26304da83bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Mon, 14 Nov 2016 11:17:06 +0100
Subject: [PATCH] [escher] Change palette names to make them consistant

Change-Id: If5381b7f970e106bea1196ef40e36ea12f846dad
---
 apps/graph/list/function_expression_view.cpp | 2 +-
 apps/graph/list/list_controller.cpp          | 2 +-
 escher/include/escher/palette.h              | 2 +-
 escher/src/palette.cpp                       | 2 +-
 escher/src/stack_view.cpp                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/graph/list/function_expression_view.cpp b/apps/graph/list/function_expression_view.cpp
index fda097910..aab6de58c 100644
--- a/apps/graph/list/function_expression_view.cpp
+++ b/apps/graph/list/function_expression_view.cpp
@@ -22,7 +22,7 @@ void FunctionExpressionView::reloadCell() {
   m_expressionView.setBackgroundColor(backgroundColor());
   if (m_function) {
     bool active = m_function->isActive();
-    KDColor textColor = active ? KDColorBlack : Palette::k_desactiveTextColor;
+    KDColor textColor = active ? KDColorBlack : Palette::DesactiveTextColor;
     m_expressionView.setTextColor(textColor);
   }
 }
diff --git a/apps/graph/list/list_controller.cpp b/apps/graph/list/list_controller.cpp
index 6c193bfb9..48fc067ca 100644
--- a/apps/graph/list/list_controller.cpp
+++ b/apps/graph/list/list_controller.cpp
@@ -225,7 +225,7 @@ void ListController::willDisplayCellAtLocation(TableViewCell * cell, int i, int
       char bufferName[5] = "*(x)";
       bufferName[0] = *function->name();
       myFunctionCell->setText(bufferName);
-      KDColor functionNameColor = function->isActive() ? function->color() : Palette::k_desactiveTextColor;
+      KDColor functionNameColor = function->isActive() ? function->color() : Palette::DesactiveTextColor;
       myFunctionCell->setColor(functionNameColor);
       myFunctionCell->setOrientation(FunctionTitleCell::Orientation::VerticalIndicator);
     } else {
diff --git a/escher/include/escher/palette.h b/escher/include/escher/palette.h
index 50e18627a..ff49f8966 100644
--- a/escher/include/escher/palette.h
+++ b/escher/include/escher/palette.h
@@ -9,7 +9,7 @@ public:
   constexpr static KDColor BackgroundColor = KDColor(0xF0F3F5);
   constexpr static KDColor CellBackgroundColor = KDColor(0xFCFCFC);
   constexpr static KDColor FocusCellBackgroundColor = KDColor(0xBFD3EB);
-  constexpr static KDColor k_desactiveTextColor = KDColor(0x646464);
+  constexpr static KDColor DesactiveTextColor = KDColor(0x646464);
 };
 
 #endif
\ No newline at end of file
diff --git a/escher/src/palette.cpp b/escher/src/palette.cpp
index 84e87ee6e..e37babeb8 100644
--- a/escher/src/palette.cpp
+++ b/escher/src/palette.cpp
@@ -4,4 +4,4 @@ constexpr KDColor Palette::LineColor;
 constexpr KDColor Palette::BackgroundColor;
 constexpr KDColor Palette::CellBackgroundColor;
 constexpr KDColor Palette::FocusCellBackgroundColor;
-constexpr KDColor Palette::k_desactiveTextColor;
+constexpr KDColor Palette::DesactiveTextColor;
diff --git a/escher/src/stack_view.cpp b/escher/src/stack_view.cpp
index 0b56a6c3b..aaafdaf2f 100644
--- a/escher/src/stack_view.cpp
+++ b/escher/src/stack_view.cpp
@@ -6,7 +6,7 @@ extern "C" {
 
 StackView::StackView() :
   View(),
-  m_textView(PointerTextView(nullptr, 0.5f, 0.5f, Palette::k_desactiveTextColor))
+  m_textView(PointerTextView(nullptr, 0.5f, 0.5f, Palette::DesactiveTextColor))
 {
 }