mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-18 00:54:19 +00:00
Code Activity

Use NullCheckedInvocation in more places

Browse source
This commit is contained in:
Tom Poole 2023-09-26 11:06:31 +01:00
parent 84750f2f2a
commit ff0cb4ad5b
46 changed files with 145 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

39
extras/Projucer/Source/CodeEditor/jucer_OpenDocumentManager.cpp
View file

@ -172,9 +172,7 @@ void OpenDocumentManager::saveIfNeededAndUserAgrees (OpenDocumentManager::Docume
{
if (! doc->needsSaving())
{
if (callback != nullptr)
callback (FileBasedDocument::savedOk);
NullCheckedInvocation::invoke (callback, FileBasedDocument::savedOk);
return;
}
@ -197,14 +195,12 @@ void OpenDocumentManager::saveIfNeededAndUserAgrees (OpenDocumentManager::Docume
if (parent == nullptr)
return;
if (callback != nullptr)
callback (hasSaved ? FileBasedDocument::savedOk : FileBasedDocument::failedToWriteToFile);
NullCheckedInvocation::invoke (callback, hasSaved ? FileBasedDocument::savedOk : FileBasedDocument::failedToWriteToFile);
});
return;
}
if (callback != nullptr)
callback (r == 2 ? FileBasedDocument::savedOk : FileBasedDocument::userCancelledSave);
NullCheckedInvocation::invoke (callback, r == 2 ? FileBasedDocument::savedOk : FileBasedDocument::userCancelledSave);
});
}
@ -233,9 +229,7 @@ void OpenDocumentManager::closeDocumentAsync (Document* doc, SaveIfNeeded saveIf
{
if (! documents.contains (doc))
{
if (callback != nullptr)
callback (true);
NullCheckedInvocation::invoke (callback, true);
return;
}
@ -249,16 +243,13 @@ void OpenDocumentManager::closeDocumentAsync (Document* doc, SaveIfNeeded saveIf
if (result != FileBasedDocument::savedOk)
{
if (callback != nullptr)
callback (false);
NullCheckedInvocation::invoke (callback, false);
return;
}
auto closed = parent->closeDocumentWithoutSaving (doc);
if (callback != nullptr)
callback (closed);
NullCheckedInvocation::invoke (callback, closed);
});
return;
@ -266,8 +257,7 @@ void OpenDocumentManager::closeDocumentAsync (Document* doc, SaveIfNeeded saveIf
auto closed = closeDocumentWithoutSaving (doc);
if (callback != nullptr)
callback (closed);
NullCheckedInvocation::invoke (callback, closed);
}
void OpenDocumentManager::closeFileWithoutSaving (const File& f)
@ -286,9 +276,7 @@ static void closeLastAsyncRecusrsive (WeakReference<OpenDocumentManager> parent,
if (lastIndex < 0)
{
if (callback != nullptr)
callback (true);
NullCheckedInvocation::invoke (callback, true);
return;
}
@ -301,9 +289,7 @@ static void closeLastAsyncRecusrsive (WeakReference<OpenDocumentManager> parent,
if (! closedSuccessfully)
{
if (callback != nullptr)
callback (false);
NullCheckedInvocation::invoke (callback, false);
return;
}
@ -334,9 +320,7 @@ void OpenDocumentManager::closeLastDocumentUsingProjectRecursive (WeakReference<
if (! closedSuccessfully)
{
if (callback != nullptr)
callback (false);
NullCheckedInvocation::invoke (callback, false);
return;
}
@ -348,8 +332,7 @@ void OpenDocumentManager::closeLastDocumentUsingProjectRecursive (WeakReference<
}
}
if (callback != nullptr)
callback (true);
NullCheckedInvocation::invoke (callback, true);
}
void OpenDocumentManager::closeAllDocumentsUsingProjectAsync (Project& project, SaveIfNeeded askUserToSave, std::function<void (bool)> callback)