Fix a bunch of random typos.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c551828e816d5aba5ed017400a62db0e6cdfb02..e21ace688663d4f4327fd161903140f4071c6048 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,7 +329,7 @@ if(Qt5Core_FOUND)
        qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
        qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
        qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
        qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()

-       # Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+       # Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.

        # https://bugreports.qt.io/browse/QTBUG-22829
        qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
                OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
        # https://bugreports.qt.io/browse/QTBUG-22829
        qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
                OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)

diff --git a/main.cpp b/main.cpp
index 7ac7ef36f66c713dcd9ef80f0595000d7f54d53e..3e00479664aeb5f4b6a151a9d853fd6ac54da605 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
        }
 
        if (argc - optind > 1) {
        }
 
        if (argc - optind > 1) {

-               fprintf(stderr, "Only one file can be openened.\n");
+               fprintf(stderr, "Only one file can be opened.\n");

                return 1;
        } else if (argc - optind == 1) {
                open_file = argv[argc - 1];
                return 1;
        } else if (argc - optind == 1) {
                open_file = argv[argc - 1];

diff --git a/pv/session.cpp b/pv/session.cpp
index c885d37aaeea5edf3cd385712b227b95d55df105..9fd8fb3eb9b5bdf6a1c03cf5f457e9b5113de493 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -581,7 +581,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
                if (iter != cur_analog_segments_.end())
                        segment = (*iter).second;
                else {
                if (iter != cur_analog_segments_.end())
                        segment = (*iter).second;
                else {

-                       // If no segment was found, this means we havn't
+                       // If no segment was found, this means we haven't

                        // created one yet. i.e. this is the first packet
                        // in the sweep containing this segment.
                        sweep_beginning = true;
                        // created one yet. i.e. this is the first packet
                        // in the sweep containing this segment.
                        sweep_beginning = true;

diff --git a/pv/util.hpp b/pv/util.hpp
index 1cf2fe548bab8e725abae5f87d60611575cf0748..71177ccf1e9c44504435fd15e3421ef242031446 100644 (file)
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -73,7 +73,7 @@ typedef boost::multiprecision::number<
  * @param unit The unit of quantity.
  * @param sign Whether or not to add a sign also for positive numbers.
  *
  * @param unit The unit of quantity.
  * @param sign Whether or not to add a sign also for positive numbers.
  *

- * @return The formated value.
+ * @return The formatted value.

  */
 QString format_time_si(
        const Timestamp& t,
  */
 QString format_time_si(
        const Timestamp& t,


@@ -83,9 +83,9 @@ QString format_time_si(
        bool sign = true);
 
 /**
        bool sign = true);
 
 /**

- * Wrapper around 'format_time_si()' that interpretes the given 'precision'
+ * Wrapper around 'format_time_si()' that interprets the given 'precision'

  * value as the number of decimal places if the timestamp would be formatted
  * value as the number of decimal places if the timestamp would be formatted

- * without a SI prefix (using 'SIPrefix::none') and adjustes the precision to
+ * without a SI prefix (using 'SIPrefix::none') and adjusts the precision to

  * match the given 'prefix'
  *
  * @param t The value to format.
  * match the given 'prefix'
  *
  * @param t The value to format.


@@ -95,7 +95,7 @@ QString format_time_si(
  * @param unit The unit of quantity.
  * @param sign Whether or not to add a sign also for positive numbers.
  *
  * @param unit The unit of quantity.
  * @param sign Whether or not to add a sign also for positive numbers.
  *

- * @return The formated value.
+ * @return The formatted value.

  */
 QString format_time_si_adjusted(
        const Timestamp& t,
  */
 QString format_time_si_adjusted(
        const Timestamp& t,


@@ -115,7 +115,7 @@ QString format_time_si_adjusted(
  * @param precision The number of digits after the decimal separator.
  * @param sign Whether or not to add a sign also for positive numbers.
  *
  * @param precision The number of digits after the decimal separator.
  * @param sign Whether or not to add a sign also for positive numbers.
  *

- * @return The formated value.
+ * @return The formatted value.

  */
 QString format_time_minutes(
        const Timestamp& t,
  */
 QString format_time_minutes(
        const Timestamp& t,

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e3c480ee325cf4a233d31508b4ba1083b861adeb..ef98a9c45ffc00247cb38f8297f37eaceea5dec8 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -149,7 +149,7 @@ endif()
 if(Qt5Core_FOUND)
        qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
 else()
 if(Qt5Core_FOUND)
        qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
 else()

-       # Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+       # Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.

        # https://bugreports.qt.io/browse/QTBUG-22829
        qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}
                OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
        # https://bugreports.qt.io/browse/QTBUG-22829
        qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS}
                OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)