oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed NULLs to nullptr

Browse Source
This commit is contained in:
itsmattkc
2019-01-12 12:57:15 +11:00
parent 6da0f29e8c
commit a8e37ac76a
59 changed files with 785 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/sequence.cpp
+11 -11
View File
@@ -33,8 +33,8 @@ Sequence* Sequence::copy() {
s->clips.resize(clips.size());
for (int i=0;i<clips.size();i++) {
Clip* c = clips.at(i);
if (c == NULL) {
s->clips[i] = NULL;
if (c == nullptr) {
s->clips[i] = nullptr;
} else {
Clip* copy = c->copy(s);
copy->linked = c->linked;
@@ -48,7 +48,7 @@ long Sequence::getEndFrame() {
long end = 0;
for (int j=0;j<clips.size();j++) {
Clip* c = clips.at(j);
if (c != NULL && c->timeline_out > end) {
if (c != nullptr && c->timeline_out > end) {
end = c->timeline_out;
}
}
@@ -61,10 +61,10 @@ void Sequence::hard_delete_transition(Clip *c, int type) {
bool del = true;
Transition* t = transitions.at(transition_index);
if (t->secondary_clip != NULL) {
if (t->secondary_clip != nullptr) {
for (int i=0;i<clips.size();i++) {
Clip* comp = clips.at(i);
if (comp != NULL
if (comp != nullptr
&& c != comp
&& (c->opening_transition == transition_index
|| c->closing_transition == transition_index)) {
@@ -74,14 +74,14 @@ void Sequence::hard_delete_transition(Clip *c, int type) {
}
del = false;
t->secondary_clip = NULL;
t->secondary_clip = nullptr;
}
}
}
if (del) {
delete transitions.at(transition_index);
transitions[transition_index] = NULL;
transitions[transition_index] = nullptr;
}
if (type == TA_OPENING_TRANSITION) {
@@ -97,7 +97,7 @@ void Sequence::getTrackLimits(int* video_tracks, int* audio_tracks) {
int at = 0;
for (int j=0;j<clips.size();j++) {
Clip* c = clips.at(j);
if (c != NULL) {
if (c != nullptr) {
if (c->track < 0 && c->track < vt) { // video clip
vt = c->track;
} else if (c->track > at) {
@@ -105,9 +105,9 @@ void Sequence::getTrackLimits(int* video_tracks, int* audio_tracks) {
}
}
}
if (video_tracks != NULL) *video_tracks = vt;
if (audio_tracks != NULL) *audio_tracks = at;
if (video_tracks != nullptr) *video_tracks = vt;
if (audio_tracks != nullptr) *audio_tracks = at;
}
// static variable for the currently active sequence
Sequence* sequence = NULL;
Sequence* sequence = nullptr;