Skip to content

Commit 45cfda4

Browse files
ferdnycferdnyc
committed
(include/src)/effects/: std::prefixes
1 parent 352fd66 commit 45cfda4

28 files changed

+101
-129
lines changed

‎include/effects/Bars.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
#include "../KeyFrame.h"
4242

4343

44-
using namespace std;
45-
4644
namespace openshot
4745
{
4846

@@ -91,14 +89,14 @@ namespace openshot
9189
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
9290

9391
/// Get and Set JSON methods
94-
string Json(); ///< Generate JSON string of this object
95-
void SetJson(string value); ///< Load JSON string into this object
92+
std::string Json(); ///< Generate JSON string of this object
93+
void SetJson(std::string value); ///< Load JSON string into this object
9694
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
9795
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
9896

9997
/// Get all properties for a specific frame (perfect for a UI to display the current state
10098
/// of all properties at any time)
101-
string PropertiesJSON(int64_t requested_frame);
99+
std::string PropertiesJSON(int64_t requested_frame);
102100
};
103101

104102
}

‎include/effects/Blur.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
#include "../QtImageReader.h"
5050
#include "../ChunkReader.h"
5151

52-
using namespace std;
53-
5452
namespace openshot
5553
{
5654

@@ -104,14 +102,14 @@ namespace openshot
104102
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
105103

106104
/// Get and Set JSON methods
107-
string Json(); ///< Generate JSON string of this object
108-
void SetJson(string value); ///< Load JSON string into this object
105+
std::string Json(); ///< Generate JSON string of this object
106+
void SetJson(std::string value); ///< Load JSON string into this object
109107
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
110108
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
111109

112110
/// Get all properties for a specific frame (perfect for a UI to display the current state
113111
/// of all properties at any time)
114-
string PropertiesJSON(int64_t requested_frame);
112+
std::string PropertiesJSON(int64_t requested_frame);
115113
};
116114

117115
}

‎include/effects/Brightness.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
#include "../QtImageReader.h"
4949
#include "../ChunkReader.h"
5050

51-
using namespace std;
52-
5351
namespace openshot
5452
{
5553

@@ -91,14 +89,14 @@ namespace openshot
9189
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
9290

9391
/// Get and Set JSON methods
94-
string Json(); ///< Generate JSON string of this object
95-
void SetJson(string value); ///< Load JSON string into this object
92+
std::string Json(); ///< Generate JSON string of this object
93+
void SetJson(std::string value); ///< Load JSON string into this object
9694
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
9795
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
9896

9997
/// Get all properties for a specific frame (perfect for a UI to display the current state
10098
/// of all properties at any time)
101-
string PropertiesJSON(int64_t requested_frame);
99+
std::string PropertiesJSON(int64_t requested_frame);
102100
};
103101

104102
}

‎include/effects/ChromaKey.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
#include "../Exceptions.h"
4444
#include "../KeyFrame.h"
4545

46-
using namespace std;
47-
4846
namespace openshot
4947
{
5048

@@ -88,13 +86,13 @@ namespace openshot
8886
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
8987

9088
/// Get and Set JSON methods
91-
string Json(); ///< Generate JSON string of this object
92-
void SetJson(string value); ///< Load JSON string into this object
89+
std::string Json(); ///< Generate JSON string of this object
90+
void SetJson(std::string value); ///< Load JSON string into this object
9391
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
9492
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
9593

9694
// Get all properties for a specific frame
97-
string PropertiesJSON(int64_t requested_frame);
95+
std::string PropertiesJSON(int64_t requested_frame);
9896
};
9997

10098
}

‎include/effects/ColorShift.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
#include "../KeyFrame.h"
4141

4242

43-
using namespace std;
44-
4543
namespace openshot
4644
{
4745

@@ -95,14 +93,14 @@ namespace openshot
9593
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
9694

9795
/// Get and Set JSON methods
98-
string Json(); ///< Generate JSON string of this object
99-
void SetJson(string value); ///< Load JSON string into this object
96+
std::string Json(); ///< Generate JSON string of this object
97+
void SetJson(std::string value); ///< Load JSON string into this object
10098
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
10199
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
102100

103101
/// Get all properties for a specific frame (perfect for a UI to display the current state
104102
/// of all properties at any time)
105-
string PropertiesJSON(int64_t requested_frame);
103+
std::string PropertiesJSON(int64_t requested_frame);
106104
};
107105

