Commit 7c1225c9 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Workspace: Pass the project Settings instance when constructing the class

parent 5a7d21e1
......@@ -35,7 +35,7 @@ Project::Project()
m_settings = new Settings( QString() );
m_undoStack = new QUndoStack;
m_workflow = new MainWorkflow;
m_workspace = new Workspace;
m_workspace = new Workspace( m_settings );
}
Project::~Project()
......
......@@ -40,7 +40,8 @@
const QString Workspace::workspacePrefix = "workspace://";
Workspace::Workspace() : m_copyInProgress( false )
Workspace::Workspace(Settings *settings)
: m_copyInProgress( false )
{
m_mediasToCopyMutex = new QMutex;
#ifdef WITH_GUI
......
......@@ -23,16 +23,17 @@
#ifndef WORKSPACE_H
#define WORKSPACE_H
#include "Tools/ErrorHandler.h"
#include <QObject>
#include <QQueue>
class Clip;
class Media;
#include "Tools/ErrorHandler.h"
class QFileInfo;
class QMutex;
class QFileInfo;
class Clip;
class Media;
class Settings;
class Workspace : public QObject, public ErrorHandler
{
......@@ -41,7 +42,7 @@ class Workspace : public QObject, public ErrorHandler
public:
static const QString workspacePrefix;
Workspace();
Workspace( Settings* settings );
~Workspace();
static bool isInProjectDir( const QString &path );
static bool isInProjectDir( const QFileInfo &fInfo );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment