Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Break dependency cycle introduced at 50f3321...

Browse Source 
... This only cuts and pastes some functions from FileNames to another new file
and namespace, and changes namespace qualifiers where they are called.

The cycle resulted because of the need to include widgets/ErrorDialog.h
This commit is contained in:
Paul Licameli
2021-01-14 10:50:06 -05:00
parent 086cacad76
commit 43574553fc
13 changed files with 202 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ProjectFileIO.cpp
View File

@@ -20,13 +20,13 @@ Paul Licameli split from AudacityProject.cpp
#include "ActiveProjects.h"
#include "DBConnection.h"
#include "FileNames.h"
#include "Project.h"
#include "ProjectFileIORegistry.h"
#include "ProjectSerializer.h"
#include "ProjectSettings.h"
#include "SampleBlock.h"
#include "Tags.h"
#include "TempDirectory.h"
#include "TimeTrack.h"
#include "ViewInfo.h"
#include "WaveTrack.h"
@@ -309,7 +309,7 @@ bool ProjectFileIO::OpenConnection(FilePath fileName /* = {} */)
fileName = GetFileName();
if (fileName.empty())
{
fileName = FileNames::UnsavedProjectFileName();
fileName = TempDirectory::UnsavedProjectFileName();
isTemp = true;
}
}
@@ -317,7 +317,7 @@ bool ProjectFileIO::OpenConnection(FilePath fileName /* = {} */)
{
// If this project resides in the temporary directory, then we'll mark it
// as temporary.
wxFileName temp(FileNames::TempDir(), wxT(""));
wxFileName temp(TempDirectory::TempDir(), wxT(""));
wxFileName file(fileName);
file.SetFullName(wxT(""));
if (file == temp)
@@ -398,7 +398,7 @@ void ProjectFileIO::DiscardConnection()
if (mPrevTemporary)
{
// This is just a safety check.
wxFileName temp(FileNames::TempDir(), wxT(""));
wxFileName temp(TempDirectory::TempDir(), wxT(""));
wxFileName file(mPrevFileName);
file.SetFullName(wxT(""));
if (file == temp)
@@ -2278,7 +2278,7 @@ bool ProjectFileIO::CloseProject()
if (IsTemporary())
{
// This is just a safety check.
wxFileName temp(FileNames::TempDir(), wxT(""));
wxFileName temp(TempDirectory::TempDir(), wxT(""));
wxFileName file(filename);
file.SetFullName(wxT(""));
if (file == temp)