From 8657066b49f76dfb0f72b5bf09a07355b568148d Mon Sep 17 00:00:00 2001
From: jackfiled <xcrenchangjun@outlook.com>
Date: Mon, 4 Jul 2022 17:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E6=8F=90=E9=AB=98=E4=BA=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/BusFCFSStrategy.h | 6 +++---
 include/BusSCANStrategy.h | 6 +++---
 include/BusSSTFStrategy.h | 6 +++---
 include/BusStrategyBase.h | 2 +-
 include/PosPair.h         | 2 +-
 src/PosPair.cpp           | 2 +-
 src/StrategyFactory.cpp   | 8 +++-----
 src/busModel.cpp          | 4 +---
 8 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/include/BusFCFSStrategy.h b/include/BusFCFSStrategy.h
index cc1070e..ab01db3 100644
--- a/include/BusFCFSStrategy.h
+++ b/include/BusFCFSStrategy.h
@@ -8,11 +8,11 @@
 
 class BusFCFSStrategy : public BusStrategyBase
 {
-    int GetBusDirection();
+    int GetBusDirection() override;
 
-    bus_query_t *GetTargetQuery();
+    bus_query_t *GetTargetQuery() override;
 
-    bus_query_t *HandleBTWQuery();
+    bus_query_t *HandleBTWQuery() override;
 };
 
 
diff --git a/include/BusSCANStrategy.h b/include/BusSCANStrategy.h
index 7a48cba..3ef96c3 100644
--- a/include/BusSCANStrategy.h
+++ b/include/BusSCANStrategy.h
@@ -9,11 +9,11 @@
 
 class BusSCANStrategy : public BusStrategyBase
 {
-    int GetBusDirection();
+    int GetBusDirection() override;
 
-    bus_query_t *GetTargetQuery();
+    bus_query_t *GetTargetQuery() override;
 
-    bus_query_t *HandleBTWQuery();
+    bus_query_t *HandleBTWQuery() override;
 
 };
 
diff --git a/include/BusSSTFStrategy.h b/include/BusSSTFStrategy.h
index 35d8c41..0aed03f 100644
--- a/include/BusSSTFStrategy.h
+++ b/include/BusSSTFStrategy.h
@@ -8,11 +8,11 @@
 
 class BusSSTFStrategy : public BusStrategyBase
 {
-    int GetBusDirection();
+    int GetBusDirection() override;
 
-    bus_query_t *GetTargetQuery();
+    bus_query_t *GetTargetQuery() override;
 
-    bus_query_t *HandleBTWQuery();
+    bus_query_t *HandleBTWQuery() override;
 };
 
 
diff --git a/include/BusStrategyBase.h b/include/BusStrategyBase.h
index faf5eb1..97d3477 100644
--- a/include/BusStrategyBase.h
+++ b/include/BusStrategyBase.h
@@ -44,7 +44,7 @@ public:
 
     BusStrategyBase();
 
-    virtual ~BusStrategyBase();
+    ~BusStrategyBase() override;
 
     /**
      * 获得当前公交车应该前进的方向
diff --git a/include/PosPair.h b/include/PosPair.h
index 4705d77..c445811 100644
--- a/include/PosPair.h
+++ b/include/PosPair.h
@@ -47,7 +47,7 @@ public:
      * @param stop_number 站点的数量
      * @return 站点之间的距离
      */
-    int GetStopSpaceLength(int stop_number) const;
+    static int GetStopSpaceLength(int stop_number) ;
 
     /**
      * 加上一定的距离
diff --git a/src/PosPair.cpp b/src/PosPair.cpp
index 615867b..9293eb3 100644
--- a/src/PosPair.cpp
+++ b/src/PosPair.cpp
@@ -10,7 +10,7 @@ PosPair::PosPair()
     pos_y = stop_begin_y;
 }
 
-int PosPair::GetStopSpaceLength(int stop_number) const
+int PosPair::GetStopSpaceLength(int stop_number)
 {
     return 2 * (stop_rail_width + stop_rail_height) / stop_number;
 }
diff --git a/src/StrategyFactory.cpp b/src/StrategyFactory.cpp
index 831e259..de75c8d 100644
--- a/src/StrategyFactory.cpp
+++ b/src/StrategyFactory.cpp
@@ -131,15 +131,13 @@ BusStrategyBase *StrategyFactory::GetStrategy(const QString& file_name)
             break;
         case BUS_SCAN:
             controller = new BusSCANStrategy;
+            break;
         default:
             controller = nullptr;
             break;
     }
 
-    if(controller != nullptr)
-    {
-        controller->rails_model->CreateRails(distance, total_station);
-        controller->strategy = chosen_strategy;
-    }
+    controller->rails_model->CreateRails(distance, total_station);
+    controller->strategy = chosen_strategy;
     return controller;
 }
diff --git a/src/busModel.cpp b/src/busModel.cpp
index bcb8e6d..1c2ecc4 100644
--- a/src/busModel.cpp
+++ b/src/busModel.cpp
@@ -13,9 +13,7 @@ BusModel::BusModel()
 }
 
 BusModel::~BusModel()
-{
-
-}
+= default;
 
 void BusModel::ResetBus(rail_node_t *head)
 {