From 39ccf9c39ec5c1ddeb5ba62f77cc811a2598bf72 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Sun, 3 Jan 2016 20:40:27 +0100
Subject: [PATCH] Fix a bunch of random typos.

---
 CMakeLists.txt      |  2 +-
 main.cpp            |  2 +-
 pv/session.cpp      |  2 +-
 pv/util.hpp         | 10 +++++-----
 test/CMakeLists.txt |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c551828..e21ace68 100644
--- 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()
-	# 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)
diff --git a/main.cpp b/main.cpp
index 7ac7ef36..3e004796 100644
--- a/main.cpp
+++ b/main.cpp
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 	}
 
 	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];
diff --git a/pv/session.cpp b/pv/session.cpp
index c885d37a..9fd8fb3e 100644
--- 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 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;
diff --git a/pv/util.hpp b/pv/util.hpp
index 1cf2fe54..71177ccf 100644
--- 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.
  *
- * @return The formated value.
+ * @return The formatted value.
  */
 QString format_time_si(
 	const Timestamp& t,
@@ -83,9 +83,9 @@ QString format_time_si(
 	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
- * 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.
@@ -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.
  *
- * @return The formated value.
+ * @return The formatted value.
  */
 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.
  *
- * @return The formated value.
+ * @return The formatted value.
  */
 QString format_time_minutes(
 	const Timestamp& t,
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e3c480ee..ef98a9c4 100644
--- 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()
-	# 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)
-- 
2.30.2