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

switched global to unique ptr and renamed olive namespace

Browse Source
This commit is contained in:
itsmattkc
2019-02-16 15:08:33 -08:00
parent 3d0a65c70d
commit e063a5ba8f
65 changed files with 860 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/focusfilter.cpp
+5 -5
View File
@@ -24,7 +24,7 @@
#include "project/sequence.h"
#include "ui/timelineheader.h"
FocusFilter Olive::FocusFilter;
FocusFilter olive::FocusFilter;
FocusFilter::FocusFilter() {}
@@ -100,7 +100,7 @@ void FocusFilter::set_viewer_fullscreen() {
}
void FocusFilter::set_marker() {
if (Olive::ActiveSequence != nullptr) {
if (olive::ActiveSequence != nullptr) {
QDockWidget* focused_panel = get_focused_panel();
if (focused_panel == panel_footage_viewer) {
@@ -205,7 +205,7 @@ void FocusFilter::delete_function() {
} else if (panel_graph_editor->view_is_focused()) {
panel_graph_editor->delete_selected_keys();
} else {
panel_timeline->delete_selection(Olive::ActiveSequence->selections, false);
panel_timeline->delete_selection(olive::ActiveSequence->selections, false);
}
}
@@ -251,7 +251,7 @@ void FocusFilter::zoom_out() {
}
void FocusFilter::cut() {
if (Olive::ActiveSequence != nullptr) {
if (olive::ActiveSequence != nullptr) {
QDockWidget* focused_panel = get_focused_panel();
if (panel_effect_controls == focused_panel) {
panel_effect_controls->copy(true);
@@ -262,7 +262,7 @@ void FocusFilter::cut() {
}
void FocusFilter::copy() {
if (Olive::ActiveSequence != nullptr) {
if (olive::ActiveSequence != nullptr) {
QDockWidget* focused_panel = get_focused_panel();
if (panel_effect_controls == focused_panel) {
panel_effect_controls->copy(false);