std:: prefixes for ClipBase

Author: ferdnyc

include/ClipBase.h

@@ -43,8 +43,6 @@
 #include "KeyFrame.h"
 #include "Json.h"
 
-using namespace std;
-
 namespace openshot {
 
 	/**
@@ -55,18 +53,18 @@ namespace openshot {
 	 */
 	class ClipBase {
 	protected:
-		string id; ///< ID Property for all derived Clip and Effect classes.
+		std::string id; ///< ID Property for all derived Clip and Effect classes.
 		float position; ///< The position on the timeline where this clip should start playing
 		int layer; ///< The layer this clip is on. Lower clips are covered up by higher clips.
 		float start; ///< The position in seconds to start playing (used to trim the beginning of a clip)
 		float end; ///< The position in seconds to end playing (used to trim the ending of a clip)
-		string previous_properties; ///< This string contains the previous JSON properties
+		std::string previous_properties; ///< This string contains the previous JSON properties
 
 		/// Generate JSON for a property
-		Json::Value add_property_json(string name, float value, string type, string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame);
+		Json::Value add_property_json(std::string name, float value, std::string type, std::string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame);
 
 		/// Generate JSON choice for a property (dropdown properties)
-		Json::Value add_property_choice_json(string name, int value, int selected_value);
+		Json::Value add_property_choice_json(std::string name, int value, int selected_value);
 
 	public:
 
@@ -80,29 +78,29 @@ namespace openshot {
 		bool operator>= ( ClipBase& a) { return (Position() >= a.Position()); }
 
 		/// Get basic properties
-		string Id() { return id; } ///< Get the Id of this clip object
+		std::string Id() { return id; } ///< Get the Id of this clip object
 		float Position() { return position; } ///< Get position on timeline (in seconds)
 		int Layer() { return layer; } ///< Get layer of clip on timeline (lower number is covered by higher numbers)
 		float Start() { return start; } ///< Get start position (in seconds) of clip (trim start of video)
 		float End() { return end; } ///< Get end position (in seconds) of clip (trim end of video)
 		float Duration() { return end - start; } ///< Get the length of this clip (in seconds)
 
 		/// Set basic properties
-		void Id(string value) { id = value; } ///> Set the Id of this clip object
+		void Id(std::string value) { id = value; } ///> Set the Id of this clip object
 		void Position(float value) { position = value; } ///< Set position on timeline (in seconds)
 		void Layer(int value) { layer = value; } ///< Set layer of clip on timeline (lower number is covered by higher numbers)
 		void Start(float value) { start = value; } ///< Set start position (in seconds) of clip (trim start of video)
 		void End(float value) { end = value; } ///< Set end position (in seconds) of clip (trim end of video)
 
 		/// Get and Set JSON methods
-		virtual string Json() = 0; ///< Generate JSON string of this object
-		virtual void SetJson(string value) = 0; ///< Load JSON string into this object
+		virtual std::string Json() = 0; ///< Generate JSON string of this object
+		virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object
 		virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
 		virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		virtual string PropertiesJSON(int64_t requested_frame) = 0;
+		virtual std::string PropertiesJSON(int64_t requested_frame) = 0;
 
 		virtual ~ClipBase() = default;
 	};

src/ClipBase.cpp

@@ -65,7 +65,7 @@ void ClipBase::SetJsonValue(Json::Value root) {
 }
 
 // Generate JSON for a property
-Json::Value ClipBase::add_property_json(string name, float value, string type, string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) {
+Json::Value ClipBase::add_property_json(std::string name, float value, std::string type, std::string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) {
 
 	// Requested Point
 	Point requested_point(requested_frame, requested_frame);
@@ -101,7 +101,7 @@ Json::Value ClipBase::add_property_json(string name, float value, string type, s
 	return prop;
 }
 
-Json::Value ClipBase::add_property_choice_json(string name, int value, int selected_value) {
+Json::Value ClipBase::add_property_choice_json(std::string name, int value, int selected_value) {
 
 	// Create choice
 	Json::Value new_choice = Json::Value(Json::objectValue);