summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--filter-kalman/kalman.cpp4
-rw-r--r--logic/pipeline.hpp2
-rw-r--r--logic/runtime-libraries.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/filter-kalman/kalman.cpp b/filter-kalman/kalman.cpp
index 82b1b0f1..3a0da608 100644
--- a/filter-kalman/kalman.cpp
+++ b/filter-kalman/kalman.cpp
@@ -270,9 +270,9 @@ dialog_kalman::dialog_kalman()
void dialog_kalman::updateLabels(const slider_value&)
{
- // M$ hates unicode! (M$ autoconverts source code of one kind of utf-8 format,
+ // M$ hates unicode! (M$ autoconverts source code of one kind of utf-8 format,
// the one without BOM, to another kind that QT does not like)
- // Previous attempt to use c++11 utf8 strings like u8" °" now failed for unkown
+ // Previous attempt to use c++11 utf8 strings like u8" °" now failed for unknown
// reasons where it worked before. Hence fallback to QChar(0x00b0).
this->ui.noiseRotLabel->setText(
QString::number(settings::map_slider_value(s.noise_rot_slider_value), 'f', 3) + " " + QChar(0x00b0));
diff --git a/logic/pipeline.hpp b/logic/pipeline.hpp
index 5c3c3a26..45d5b2b2 100644
--- a/logic/pipeline.hpp
+++ b/logic/pipeline.hpp
@@ -92,7 +92,7 @@ private:
Pose newpose;
runtime_libraries const& libs;
// The owner of the reference is the main window.
- // This design might be usefull if we decide later on to swap out
+ // This design might be useful if we decide later on to swap out
// the logger while the tracker is running.
TrackLogger& logger;
diff --git a/logic/runtime-libraries.cpp b/logic/runtime-libraries.cpp
index 1dcff4a5..d05e90c2 100644
--- a/logic/runtime-libraries.cpp
+++ b/logic/runtime-libraries.cpp
@@ -19,7 +19,7 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli
if(status = pProtocol->initialize(), !status.is_ok())
{
- status = _("Error occured while loading protocol %1\n\n%2\n")
+ status = _("Error occurred while loading protocol %1\n\n%2\n")
.arg(p->name).arg(status.error);
goto end;
}
@@ -36,14 +36,14 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli
if (pFilter)
if(status = pFilter->initialize(), !status.is_ok())
{
- status = _("Error occured while loading filter %1\n\n%2\n")
+ status = _("Error occurred while loading filter %1\n\n%2\n")
.arg(f->name).arg(status.error);
goto end;
}
if (status = pTracker->start_tracker(frame), !status.is_ok())
{
- status = _("Error occured while loading tracker %1\n\n%2\n")
+ status = _("Error occurred while loading tracker %1\n\n%2\n")
.arg(t->name).arg(status.error);
goto end;
}