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

Some minor code tidying

Browse source
This commit is contained in:
Tom Poole 2023-01-03 14:48:32 +00:00
parent 098262aa8a
commit 220d6fc5ee
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/GUI/OpenGLAppDemo.h
View file

@ -205,7 +205,7 @@ public:
attributes.reset(); attributes.reset();
uniforms .reset(); uniforms .reset();
shader.reset (newShader.release()); shader = std::move (newShader);
shader->use(); shader->use();
shape .reset (new Shape()); shape .reset (new Shape());

2
extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
View file

@ -573,7 +573,7 @@ bool JucerDocument::reloadFromDocument()
if (currentXML != nullptr && currentXML->isEquivalentTo (newXML.get(), true)) if (currentXML != nullptr && currentXML->isEquivalentTo (newXML.get(), true))
return true; return true;
currentXML.reset (newXML.release()); currentXML = std::move (newXML);
stopTimer(); stopTimer();
resources.loadFromCpp (getCppFile(), cppContent); resources.loadFromCpp (getCppFile(), cppContent);

6
modules/juce_core/javascript/juce_Javascript.cpp
View file

@ -1278,7 +1278,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
Expression* parseFunctionCall (FunctionCall* call, ExpPtr& function) Expression* parseFunctionCall (FunctionCall* call, ExpPtr& function)
{ {
std::unique_ptr<FunctionCall> s (call); std::unique_ptr<FunctionCall> s (call);
s->object.reset (function.release()); s->object = std::move (function);
match (TokenTypes::openParen); match (TokenTypes::openParen);
while (currentType != TokenTypes::closeParen) while (currentType != TokenTypes::closeParen)
@ -1304,7 +1304,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
if (matchIf (TokenTypes::openBracket)) if (matchIf (TokenTypes::openBracket))
{ {
std::unique_ptr<ArraySubscript> s (new ArraySubscript (location)); std::unique_ptr<ArraySubscript> s (new ArraySubscript (location));
s->object.reset (input.release()); s->object = std::move (input);
s->index.reset (parseExpression()); s->index.reset (parseExpression());
match (TokenTypes::closeBracket); match (TokenTypes::closeBracket);
return parseSuffixes (s.release()); return parseSuffixes (s.release());
@ -1513,7 +1513,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
Expression* parseTernaryOperator (ExpPtr& condition) Expression* parseTernaryOperator (ExpPtr& condition)
{ {
std::unique_ptr<ConditionalOp> e (new ConditionalOp (location)); std::unique_ptr<ConditionalOp> e (new ConditionalOp (location));
e->condition.reset (condition.release()); e->condition = std::move (condition);
e->trueBranch.reset (parseExpression()); e->trueBranch.reset (parseExpression());
match (TokenTypes::colon); match (TokenTypes::colon);
e->falseBranch.reset (parseExpression()); e->falseBranch.reset (parseExpression());

2
modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp
View file

@ -459,7 +459,7 @@ bool ActiveXControlComponent::createControl (const void* controlIID)
if (newControl->control->DoVerb (OLEIVERB_SHOW, nullptr, newControl->clientSite, 0, hwnd, &rect) == S_OK) if (newControl->control->DoVerb (OLEIVERB_SHOW, nullptr, newControl->clientSite, 0, hwnd, &rect) == S_OK)
{ {
control.reset (newControl.release()); control = std::move (newControl);
control->controlHWND = ActiveXHelpers::getHWND (this); control->controlHWND = ActiveXHelpers::getHWND (this);
if (control->controlHWND != nullptr) if (control->controlHWND != nullptr)