Merge pull request #296 from OpenShot/std-prefixes

Remove all 'using namespace' directives from headers
This commit is contained in:
Jonathan Thomas
2019-11-17 16:18:14 -06:00
committed by GitHub
110 changed files with 1034 additions and 1132 deletions

View File

@@ -143,7 +143,7 @@ namespace openshot
/// Get and Set JSON methods
std::string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into 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