mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Some minor code tidying
This commit is contained in:
parent
098262aa8a
commit
220d6fc5ee
4 changed files with 6 additions and 6 deletions
|
|
@ -205,7 +205,7 @@ public:
|
|||
attributes.reset();
|
||||
uniforms .reset();
|
||||
|
||||
shader.reset (newShader.release());
|
||||
shader = std::move (newShader);
|
||||
shader->use();
|
||||
|
||||
shape .reset (new Shape());
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ bool JucerDocument::reloadFromDocument()
|
|||
if (currentXML != nullptr && currentXML->isEquivalentTo (newXML.get(), true))
|
||||
return true;
|
||||
|
||||
currentXML.reset (newXML.release());
|
||||
currentXML = std::move (newXML);
|
||||
stopTimer();
|
||||
|
||||
resources.loadFromCpp (getCppFile(), cppContent);
|
||||
|
|
|
|||
|
|
@ -1278,7 +1278,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
|
|||
Expression* parseFunctionCall (FunctionCall* call, ExpPtr& function)
|
||||
{
|
||||
std::unique_ptr<FunctionCall> s (call);
|
||||
s->object.reset (function.release());
|
||||
s->object = std::move (function);
|
||||
match (TokenTypes::openParen);
|
||||
|
||||
while (currentType != TokenTypes::closeParen)
|
||||
|
|
@ -1304,7 +1304,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
|
|||
if (matchIf (TokenTypes::openBracket))
|
||||
{
|
||||
std::unique_ptr<ArraySubscript> s (new ArraySubscript (location));
|
||||
s->object.reset (input.release());
|
||||
s->object = std::move (input);
|
||||
s->index.reset (parseExpression());
|
||||
match (TokenTypes::closeBracket);
|
||||
return parseSuffixes (s.release());
|
||||
|
|
@ -1513,7 +1513,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
|
|||
Expression* parseTernaryOperator (ExpPtr& condition)
|
||||
{
|
||||
std::unique_ptr<ConditionalOp> e (new ConditionalOp (location));
|
||||
e->condition.reset (condition.release());
|
||||
e->condition = std::move (condition);
|
||||
e->trueBranch.reset (parseExpression());
|
||||
match (TokenTypes::colon);
|
||||
e->falseBranch.reset (parseExpression());
|
||||
|
|
|
|||
|
|
@ -459,7 +459,7 @@ bool ActiveXControlComponent::createControl (const void* controlIID)
|
|||
|
||||
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);
|
||||
|
||||
if (control->controlHWND != nullptr)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue