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

@@ -108,7 +108,7 @@ void Point::Initialize_RightHandle(float x, float y) {
}
// Generate JSON string of this object
string Point::Json() {
std::string Point::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -132,14 +132,14 @@ Json::Value Point::JsonValue() {
}
// Load JSON string into this object
void Point::SetJson(string value) {
void Point::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;