oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions 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
panels/panels.cpp
+9 -9
View File
@@ -30,10 +30,10 @@ void update_effect_controls() {
int aclip = -1;
QVector<int> selected_clips;
int mode = TA_NO_TRANSITION;
if (sequence != NULL) {
if (sequence != nullptr) {
for (int i=0;i<sequence->clips.size();i++) {
Clip* clip = sequence->clips.at(i);
if (clip != NULL) {
if (clip != nullptr) {
for (int j=0;j<sequence->selections.size();j++) {
const Selection& s = sequence->selections.at(j);
bool add = true;
@@ -113,7 +113,7 @@ void update_ui(bool modified) {
}
QDockWidget *get_focused_panel() {
QDockWidget* w = NULL;
QDockWidget* w = nullptr;
if (config.hover_focus) {
if (panel_project->underMouse()) {
w = panel_project;
@@ -127,7 +127,7 @@ QDockWidget *get_focused_panel() {
w = panel_timeline;
}
}
if (w == NULL) {
if (w == nullptr) {
if (panel_project->is_focused()) {
w = panel_project;
} else if (panel_effect_controls->keyframe_focus() || panel_effect_controls->is_focused()) {
@@ -162,15 +162,15 @@ void alloc_panels(QWidget* parent) {
void free_panels() {
delete panel_sequence_viewer;
panel_sequence_viewer = NULL;
panel_sequence_viewer = nullptr;
delete panel_footage_viewer;
panel_footage_viewer = NULL;
panel_footage_viewer = nullptr;
delete panel_project;
panel_project = NULL;
panel_project = nullptr;
delete panel_effect_controls;
panel_effect_controls = NULL;
panel_effect_controls = nullptr;
delete panel_timeline;
panel_timeline = NULL;
panel_timeline = nullptr;
}
void scroll_to_frame_internal(QScrollBar* bar, long frame, double zoom, int area_width) {