From 2ef5170940860fa297e0ef605f2926af7c9659d4 Mon Sep 17 00:00:00 2001
From: Mark Watkins <mark@jedimark.net>
Date: Thu, 26 Apr 2018 05:50:54 +1000
Subject: [PATCH] Metric height is generally measured in meters

---
 sleepyhead/SleepLib/common.cpp  | 4 +++-
 sleepyhead/SleepLib/common.h    | 1 +
 sleepyhead/SleepLib/machine.cpp | 1 +
 sleepyhead/newprofile.cpp       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp
index 70b4c29c..7afd8d17 100644
--- a/sleepyhead/SleepLib/common.cpp
+++ b/sleepyhead/SleepLib/common.cpp
@@ -121,6 +121,7 @@ void copyPath(QString src, QString dst)
 }
 
 
+QString STR_UNIT_M;
 QString STR_UNIT_CM;
 QString STR_UNIT_INCH;
 QString STR_UNIT_FOOT;
@@ -322,7 +323,8 @@ QString STR_TR_WAvg;   // Short form of Weighted Average
 
 void initializeStrings()
 {
-    STR_UNIT_CM = QObject::tr("cm");
+    STR_UNIT_M = QObject::tr(" m");
+    STR_UNIT_CM = QObject::tr(" cm");
     STR_UNIT_INCH = QObject::tr("\"");
     STR_UNIT_FOOT = QObject::tr("ft");
     STR_UNIT_POUND = QObject::tr("lb");
diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h
index 64a53a66..16661d52 100644
--- a/sleepyhead/SleepLib/common.h
+++ b/sleepyhead/SleepLib/common.h
@@ -146,6 +146,7 @@ const QString STR_AppRoot = "SleepyHeadData";
 // Commonly used translatable text strings
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
+extern QString STR_UNIT_M;
 extern QString STR_UNIT_CM;
 extern QString STR_UNIT_INCH;
 extern QString STR_UNIT_FOOT;
diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp
index 9aa9e99e..cd67cb75 100644
--- a/sleepyhead/SleepLib/machine.cpp
+++ b/sleepyhead/SleepLib/machine.cpp
@@ -874,6 +874,7 @@ void Machine::runTasks()
         //QApplication::processEvents();
     }
     QThreadPool::globalInstance()->waitForDone(-1);
+
 }
 
 bool Machine::hasModifiedSessions()
diff --git a/sleepyhead/newprofile.cpp b/sleepyhead/newprofile.cpp
index fb56aa19..b6025b5d 100644
--- a/sleepyhead/newprofile.cpp
+++ b/sleepyhead/newprofile.cpp
@@ -398,7 +398,7 @@ void NewProfile::edit(const QString name)
         ui->heightEdit->setValue(v);
         ui->heightEdit2->setVisible(false);
         ui->heightEdit->setDecimals(2);
-        ui->heightEdit->setSuffix(STR_UNIT_CM);
+        ui->heightEdit->setSuffix(STR_UNIT_M);
     }
 }