From 6f27a1d4a448cbe9fba6a8c5e6ce85ec3bad8c31 Mon Sep 17 00:00:00 2001
From: tpoole <t.b.poole@gmail.com>
Date: Thu, 22 Dec 2016 20:21:13 +0000
Subject: [PATCH] Typo fixes

---
 .../littlefoot/juce_LittleFootCompiler.h           | 14 +++++++-------
 modules/juce_core/javascript/juce_Javascript.cpp   |  4 ++--
 modules/juce_gui_basics/widgets/juce_ComboBox.h    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h b/modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h
index eb9eea3c76..230551050f 100644
--- a/modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h
+++ b/modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h
@@ -504,7 +504,7 @@ private:
         {
             auto lhs = parseLogicOperator();
 
-            if (matchIf (Token::question))          return parseTerneryOperator (lhs);
+            if (matchIf (Token::question))          return parseTernaryOperator (lhs);
             if (matchIf (Token::plusEquals))        return parseInPlaceOpExpression (lhs, Token::plus);
             if (matchIf (Token::minusEquals))       return parseInPlaceOpExpression (lhs, Token::minus);
             if (matchIf (Token::timesEquals))       return parseInPlaceOpExpression (lhs, Token::times);
@@ -522,9 +522,9 @@ private:
             return lhs;
         }
 
-        ExpPtr parseTerneryOperator (ExpPtr condition)
+        ExpPtr parseTernaryOperator (ExpPtr condition)
         {
-            auto e = allocate<TerneryOp> (location, blockBeingParsed);
+            auto e = allocate<TernaryOp> (location, blockBeingParsed);
             e->condition = condition;
             e->trueBranch = parseExpression();
             match (Token::colon);
@@ -1277,9 +1277,9 @@ private:
         StatementPtr trueBranch, falseBranch;
     };
 
-    struct TerneryOp  : public Expression
+    struct TernaryOp  : public Expression
     {
-        TerneryOp (const CodeLocation& l, BlockPtr parent)  : Expression (l, parent) {}
+        TernaryOp (const CodeLocation& l, BlockPtr parent)  : Expression (l, parent) {}
 
         void emit (CodeGenerator& cg, Type requiredType, int stackDepth) const override
         {
@@ -1298,8 +1298,8 @@ private:
         {
             auto type = trueBranch->getType (cg);
 
-            if (type == Type::void_)                location.throwError ("The ternery operator cannot take void arguments");
-            if (type != falseBranch->getType (cg))  location.throwError ("Expected both branches of this ternery operator to have the same type");
+            if (type == Type::void_)                location.throwError ("The ternary operator cannot take void arguments");
+            if (type != falseBranch->getType (cg))  location.throwError ("Expected both branches of this ternary operator to have the same type");
 
             return type;
         }
diff --git a/modules/juce_core/javascript/juce_Javascript.cpp b/modules/juce_core/javascript/juce_Javascript.cpp
index 2c8f83d4af..719c2b47c8 100644
--- a/modules/juce_core/javascript/juce_Javascript.cpp
+++ b/modules/juce_core/javascript/juce_Javascript.cpp
@@ -1072,7 +1072,7 @@ struct JavascriptEngine::RootObject   : public DynamicObject
         {
             ExpPtr lhs (parseLogicOperator());
 
-            if (matchIf (TokenTypes::question))          return parseTerneryOperator (lhs);
+            if (matchIf (TokenTypes::question))          return parseTernaryOperator (lhs);
             if (matchIf (TokenTypes::assign))            { ExpPtr rhs (parseExpression()); return new Assignment (location, lhs, rhs); }
             if (matchIf (TokenTypes::plusEquals))        return parseInPlaceOpExpression<AdditionOp> (lhs);
             if (matchIf (TokenTypes::minusEquals))       return parseInPlaceOpExpression<SubtractionOp> (lhs);
@@ -1485,7 +1485,7 @@ struct JavascriptEngine::RootObject   : public DynamicObject
             return a.release();
         }
 
-        Expression* parseTerneryOperator (ExpPtr& condition)
+        Expression* parseTernaryOperator (ExpPtr& condition)
         {
             ScopedPointer<ConditionalOp> e (new ConditionalOp (location));
             e->condition = condition;
diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.h b/modules/juce_gui_basics/widgets/juce_ComboBox.h
index 22731d5355..4d03666355 100644
--- a/modules/juce_gui_basics/widgets/juce_ComboBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ComboBox.h
@@ -272,7 +272,7 @@ public:
     /** Returns the PopupMenu object associated with the ComboBox.
         Can be useful for adding sub-menus to the ComboBox standard PopupMenu
     */
-    PopupMenu *getRootMenu() { return &currentMenu; }
+    PopupMenu* getRootMenu() { return &currentMenu; }
 
     //==============================================================================
     /**