From 8da559a1863c29eb03500312e039571f9e246671 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 23 Apr 2016 13:55:42 +0200
Subject: [PATCH] refs #642, as proposed by MS
 https://dev.vatsim-germany.org/issues/642#note-4

---
 src/blackcore/setupreader.cpp       | 2 +-
 src/blackmisc/statusmessage.cpp     | 2 +-
 src/blackmisc/statusmessage.h       | 2 +-
 src/blackmisc/statusmessagelist.cpp | 4 ++--
 src/blackmisc/statusmessagelist.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp
index ff98bd01a..172d47a34 100644
--- a/src/blackcore/setupreader.cpp
+++ b/src/blackcore/setupreader.cpp
@@ -111,7 +111,7 @@ namespace BlackCore
             if (cacheAvailable && readMsgs.isFailure())
             {
                 // error but cache is available, we can continue
-                readMsgs.clipSeverity(CStatusMessage::SeverityWarning);
+                readMsgs.clampSeverity(CStatusMessage::SeverityWarning);
                 msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityWarning, "Loading setup failed, but cache is available, will continue"));
                 msgs.push_back(readMsgs);
             }
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index d502da5b8..b784d0524 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -197,7 +197,7 @@ namespace BlackMisc
         return c.isEmpty() ? this->getCategoriesAsString() : c;
     }
 
-    bool CStatusMessage::clipSeverity(CStatusMessage::StatusSeverity severity)
+    bool CStatusMessage::clampSeverity(CStatusMessage::StatusSeverity severity)
     {
         if (this->getSeverity() <= severity) { return false; }
         this->setSeverity(severity);
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 08ca5b04f..46454d725 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -206,7 +206,7 @@ namespace BlackMisc
         StatusSeverity getSeverity() const { return this->m_severity; }
 
         //! Clip/reduce severity if higher (more critical)
-        bool clipSeverity(StatusSeverity severity);
+        bool clampSeverity(StatusSeverity severity);
 
         //! Info or debug, no warning or error
         bool isSeverityInfoOrLess() const { return this->m_severity == SeverityInfo || this->m_severity == SeverityDebug; }
diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp
index 539e86db7..75c287f7d 100644
--- a/src/blackmisc/statusmessagelist.cpp
+++ b/src/blackmisc/statusmessagelist.cpp
@@ -103,11 +103,11 @@ namespace BlackMisc
         }
     }
 
-    void CStatusMessageList::clipSeverity(CStatusMessage::StatusSeverity severity)
+    void CStatusMessageList::clampSeverity(CStatusMessage::StatusSeverity severity)
     {
         for (auto &msg : *this)
         {
-            msg.clipSeverity(severity);
+            msg.clampSeverity(severity);
         }
     }
 
diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h
index 2b09abb89..b9afd1814 100644
--- a/src/blackmisc/statusmessagelist.h
+++ b/src/blackmisc/statusmessagelist.h
@@ -80,7 +80,7 @@ namespace BlackMisc
         void setCategories(const CLogCategoryList &categories);
 
         //! And higher (more critical) severity will be clipped to given severity
-        void clipSeverity(CStatusMessage::StatusSeverity severity);
+        void clampSeverity(CStatusMessage::StatusSeverity severity);
 
         //! Remove warnings and below
         void removeWarningsAndBelow();