修改影片类型常量

chentuo14 · Mar 7, 2019 · c27eee7 · c27eee7
1 parent 4c43d61
commit c27eee7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/ch1_firstCase/ch1_switch/movie.cpp b/ch1_firstCase/ch1_switch/movie.cpp
@@ -1,13 +1,9 @@
 #include "movie.h"
 
-const int REGULAR = 0;          //普通影片
-const int NEW_RELEASE = 1;      //新片
-const int CHILDRENS = 2;        //儿童影片
-
 Movie::Movie(std::__cxx11::string title, int price)
-    :_title(title), _priceCode(price)
 {
-
+    _title = title;
+    _priceCode = price;
 }
 
 int Movie::getPriceCode()

diff --git a/ch1_firstCase/ch1_switch/movie.h b/ch1_firstCase/ch1_switch/movie.h
@@ -13,9 +13,12 @@ class Movie
     void setPriceCode(int arg);
     std::string getTitle();
 
-    static const int REGULAR;          //普通影片
-    static const int NEW_RELEASE;      //新片
-    static const int CHILDRENS;        //儿童影片
+    enum category {
+        REGULAR = 0,            //普通影片
+        NEW_RELEASE,            //新片
+        CHILDRENS               //儿童影片
+    };
+
 private:
     std::string _title;                 //影片名
     int _priceCode;                     //价格码

diff --git a/ch1_firstCase/ch1_switch/rental.cpp b/ch1_firstCase/ch1_switch/rental.cpp
@@ -20,15 +20,15 @@ double Rental::getCharge()
 {
     double result = 0;
     switch(getMovie().getPriceCode()) {
-    case 0:             //普通片，起步价为2元，租期超过2天的部分每天1.5元
+    case Movie::REGULAR:             //普通片，起步价为2元，租期超过2天的部分每天1.5元
         result += 2;
         if(getDaysRented() > 2)
             result += (getDaysRented() - 2) * 1.5;
         break;
-    case 1:             //新片，每天3元
+    case Movie::NEW_RELEASE:             //新片，每天3元
         result += getDaysRented() * 3;
         break;
-    case 2:             //儿童片，起步价1.5元，租期超过3天的部分每天1.5元
+    case Movie::CHILDRENS:             //儿童片，起步价1.5元，租期超过3天的部分每天1.5元
         result += 1.5;
         if(getDaysRented() > 3)
             result += (getDaysRented() - 3) * 1.5;