Merge branch 'master' of https://github.com/olive-editor/olive
This commit is contained in:
@@ -21,7 +21,7 @@ CurveView::CurveView(QWidget *parent) :
|
||||
|
||||
CurveView::~CurveView()
|
||||
{
|
||||
// Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other memebers have been destroyed
|
||||
// Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other members have been destroyed
|
||||
Clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ CurveWidget::CurveWidget(QWidget *parent) :
|
||||
|
||||
CurveWidget::~CurveWidget()
|
||||
{
|
||||
// Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other memebers have been destroyed
|
||||
// Quick way to avoid segfault when QGraphicsScene::selectionChanged is emitted after other members have been destroyed
|
||||
view_->Clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ void NodeParamViewItem::SetupUI()
|
||||
NodeParamViewWidgetBridge* bridge = new NodeParamViewWidgetBridge(input, this);
|
||||
bridges_.append(bridge);
|
||||
|
||||
// Add widgets for this parameter ot the layout
|
||||
// Add widgets for this parameter to the layout
|
||||
const QList<QWidget*>& widgets_for_param = bridge->widgets();
|
||||
for (int i=0;i<widgets_for_param.size();i++) {
|
||||
content_layout_->addWidget(widgets_for_param.at(i), row_count, i + 1);
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
void SetNode(Node* n);
|
||||
|
||||
/**
|
||||
* @brief Get currently attached noe
|
||||
* @brief Get currently attached node
|
||||
*/
|
||||
Node* node();
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "undo/undocommand.h"
|
||||
|
||||
/**
|
||||
* @brief An undoable commnd for connecting two NodeParams together
|
||||
* @brief An undoable command for connecting two NodeParams together
|
||||
*
|
||||
* Can be considered a QUndoCommand wrapper for NodeParam::ConnectEdge()/
|
||||
*/
|
||||
@@ -31,7 +31,7 @@ private:
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief An undoable commnd for disconnecting two NodeParams
|
||||
* @brief An undoable command for disconnecting two NodeParams
|
||||
*
|
||||
* Can be considered a QUndoCommand wrapper for NodeParam::DisonnectEdge()/
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user