From 1334450eec60e166efb7d00fd28d82c2cace43c3 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sun, 4 Aug 2019 23:14:38 -0400
Subject: [PATCH] Decklink*: std:: prefixes

---
 include/DecklinkInput.h  | 2 +-
 include/DecklinkOutput.h | 6 +++---
 include/DecklinkReader.h | 8 +++-----
 include/DecklinkWriter.h | 2 --
 src/DecklinkReader.cpp   | 6 +++---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/include/DecklinkInput.h b/include/DecklinkInput.h
index 87207505..3541811e 100644
--- a/include/DecklinkInput.h
+++ b/include/DecklinkInput.h
@@ -79,7 +79,7 @@ public:
 	unsigned long 			final_frameCount;
 
 	// Queue of raw video frames
-	deque<IDeckLinkMutableVideoFrame*> raw_video_frames;
+	std::deque<IDeckLinkMutableVideoFrame*> raw_video_frames;
 	openshot::CacheMemory final_frames;
 
 	// Convert between YUV and RGB
diff --git a/include/DecklinkOutput.h b/include/DecklinkOutput.h
index ebaa9ab4..9b1618b0 100644
--- a/include/DecklinkOutput.h
+++ b/include/DecklinkOutput.h
@@ -93,14 +93,14 @@ protected:
 
 	unsigned long 							frameCount;
 	//map<int, IDeckLinkMutableVideoFrame* > 	temp_cache;
-	map<int, uint8_t * > 	temp_cache;
+	std::map<int, uint8_t * > 	temp_cache;
 
 	BMDTimeValue frameRateDuration, frameRateScale;
 
 	// Queue of raw video frames
 	//deque<IDeckLinkMutableVideoFrame*> final_frames;
-	deque<uint8_t * > final_frames;
-	deque<std::shared_ptr<openshot::Frame> > raw_video_frames;
+	std::deque<uint8_t * > final_frames;
+	std::deque<std::shared_ptr<openshot::Frame> > raw_video_frames;
 
 	// Convert between YUV and RGB
 	IDeckLinkOutput *deckLinkOutput;
diff --git a/include/DecklinkReader.h b/include/DecklinkReader.h
index 3dc7e23d..de077bdf 100644
--- a/include/DecklinkReader.h
+++ b/include/DecklinkReader.h
@@ -50,8 +50,6 @@
 #include "Frame.h"
 #include "DecklinkInput.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -117,11 +115,11 @@ namespace openshot
 		bool IsOpen() { return is_open; };
 
 		/// Return the type name of the class
-		string Name() { return "DecklinkReader"; };
+		std::string Name() { return "DecklinkReader"; };
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
diff --git a/include/DecklinkWriter.h b/include/DecklinkWriter.h
index 809890f3..84117d0e 100644
--- a/include/DecklinkWriter.h
+++ b/include/DecklinkWriter.h
@@ -50,8 +50,6 @@
 #include "Frame.h"
 #include "DecklinkOutput.h"
 
-using namespace std;
-
 namespace openshot
 {
 
diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp
index 3af5e3fc..6d727da1 100644
--- a/src/DecklinkReader.cpp
+++ b/src/DecklinkReader.cpp
@@ -246,7 +246,7 @@ std::shared_ptr<Frame> DecklinkReader::GetFrame(int64_t requested_frame)
 
 
 // Generate JSON string of this object
-string DecklinkReader::Json() {
+std::string DecklinkReader::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -264,14 +264,14 @@ Json::Value DecklinkReader::JsonValue() {
 }
 
 // Load JSON string into this object
-void DecklinkReader::SetJson(string value) {
+void DecklinkReader::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;