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
+13 -9
View File
@@ -23,8 +23,10 @@
#include <QList>
#include <QVariant>
#include <QIcon>
#include "project/marker.h"
#include "project/footage.h"
enum MediaType {
MEDIA_TYPE_FOOTAGE,
@@ -32,25 +34,27 @@ enum MediaType {
MEDIA_TYPE_FOLDER
};
struct Footage;
class Sequence;
using SequencePtr = std::shared_ptr<Sequence>;
using VoidPtr = std::shared_ptr<void>;
class MediaThrobber;
struct Sequence;
#include <QIcon>
class Media
{
public:
Media(Media* iparent);
~Media();
Footage *to_footage();
Sequence* to_sequence();
void set_footage(Footage* f);
void set_sequence(Sequence* s);
FootagePtr to_footage();
SequencePtr to_sequence();
void set_footage(FootagePtr f);
void set_sequence(SequencePtr s);
void set_folder();
void set_icon(const QIcon &ico);
void set_parent(Media* p);
void update_tooltip(const QString& error = 0);
void *to_object();
VoidPtr to_object();
int get_type();
const QString& get_name();
void set_name(const QString& n);
@@ -78,7 +82,7 @@ public:
int temp_id2;
private:
int type;
void* object;
VoidPtr object;
// item functions
QList<Media*> children;