Merge branch 'master' into nodeview-redux

app/common/commandlineparser.h

@@ -29,7 +29,7 @@
 /**
  * @brief Command-line argument parser
  *
- * You may be wondering why we don't use QCommandLineParser instead of a custom implmentation like
+ * You may be wondering why we don't use QCommandLineParser instead of a custom implementation like
  * this. The reason why is because QCommandLineParser requires a QApplication object of some kind
  * to already have been created before it can parse anything, but we need to be able to control
  * whether a QApplication (GUI-mode) or a QCoreApplication (CLI-mode) is created which is set by

app/common/rational.cpp

@@ -309,7 +309,7 @@ bool rational::operator<(const rational &rhs) const
 
   if (rhs == RATIONAL_MAX
       || *this == RATIONAL_MIN) {
-    // We will always wither be LESS THAN (true) or EQUAL (false)
+    // We will always either be LESS THAN (true) or EQUAL (false)
     return (*this != rhs);
   }
 
@@ -342,7 +342,7 @@ bool rational::operator<=(const rational &rhs) const
 
   if (rhs == RATIONAL_MAX
       || *this == RATIONAL_MIN) {
-    // We will always wither be LESS THAN (true) or EQUAL (true)
+    // We will always either be LESS THAN (true) or EQUAL (true)
     return true;
   }