From e4d08ee685bea522eb67fd3ad8bc603fb30e9eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 1 Feb 2017 16:12:24 +0100
Subject: [PATCH] [apps] [poincare] Merge AngleUnit enum class (previously in
 preference and expression)

Change-Id: I1cf5175e724904f75ced16f947033b1e30f02eb6
---
 apps/preferences.cpp             |  6 +++---
 apps/preferences.h               | 10 +++-------
 apps/settings/sub_controller.cpp |  2 +-
 apps/title_bar_view.cpp          |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/preferences.cpp b/apps/preferences.cpp
index 9bfb4ae4f..efa68b331 100644
--- a/apps/preferences.cpp
+++ b/apps/preferences.cpp
@@ -1,7 +1,7 @@
 #include "preferences.h"
 
 Preferences::Preferences() :
-  m_angleUnit(AngleUnit::Degree),
+  m_angleUnit(Expression::AngleUnit::Degree),
   m_displayMode(Expression::DisplayMode::Auto),
   m_numberType(NumberType::Reel),
   m_complexFormat(ComplexFormat::Algebric),
@@ -9,11 +9,11 @@ Preferences::Preferences() :
 {
 }
 
-Preferences::AngleUnit Preferences::angleUnit() const {
+Expression::AngleUnit Preferences::angleUnit() const {
   return m_angleUnit;
 }
 
-void Preferences::setAngleUnit(AngleUnit angleUnit) {
+void Preferences::setAngleUnit(Expression::AngleUnit angleUnit) {
   if (angleUnit != m_angleUnit) {
     m_angleUnit = angleUnit;
   }
diff --git a/apps/preferences.h b/apps/preferences.h
index 013e14b57..819360559 100644
--- a/apps/preferences.h
+++ b/apps/preferences.h
@@ -5,10 +5,6 @@
 
 class Preferences {
 public:
-  enum class AngleUnit {
-    Degree = 0,
-    Radian = 1
-  };
   enum class NumberType {
     Reel = 0,
     Complex = 1
@@ -22,8 +18,8 @@ public:
     English = 1
   };
   Preferences();
-  AngleUnit angleUnit() const;
-  void setAngleUnit(AngleUnit angleUnit);
+  Expression::AngleUnit angleUnit() const;
+  void setAngleUnit(Expression::AngleUnit angleUnit);
   Expression::DisplayMode displayMode() const;
   void setDisplayMode(Expression::DisplayMode displayMode);
   NumberType numberType() const;
@@ -33,7 +29,7 @@ public:
   Language language() const;
   void setLanguage(Language language);
 private:
-  AngleUnit m_angleUnit;
+  Expression::AngleUnit m_angleUnit;
   Expression::DisplayMode m_displayMode;
   NumberType m_numberType;
   ComplexFormat m_complexFormat;
diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp
index 1760ec785..9fdb687c6 100644
--- a/apps/settings/sub_controller.cpp
+++ b/apps/settings/sub_controller.cpp
@@ -82,7 +82,7 @@ StackViewController * SubController::stackController() const {
 void SubController::setPreferenceAtIndexWithValueIndex(int preferenceIndex, int valueIndex) {
   switch (preferenceIndex) {
     case 0:
-      m_preferences->setAngleUnit((Preferences::AngleUnit)valueIndex);
+      m_preferences->setAngleUnit((Expression::AngleUnit)valueIndex);
       break;
     case 1:
       m_preferences->setDisplayMode((Expression::DisplayMode)valueIndex);
diff --git a/apps/title_bar_view.cpp b/apps/title_bar_view.cpp
index c4a2c1380..12ed6d2a6 100644
--- a/apps/title_bar_view.cpp
+++ b/apps/title_bar_view.cpp
@@ -55,7 +55,7 @@ void TitleBarView::setPreferences(Preferences * preferences) {
     strlcpy(buffer+numberOfChar, "cplx/", 6);
     numberOfChar += 5;
   }
-  if (preferences->angleUnit() == Preferences::AngleUnit::Radian) {
+  if (preferences->angleUnit() == Expression::AngleUnit::Radian) {
     strlcpy(buffer+numberOfChar, "rad", 4);
   } else {
     strlcpy(buffer+numberOfChar, "deg", 4);