Browse Source

修改函数传参 std::string ---> std::string& const

zzj 6 years ago
parent
commit
3c859796f4
7 changed files with 9 additions and 9 deletions
  1. 1 1
      card_base.cpp
  2. 1 1
      card_base.h
  3. 1 1
      card_car.cpp
  4. 1 1
      card_car.h
  5. 1 1
      db/db_tool.cpp
  6. 2 2
      event.cpp
  7. 2 2
      tool_time.h

+ 1 - 1
card_base.cpp

@@ -21,7 +21,7 @@
 
 extern config_file config;
 
-card_location_base::card_location_base(std::string type,uint32_t id,uint16_t dis,int16_t t,int32_t deptid,int32_t level_id,uint32_t cid)
+card_location_base::card_location_base(const std::string&type,uint32_t id,uint16_t dis,int16_t t,int32_t deptid,int32_t level_id,uint32_t cid)
 	:card(id,dis,t,deptid,level_id,cid)
 {
     select_tool_manage::instance()->create_tool(type,m_sel_tool,m_smo_tool);

+ 1 - 1
card_base.h

@@ -71,7 +71,7 @@ struct card_location_base:card,std::enable_shared_from_this<card_location_base>
 	std::unique_ptr<location_card> m_his_location_card;
 
     card_location_base()=default;
-    card_location_base(std::string type,uint32_t id,uint16_t dis,int16_t t,int32_t,int32_t,uint32_t );
+    card_location_base(const std::string&type,uint32_t id,uint16_t dis,int16_t t,int32_t,int32_t,uint32_t );
 
 	virtual void do_business(const std::shared_ptr<site>&site,const point &pt,double acc)=0;
 	virtual void on_timer()=0;

+ 1 - 1
card_car.cpp

@@ -11,7 +11,7 @@
 #include "common_tool.h"
 #include "tool_time.h"
 #include "mine_business.h"
-car::car(std::string type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,
+car::car(const std::string&type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,
 		int32_t categoryid, int type_id,int32_t level_id,uint32_t cid)
 	:card_location_base(type,cardid,needdisplay,t,deptid,level_id,cid)
 	,m_vehicle_category_id(categoryid)

+ 1 - 1
card_car.h

@@ -22,7 +22,7 @@ struct car:card_location_base,card_area
 
 public:
 
-    car(std::string type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,
+    car(const std::string&type,uint32_t cardid,uint16_t needdisplay,int16_t t,int32_t deptid,
         int32_t categoryid, int type_id,int32_t level_id,uint32_t cid);
 	~car();
 

+ 1 - 1
db/db_tool.cpp

@@ -60,7 +60,7 @@ namespace db_tool
        		landmarkdist=std::get<3>(lm);
 		}
 
-        sprintf(sql, "CALL %s(%s, %d, '%s', '%s', %d, %d, %.3f);", call.c_str(),
+        sprintf(sql, "CALL %s(%s, %d, '%s', '%s', %d, %d, %.3lf);", call.c_str(),
                type_id_to_str(card_ptr->m_type,card_ptr->m_id).c_str(),
                 card_ptr->m_cid, start_str.c_str(), end_str.c_str(),
                 landmarkid, landmarkdirect, landmarkdist);

+ 2 - 2
event.cpp

@@ -28,7 +28,7 @@ struct Event
     {}
     void handle_alarm_event(EVENT_TYPE et,uint64_t id,double limit_value,double cur_value,bool f,const std::string &desc="");
     virtual std::shared_ptr<ya_event> on_message(EVENT_TYPE et,uint64_t id,bool f)=0;
-    std::shared_ptr<ya_event> create_event(std::string obj_id,EVENT_TYPE ev_type);
+    std::shared_ptr<ya_event> create_event(const std::string&obj_id,EVENT_TYPE ev_type);
     virtual ~Event(){}
 };
 struct mine_event:Event
@@ -78,7 +78,7 @@ void event_tool::handle_event(OBJECT_TYPE ot,EVENT_TYPE et,uint64_t id,double li
     m_map[ot]->handle_alarm_event(et,id,limit_value,cur_value,f,desc);
 }
 
-std::shared_ptr<ya_event> Event::create_event(std::string obj_id,EVENT_TYPE ev_type)
+std::shared_ptr<ya_event> Event::create_event(const std::string&obj_id,EVENT_TYPE ev_type)
 {
     auto ev_ptr = std::make_shared<ya_event>(tool_time::now_to_us());
     ev_ptr->m_ev_type = ev_type;

+ 2 - 2
tool_time.h

@@ -61,7 +61,7 @@ public:
 		return now*1000;
 	}
     //"%Y-%m-%d %H:%M:%S"
-    static time_t to_time(std::string str)
+    static time_t to_time(const std::string&str)
     {
         time_t t_;
         tm tm_;
@@ -72,7 +72,7 @@ public:
     }
 
     ////"%d-%02d-%02d %02d:%02d:%02d.%03d"
-    static std::chrono::system_clock::time_point to_time_ex(std::string str)
+    static std::chrono::system_clock::time_point to_time_ex(const std::string&str)
     {
         uint64_t pos = str.length()-3;