From 21bf58f1ec056b2edae72e1d78c5b2720322b990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 20 Sep 2010 19:43:03 +0200 Subject: [PATCH] Optimisation: small optimisation of CheckClass::privateFunctions --- lib/checkclass.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 3eb51925c..12374595a 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1318,15 +1318,17 @@ void CheckClass::privateFunctions() inclass = false; } - if (Token::Match(ftok, ("class " + classname + " :|{").c_str())) + else if (ftok->str() == "class" && + ftok->next()->str() == classname && + Token::Match(ftok->tokAt(2), ":|{")) { indent_level = 0; inclass = true; } // Check member class functions to see what functions are used.. - if ((inclass && indent_level == 1 && Token::Match(ftok, "%var% (")) || - (Token::Match(ftok, (classname + " :: ~| %var% (").c_str()))) + else if ((inclass && indent_level == 1 && Token::Match(ftok, "%var% (")) || + (ftok->str() == classname && Token::Match(ftok->next(), ":: ~| %var% ("))) { while (ftok && ftok->str() != ")") ftok = ftok->next();