mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Misc cleanups relating to ScopedPointer

Browse source
This commit is contained in:
jules 2018-01-08 18:03:26 +00:00
parent edea094d7d
commit 3ec5c17bb1
13 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
extras/Projucer/Source/Application/Windows/jucer_EditorColourSchemeWindowComponent.h
View file

@ -35,9 +35,9 @@ public:
EditorColourSchemeWindowComponent()
{
if (getAppSettings().monospacedFontNames.size() == 0)
content = new AppearanceEditor::FontScanPanel();
content.reset (new AppearanceEditor::FontScanPanel());
else
content = new AppearanceEditor::EditorPanel();
content.reset (new AppearanceEditor::EditorPanel());
changeContent (content.get());
}
@ -54,10 +54,11 @@ public:
void changeContent (Component* newContent)
{
content = newContent;
addAndMakeVisible (content);
content.reset (newContent);
addAndMakeVisible (newContent);
content->setBounds (getLocalBounds().reduced (10));
}
private:
ScopedPointer<Component> content;

12
extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
View file

@ -184,7 +184,9 @@ public:
{
StringPairArray responseHeaders;
in = url.createInputStream (false, nullptr, nullptr, headers, 10000, &responseHeaders, &statusCode, 0);
in.reset (url.createInputStream (false, nullptr, nullptr, headers,
10000, &responseHeaders, &statusCode, 0));
if (in == nullptr || statusCode != 302)
break;
@ -355,11 +357,11 @@ public:
void buttonClicked (Button* clickedButton) override
{
if (DialogWindow* parentDialog = findParentComponentOfClass<DialogWindow>())
if (auto* parentDialog = findParentComponentOfClass<DialogWindow>())
{
if (clickedButton == overwriteButton) parentDialog->exitModalState (1);
else if (clickedButton == okButton) parentDialog->exitModalState (2);
else if (clickedButton == cancelButton) parentDialog->exitModalState (-1);
if (clickedButton == overwriteButton.get()) parentDialog->exitModalState (1);
else if (clickedButton == okButton.get()) parentDialog->exitModalState (2);
else if (clickedButton == cancelButton.get()) parentDialog->exitModalState (-1);
}
else
jassertfalse;

8
extras/Projucer/Source/Application/jucer_CommandLine.cpp
View file

@ -127,12 +127,12 @@ namespace
{
hideDockIcon();
File projectFile = getFileCheckingForExistence (fileToLoad);
auto projectFile = getFileCheckingForExistence (fileToLoad);
if (! projectFile.hasFileExtension (Project::projectFileExtension))
throw CommandLineError (projectFile.getFullPathName() + " isn't a valid jucer project file!");
project = new Project (projectFile);
project.reset (new Project (projectFile));
if (! project->loadFrom (projectFile, true))
{
@ -145,8 +145,8 @@ namespace
{
if (project != nullptr)
{
Result error (justSaveResources ? project->saveResourcesOnly (project->getFile())
: project->saveProject (project->getFile(), true));
auto error = justSaveResources ? project->saveResourcesOnly (project->getFile())
: project->saveProject (project->getFile(), true);
project.reset();

14
extras/Projucer/Source/CodeEditor/jucer_ItemPreviewComponent.h
View file

@ -87,21 +87,21 @@ private:
if (input != nullptr)
{
const int64 totalSize = input->getTotalLength();
auto totalSize = input->getTotalLength();
String formatName;
if (ImageFileFormat* format = ImageFileFormat::findImageFormatForStream (*input))
if (auto* format = ImageFileFormat::findImageFormatForStream (*input))
formatName = " " + format->getFormatName();
input.reset();
Image image (ImageCache::getFromFile (file));
auto image = ImageCache::getFromFile (file);
if (image.isValid())
{
DrawableImage* d = new DrawableImage();
auto* d = new DrawableImage();
d->setImage (image);
drawable = d;
drawable.reset (d);
facts.add (String (image.getWidth()) + " x " + String (image.getHeight()) + formatName);
}
@ -116,7 +116,7 @@ private:
ScopedPointer<XmlElement> svg (XmlDocument::parse (file));
if (svg != nullptr)
drawable = Drawable::createFromSVG (*svg);
drawable.reset (Drawable::createFromSVG (*svg));
}
facts.removeEmptyStrings (true);

14
extras/Projucer/Source/CodeEditor/jucer_SourceCodeEditor.cpp
View file

@ -38,7 +38,7 @@ CodeDocument& SourceCodeDocument::getCodeDocument()
{
if (codeDoc == nullptr)
{
codeDoc = new CodeDocument();
codeDoc.reset (new CodeDocument());
reloadInternal();
codeDoc->clearUndoHistory();
}
@ -48,7 +48,7 @@ CodeDocument& SourceCodeDocument::getCodeDocument()
Component* SourceCodeDocument::createEditor()
{
SourceCodeEditor* e = new SourceCodeEditor (this, getCodeDocument());
auto* e = new SourceCodeEditor (this, getCodeDocument());
applyLastState (*(e->editor));
return e;
}
@ -105,7 +105,7 @@ bool SourceCodeDocument::saveAs()
void SourceCodeDocument::updateLastState (CodeEditorComponent& editor)
{
lastState = new CodeEditorComponent::State (editor);
lastState.reset (new CodeEditorComponent::State (editor));
}
void SourceCodeDocument::applyLastState (CodeEditorComponent& editor) const
@ -169,7 +169,8 @@ void SourceCodeEditor::setEditor (GenericCodeEditorComponent* newEditor)
if (editor != nullptr)
editor->getDocument().removeListener (this);
addAndMakeVisible (editor = newEditor);
editor.reset (newEditor);
addAndMakeVisible (newEditor);
editor->setFont (AppearanceSettings::getDefaultCodeFont());
editor->setTabSize (4, true);
@ -458,10 +459,9 @@ void GenericCodeEditorComponent::showFindPanel()
{
if (findPanel == nullptr)
{
findPanel = new FindPanel();
findPanel.reset (new FindPanel());
findPanel->setCommandManager (&ProjucerApplication::getCommandManager());
addAndMakeVisible (findPanel);
addAndMakeVisible (findPanel.get());
resized();
}

2
extras/Projucer/Source/ComponentEditor/Documents/jucer_ButtonDocument.cpp
View file

@ -54,7 +54,7 @@ ButtonDocument::ButtonDocument (SourceCodeDocument* c)
for (int i = 7; --i >= 0;)
{
paintRoutines[i] = new PaintRoutine();
paintRoutines[i].reset (new PaintRoutine());
paintRoutines[i]->setDocument (this);
paintRoutines[i]->setBackgroundColour (Colours::transparentBlack);
}

4
extras/Projucer/Source/ComponentEditor/Documents/jucer_ComponentDocument.cpp
View file

@ -32,10 +32,10 @@
ComponentDocument::ComponentDocument (SourceCodeDocument* c)
: JucerDocument (c)
{
components = new ComponentLayout();
components.reset (new ComponentLayout());
components->setDocument (this);
backgroundGraphics = new PaintRoutine();
backgroundGraphics.reset (new PaintRoutine());
backgroundGraphics->setDocument (this);
}

2
extras/Projucer/Source/Licenses/jucer_LicenseController.h
View file

@ -105,7 +105,7 @@ private:
struct ModalCompletionCallback;
friend struct ModalCompletionCallback;
friend class ScopedPointer<LicenseThread>;
friend struct ContainerDeletePolicy<LicenseThread>;
friend struct LicenseThread;
//==============================================================================

6
modules/juce_core/memory/juce_OptionalScopedPointer.h
View file

@ -80,7 +80,7 @@ public:
if (object != objectToTransferFrom.object)
{
reset();
object = objectToTransferFrom.object;
object.reset (objectToTransferFrom.object.release());
}
shouldDelete = objectToTransferFrom.shouldDelete;
@ -101,7 +101,7 @@ public:
inline operator ObjectType*() const noexcept { return object.get(); }
/** Returns the object that this pointer is managing. */
inline ObjectType* get() const noexcept { return object; }
inline ObjectType* get() const noexcept { return object.get(); }
/** Returns the object that this pointer is managing. */
inline ObjectType& operator*() const noexcept { return *object; }
@ -136,7 +136,7 @@ public:
*/
void set (ObjectType* newObject, bool takeOwnership)
{
if (object != newObject)
if (object.get() != newObject)
{
reset();
object = newObject;

4
modules/juce_graphics/native/juce_RenderingHelpers.h
View file

@ -2594,7 +2594,9 @@ public:
auto t = transform.getTransformWith (AffineTransform::scale (fontHeight * font.getHorizontalScale(), fontHeight)
.followedBy (trans));
if (ScopedPointer<EdgeTable> et = font.getTypeface()->getEdgeTableForGlyph (glyphNumber, t, fontHeight))
ScopedPointer<EdgeTable> et (font.getTypeface()->getEdgeTableForGlyph (glyphNumber, t, fontHeight));
if (et != nullptr)
fillShape (new EdgeTableRegionType (*et), false);
}
}

2
modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h
View file

@ -41,7 +41,7 @@ struct TextEditorKeyMapper
*/
static bool invokeKeyFunction (CallbackClass& target, const KeyPress& key)
{
const ModifierKeys& mods = key.getModifiers();
auto mods = key.getModifiers();
const bool isShiftDown = mods.isShiftDown();
const bool ctrlOrAltDown = mods.isCtrlDown() || mods.isAltDown();

2
modules/juce_gui_basics/widgets/juce_Slider.cpp
View file

@ -1318,7 +1318,7 @@ public:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PopupDisplayComponent)
};
std::unique_ptr<PopupDisplayComponent> popupDisplay;
ScopedPointer<PopupDisplayComponent> popupDisplay;
Component* parentForPopupDisplay = nullptr;
//==============================================================================

3
modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
View file

@ -161,7 +161,8 @@ namespace LiveConstantEditor
template <typename ValueType>
LivePropertyEditor (ValueType& v, CodeDocument& d) : LivePropertyEditorBase (v, d)
{
addAndMakeVisible (customComp = CustomEditor<Type>::create (*this));
customComp.reset (CustomEditor<Type>::create (*this));
addAndMakeVisible (customComp.get());
}
};