changed NULLs to nullptr

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
+26 -26
View File
@@ -40,8 +40,8 @@ Viewer::Viewer(QWidget *parent) :
QDockWidget(parent),
playing(false),
just_played(false),
media(NULL),
seq(NULL),
media(nullptr),
seq(nullptr),
created_sequence(false),
cue_recording_internal(false),
panel_name("Viewer: "),
@@ -57,7 +57,7 @@ Viewer::Viewer(QWidget *parent) :
viewer_container->viewer = this;
viewer_widget = viewer_container->child;
viewer_widget->viewer = this;
set_media(NULL);
set_media(nullptr);
currentTimecode->setEnabled(false);
currentTimecode->set_minimum_value(0);
@@ -101,13 +101,13 @@ void Viewer::set_main_sequence() {
void Viewer::reset_all_audio() {
// reset all clip audio
if (seq != NULL) {
if (seq != nullptr) {
audio_ibuffer_frame = seq->playhead;
audio_ibuffer_timecode = (double) audio_ibuffer_frame / seq->frame_rate;
for (int i=0;i<seq->clips.size();i++) {
Clip* c = seq->clips.at(i);
if (c != NULL) c->reset_audio();
if (c != nullptr) c->reset_audio();
}
}
clear_audio_ibuffer();
@@ -257,19 +257,19 @@ void Viewer::seek(long p) {
}
void Viewer::go_to_start() {
if (seq != NULL) seek(0);
if (seq != nullptr) seek(0);
}
void Viewer::go_to_end() {
if (seq != NULL) seek(seq->getEndFrame());
if (seq != nullptr) seek(seq->getEndFrame());
}
void Viewer::close_media() {
set_media(NULL);
set_media(nullptr);
}
void Viewer::go_to_in() {
if (seq != NULL) {
if (seq != nullptr) {
if (seq->using_workarea && seq->enable_workarea) {
seek(seq->workarea_in);
} else {
@@ -279,15 +279,15 @@ void Viewer::go_to_in() {
}
void Viewer::previous_frame() {
if (seq != NULL && seq->playhead > 0) seek(seq->playhead-1);
if (seq != nullptr && seq->playhead > 0) seek(seq->playhead-1);
}
void Viewer::next_frame() {
if (seq != NULL) seek(seq->playhead+1);
if (seq != nullptr) seek(seq->playhead+1);
}
void Viewer::go_to_out() {
if (seq != NULL) {
if (seq != nullptr) {
if (seq->using_workarea && seq->enable_workarea) {
seek(seq->workarea_out);
} else {
@@ -327,7 +327,7 @@ void Viewer::play() {
if (panel_sequence_viewer->playing) panel_sequence_viewer->pause();
if (panel_footage_viewer->playing) panel_footage_viewer->pause();
if (seq != NULL) {
if (seq != nullptr) {
if (!is_recording_cued()
&& seq->playhead >= get_seq_out()
&& (config.loop || !main_sequence)) {
@@ -352,7 +352,7 @@ void Viewer::play_wake() {
if (just_played) {
start_msecs = QDateTime::currentMSecsSinceEpoch();
playback_updater.start();
if (audio_thread != NULL) audio_thread->notifyReceiver();
if (audio_thread != nullptr) audio_thread->notifyReceiver();
just_played = false;
}
}
@@ -406,11 +406,11 @@ void Viewer::update_playhead_timecode(long p) {
}
void Viewer::update_end_timecode() {
endTimecode->setText((seq == NULL) ? frame_to_timecode(0, config.timecode_view, 30) : frame_to_timecode(seq->getEndFrame(), config.timecode_view, seq->frame_rate));
endTimecode->setText((seq == nullptr) ? frame_to_timecode(0, config.timecode_view, 30) : frame_to_timecode(seq->getEndFrame(), config.timecode_view, seq->frame_rate));
}
void Viewer::update_header_zoom() {
if (seq != NULL) {
if (seq != nullptr) {
long sequenceEndFrame = seq->getEndFrame();
if (cached_end_frame != sequenceEndFrame) {
minimum_zoom = (sequenceEndFrame > 0) ? ((double) headers->width() / (double) sequenceEndFrame) : 1;
@@ -431,8 +431,8 @@ void Viewer::update_parents(bool reload_fx) {
}
}
void Viewer::resizeEvent(QResizeEvent *event) {
if (seq != NULL) {
void Viewer::resizeEvent(QResizeEvent *) {
if (seq != nullptr) {
set_sb_max();
}
}
@@ -440,7 +440,7 @@ void Viewer::resizeEvent(QResizeEvent *event) {
void Viewer::update_viewer() {
update_header_zoom();
viewer_widget->update();
if (seq != NULL) update_playhead_timecode(seq->playhead);
if (seq != nullptr) update_playhead_timecode(seq->playhead);
update_end_timecode();
}
@@ -466,7 +466,7 @@ void Viewer::clear_inout_point() {
}
void Viewer::toggle_enable_inout() {
if (seq != NULL && seq->using_workarea) {
if (seq != nullptr && seq->using_workarea) {
undo_stack.push(new SetBool(&seq->enable_workarea, !seq->enable_workarea));
update_parents();
}
@@ -481,7 +481,7 @@ void Viewer::set_out_point() {
}
void Viewer::set_zoom(bool in) {
if (seq != NULL) {
if (seq != nullptr) {
set_zoom_value(in ? headers->get_zoom()*2 : qMax(minimum_zoom, headers->get_zoom()*0.5));
}
}
@@ -492,7 +492,7 @@ void Viewer::set_zoom_value(double d) {
viewer_widget->waveform_zoom = d;
viewer_widget->update();
}
if (seq != NULL) {
if (seq != nullptr) {
set_sb_max();
if (!horizontal_bar->is_resizing())
center_scroll_to_playhead(horizontal_bar, headers->get_zoom(), seq->playhead);
@@ -617,7 +617,7 @@ void Viewer::set_media(Media* m) {
main_sequence = false;
media = m;
clean_created_seq();
if (media != NULL) {
if (media != nullptr) {
switch (media->get_type()) {
case MEDIA_TYPE_FOOTAGE:
{
@@ -741,7 +741,7 @@ void Viewer::clean_created_seq() {
}*/
delete seq;
seq = NULL;
seq = nullptr;
created_sequence = false;
}
}
@@ -751,14 +751,14 @@ void Viewer::set_sequence(bool main, Sequence *s) {
reset_all_audio();
if (seq != NULL) {
if (seq != nullptr) {
closeActiveClips(seq);
}
main_sequence = main;
seq = (main) ? sequence : s;
bool null_sequence = (seq == NULL);
bool null_sequence = (seq == nullptr);
headers->setEnabled(!null_sequence);
currentTimecode->setEnabled(!null_sequence);