openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296 from OpenShot/std-prefixes

Browse Source 
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
parent 458c0be919 75e9ba38e6
commit 272f004c0e
110 changed files with 1034 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/KeyFrame.h
View File

@@ -42,9 +42,6 @@
#include "Point.h"
#include "Json.h"
using namespace std;
using namespace openshot;
namespace openshot {
/**
@@ -92,8 +89,8 @@ namespace openshot {
double Bernstein(int64_t n, int64_t i, double t);
public:
vector<Point> Points; ///< Vector of all Points
vector<Coordinate> Values; ///< Vector of all Values (i.e. the processed coordinates from the curve)
std::vector<Point> Points; ///< Vector of all Points
std::vector<Coordinate> Values; ///< Vector of all Values (i.e. the processed coordinates from the curve)
/// Default constructor for the Keyframe class
Keyframe();
@@ -160,9 +157,9 @@ namespace openshot {
bool IsIncreasing(int index);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
std::string Json(); ///< Generate JSON string of this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJson(string value); ///< Load JSON string into this object
void SetJson(std::string value); ///< Load JSON string into this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/**