[vlmc-devel] ProjectManager: Remove projectClosed signal

Hugo Beauzée-Luyssen git at videolan.org
Mon Mar 31 17:59:20 CEST 2014


vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Sun Mar 30 22:04:27 2014 +0300| [f9c7ba5df57cba286ae2af2202857a69e5a9bfea] | committer: Hugo Beauzée-Luyssen

ProjectManager: Remove projectClosed signal

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=f9c7ba5df57cba286ae2af2202857a69e5a9bfea
---

 src/Library/Library.cpp        |    2 --
 src/Main/Project.cpp           |    2 +-
 src/Project/ProjectManager.cpp |    2 --
 src/Project/ProjectManager.h   |    1 -
 src/Workflow/MainWorkflow.cpp  |    3 +--
 src/Workflow/MainWorkflow.h    |    2 +-
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index 26c7516..22f19ff 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -44,8 +44,6 @@ Library::Library( Workspace *workspace , ProjectManager *projectManager )
     : m_cleanState( true )
     , m_workspace( workspace )
 {
-    connect( projectManager, SIGNAL( projectClosed() ),
-             this, SLOT( clear() ) );
     connect( this, SIGNAL( cleanStateChanged( bool ) ),
              projectManager, SLOT( cleanChanged( bool ) ) );
 }
diff --git a/src/Main/Project.cpp b/src/Main/Project.cpp
index a84e539..eff61c2 100644
--- a/src/Main/Project.cpp
+++ b/src/Main/Project.cpp
@@ -35,7 +35,7 @@ Project::Project()
     m_settings = new Settings( QString() );
     m_projectManager = new ProjectManager( m_settings, Core::getInstance()->settings() );
     m_undoStack = new QUndoStack;
-    m_workflow = new MainWorkflow( m_projectManager );
+    m_workflow = new MainWorkflow();
     m_workspace = new Workspace( m_settings );
     m_library = new Library( m_workspace, m_projectManager );
 
diff --git a/src/Project/ProjectManager.cpp b/src/Project/ProjectManager.cpp
index 3c71929..b832460 100644
--- a/src/Project/ProjectManager.cpp
+++ b/src/Project/ProjectManager.cpp
@@ -407,8 +407,6 @@ ProjectManager::closeProject()
     m_projectFile = NULL;
     m_needSave = false;
     m_projectName = QString();
-    //This one is for every part that need to clean something when the project is closed.
-    emit projectClosed();
     //This one is for the mainwindow, to update the title bar
     Project::getInstance()->undoStack()->clear();
     emit projectUpdated( projectName(), true );
diff --git a/src/Project/ProjectManager.h b/src/Project/ProjectManager.h
index ad2571b..59491f8 100644
--- a/src/Project/ProjectManager.h
+++ b/src/Project/ProjectManager.h
@@ -170,7 +170,6 @@ signals:
      *  Right now, it is only used by the undo stack to flag the current state as clean.
      */
     void            projectSaved();
-    void            projectClosed();
 
     /**
      * @brief projectLoaded Emited when a project is loaded (which also include a project
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 2dd11c3..b6d8ab3 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -38,7 +38,7 @@
 #include <QDomElement>
 #include <QMutex>
 
-MainWorkflow::MainWorkflow( ProjectManager *projectManager, int trackCount ) :
+MainWorkflow::MainWorkflow( int trackCount ) :
         m_blackOutput( NULL ),
         m_lengthFrame( 0 ),
         m_renderStarted( false ),
@@ -60,7 +60,6 @@ MainWorkflow::MainWorkflow( ProjectManager *projectManager, int trackCount ) :
                  this, SLOT( lengthUpdated( qint64 ) ) );
         m_currentFrame[i] = 0;
     }
-    connect( projectManager, SIGNAL( projectClosed() ), this, SLOT( clear() ) );
 }
 
 MainWorkflow::~MainWorkflow()
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index 6913ecd..3184c29 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -57,7 +57,7 @@ class   MainWorkflow : public QObject
     Q_OBJECT
 
     public:
-        MainWorkflow( ProjectManager* projectManager,  int trackCount = 64 );
+        MainWorkflow( int trackCount = 64 );
         ~MainWorkflow();
 
         /**



More information about the Vlmc-devel mailing list