[vlmc-devel] Merge ProjectManager in the Project class.

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 31 02:18:32 2014 +0300| [0c33156c648f52c3fdd13f064d665081d75c5823] | committer: Hugo Beauzée-Luyssen

Merge ProjectManager in the Project class.

Expect kitten blood all over the wall.

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

 src/CMakeLists.txt                              |    3 +-
 src/Commands/Commands.cpp                       |    2 +-
 src/EffectsEngine/EffectHelper.cpp              |    2 +-
 src/Gui/MainWindow.cpp                          |   18 +-
 src/Gui/WorkflowFileRendererDialog.cpp          |    2 +-
 src/Gui/import/ImportController.cpp             |    2 +-
 src/Gui/library/MediaCellView.cpp               |    2 +-
 src/Gui/library/MediaLibrary.cpp                |    2 +-
 src/Gui/project/GuiProjectManager.cpp           |    2 +-
 src/Gui/project/GuiProjectManager.h             |    4 +-
 src/Gui/timeline/GraphicsTrack.cpp              |    2 +-
 src/Gui/timeline/Timeline.cpp                   |    2 +-
 src/Gui/timeline/TracksScene.cpp                |    2 +-
 src/Gui/timeline/TracksView.cpp                 |    2 +-
 src/Gui/wizard/GeneralPage.cpp                  |    6 +-
 src/Gui/wizard/OpenPage.cpp                     |   11 +-
 src/Gui/wizard/ProjectWizard.cpp                |   10 +-
 src/Gui/wizard/ProjectWizard.h                  |    6 +-
 src/Gui/wizard/WelcomePage.cpp                  |    2 +-
 src/Library/Library.cpp                         |    6 +-
 src/Library/Library.h                           |    2 +-
 src/Main/Project.cpp                            |   90 -----
 src/Main/Project.h                              |   61 ----
 src/Main/main.cpp                               |    8 +-
 src/Main/vlmc.cpp                               |    4 +-
 src/Project/AutomaticBackup.cpp                 |    4 +-
 src/Project/AutomaticBackup.h                   |    6 +-
 src/Project/{ProjectManager.cpp => Project.cpp} |  412 +++++++++++++----------
 src/Project/Project.h                           |  196 +++++++++++
 src/Project/ProjectManager.h                    |  180 ----------
 src/Project/RecentProjects.cpp                  |   18 +-
 src/Project/RecentProjects.h                    |   10 +-
 src/Project/Workspace.cpp                       |    2 +-
 src/Renderer/WorkflowRenderer.cpp               |    2 +-
 src/Settings/Settings.h                         |    2 +-
 src/Tools/Singleton.hpp                         |    2 +-
 src/Workflow/ImageClipWorkflow.cpp              |    2 +-
 src/Workflow/MainWorkflow.cpp                   |    4 +-
 src/Workflow/TrackWorkflow.cpp                  |    2 +-
 src/Workflow/VideoClipWorkflow.cpp              |    2 +-
 40 files changed, 509 insertions(+), 588 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commitdiff;h=0c33156c648f52c3fdd13f064d665081d75c5823