From 4849aaa7eefe337c8985bbbe19a5e4f0aeef31b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 24 Feb 2009 17:50:51 +0000 Subject: [PATCH] checkclass: refactoring --- src/checkclass.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/checkclass.cpp b/src/checkclass.cpp index 7c5fdca7a..c51e54545 100644 --- a/src/checkclass.cpp +++ b/src/checkclass.cpp @@ -476,7 +476,7 @@ void CheckClass::privateFunctions() // The class implementation must be available.. const std::string classconstructor(classname + " :: " + classname); - if (!Token::findmatch(_tokenizer->tokens(), classconstructor.c_str())) + if (tok1->fileIndex()>0 && !Token::findmatch(_tokenizer->tokens(), classconstructor.c_str())) continue; // Get private functions.. @@ -549,13 +549,13 @@ void CheckClass::privateFunctions() { if (ftok->str() == "{") ++indent_level; - if (ftok->str() == "}") + else if (ftok->str() == "}") { if (indent_level <= 1) break; --indent_level; } - if (Token::Match(ftok->next(), "(")) + else if (Token::Match(ftok, "%var% (")) { // Remove function from FuncList for (std::list::iterator it = FuncList.begin(); it != FuncList.end(); ++it)