summaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/battery/batterywindows.cpp4
-rw-r--r--src/util/db/dbconnectionpool.h2
-rw-r--r--src/util/db/fwdsqlqueryselectresult.cpp2
-rw-r--r--src/util/math.h2
-rw-r--r--src/util/sample.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/util/battery/batterywindows.cpp b/src/util/battery/batterywindows.cpp
index b1ee079ae0..e71cf92d7b 100644
--- a/src/util/battery/batterywindows.cpp
+++ b/src/util/battery/batterywindows.cpp
@@ -25,7 +25,7 @@ void BatteryWindows::read() {
if (GetSystemPowerStatus(&spsPwr)) {
// get rest power of battery
m_dPercentage = static_cast<double>(spsPwr.BatteryLifePercent);
- // check for unkown flag and reset to default
+ // check for unknown flag and reset to default
if (m_dPercentage == 255) {
m_dPercentage = 0;
}
@@ -43,7 +43,7 @@ void BatteryWindows::read() {
m_iMinutesLeft = static_cast<int>(spsPwr.BatteryLifeTime) / 60;
}
- // QString bat = "unkown";
+ // QString bat = "unknown";
// switch (m_chargingState) {
// case Battery::CHARGING:
// bat = "charging";
diff --git a/src/util/db/dbconnectionpool.h b/src/util/db/dbconnectionpool.h
index d52e467635..1ecfd8ed51 100644
--- a/src/util/db/dbconnectionpool.h
+++ b/src/util/db/dbconnectionpool.h
@@ -19,7 +19,7 @@ class DbConnectionPool final {
public:
// Creates a new pool of database connections (one per thread) that
// all use the same connection parameters. Unique connection names
- // will be generated based on the given connection name that serves
+ // will be generated based on the given connection name that serves
// as the base name (= common prefix).
static DbConnectionPoolPtr create(
const DbConnection::Params& params,
diff --git a/src/util/db/fwdsqlqueryselectresult.cpp b/src/util/db/fwdsqlqueryselectresult.cpp
index 54ab54f857..3543756825 100644
--- a/src/util/db/fwdsqlqueryselectresult.cpp
+++ b/src/util/db/fwdsqlqueryselectresult.cpp
@@ -7,7 +7,7 @@ FwdSqlQuerySelectResult::FwdSqlQuerySelectResult()
}
// NOTE(uklotzde): The query is passed as an r-value reference to
-// indicate that ownership is transfered. Qt uses implicit sharing
+// indicate that ownership is transferred. Qt uses implicit sharing
// instead of actually moving the contents of the object. This might
// be less efficient than actually moving the object's contents, but
// meets all requirements.
diff --git a/src/util/math.h b/src/util/math.h
index 29e2bfe7af..9ed13a5758 100644
--- a/src/util/math.h
+++ b/src/util/math.h
@@ -12,7 +12,7 @@
#include <math.h>
#include <cmath>
-// Note: Because of our fpclassify hack, we actualy need to inlude both,
+// Note: Because of our fpclassify hack, we actually need to inlude both,
// the c and the c++ version of the math header.
// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included
// after our fpclassify hack
diff --git a/src/util/sample.cpp b/src/util/sample.cpp
index c390fdf38b..7d81402542 100644
--- a/src/util/sample.cpp
+++ b/src/util/sample.cpp
@@ -43,7 +43,7 @@ CSAMPLE* SampleUtil::alloc(SINT size) {
// true start of the buffer in the slack space as well so that we can free
// it correctly.
// TODO(XXX): Replace with C++11 aligned_alloc.
- // TODO(XXX): consider 32 byte alignement to optimize for AVX builds
+ // TODO(XXX): consider 32 byte alignment to optimize for AVX builds
if (useAlignedAlloc()) {
#ifdef _MSC_VER
return static_cast<CSAMPLE*>(_aligned_malloc(sizeof(CSAMPLE) * size, 16));