several conversions to smart pointers

This commit is contained in:
itsmattkc
2019-02-16 21:21:04 -08:00
parent e063a5ba8f
commit 5207a0511f
104 changed files with 972 additions and 945 deletions
+18 -15
View File
@@ -30,19 +30,22 @@
#include <QOpenGLTexture>
#include <QMutex>
#include <QThread>
class QLabel;
class QWidget;
class CollapsibleWidget;
class QGridLayout;
class QPushButton;
class QMouseEvent;
#include <QLabel>
#include <QWidget>
#include <QGridLayout>
#include <QPushButton>
#include <QMouseEvent>
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
#include "ui/collapsiblewidget.h"
#include "ui/checkboxex.h"
class Clip;
class QXmlStreamReader;
class QXmlStreamWriter;
using ClipPtr = std::shared_ptr<Clip>;
class Effect;
class EffectRow;
class CheckboxEx;
using EffectPtr = std::shared_ptr<Effect>;
struct EffectMeta {
QString name;
@@ -57,7 +60,7 @@ struct EffectMeta {
extern QVector<EffectMeta> effects;
double log_volume(double linear);
Effect* create_effect(Clip* c, const EffectMeta *em);
EffectPtr create_effect(ClipPtr c, const EffectMeta *em);
const EffectMeta* get_internal_meta(int internal_id, int type);
enum EffectType {
@@ -166,9 +169,9 @@ qint16 mix_audio_sample(qint16 a, qint16 b);
class Effect : public QObject {
Q_OBJECT
public:
Effect(Clip* c, const EffectMeta* em);
Effect(ClipPtr c, const EffectMeta* em);
~Effect();
Clip* parent_clip;
ClipPtr parent_clip;
const EffectMeta* meta;
int id;
QString name;
@@ -187,8 +190,8 @@ public:
virtual void refresh();
virtual Effect* copy(Clip* c);
void copy_field_keyframes(Effect *e);
virtual EffectPtr copy(ClipPtr c);
void copy_field_keyframes(EffectPtr e);
virtual void load(QXmlStreamReader& stream);
virtual void custom_load(QXmlStreamReader& stream);