Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Remove TSmartObject from TProject

otakuto6034e2270bee
diff --git a/toonz/sources/include/toonz/sceneresources.h b/toonz/sources/include/toonz/sceneresources.h
index 192b42d6e..92c6e3c54 100644
--- a/toonz/sources/include/toonz/sceneresources.h
+++ b/toonz/sources/include/toonz/sceneresources.h
@@ -5,6 +5,7 @@
#include "tfilepath.h"
#include <map>
+#include <memory>
#undef DVAPI
#undef DVVAR
@@ -329,7 +330,7 @@ private:
class DVAPI ResourceImporter final : public ResourceProcessor {
public:
- ResourceImporter(ToonzScene *scene, TProject *dstProject,
+ ResourceImporter(ToonzScene *scene, std::shared_ptr<TProject> dstProject,
ResourceImportStrategy &strategy);
~ResourceImporter();
@@ -354,7 +355,7 @@ public:
private:
ToonzScene *m_scene;
- TProject *m_dstProject;
+ std::shared_ptr<TProject> m_dstProject;
ToonzScene *m_dstScene;
ResourceImportStrategy &m_importStrategy;
};
diff --git a/toonz/sources/include/toonz/toonzscene.h b/toonz/sources/include/toonz/toonzscene.h
index 679ca41d5..9cc89159b 100644
--- a/toonz/sources/include/toonz/toonzscene.h
+++ b/toonz/sources/include/toonz/toonzscene.h
@@ -3,6 +3,8 @@
#ifndef TOONZSCENE_H
#define TOONZSCENE_H
+#include <memory>
+
// TnzCore includes
#include "tfilepath.h"
#include "traster.h"
@@ -51,9 +53,8 @@ public:
scene referring to the project. I would expect a
\a project to own its scenes, not the other way around... */
- TProject *getProject()
- const; //!< Returns a pointer to the project holding a scene instance.
- void setProject(TProject *); //!< Associates a scene to a project.
+ std::shared_ptr<TProject> getProject() const; //!< Returns a pointer to the project holding a scene instance.
+ void setProject(std::shared_ptr<TProject>); //!< Associates a scene to a project.
void setScenePath(const TFilePath &p); //!< Sets the scene's file path.
TFilePath getScenePath() const {
@@ -268,7 +269,7 @@ private:
ChildStack *m_childStack; //!< Xsheet hierarchy.
TSceneProperties *m_properties;
TLevelSet *m_levelSet;
- TProject *m_project;
+ std::shared_ptr<TProject> m_project;
TContentHistory *m_contentHistory;
bool m_isUntitled; //!< Whether the scene is untitled.
//! \sa The setUntitled() member function.
diff --git a/toonz/sources/include/toonz/tproject.h b/toonz/sources/include/toonz/tproject.h
index 109111daf..4a3b96e95 100644
--- a/toonz/sources/include/toonz/tproject.h
+++ b/toonz/sources/include/toonz/tproject.h
@@ -3,9 +3,9 @@
#ifndef TPROJECT_INCLUDED
#define TPROJECT_INCLUDED
#include <set>
+#include <memory>
#include "tfilepath.h"
-#include "tsmartpointer.h"
class ToonzScene;
class TSceneProperties;
@@ -21,7 +21,7 @@ class FilePathProperties;
#define DVVAR DV_IMPORT_VAR
#endif
-class DVAPI TProject final : public TSmartObject {
+class DVAPI TProject final {
TFilePath m_name, m_path;
std::vector<std::string> m_folderNames;
std::map<std::string, TFilePath> m_folders;
@@ -96,10 +96,6 @@ private:
TProject &operator=(const TProject &);
};
-#ifdef _WIN32
-template class DVAPI TSmartPointerT<TProject>;
-#endif
-typedef TSmartPointerT<TProject> TProjectP;
//===================================================================
@@ -134,7 +130,7 @@ public:
TFilePath getCurrentProjectPath();
void setCurrentProjectPath(const TFilePath &fp);
- TProjectP getCurrentProject();
+ std::shared_ptr<TProject> getCurrentProject();
void initializeScene(ToonzScene *scene);
@@ -154,13 +150,13 @@ public:
TFilePath getProjectPathByName(const TFilePath &projectName);
TFilePath getProjectPathByProjectFolder(const TFilePath &projectFolder);
- TProjectP loadSceneProject(const TFilePath &scenePath);
+ std::shared_ptr<TProject> loadSceneProject(const TFilePath &scenePath);
void getFolderNames(std::vector<std::string> &names);
void addListener(Listener *listener);
void removeListener(Listener *listener);
- TProjectP createStandardProject();
+ std::shared_ptr<TProject> createStandardProject();
void createSandboxIfNeeded();
bool isTabKidsModeEnabled() const { return m_tabKidsMode; }
diff --git a/toonz/sources/tcleanupper/tcleanupper.cpp b/toonz/sources/tcleanupper/tcleanupper.cpp
index 196c88125..b62da1ad7 100644
--- a/toonz/sources/tcleanupper/tcleanupper.cpp
+++ b/toonz/sources/tcleanupper/tcleanupper.cpp
@@ -585,8 +585,7 @@ int main(int argc, char *argv[]) {
Tiio::defineStd();
/*- プロジェクトのロード -*/
- TProjectManager *pm = TProjectManager::instance();
- TProjectP project = pm->loadSceneProject(srcName);
+ auto project = TProjectManager::instance()->loadSceneProject(srcName);
if (!project) {
string err = "Couldn't find the project" + project->getName().getName();
@@ -629,13 +628,13 @@ int main(int argc, char *argv[]) {
/*-- CleanupSettingsファイルパスを直接入力した場合 --*/
else {
try {
- TProjectManager *pm = TProjectManager::instance();
- TProjectP sceneProject = pm->loadSceneProject(fp);
+ TProjectManager *pm = TProjectManager::instance();
+ auto sceneProject = pm->loadSceneProject(fp);
if (!sceneProject) {
cerr << "can't open project." << endl;
return -3;
}
- scene->setProject(sceneProject.getPointer());
+ scene->setProject(sceneProject);
/*- CleanupSettingsファイルに対応するTIFファイルが有るかチェック -*/
TFilePath tifImagePath = fp.withType("tif");
diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp
index 077567af9..720453a22 100644
--- a/toonz/sources/tcomposer/tcomposer.cpp
+++ b/toonz/sources/tcomposer/tcomposer.cpp
@@ -811,10 +811,9 @@ int main(int argc, char *argv[]) {
msg = "Loading " + srcFilePath.getName();
cout << endl << msg << endl;
m_userLog->info(msg);
- TProjectManager *pm = TProjectManager::instance();
// pm->enableTabMode(true);
- TProjectP project = pm->loadSceneProject(srcFilePath);
+ auto project = TProjectManager::instance()->loadSceneProject(srcFilePath);
if (!project) {
msg = "Couldn't find the project"; //+ project->getName().getName();
cerr << msg << endl;
diff --git a/toonz/sources/toonz/cleanupsettingsmodel.cpp b/toonz/sources/toonz/cleanupsettingsmodel.cpp
index 81a7382ca..bceff21c9 100644
--- a/toonz/sources/toonz/cleanupsettingsmodel.cpp
+++ b/toonz/sources/toonz/cleanupsettingsmodel.cpp
@@ -59,8 +59,7 @@ public:
if (!folderPath.isEmpty())
folderPath = folderPath.getParentDir();
else {
- TProject *currentProject =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
if (currentProject)
folderPath =
currentProject->decode(currentProject->getFolder(TProject::Inputs));
diff --git a/toonz/sources/toonz/convertpopup.cpp b/toonz/sources/toonz/convertpopup.cpp
index ad797cb38..c3d8d77e8 100644
--- a/toonz/sources/toonz/convertpopup.cpp
+++ b/toonz/sources/toonz/convertpopup.cpp
@@ -711,8 +711,7 @@ void ConvertPopup::onAntialiasSelected(int index) {
void ConvertPopup::onFileInChanged() {
assert(m_convertFileFld);
std::vector<TFilePath> fps;
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
fps.push_back(scene->decodeFilePath(
TFilePath(m_convertFileFld->getPath().toStdString())));
diff --git a/toonz/sources/toonz/crashhandler.cpp b/toonz/sources/toonz/crashhandler.cpp
index a57909ed3..1c34236d3 100644
--- a/toonz/sources/toonz/crashhandler.cpp
+++ b/toonz/sources/toonz/crashhandler.cpp
@@ -576,13 +576,10 @@ bool CrashHandler::trigger(const QString reason, bool showDialog) {
}
try {
if (s_reportProjInfo) {
- TProjectManager *pm = TProjectManager::instance();
- TApp *app = TApp::instance();
-
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
TFilePath projectPath = currentProject->getProjectPath();
- ToonzScene *currentScene = app->getCurrentScene()->getScene();
+ ToonzScene *currentScene = TApp::instance()->getCurrentScene()->getScene();
std::wstring sceneName = currentScene->getSceneName();
out.append("\nApplication Dir: ");
diff --git a/toonz/sources/toonz/dvdirtreeview.cpp b/toonz/sources/toonz/dvdirtreeview.cpp
index 1ea12a48f..69aaf3ca3 100644
--- a/toonz/sources/toonz/dvdirtreeview.cpp
+++ b/toonz/sources/toonz/dvdirtreeview.cpp
@@ -1024,8 +1024,7 @@ void DvDirTreeView::editCurrentVersionControlNode() {
TFilePath fp =
TProjectManager::instance()->projectFolderToProjectPath(path);
- TProject *currentProject =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
if (!currentProject) return;
TFilePath sceneFolder =
currentProject->decode(currentProject->getFolder(TProject::Scenes));
@@ -1079,8 +1078,7 @@ void DvDirTreeView::unlockCurrentVersionControlNode() {
TFilePath fp =
TProjectManager::instance()->projectFolderToProjectPath(path);
- TProject *currentProject =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
if (!currentProject) return;
TFilePath sceneFolder =
currentProject->decode(currentProject->getFolder(TProject::Scenes));
@@ -1132,8 +1130,8 @@ void DvDirTreeView::revertCurrentVersionControlNode() {
} else {
TFilePath fp =
TProjectManager::instance()->projectFolderToProjectPath(path);
- TProject *currentProject =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto currentProject =
+ TProjectManager::instance()->getCurrentProject();
if (!currentProject) return;
TFilePath sceneFolder =
currentProject->decode(currentProject->getFolder(TProject::Scenes));
diff --git a/toonz/sources/toonz/dvitemview.cpp b/toonz/sources/toonz/dvitemview.cpp
index 8b2ca4270..e7fe42430 100644
--- a/toonz/sources/toonz/dvitemview.cpp
+++ b/toonz/sources/toonz/dvitemview.cpp
@@ -1415,8 +1415,7 @@ void DvItemViewerPanel::setThumbnailsView() {
//-----------------------------------------------------------------------------
void DvItemViewerPanel::exportFileList() {
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
TFilePath fp;
if (scene) fp = scene->decodeFilePath(project->getFolder(TProject::Extras));
diff --git a/toonz/sources/toonz/exportlevelpopup.cpp b/toonz/sources/toonz/exportlevelpopup.cpp
index 8e5b3e613..d8586171f 100644
--- a/toonz/sources/toonz/exportlevelpopup.cpp
+++ b/toonz/sources/toonz/exportlevelpopup.cpp
@@ -686,8 +686,7 @@ bool ExportLevelPopup::execute() {
void ExportLevelPopup::initFolder() {
TFilePath fp;
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
if (scene) fp = scene->decodeFilePath(TFilePath("+drawings"));
diff --git a/toonz/sources/toonz/exportscenepopup.cpp b/toonz/sources/toonz/exportscenepopup.cpp
index ed6b98f43..47c67621c 100644
--- a/toonz/sources/toonz/exportscenepopup.cpp
+++ b/toonz/sources/toonz/exportscenepopup.cpp
@@ -146,7 +146,7 @@ ExportSceneDvDirModelProjectNode::createExposeSceneNode(DvDirModelNode *parent,
node = new ExportSceneDvDirModelFileFolderNode(parent, path);
if (path.getName().find("_files") == std::string::npos)
node->enableRename(true);
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(
TProjectManager::instance()->projectFolderToProjectPath(getPath()));
int k = project->getFolderIndexFromPath(node->getPath());
@@ -699,9 +699,9 @@ TFilePath ExportScenePopup::createNewProject() {
return TFilePath();
}
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = pm->getCurrentProject();
assert(currentProject);
int i;
for (i = 0; i < (int)currentProject->getFolderCount(); i++)
diff --git a/toonz/sources/toonz/filebrowsermodel.cpp b/toonz/sources/toonz/filebrowsermodel.cpp
index 31054167a..bb8aaf054 100644
--- a/toonz/sources/toonz/filebrowsermodel.cpp
+++ b/toonz/sources/toonz/filebrowsermodel.cpp
@@ -706,7 +706,7 @@ void DvDirVersionControlProjectNode::refreshChildren() {
DvDirModelFileFolderNode::refreshChildren();
int i;
TProjectManager *pm = TProjectManager::instance();
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(getProjectPath());
for (i = 0; i < getChildCount(); i++) {
DvDirModelFileFolderNode *node =
@@ -716,7 +716,6 @@ void DvDirVersionControlProjectNode::refreshChildren() {
node->setIsProjectFolder(k >= 0);
}
}
- delete project;
}
//-----------------------------------------------------------------------------
@@ -725,7 +724,7 @@ void DvDirVersionControlProjectNode::getChildrenNames(
std::vector<std::wstring> &names) const {
DvDirVersionControlNode::getChildrenNames(names);
TProjectManager *pm = TProjectManager::instance();
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(getProjectPath());
int i;
for (i = 0; i < project->getFolderCount(); i++) {
@@ -736,7 +735,6 @@ void DvDirVersionControlProjectNode::getChildrenNames(
names.push_back(L"+" + ::to_wstring(folderName));
}
}
- delete project;
}
//=============================================================================
@@ -789,7 +787,7 @@ void DvDirModelProjectNode::refreshChildren() {
DvDirModelFileFolderNode::refreshChildren();
int i;
TProjectManager *pm = TProjectManager::instance();
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(getProjectPath());
for (i = 0; i < getChildCount(); i++) {
DvDirModelFileFolderNode *node =
@@ -799,7 +797,6 @@ void DvDirModelProjectNode::refreshChildren() {
node->setIsProjectFolder(k >= 0);
}
}
- delete project;
}
//-----------------------------------------------------------------------------
@@ -808,7 +805,7 @@ void DvDirModelProjectNode::getChildrenNames(
std::vector<std::wstring> &names) const {
DvDirModelFileFolderNode::getChildrenNames(names);
TProjectManager *pm = TProjectManager::instance();
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(getProjectPath());
int i;
for (i = 0; i < project->getFolderCount(); i++) {
@@ -819,7 +816,6 @@ void DvDirModelProjectNode::getChildrenNames(
names.push_back(L"+" + ::to_wstring(folderName));
}
}
- delete project;
}
//-----------------------------------------------------------------------------
@@ -827,12 +823,11 @@ void DvDirModelProjectNode::getChildrenNames(
DvDirModelNode *DvDirModelProjectNode::makeChild(std::wstring name) {
if (name != L"" && name[0] == L'+') {
TProjectManager *pm = TProjectManager::instance();
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(getProjectPath());
std::string folderName = ::to_string(name.substr(1));
TFilePath folderPath = project->getFolder(folderName);
DvDirModelNode *node = new DvDirModelFileFolderNode(this, name, folderPath);
- delete project;
return node;
} else
return DvDirModelFileFolderNode::makeChild(name);
diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp
index ef8486105..46fafd050 100644
--- a/toonz/sources/toonz/filebrowserpopup.cpp
+++ b/toonz/sources/toonz/filebrowserpopup.cpp
@@ -540,7 +540,7 @@ void LoadScenePopup::initFolder() { setInitialFolderByCurrentRoom(); }
void LoadScenePopup::setInitialFolderByCurrentRoom() {
QString roomName = TApp::instance()->getCurrentRoomName();
- TProjectP project = TProjectManager::instance()->getCurrentProject();
+ auto project = TProjectManager::instance()->getCurrentProject();
TFilePath scenePath;
if (roomName == "Cleanup" || roomName == "InknPaint")
scenePath = project->getFolder(TProject::Drawings, true);
@@ -1291,8 +1291,7 @@ bool LoadLevelPopup::execute() {
void LoadLevelPopup::initFolder() {
TFilePath fp;
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
if (scene) fp = scene->decodeFilePath(project->getProjectFolder());
@@ -1673,8 +1672,8 @@ bool SaveLevelAsPopup::execute() {
}
void SaveLevelAsPopup::initFolder() {
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project =
+ TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
TFilePath fp;
if (scene) fp = scene->decodeFilePath(project->getFolder(TProject::Drawings));
@@ -2191,8 +2190,7 @@ bool ImportMagpieFilePopup::execute() {
}
void ImportMagpieFilePopup::initFolder() {
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
TFilePath fp;
if (scene) fp = scene->decodeFilePath(project->getFolder(TProject::Drawings));
@@ -2231,8 +2229,7 @@ bool BrowserPopup::execute() {
void BrowserPopup::initFolder(TFilePath path) {
// if the path is empty
if (path.isEmpty()) {
- TProject *project =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene();
if (scene)
setFolder(scene->decodeFilePath(project->getFolder(TProject::Drawings)));
diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp
index 198155867..6a88aea89 100644
--- a/toonz/sources/toonz/iocommand.cpp
+++ b/toonz/sources/toonz/iocommand.cpp
@@ -784,7 +784,7 @@ void ChildLevelResourceImporter::process(TXshSoundLevel *sl) {
TXshLevel *loadChildLevel(ToonzScene *parentScene, TFilePath actualPath,
int row, int &col,
ResourceImportDialog &importStrategy) {
- TProjectP project = TProjectManager::instance()->loadSceneProject(actualPath);
+ auto project = TProjectManager::instance()->loadSceneProject(actualPath);
// In Tab mode we don't need the project. Otherwise if it is not available
// we must exit
@@ -793,7 +793,7 @@ TXshLevel *loadChildLevel(ToonzScene *parentScene, TFilePath actualPath,
// load the subxsheet
ToonzScene scene;
scene.loadTnzFile(actualPath);
- scene.setProject(project.getPointer());
+ scene.setProject(project);
std::wstring subSceneName = actualPath.getWideName();
// camera settings. get the child camera ...
@@ -1833,19 +1833,17 @@ bool IoCmd::loadScene(ToonzScene &scene, const TFilePath &scenePath,
if (!TSystem::doesExistFileOrLevel(scenePath)) return false;
scene.load(scenePath);
// import if needed
- TProjectManager *pm = TProjectManager::instance();
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
if (!scene.getProject()) return false;
if (scene.getProject()->getProjectPath() !=
currentProject->getProjectPath()) {
ResourceImportDialog resourceLoader;
// resourceLoader.setImportEnabled(true);
- ResourceImporter importer(&scene, currentProject.getPointer(),
- resourceLoader);
+ ResourceImporter importer(&scene, currentProject, resourceLoader);
SceneResources resources(&scene, scene.getXsheet());
resources.accept(&importer);
scene.setScenePath(importer.getImportedScenePath());
- scene.setProject(currentProject.getPointer());
+ scene.setProject(currentProject);
}
return true;
}
@@ -1893,8 +1891,8 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,
TSystem::removeFileOrLevel(scenePathTemp);
}
- TProjectManager *pm = TProjectManager::instance();
- TProjectP sceneProject = pm->loadSceneProject(scenePath);
+ TProjectManager *pm = TProjectManager::instance();
+ auto sceneProject = pm->loadSceneProject(scenePath);
if (!sceneProject) {
QString msg;
msg = QObject::tr(
@@ -1963,18 +1961,16 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,
/*-- プログレス表示を行いながらLoad --*/
scene->load(scenePath);
// import if needed
- TProjectManager *pm = TProjectManager::instance();
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
if (!scene->getProject() || scene->getProject()->getProjectPath() !=
currentProject->getProjectPath()) {
ResourceImportDialog resourceLoader;
// resourceLoader.setImportEnabled(true);
- ResourceImporter importer(scene, currentProject.getPointer(),
- resourceLoader);
+ ResourceImporter importer(scene, currentProject, resourceLoader);
SceneResources resources(scene, scene->getXsheet());
resources.accept(&importer);
scene->setScenePath(importer.getImportedScenePath());
- scene->setProject(currentProject.getPointer());
+ scene->setProject(currentProject);
}
VersionControlManager::instance()->setFrameRange(scene->getLevelSet());
} catch (...) {
@@ -1987,9 +1983,9 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,
DVGui::warning(msg);
}
printf("%s:%s end load:\n", __FILE__, __FUNCTION__);
- TProject *project = scene->getProject();
+ auto project = scene->getProject();
if (!project) {
- project = new TProject();
+ project = std::make_shared<TProject>();
project->setFolder("project", scenePath);
scene->setProject(project);
}
diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp
index 68671ba4e..0b0e79685 100644
--- a/toonz/sources/toonz/main.cpp
+++ b/toonz/sources/toonz/main.cpp
@@ -664,8 +664,8 @@ int main(int argc, char *argv[]) {
// load script
if (TFileStatus(loadFilePath).doesExist()) {
// find project for this script file
- TProjectManager *pm = TProjectManager::instance();
- TProjectP sceneProject = pm->loadSceneProject(loadFilePath);
+ TProjectManager *pm = TProjectManager::instance();
+ auto sceneProject = pm->loadSceneProject(loadFilePath);
TFilePath oldProjectPath;
if (!sceneProject) {
std::cerr << QObject::tr(
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index bd7a4efe6..f23d18649 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -488,7 +488,7 @@ void MainWindow::changeWindowTitle() {
ToonzScene *scene = app->getCurrentScene()->getScene();
if (!scene) return;
- TProject *project = scene->getProject();
+ auto project = scene->getProject();
QString projectName = QString::fromStdString(project->getName().getName());
QString sceneName = QString::fromStdWString(scene->getSceneName());
diff --git a/toonz/sources/toonz/projectpopup.cpp b/toonz/sources/toonz/projectpopup.cpp
index a08289ef2..fe536788f 100644
--- a/toonz/sources/toonz/projectpopup.cpp
+++ b/toonz/sources/toonz/projectpopup.cpp
@@ -452,7 +452,7 @@ void ProjectPopup::updateChooseProjectCombo() {
}
}
// Add in project of current project if outside known Project root folders
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = pm->getCurrentProject();
TFilePath currentProjectFP = currentProject->getProjectPath();
if (m_projectPaths.indexOf(currentProjectFP) == -1) {
m_projectPaths.push_back(currentProjectFP);
@@ -469,7 +469,7 @@ void ProjectPopup::updateChooseProjectCombo() {
//-----------------------------------------------------------------------------
-void ProjectPopup::updateFieldsFromProject(TProject *project) {
+void ProjectPopup::updateFieldsFromProject(std::shared_ptr<TProject> project) {
m_nameFld->setText(toQString(project->getName()));
int i;
for (i = 0; i < m_folderFlds.size(); i++) {
@@ -501,7 +501,7 @@ void ProjectPopup::updateFieldsFromProject(TProject *project) {
//-----------------------------------------------------------------------------
-void ProjectPopup::updateProjectFromFields(TProject *project) {
+void ProjectPopup::updateProjectFromFields(std::shared_ptr<TProject> project) {
int i;
for (i = 0; i < m_folderFlds.size(); i++) {
std::string folderName = m_folderFlds[i].first;
@@ -534,8 +534,8 @@ void ProjectPopup::updateProjectFromFields(TProject *project) {
//-----------------------------------------------------------------------------
void ProjectPopup::onProjectSwitched() {
- TProjectP currentProject = TProjectManager::instance()->getCurrentProject();
- updateFieldsFromProject(currentProject.getPointer());
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
+ updateFieldsFromProject(currentProject);
}
//-----------------------------------------------------------------------------
@@ -545,8 +545,8 @@ void ProjectPopup::showEvent(QShowEvent *) {
DvDirModelNode *rootNode = m_model->getNode(QModelIndex());
QModelIndex index = m_model->getIndexByNode(rootNode);
m_model->refreshFolderChild(index);
- TProjectP currentProject = TProjectManager::instance()->getCurrentProject();
- updateFieldsFromProject(currentProject.getPointer());
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
+ updateFieldsFromProject(currentProject);
updateChooseProjectCombo();
}
@@ -605,16 +605,15 @@ void ProjectSettingsPopup::onChooseProjectChanged(int index) {
TProjectManager *pm = TProjectManager::instance();
pm->setCurrentProjectPath(projectFp);
- TProject *projectP =
- TProjectManager::instance()->getCurrentProject().getPointer();
+ auto project = TProjectManager::instance()->getCurrentProject();
// In case the project file was upgraded to current version, save it now
- if (projectP->getProjectPath() != projectFp) {
- m_projectPaths[index] = projectP->getProjectPath();
- projectP->save();
+ if (project->getProjectPath() != projectFp) {
+ m_projectPaths[index] = project->getProjectPath();
+ project->save();
}
- updateFieldsFromProject(projectP);
+ updateFieldsFromProject(project);
IoCmd::saveSceneIfNeeded("Change project");
IoCmd::newScene();
}
@@ -622,8 +621,8 @@ void ProjectSettingsPopup::onChooseProjectChanged(int index) {
//-----------------------------------------------------------------------------
void ProjectSettingsPopup::onSomethingChanged() {
- TProjectP project = TProjectManager::instance()->getCurrentProject();
- updateProjectFromFields(project.getPointer());
+ auto project = TProjectManager::instance()->getCurrentProject();
+ updateProjectFromFields(project);
try {
project->save();
} catch (TSystemException se) {
@@ -716,9 +715,9 @@ void ProjectCreatePopup::createProject() {
TFilePath projectFolder = currentProjectRoot + projectName;
TFilePath projectPath = pm->projectFolderToProjectPath(projectFolder);
- TProject *project = new TProject();
+ auto project = std::shared_ptr<TProject>();
updateProjectFromFields(project);
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = pm->getCurrentProject();
project->setSceneProperties(currentProject->getSceneProperties());
try {
bool isSaved = project->save(projectPath);
diff --git a/toonz/sources/toonz/projectpopup.h b/toonz/sources/toonz/projectpopup.h
index f13e415ba..96e31f607 100644
--- a/toonz/sources/toonz/projectpopup.h
+++ b/toonz/sources/toonz/projectpopup.h
@@ -131,8 +131,8 @@ public:
// da TProjectManager::Listener
void onProjectChanged() override {}
- void updateProjectFromFields(TProject *);
- void updateFieldsFromProject(TProject *);
+ void updateProjectFromFields(std::shared_ptr<TProject>);
+ void updateFieldsFromProject(std::shared_ptr<TProject>);
void updateChooseProjectCombo();
diff --git a/toonz/sources/toonz/startuppopup.cpp b/toonz/sources/toonz/startuppopup.cpp
index 3d93b22c7..cdf1f49d5 100644
--- a/toonz/sources/toonz/startuppopup.cpp
+++ b/toonz/sources/toonz/startuppopup.cpp
@@ -629,7 +629,7 @@ void StartupPopup::updateProjectCB() {
}
}
// Add in project of current project if outside known Project root folders
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = pm->getCurrentProject();
TFilePath currentProjectFP = currentProject->getProjectPath();
if (m_projectPaths.indexOf(currentProjectFP) == -1) {
m_projectPaths.push_back(currentProjectFP);
@@ -663,7 +663,7 @@ void StartupPopup::onProjectChanged(int index) {
TProjectManager *pm = TProjectManager::instance();
pm->setCurrentProjectPath(projectFp);
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = pm->getCurrentProject();
// In case the project file was upgraded to current version, save it now
if (currentProject->getProjectPath() != projectFp) {
@@ -677,8 +677,7 @@ void StartupPopup::onProjectChanged(int index) {
//-----------------------------------------------------------------------------
void StartupPopup::setupProjectChange() {
- TProjectManager *pm = TProjectManager::instance();
- TProjectP currentProject = pm->getCurrentProject();
+ auto currentProject = TProjectManager::instance()->getCurrentProject();
IoCmd::newScene();
m_pathFld->setPath(TApp::instance()
diff --git a/toonz/sources/toonz/viewerpane.cpp b/toonz/sources/toonz/viewerpane.cpp
index e0d4e6ade..34db9edf4 100644
--- a/toonz/sources/toonz/viewerpane.cpp
+++ b/toonz/sources/toonz/viewerpane.cpp
@@ -608,7 +608,7 @@ void BaseViewerPanel::changeWindowTitle() { // �v�m�F
// if the frame type is "scene editing"
if (app->getCurrentFrame()->isEditingScene()) {
- TProject *project = scene->getProject();
+ auto project = scene->getProject();
QString sceneName = QString::fromStdWString(scene->getSceneName());
if (sceneName.isEmpty()) sceneName = tr("Untitled");
if (app->getCurrentScene()->getDirtyFlag()) sceneName += QString("*");
diff --git a/toonz/sources/toonz/xdtsio.cpp b/toonz/sources/toonz/xdtsio.cpp
index 8f57c4fcf..dbdfa9f09 100644
--- a/toonz/sources/toonz/xdtsio.cpp
+++ b/toonz/sources/toonz/xdtsio.cpp
@@ -519,10 +519,9 @@ bool XdtsIo::loadXdtsScene(ToonzScene *scene, const TFilePath &scenePath) {
scene->clear();
- TProjectManager *pm = TProjectManager::instance();
- TProjectP sceneProject = pm->loadSceneProject(scenePath);
+ auto sceneProject = TProjectManager::instance()->loadSceneProject(scenePath);
if (!sceneProject) return false;
- scene->setProject(sceneProject.getPointer());
+ scene->setProject(sceneProject);
std::string sceneFileName = scenePath.getName() + ".tnz";
scene->setScenePath(scenePath.getParentDir() + sceneFileName);
// set the current scene here in order to use $scenefolder node properly
diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cpp
index 9ec082618..9b3bcad49 100644
--- a/toonz/sources/toonz/xsheetviewer.cpp
+++ b/toonz/sources/toonz/xsheetviewer.cpp
@@ -1775,7 +1775,7 @@ void XsheetViewer::changeWindowTitle() {
TApp *app = TApp::instance();
ToonzScene *scene = app->getCurrentScene()->getScene();
if (!scene || !app->getCurrentFrame()->isEditingScene()) return;
- TProject *project = scene->getProject();
+ auto project = scene->getProject();
QString sceneName = QString::fromStdWString(scene->getSceneName());
if (sceneName.isEmpty()) sceneName = tr("Untitled");
if (app->getCurrentScene()->getDirtyFlag()) sceneName += QString("*");
diff --git a/toonz/sources/toonzlib/sceneresources.cpp b/toonz/sources/toonzlib/sceneresources.cpp
index 81cd4acc3..b3c4f8ff5 100644
--- a/toonz/sources/toonzlib/sceneresources.cpp
+++ b/toonz/sources/toonzlib/sceneresources.cpp
@@ -565,7 +565,7 @@ void SceneResources::getDirtyResources(QStringList &dirtyResources) {
//
//-----------------------------------------------------------------------------
-ResourceImporter::ResourceImporter(ToonzScene *scene, TProject *dstProject,
+ResourceImporter::ResourceImporter(ToonzScene *scene, std::shared_ptr<TProject> dstProject,
ResourceImportStrategy &importStrategy)
: m_scene(scene)
, m_dstProject(dstProject)
diff --git a/toonz/sources/toonzlib/studiopalette.cpp b/toonz/sources/toonzlib/studiopalette.cpp
index 039bb1649..50c1a7ec5 100644
--- a/toonz/sources/toonzlib/studiopalette.cpp
+++ b/toonz/sources/toonzlib/studiopalette.cpp
@@ -218,11 +218,11 @@ TFilePath StudioPalette::getLevelPalettesRoot() {
//-------------------------------------------------------------------
TFilePath StudioPalette::getProjectPalettesRoot() {
- TProjectP p = TProjectManager::instance()->getCurrentProject();
- TFilePath folderName = p->getFolder(TProject::Palettes);
+ auto project = TProjectManager::instance()->getCurrentProject();
+ TFilePath folderName = project->getFolder(TProject::Palettes);
if (folderName.isEmpty()) return TFilePath();
if (folderName.isAbsolute()) return folderName;
- return p->getProjectFolder() + folderName;
+ return project->getProjectFolder() + folderName;
}
//-------------------------------------------------------------------
diff --git a/toonz/sources/toonzlib/toonzscene.cpp b/toonz/sources/toonzlib/toonzscene.cpp
index 203e7815a..bce5788e3 100644
--- a/toonz/sources/toonzlib/toonzscene.cpp
+++ b/toonz/sources/toonzlib/toonzscene.cpp
@@ -281,8 +281,7 @@ ToonzScene::ToonzScene()
m_childStack = new ChildStack(this);
m_properties = new TSceneProperties();
m_levelSet = new TLevelSet();
- m_project = new TProject();
- m_project->addRef();
+ m_project = std::make_shared<TProject>();
}
//-----------------------------------------------------------------------------
@@ -292,9 +291,6 @@ ToonzScene::~ToonzScene() {
delete m_levelSet;
delete m_childStack;
delete m_contentHistory;
-
- assert(m_project);
- if (m_project) m_project->release();
}
//-----------------------------------------------------------------------------
@@ -319,19 +315,14 @@ void ToonzScene::clear() {
//-----------------------------------------------------------------------------
-void ToonzScene::setProject(TProject *project) {
+void ToonzScene::setProject(std::shared_ptr<TProject> project) {
assert(project);
-
- if (project != m_project) {
- if (project) project->addRef();
- if (m_project) m_project->release();
- m_project = project;
- }
+ m_project = project;
}
//-----------------------------------------------------------------------------
-TProject *ToonzScene::getProject() const { return m_project; }
+std::shared_ptr<TProject> ToonzScene::getProject() const { return m_project; }
//-----------------------------------------------------------------------------
@@ -394,11 +385,11 @@ int ToonzScene::loadFrameCount(const TFilePath &fp) {
void ToonzScene::loadNoResources(const TFilePath &fp) {
clear();
- TProjectManager *pm = TProjectManager::instance();
- TProjectP sceneProject = pm->loadSceneProject(fp);
+ TProjectManager *pm = TProjectManager::instance();
+ auto sceneProject = pm->loadSceneProject(fp);
if (!sceneProject) return;
- setProject(sceneProject.getPointer());
+ setProject(sceneProject);
loadTnzFile(fp);
getXsheet()->updateFrameCount();
@@ -1250,7 +1241,7 @@ TXshLevel *ToonzScene::loadLevel(const TFilePath &actualPath,
//-----------------------------------------------------------------------------
TFilePath ToonzScene::decodeFilePath(const TFilePath &path) const {
- TProject *project = getProject();
+ auto project = getProject();
bool projectIsEmpty = project->getFolderCount() ? false : true;
TFilePath fp = path;
@@ -1348,7 +1339,7 @@ TFilePath ToonzScene::decodeFilePath(const TFilePath &path) const {
TFilePath ToonzScene::codeFilePath(const TFilePath &path) const {
TFilePath fp(path);
- TProject *project = getProject();
+ auto project = getProject();
Preferences::PathAliasPriority priority =
Preferences::instance()->getPathAliasPriority();
@@ -1391,7 +1382,7 @@ bool ToonzScene::codeFilePathWithSceneFolder(TFilePath &path) const {
TFilePath ToonzScene::getDefaultLevelPath(int levelType,
std::wstring levelName) const {
- TProject *project = getProject();
+ auto project = getProject();
assert(project);
TFilePath levelPath;
switch (levelType) {
@@ -1478,7 +1469,7 @@ TFilePath ToonzScene::decodeSavePath(TFilePath path) const {
//-----------------------------------------------------------------------------
bool ToonzScene::isExternPath(const TFilePath &fp) const {
- TProject *project = m_project;
+ auto project = m_project;
assert(project);
for (int i = 0; i < project->getFolderCount(); i++) {
if (project->getFolderName(i) == "scenes") continue;
diff --git a/toonz/sources/toonzlib/tproject.cpp b/toonz/sources/toonzlib/tproject.cpp
index 95ea40095..83b18e6a1 100644
--- a/toonz/sources/toonzlib/tproject.cpp
+++ b/toonz/sources/toonzlib/tproject.cpp
@@ -59,7 +59,7 @@ const std::string
//! Default project name
const TFilePath TProject::SandboxProjectName("sandbox");
-TProjectP currentProject;
+std::shared_ptr<TProject> currentProject;
//===================================================================
@@ -962,7 +962,7 @@ void TProjectManager::getFolderNames(std::vector<std::string> &names) {
void TProjectManager::setCurrentProjectPath(const TFilePath &fp) {
assert(TProject::isAProjectPath(fp));
currentProjectPath = ::to_string(fp.getWideString());
- currentProject = TProjectP();
+ currentProject = std::make_shared<TProject>();
notifyListeners();
}
@@ -994,11 +994,11 @@ TFilePath TProjectManager::getCurrentProjectPath() {
If a current TProject() doesn't exist, load the project in the the
current project path.
*/
-TProjectP TProjectManager::getCurrentProject() {
- if (currentProject.getPointer() == 0) {
+std::shared_ptr<TProject> TProjectManager::getCurrentProject() {
+ if (!currentProject) {
TFilePath fp = getCurrentProjectPath();
assert(TProject::isAProjectPath(fp));
- currentProject = new TProject();
+ currentProject = std::make_shared<TProject>();
currentProject->load(fp);
// update TFilePath condition on loading the current project
@@ -1016,7 +1016,7 @@ TProjectP TProjectManager::getCurrentProject() {
folder of a project root.
\note \b scenePath must be an absolute path.\n
Creates a new TProject. The caller gets ownership.*/
-TProjectP TProjectManager::loadSceneProject(const TFilePath &scenePath) {
+std::shared_ptr<TProject> TProjectManager::loadSceneProject(const TFilePath &scenePath) {
// cerca il file scenes.xml nella stessa directory della scena
// oppure in una
// directory superiore
@@ -1069,8 +1069,9 @@ TProjectP TProjectManager::loadSceneProject(const TFilePath &scenePath) {
}
if (!TFileStatus(projectPath).doesExist()) return 0;
- TProject *project = new TProject();
+ auto project = std::make_shared<TProject>();
project->load(projectPath);
+
return project;
}
@@ -1108,7 +1109,7 @@ void TProjectManager::removeListener(Listener *listener) {
\see TSceneProperties
*/
void TProjectManager::initializeScene(ToonzScene *scene) {
- TProject *project = scene->getProject();
+ auto project = scene->getProject();
TSceneProperties *sprop = scene->getProperties();
TFilePath currentProjectPath = getCurrentProjectPath();
@@ -1135,7 +1136,7 @@ void TProjectManager::saveTemplate(ToonzScene *scene) {
// camera capture's "save in" path is saved in env, not in the project
props.setCameraCaptureSaveInPath(TFilePath());
- TProjectP currentProject = getCurrentProject();
+ auto currentProject = getCurrentProject();
currentProject->setSceneProperties(props);
currentProject->save();
}
@@ -1145,7 +1146,7 @@ void TProjectManager::saveTemplate(ToonzScene *scene) {
void TProjectManager::createSandboxIfNeeded() {
TFilePath path = getSandboxProjectPath();
if (!TFileStatus(path).doesExist()) {
- TProjectP project = createStandardProject();
+ auto project = createStandardProject();
try {
project->save(path);
} catch (...) {
@@ -1158,8 +1159,8 @@ void TProjectManager::createSandboxIfNeeded() {
A standard project is a project containing the standard named and
constant folder.
\see TProject. */
-TProjectP TProjectManager::createStandardProject() {
- TProject *project = new TProject();
+std::shared_ptr<TProject> TProjectManager::createStandardProject() {
+ auto project = std::make_shared<TProject>();
// set default folders (+drawings, ecc.)
std::vector<std::string> names;
getFolderNames(names);