108106
}

‎include/effects/Crop.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
#include "../KeyFrame.h"
4242

4343

44-
using namespace std;
45-
4644
namespace openshot
4745
{
4846

@@ -90,14 +88,14 @@ namespace openshot
9088
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
9189

9290
/// Get and Set JSON methods
93-
string Json(); ///< Generate JSON string of this object
94-
void SetJson(string value); ///< Load JSON string into this object
91+
std::string Json(); ///< Generate JSON string of this object
92+
void SetJson(std::string value); ///< Load JSON string into this object
9593
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
9694
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
9795

9896
/// Get all properties for a specific frame (perfect for a UI to display the current state
9997
/// of all properties at any time)
100-
string PropertiesJSON(int64_t requested_frame);
98+
std::string PropertiesJSON(int64_t requested_frame);
10199
};
102100

103101
}

‎include/effects/Deinterlace.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
#include "../Json.h"
4545
#include "../KeyFrame.h"
4646

47-
using namespace std;
48-
4947
namespace openshot
5048
{
5149

@@ -84,13 +82,13 @@ namespace openshot
8482
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
8583

8684
/// Get and Set JSON methods
87-
string Json(); ///< Generate JSON string of this object
88-
void SetJson(string value); ///< Load JSON string into this object
85+
std::string Json(); ///< Generate JSON string of this object
86+
void SetJson(std::string value); ///< Load JSON string into this object
8987
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
9088
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
9189

9290
// Get all properties for a specific frame
93-
string PropertiesJSON(int64_t requested_frame);
91+
std::string PropertiesJSON(int64_t requested_frame);
9492
};
9593

9694
}

‎include/effects/Hue.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
#include "../KeyFrame.h"
4141

4242

43-
using namespace std;
44-
4543
namespace openshot
4644
{
4745

@@ -81,14 +79,14 @@ namespace openshot
8179
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
8280

8381
/// Get and Set JSON methods
84-
string Json(); ///< Generate JSON string of this object
85-
void SetJson(string value); ///< Load JSON string into this object
82+
std::string Json(); ///< Generate JSON string of this object
83+
void SetJson(std::string value); ///< Load JSON string into this object
8684
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
8785
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
8886

8987
/// Get all properties for a specific frame (perfect for a UI to display the current state
9088
/// of all properties at any time)
91-
string PropertiesJSON(int64_t requested_frame);
89+
std::string PropertiesJSON(int64_t requested_frame);
9290
};
9391

9492
}

‎include/effects/Mask.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
#include "../ImageReader.h"
5353
#endif
5454

55-
using namespace std;
56-
5755
namespace openshot
5856
{
5957

@@ -103,14 +101,14 @@ namespace openshot
103101
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
104102

105103
/// Get and Set JSON methods
106-
string Json(); ///< Generate JSON string of this object
107-
void SetJson(string value); ///< Load JSON string into this object
104+
std::string Json(); ///< Generate JSON string of this object
105+
void SetJson(std::string value); ///< Load JSON string into this object
108106
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
109107
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
110108

111109
/// Get all properties for a specific frame (perfect for a UI to display the current state
112110
/// of all properties at any time)
113-
string PropertiesJSON(int64_t requested_frame);
111+
std::string PropertiesJSON(int64_t requested_frame);
114112

115113
/// Get the reader object of the mask grayscale image
116114
ReaderBase* Reader() { return reader; };

‎include/effects/Negate.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
#include "../Exceptions.h"
4444
#include "../KeyFrame.h"
4545

46-
using namespace std;
47-
4846
namespace openshot
4947
{
5048

@@ -72,13 +70,13 @@ namespace openshot
7270
std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
7371

7472
/// Get and Set JSON methods
75-
string Json(); ///< Generate JSON string of this object
76-
void SetJson(string value); ///< Load JSON string into this object
73+
std::string Json(); ///< Generate JSON string of this object
74+
void SetJson(std::string value); ///< Load JSON string into this object
7775
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
7876
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
7977

8078
// Get all properties for a specific frame
81-
string PropertiesJSON(int64_t requested_frame);
79+
std::string PropertiesJSON(int64_t requested_frame);
8280
};
8381

8482
}

0 commit comments

Comments
 (0)