core: fixed bug that didn't register ProjectPtr correctly and broke some
functionality as a result
This commit is contained in:
+1
-1
@@ -538,7 +538,7 @@ void Core::DeclareTypesForQt()
|
||||
qRegisterMetaType<Decoder::RetrieveState>();
|
||||
qRegisterMetaType<TimeRange>();
|
||||
qRegisterMetaType<Color>();
|
||||
qRegisterMetaType<ProjectPtr>();
|
||||
qRegisterMetaType<OLIVE_NAMESPACE::ProjectPtr>();
|
||||
}
|
||||
|
||||
void Core::StartGUI(bool full_screen)
|
||||
|
||||
+2
-2
@@ -477,12 +477,12 @@ private:
|
||||
private slots:
|
||||
void SaveAutorecovery();
|
||||
|
||||
void ProjectSaveSucceeded(ProjectPtr p);
|
||||
void ProjectSaveSucceeded(OLIVE_NAMESPACE::ProjectPtr p);
|
||||
|
||||
/**
|
||||
* @brief Adds a project to the "open projects" list
|
||||
*/
|
||||
void AddOpenProject(ProjectPtr p);
|
||||
void AddOpenProject(OLIVE_NAMESPACE::ProjectPtr p);
|
||||
|
||||
void ImportTaskComplete(QUndoCommand* command);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ protected:
|
||||
virtual void Action() override;
|
||||
|
||||
signals:
|
||||
void ProjectLoaded(ProjectPtr project);
|
||||
void ProjectLoaded(OLIVE_NAMESPACE::ProjectPtr project);
|
||||
|
||||
private:
|
||||
QString filename_;
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
ProjectSaveManager(ProjectPtr project);
|
||||
|
||||
signals:
|
||||
void ProjectSaveSucceeded(ProjectPtr p);
|
||||
void ProjectSaveSucceeded(OLIVE_NAMESPACE::ProjectPtr p);
|
||||
|
||||
protected:
|
||||
virtual void Action() override;
|
||||
|
||||
Reference in New Issue
Block a user