Browse Source

Some minor code tidying

v7.0.9
Tom Poole 2 years ago
parent
commit
220d6fc5ee
4 changed files with 6 additions and 6 deletions
  1. +1
    -1
      examples/GUI/OpenGLAppDemo.h
  2. +1
    -1
      extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
  3. +3
    -3
      modules/juce_core/javascript/juce_Javascript.cpp
  4. +1
    -1
      modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp

+ 1
- 1
examples/GUI/OpenGLAppDemo.h View File

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


+ 1
- 1
extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp View File

@@ -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);


+ 3
- 3
modules/juce_core/javascript/juce_Javascript.cpp View File

@@ -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());


+ 1
- 1
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)
{
control.reset (newControl.release());
control = std::move (newControl);
control->controlHWND = ActiveXHelpers::getHWND (this);
if (control->controlHWND != nullptr)


Loading…
Cancel
Save