From 37814513f855faeddf6067a5d69e875eb69c3b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Wed, 6 Mar 2019 07:08:56 +0100
Subject: [PATCH] Revert "Moved all simplified CheckOther checks from
 simplified to normal checking"

This reverts commit 2900690881c5897b0b1acb35e00ad89b82b48820.
---
 lib/checkother.h | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/checkother.h b/lib/checkother.h
index 2d4ca2e61..4047031df 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -86,22 +86,24 @@ public:
         checkOther.checkComparePointers();
         checkOther.checkIncompleteStatement();
         checkOther.checkPipeParameterSize();
-        checkOther.clarifyCalculation();
-        checkOther.clarifyStatement();
-        checkOther.checkPassByReference();
-        checkOther.checkCastIntToCharAndBack();
-        checkOther.checkMisusedScopedObject();
-        checkOther.checkInvalidFree();
-        checkOther.checkRedundantCopy();
-        checkOther.checkComparisonFunctionIsAlwaysTrueOrFalse();
-        checkOther.checkAccessOfMovedVariable();
     }
 
     /** @brief Run checks against the simplified token list */
     void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
-        (void)tokenizer;
-        (void)settings;
-        (void)errorLogger;
+        CheckOther checkOther(tokenizer, settings, errorLogger);
+
+        // Checks
+        checkOther.clarifyCalculation();
+        checkOther.clarifyStatement();
+        checkOther.checkPassByReference();
+        checkOther.checkCastIntToCharAndBack();
+
+        checkOther.checkMisusedScopedObject();
+
+        checkOther.checkInvalidFree();
+        checkOther.checkRedundantCopy();
+        checkOther.checkComparisonFunctionIsAlwaysTrueOrFalse();
+        checkOther.checkAccessOfMovedVariable();
     }
 
     /** @brief Clarify calculation for ".. a * b ? .." */