diff --git a/GUI/coregui/mainwindow/SaveService.cpp b/GUI/coregui/mainwindow/SaveService.cpp index 2c8c14ac8e3537245dbef1de2618519f0c581e7c..14c9b4ff9c8d146fec0715fb0d20ac4e5b53c17f 100644 --- a/GUI/coregui/mainwindow/SaveService.cpp +++ b/GUI/coregui/mainwindow/SaveService.cpp @@ -148,7 +148,7 @@ void SaveService::process_queue() // saving project file in a main thread const bool isAutosave = project_file_name.contains(ProjectUtils::autosaveSubdir()); - m_document->save_project_file(project_file_name, isAutosave); + m_document->saveProjectFile(project_file_name, isAutosave); if (m_document->hasData()) { // saving heavy data in separate thread diff --git a/GUI/coregui/mainwindow/SaveThread.cpp b/GUI/coregui/mainwindow/SaveThread.cpp index 08fde575e3f234ebc82d11492b0069d6f74a3504..2e132a0af4503f0b2db451506ebe47b31a5f93ca 100644 --- a/GUI/coregui/mainwindow/SaveThread.cpp +++ b/GUI/coregui/mainwindow/SaveThread.cpp @@ -26,7 +26,7 @@ SaveThread::~SaveThread() void SaveThread::run() { ASSERT(m_document); - m_document->save_project_data(m_projectFile); + m_document->saveProjectData(m_projectFile); emit saveReady(); } diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp index c1ca74073ba044e75d70278a59ec4d4ae7f88b7d..8f387b5a7d0c961894db864029c930b43214b8f9 100644 --- a/GUI/coregui/mainwindow/projectdocument.cpp +++ b/GUI/coregui/mainwindow/projectdocument.cpp @@ -93,11 +93,11 @@ void ProjectDocument::setApplicationModels(ApplicationModels* applicationModels) void ProjectDocument::save(const QString& project_file_name, bool autoSave) { - save_project_data(project_file_name); - save_project_file(project_file_name, autoSave); + saveProjectData(project_file_name); + saveProjectFile(project_file_name, autoSave); } -void ProjectDocument::save_project_file(const QString& project_file_name, bool autoSave) +void ProjectDocument::saveProjectFile(const QString& project_file_name, bool autoSave) { QElapsedTimer timer; timer.start(); @@ -118,7 +118,7 @@ void ProjectDocument::save_project_file(const QString& project_file_name, bool a } } -void ProjectDocument::save_project_data(const QString& project_file_name) +void ProjectDocument::saveProjectData(const QString& project_file_name) { QElapsedTimer timer; timer.start(); @@ -126,7 +126,7 @@ void ProjectDocument::save_project_data(const QString& project_file_name) m_dataService->save(ProjectUtils::projectDir(project_file_name)); } -void ProjectDocument::load(const QString& project_file_name) +void ProjectDocument::loadDataFile(const QString& project_file_name) { QElapsedTimer timer1, timer2; timer1.start(); diff --git a/GUI/coregui/mainwindow/projectdocument.h b/GUI/coregui/mainwindow/projectdocument.h index d7d696c7dd16d6dba1754985b4fcd378a1709abc..fd612e850e3c68f3bdbdd37f4788f971c32107ad 100644 --- a/GUI/coregui/mainwindow/projectdocument.h +++ b/GUI/coregui/mainwindow/projectdocument.h @@ -58,10 +58,10 @@ public: void save(const QString& project_file_name, bool autoSave = false); - void save_project_file(const QString& project_file_name, bool autoSave = false); - void save_project_data(const QString& project_file_name); + void saveProjectFile(const QString& project_file_name, bool autoSave = false); + void saveProjectData(const QString& project_file_name); - void load(const QString& project_file_name); + void loadDataFile(const QString& project_file_name); bool hasValidNameAndPath(); diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp index 152fc581292cfd628bd0a8f85d69645b9c755ed0..248b979d987a7dcb5ebe774cf4804e7e67580d7c 100644 --- a/GUI/coregui/mainwindow/projectmanager.cpp +++ b/GUI/coregui/mainwindow/projectmanager.cpp @@ -380,12 +380,12 @@ void ProjectManager::loadProject(const QString& projectFileName) if (useAutosave && restoreProjectDialog(projectFileName)) { QApplication::setOverrideCursor(Qt::WaitCursor); - m_project_document->load(ProjectUtils::autosaveName(projectFileName)); + m_project_document->loadDataFile(ProjectUtils::autosaveName(projectFileName)); m_project_document->setProjectFileName(projectFileName); m_project_document->setModified(true); } else { QApplication::setOverrideCursor(Qt::WaitCursor); - m_project_document->load(projectFileName); + m_project_document->loadDataFile(projectFileName); } QApplication::restoreOverrideCursor(); } diff --git a/Tests/UnitTests/GUI/TestDataItemViews.cpp b/Tests/UnitTests/GUI/TestDataItemViews.cpp index 311fb5b8ac7f8488978dd7bad5df954902932098..b0a818f55547d82b4007fffe95751ffbbd24050b 100644 --- a/Tests/UnitTests/GUI/TestDataItemViews.cpp +++ b/Tests/UnitTests/GUI/TestDataItemViews.cpp @@ -147,7 +147,7 @@ TEST_F(TestDataItemViews, testSavingLinkedData) ProjectDocument document; document.setApplicationModels(&models); document.setLogger(&message_service); - document.load(projectFileName); + document.loadDataFile(projectFileName); SessionModel* real_data_model = models.realDataModel(); auto view_item = real_data_model->topItem<DataPropertyContainer>();