You've already forked libopenshot
mirror of
https://github.com/OpenShot/libopenshot.git
synced 2026-03-02 08:53:52 -08:00
Merge pull request #296 from OpenShot/std-prefixes
Remove all 'using namespace' directives from headers
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user