From 98869e51a590319dec244ff442d0aa67e508de40 Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Thu, 3 Nov 2016 12:38:36 +0100 Subject: [PATCH] fix: astvisitor fixes * renaming files * fix typo * clang waringns --- src/lib/settings/ApplicationSettings.cpp | 4 ++-- src/lib/settings/ApplicationSettings.h | 4 ++-- src/lib/utility/synchronization/ReaderWriterLock.cpp | 4 ++-- src/lib_cxx/CMakeLists.txt | 4 ++-- src/lib_cxx/data/parser/cxx/ASTConsumer.cpp | 2 +- .../parser/cxx/{CxxASTVisitor.cpp => CxxAstVisitor.cpp} | 8 +++++--- .../data/parser/cxx/{CxxASTVisitor.h => CxxAstVisitor.h} | 4 ++-- .../QtProjectWizzardContentPreferences.cpp | 4 ++-- src/lib_java/data/parser/java/JavaParser.cpp | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) rename src/lib_cxx/data/parser/cxx/{CxxASTVisitor.cpp => CxxAstVisitor.cpp} (99%) rename src/lib_cxx/data/parser/cxx/{CxxASTVisitor.h => CxxAstVisitor.h} (98%) diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp index f920e87d..a76fb3f1 100644 --- a/src/lib/settings/ApplicationSettings.cpp +++ b/src/lib/settings/ApplicationSettings.cpp @@ -165,12 +165,12 @@ void ApplicationSettings::setLoggingEnabled(bool value) setValue("application/logging_enabled", value); } -bool ApplicationSettings::getVerboseInderxerLoggingEnabled() const +bool ApplicationSettings::getVerboseIndexerLoggingEnabled() const { return getValue("application/verbose_indexer_logging_enabled", false); } -void ApplicationSettings::setVerboseInderxerLoggingEnabled(bool value) +void ApplicationSettings::setVerboseIndexerLoggingEnabled(bool value) { setValue("application/verbose_indexer_logging_enabled", value); } diff --git a/src/lib/settings/ApplicationSettings.h b/src/lib/settings/ApplicationSettings.h index 975e7e72..c0e296d3 100644 --- a/src/lib/settings/ApplicationSettings.h +++ b/src/lib/settings/ApplicationSettings.h @@ -50,8 +50,8 @@ public: bool getLoggingEnabled() const; void setLoggingEnabled(bool loggingEnabled); - bool getVerboseInderxerLoggingEnabled() const; - void setVerboseInderxerLoggingEnabled(bool loggingEnabled); + bool getVerboseIndexerLoggingEnabled() const; + void setVerboseIndexerLoggingEnabled(bool loggingEnabled); // indexing int getIndexerThreadCount() const; diff --git a/src/lib/utility/synchronization/ReaderWriterLock.cpp b/src/lib/utility/synchronization/ReaderWriterLock.cpp index b385904d..c9f7220f 100644 --- a/src/lib/utility/synchronization/ReaderWriterLock.cpp +++ b/src/lib/utility/synchronization/ReaderWriterLock.cpp @@ -2,15 +2,15 @@ ReaderWriterLock::ReaderWriterLock() : m_readerCount(0) - , m_allowedWriters(1) , m_allowedReaders(1) + , m_allowedWriters(1) { } ReaderWriterLock::ReaderWriterLock(const ReaderWriterLock &lock) : m_readerCount(0) - , m_allowedWriters(1) , m_allowedReaders(1) + , m_allowedWriters(1) { } diff --git a/src/lib_cxx/CMakeLists.txt b/src/lib_cxx/CMakeLists.txt index 5faebeba..53f9150a 100644 --- a/src/lib_cxx/CMakeLists.txt +++ b/src/lib_cxx/CMakeLists.txt @@ -19,8 +19,8 @@ add_files( data/parser/cxx/ASTConsumer.h data/parser/cxx/CommentHandler.cpp data/parser/cxx/CommentHandler.h - data/parser/cxx/CxxASTVisitor.cpp - data/parser/cxx/CxxASTVisitor.h + data/parser/cxx/CxxAstVisitor.cpp + data/parser/cxx/CxxAstVisitor.h data/parser/cxx/CxxCompilationDatabaseSingle.cpp data/parser/cxx/CxxCompilationDatabaseSingle.h data/parser/cxx/CxxContext.cpp diff --git a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp index e0a35383..0290f237 100644 --- a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp +++ b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp @@ -5,7 +5,7 @@ ASTConsumer::ASTConsumer(clang::ASTContext* context, clang::Preprocessor* preprocessor, ParserClient* client, FileRegister* fileRegister) { - if (ApplicationSettings::getInstance()->getVerboseInderxerLoggingEnabled()) + if (ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled()) { m_visitor = std::make_shared(context, preprocessor, client, fileRegister); } diff --git a/src/lib_cxx/data/parser/cxx/CxxASTVisitor.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp similarity index 99% rename from src/lib_cxx/data/parser/cxx/CxxASTVisitor.cpp rename to src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp index a76d2f4f..3ed79d99 100644 --- a/src/lib_cxx/data/parser/cxx/CxxASTVisitor.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp @@ -1119,8 +1119,9 @@ AccessKind CxxAstVisitor::convertAccessSpecifier(clang::AccessSpecifier access) return ACCESS_PROTECTED; case clang::AS_private: return ACCESS_PRIVATE; + case clang::AS_none: + return ACCESS_NONE; } - return ACCESS_NONE; } SymbolKind CxxAstVisitor::convertTagKind(clang::TagTypeKind tagKind) @@ -1135,11 +1136,12 @@ SymbolKind CxxAstVisitor::convertTagKind(clang::TagTypeKind tagKind) return SYMBOL_CLASS; case clang::TTK_Enum: return SYMBOL_ENUM; + case clang::TTK_Interface: + return SYMBOL_KIND_MAX; } - return SYMBOL_KIND_MAX; } -NameHierarchy CxxAstVisitor::getContextName(const int skip) const +NameHierarchy CxxAstVisitor::getContextName(const size_t skip) const { if (m_contextStack.size() <= skip) { diff --git a/src/lib_cxx/data/parser/cxx/CxxASTVisitor.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h similarity index 98% rename from src/lib_cxx/data/parser/cxx/CxxASTVisitor.h rename to src/lib_cxx/data/parser/cxx/CxxAstVisitor.h index b7f2d352..139d3304 100644 --- a/src/lib_cxx/data/parser/cxx/CxxASTVisitor.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h @@ -82,7 +82,7 @@ public: virtual bool TraverseDeclRefExpr(clang::DeclRefExpr* s); virtual bool TraverseTemplateSpecializationTypeLoc(clang::TemplateSpecializationTypeLoc loc); virtual bool TraverseUnresolvedLookupExpr(clang::UnresolvedLookupExpr* s); - virtual bool TraverseTemplateArgumentLoc(const clang::TemplateArgumentLoc& loc);; + virtual bool TraverseTemplateArgumentLoc(const clang::TemplateArgumentLoc& loc); void traverseDeclContextHelper(clang::DeclContext *d); bool TraverseCallCommon(clang::CallExpr* s); @@ -129,7 +129,7 @@ protected: private: typedef clang::RecursiveASTVisitor base; - NameHierarchy getContextName(const int skip = 0) const; + NameHierarchy getContextName(const size_t skip = 0) const; bool checkIgnoresTypeLoc(const clang::TypeLoc& tl); struct FileIdHash diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp index eacda84f..c4410664 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp @@ -172,7 +172,7 @@ void QtProjectWizzardContentPreferences::load() } m_loggingEnabled->setChecked(appSettings->getLoggingEnabled()); - m_verboseIndexerLoggingEnabled->setChecked(appSettings->getVerboseInderxerLoggingEnabled()); + m_verboseIndexerLoggingEnabled->setChecked(appSettings->getVerboseIndexerLoggingEnabled()); m_verboseIndexerLoggingEnabled->setEnabled(m_loggingEnabled->isChecked()); m_scrollSpeed->setText(QString::number(appSettings->getScrollSpeed(), 'f', 1)); @@ -204,7 +204,7 @@ void QtProjectWizzardContentPreferences::save() m_oldColorSchemeIndex = -1; appSettings->setLoggingEnabled(m_loggingEnabled->isChecked()); - appSettings->setVerboseInderxerLoggingEnabled(m_verboseIndexerLoggingEnabled->isChecked()); + appSettings->setVerboseIndexerLoggingEnabled(m_verboseIndexerLoggingEnabled->isChecked()); float scrollSpeed = m_scrollSpeed->text().toFloat(); if (scrollSpeed) appSettings->setScrollSpeed(scrollSpeed); diff --git a/src/lib_java/data/parser/java/JavaParser.cpp b/src/lib_java/data/parser/java/JavaParser.cpp index 6b7e8c1a..8858aed7 100644 --- a/src/lib_java/data/parser/java/JavaParser.cpp +++ b/src/lib_java/data/parser/java/JavaParser.cpp @@ -84,7 +84,7 @@ void JavaParser::parseFile(const FilePath& filePath, std::shared_ptr filePath.str(), fileContent, classPath, - ApplicationSettings::getInstance()->getVerboseInderxerLoggingEnabled() ? 1 : 0 + ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled() ? 1 : 0 ); } }