From 4686ce7e9118aa59bcaaf483fbe49209d3365240 Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Wed, 27 Dec 2017 18:46:56 +0100 Subject: [PATCH] src: fixed some clang tidy warnings * implemented CxxDeclName constructors that just move the members * removed empty destructors because they disable default move constructors * removed some unnecessary code * replaced ".size() == 0" with ".empty()" because it's more explicit --- src/lib/data/graph/Graph.cpp | 2 +- src/lib/data/graph/Graph.h | 2 +- src/lib/data/graph/Node.cpp | 2 +- src/lib/data/graph/Node.h | 2 +- src/lib/data/name/NameHierarchy.cpp | 28 ++++++++- src/lib/data/name/NameHierarchy.h | 6 +- src/lib/data/parser/ParserClientImpl.cpp | 4 +- src/lib/data/parser/ParserClientImpl.h | 4 +- src/lib/utility/file/FilePath.cpp | 2 +- src/lib/utility/file/FilePath.h | 2 +- .../SharedMemoryGarbageCollector.cpp | 2 +- .../data/indexer/IndexerCommandCxx.cpp | 4 -- src/lib_cxx/data/indexer/IndexerCommandCxx.h | 1 - .../data/indexer/IndexerCommandCxxCdb.cpp | 4 -- .../data/indexer/IndexerCommandCxxCdb.h | 2 - .../data/indexer/IndexerCommandCxxManual.cpp | 4 -- .../data/indexer/IndexerCommandCxxManual.h | 2 - src/lib_cxx/data/indexer/IndexerCxx.h | 7 +-- .../indexer/IndexerFactoryModuleCxxCdb.cpp | 4 -- .../data/indexer/IndexerFactoryModuleCxxCdb.h | 1 - .../indexer/IndexerFactoryModuleCxxManual.cpp | 4 -- .../indexer/IndexerFactoryModuleCxxManual.h | 1 - .../data/parser/cxx/name/CxxDeclName.cpp | 35 ++++++++---- .../data/parser/cxx/name/CxxDeclName.h | 26 ++++++--- .../parser/cxx/name/CxxFunctionDeclName.cpp | 57 ++++++++++++++----- .../parser/cxx/name/CxxFunctionDeclName.h | 35 +++++++++--- src/lib_cxx/data/parser/cxx/name/CxxName.cpp | 4 -- src/lib_cxx/data/parser/cxx/name/CxxName.h | 2 +- .../cxx/name/CxxStaticFunctionDeclName.cpp | 53 +++++++++++------ .../cxx/name/CxxStaticFunctionDeclName.h | 43 +++++++++----- .../data/parser/cxx/name/CxxTypeName.cpp | 39 ++++++++----- .../data/parser/cxx/name/CxxTypeName.h | 28 ++++++--- .../parser/cxx/name/CxxVariableDeclName.cpp | 41 +++++++++---- .../parser/cxx/name/CxxVariableDeclName.h | 27 +++++++-- .../cxx/name_resolver/CxxDeclNameResolver.cpp | 30 +++++----- .../cxx/name_resolver/CxxTypeNameResolver.cpp | 8 +-- .../parser/java/JavaEnvironmentFactory.cpp | 2 +- src/lib_java/data/parser/java/JavaParser.cpp | 2 +- src/lib_java/data/parser/java/JavaParser.h | 2 +- src/lib_license/License.cpp | 54 +++++++++--------- src/lib_license/License.h | 2 +- src/lib_license/utility/Version.cpp | 11 +--- 42 files changed, 377 insertions(+), 214 deletions(-) diff --git a/src/lib/data/graph/Graph.cpp b/src/lib/data/graph/Graph.cpp index fe6cc671..e5f9787e 100644 --- a/src/lib/data/graph/Graph.cpp +++ b/src/lib/data/graph/Graph.cpp @@ -41,7 +41,7 @@ void Graph::forEachToken(std::function func) const forEachEdge(func); } -Node* Graph::createNode(Id id, NodeType type, NameHierarchy nameHierarchy, bool defined) +Node* Graph::createNode(Id id, NodeType type, const NameHierarchy& nameHierarchy, bool defined) { Node* n = getNodeById(id); if (n) diff --git a/src/lib/data/graph/Graph.h b/src/lib/data/graph/Graph.h index d8d1dbdb..c3574678 100644 --- a/src/lib/data/graph/Graph.h +++ b/src/lib/data/graph/Graph.h @@ -27,7 +27,7 @@ public: void forEachEdge(std::function func) const; void forEachToken(std::function func) const; - Node* createNode(Id id, NodeType type, NameHierarchy nameHierarchy, bool defined); + Node* createNode(Id id, NodeType type, const NameHierarchy& nameHierarchy, bool defined); Edge* createEdge(Id id, Edge::EdgeType type, Node* from, Node* to); size_t getNodeCount() const; diff --git a/src/lib/data/graph/Node.cpp b/src/lib/data/graph/Node.cpp index 68b599dd..5e35864c 100644 --- a/src/lib/data/graph/Node.cpp +++ b/src/lib/data/graph/Node.cpp @@ -11,7 +11,7 @@ #include "data/graph/token_component/TokenComponentStatic.h" #include "data/graph/token_component/TokenComponentFilePath.h" -Node::Node(Id id, NodeType type, NameHierarchy nameHierarchy, bool defined) +Node::Node(Id id, NodeType type, const NameHierarchy& nameHierarchy, bool defined) : Token(id) , m_type(type) , m_nameHierarchy(nameHierarchy) diff --git a/src/lib/data/graph/Node.h b/src/lib/data/graph/Node.h index 1fcd313f..791a7f32 100644 --- a/src/lib/data/graph/Node.h +++ b/src/lib/data/graph/Node.h @@ -22,7 +22,7 @@ class Node : public Token { public: - Node(Id id, NodeType type, NameHierarchy nameHierarchy, bool defined); + Node(Id id, NodeType type, const NameHierarchy& nameHierarchy, bool defined); Node(const Node& other); virtual ~Node(); diff --git a/src/lib/data/name/NameHierarchy.cpp b/src/lib/data/name/NameHierarchy.cpp index 88a29924..08957050 100644 --- a/src/lib/data/name/NameHierarchy.cpp +++ b/src/lib/data/name/NameHierarchy.cpp @@ -3,7 +3,7 @@ #include "utility/logging/logging.h" #include "utility/utilityString.h" -std::string NameHierarchy::serialize(NameHierarchy nameHierarchy) +std::string NameHierarchy::serialize(const NameHierarchy& nameHierarchy) { std::string serializedName = nameDelimiterTypeToString(nameHierarchy.getDelimiter()) + "\tm"; for (size_t i = 0; i < nameHierarchy.size(); i++) @@ -75,6 +75,18 @@ NameHierarchy::NameHierarchy(const std::vector& names, const NameDe } } +NameHierarchy::NameHierarchy(const NameHierarchy& other) + : m_elements(other.m_elements) + , m_delimiter(other.m_delimiter) +{ +} + +NameHierarchy::NameHierarchy(NameHierarchy&& other) + : m_elements(std::move(other.m_elements)) + , m_delimiter(other.m_delimiter) +{ +} + NameHierarchy::~NameHierarchy() { } @@ -103,6 +115,20 @@ std::shared_ptr NameHierarchy::operator[](size_t pos) const return m_elements[pos]; } +NameHierarchy& NameHierarchy::operator=(const NameHierarchy& other) +{ + m_elements = other.m_elements; + m_delimiter = other.m_delimiter; + return *this; +} + +NameHierarchy& NameHierarchy::operator=(NameHierarchy&& other) +{ + m_elements = std::move(other.m_elements); + m_delimiter = other.m_delimiter; + return *this; +} + NameHierarchy NameHierarchy::getRange(size_t first, size_t last) const { NameHierarchy hierarchy(m_delimiter); diff --git a/src/lib/data/name/NameHierarchy.h b/src/lib/data/name/NameHierarchy.h index 131abe38..e9602ed7 100644 --- a/src/lib/data/name/NameHierarchy.h +++ b/src/lib/data/name/NameHierarchy.h @@ -11,12 +11,14 @@ class NameHierarchy { public: - static std::string serialize(NameHierarchy nameHierarchy); + static std::string serialize(const NameHierarchy& nameHierarchy); static NameHierarchy deserialize(const std::string& serializedName); NameHierarchy(const NameDelimiterType delimiter); NameHierarchy(const std::string& name, const NameDelimiterType delimiter); NameHierarchy(const std::vector& names, const NameDelimiterType delimiter); + NameHierarchy(const NameHierarchy& other); + NameHierarchy(NameHierarchy&& other); ~NameHierarchy(); NameDelimiterType getDelimiter() const; @@ -27,6 +29,8 @@ public: std::shared_ptr back() const; std::shared_ptr operator[](size_t pos) const; + NameHierarchy& operator=(const NameHierarchy& other); + NameHierarchy& operator=(NameHierarchy&& other); NameHierarchy getRange(size_t first, size_t last) const; diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp index e6abec0c..1d218afa 100644 --- a/src/lib/data/parser/ParserClientImpl.cpp +++ b/src/lib/data/parser/ParserClientImpl.cpp @@ -187,7 +187,7 @@ void ParserClientImpl::addAccess(Id nodeId, AccessKind access) } } -Id ParserClientImpl::addNodeHierarchy(NameHierarchy nameHierarchy, NodeType nodeType) +Id ParserClientImpl::addNodeHierarchy(const NameHierarchy& nameHierarchy, NodeType nodeType) { if (nameHierarchy.size() == 0) { @@ -215,7 +215,7 @@ Id ParserClientImpl::addNodeHierarchy(NameHierarchy nameHierarchy, NodeType node return parentNodeId; } -Id ParserClientImpl::addNode(NodeType nodeType, NameHierarchy nameHierarchy) +Id ParserClientImpl::addNode(NodeType nodeType, const NameHierarchy& nameHierarchy) { if (!m_storage) { diff --git a/src/lib/data/parser/ParserClientImpl.h b/src/lib/data/parser/ParserClientImpl.h index 8e391699..68234299 100644 --- a/src/lib/data/parser/ParserClientImpl.h +++ b/src/lib/data/parser/ParserClientImpl.h @@ -50,9 +50,9 @@ private: NodeType symbolKindToNodeType(SymbolKind symbolType) const; Edge::EdgeType referenceKindToEdgeType(ReferenceKind referenceKind) const; void addAccess(Id nodeId, AccessKind access); - Id addNodeHierarchy(NameHierarchy nameHierarchy, NodeType nodeType = NodeType::NODE_SYMBOL); + Id addNodeHierarchy(const NameHierarchy& nameHierarchy, NodeType nodeType = NodeType::NODE_SYMBOL); - Id addNode(NodeType nodeType, NameHierarchy nameHierarchy); + Id addNode(NodeType nodeType, const NameHierarchy& nameHierarchy); void addFile(Id id, const FilePath& filePath, const std::string& modificationTime); void addSymbol(Id id, DefinitionKind definitionKind); Id addEdge(int type, Id sourceId, Id targetId); diff --git a/src/lib/utility/file/FilePath.cpp b/src/lib/utility/file/FilePath.cpp index fadc17fa..e89a2822 100644 --- a/src/lib/utility/file/FilePath.cpp +++ b/src/lib/utility/file/FilePath.cpp @@ -84,7 +84,7 @@ FilePath::~FilePath() boost::filesystem::path FilePath::getPath() const { - return boost::filesystem::path(*(m_path.get())); + return *(m_path.get()); } bool FilePath::empty() const diff --git a/src/lib/utility/file/FilePath.h b/src/lib/utility/file/FilePath.h index 9fcd4c56..bd87f8ff 100644 --- a/src/lib/utility/file/FilePath.h +++ b/src/lib/utility/file/FilePath.h @@ -20,7 +20,7 @@ public: explicit FilePath(const char* filePath); explicit FilePath(const std::string& filePath); explicit FilePath(const boost::filesystem::path& filePath); - FilePath(const FilePath& filePath); + FilePath(const FilePath& other); FilePath(FilePath&& other); FilePath(const std::string& filePath, const std::string& base); ~FilePath(); diff --git a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp index 1732880a..192dbb40 100644 --- a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp +++ b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp @@ -24,7 +24,7 @@ SharedMemoryGarbageCollector* SharedMemoryGarbageCollector::createInstance() s_instance = std::shared_ptr(new SharedMemoryGarbageCollector()); } } - catch (boost::interprocess::interprocess_exception& e) + catch (boost::interprocess::interprocess_exception) { } diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp index dc98fb81..86e2166c 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp +++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp @@ -15,10 +15,6 @@ IndexerCommandCxx::IndexerCommandCxx( { } -IndexerCommandCxx::~IndexerCommandCxx() -{ -} - size_t IndexerCommandCxx::getByteSize(size_t stringSize) const { size_t size = IndexerCommand::getByteSize(stringSize); diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.h b/src/lib_cxx/data/indexer/IndexerCommandCxx.h index 56c78c76..fadc1860 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxx.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.h @@ -20,7 +20,6 @@ public: const std::vector& frameworkSearchPaths, const std::vector& compilerFlags); - virtual ~IndexerCommandCxx(); virtual size_t getByteSize(size_t stringSize) const override; std::vector getSystemHeaderSearchPaths() const; diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp index 8b373e63..5652cd9a 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.cpp @@ -53,10 +53,6 @@ IndexerCommandCxxCdb::IndexerCommandCxxCdb( { } -IndexerCommandCxxCdb::~IndexerCommandCxxCdb() -{ -} - IndexerCommandType IndexerCommandCxxCdb::getIndexerCommandType() const { return getStaticIndexerCommandType(); diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h index 762f2a17..6eac94c8 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxCdb.h @@ -29,8 +29,6 @@ public: const std::vector& systemHeaderSearchPaths, const std::vector& frameworkSearchPaths); - virtual ~IndexerCommandCxxCdb(); - virtual IndexerCommandType getIndexerCommandType() const override; virtual size_t getByteSize(size_t stringSize) const override; diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp index 5afe117a..2ae1c5ec 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxManual.cpp @@ -19,10 +19,6 @@ IndexerCommandCxxManual::IndexerCommandCxxManual( { } -IndexerCommandCxxManual::~IndexerCommandCxxManual() -{ -} - IndexerCommandType IndexerCommandCxxManual::getIndexerCommandType() const { return getStaticIndexerCommandType(); diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h b/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h index 87df9236..834fee3f 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxxManual.h @@ -20,8 +20,6 @@ public: const std::vector& frameworkSearchPaths, const std::vector& compilerFlags); - virtual ~IndexerCommandCxxManual(); - virtual IndexerCommandType getIndexerCommandType() const override; virtual size_t getByteSize(size_t stringSize) const override; diff --git a/src/lib_cxx/data/indexer/IndexerCxx.h b/src/lib_cxx/data/indexer/IndexerCxx.h index 64270c38..b508e806 100644 --- a/src/lib_cxx/data/indexer/IndexerCxx.h +++ b/src/lib_cxx/data/indexer/IndexerCxx.h @@ -11,18 +11,13 @@ template class IndexerCxx: public Indexer { public: - virtual ~IndexerCxx(); + virtual ~IndexerCxx() = default; virtual std::shared_ptr doIndex( std::shared_ptr indexerCommand, std::shared_ptr fileRegister); }; -template -IndexerCxx::~IndexerCxx() -{ -} - template std::shared_ptr IndexerCxx::doIndex( std::shared_ptr indexerCommand, diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.cpp b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.cpp index be1d782b..0b5ca94a 100644 --- a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.cpp +++ b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.cpp @@ -4,10 +4,6 @@ #include "data/indexer/IndexerCommandCxxCdb.h" #include "data/parser/cxx/CxxParser.h" -IndexerFactoryModuleCxxCdb::~IndexerFactoryModuleCxxCdb() -{ -} - std::shared_ptr IndexerFactoryModuleCxxCdb::createIndexer() { return std::make_shared>(); diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.h b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.h index 330505e3..cd746e1d 100644 --- a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.h +++ b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxCdb.h @@ -6,7 +6,6 @@ class IndexerFactoryModuleCxxCdb: public IndexerFactoryModule { public: - virtual ~IndexerFactoryModuleCxxCdb(); virtual std::shared_ptr createIndexer(); }; diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp index ed4d7d0f..f963dca0 100644 --- a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp +++ b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.cpp @@ -4,10 +4,6 @@ #include "data/indexer/IndexerCommandCxxManual.h" #include "data/parser/cxx/CxxParser.h" -IndexerFactoryModuleCxxManual::~IndexerFactoryModuleCxxManual() -{ -} - std::shared_ptr IndexerFactoryModuleCxxManual::createIndexer() { return std::make_shared>(); diff --git a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h index 655e46e2..8e5a87d7 100644 --- a/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h +++ b/src/lib_cxx/data/indexer/IndexerFactoryModuleCxxManual.h @@ -6,7 +6,6 @@ class IndexerFactoryModuleCxxManual: public IndexerFactoryModule { public: - virtual ~IndexerFactoryModuleCxxManual(); virtual std::shared_ptr createIndexer(); }; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp index eb69b965..3e097dca 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp @@ -1,23 +1,36 @@ #include "data/parser/cxx/name/CxxDeclName.h" -CxxDeclName::CxxDeclName(std::string name, std::vector templateParameterNames) - : m_name(name) - , m_templateParameterNames(templateParameterNames) +//CxxDeclName::CxxDeclName(const std::string& name, const std::vector& templateParameterNames) +// : m_name(name) +// , m_templateParameterNames(templateParameterNames) +//{ +//} + +CxxDeclName::CxxDeclName(std::string&& name, std::vector&& templateParameterNames) + : m_name(std::move(name)) + , m_templateParameterNames(std::move(templateParameterNames)) { } +//CxxDeclName::CxxDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr parent +//) +// : CxxName(parent) +// , m_name(name) +// , m_templateParameterNames(templateParameterNames) +//{ +//} + CxxDeclName::CxxDeclName( - std::string name, - std::vector templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr parent ) : CxxName(parent) - , m_name(name) - , m_templateParameterNames(templateParameterNames) -{ -} - -CxxDeclName::~CxxDeclName() + , m_name(std::move(name)) + , m_templateParameterNames(std::move(templateParameterNames)) { } diff --git a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h index 715f87ee..c3abc7d2 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h @@ -11,18 +11,30 @@ class CxxDeclName: public CxxName { public: - CxxDeclName( - std::string name, - std::vector templateParameterNames - ); + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxDeclName( + // const std::string& name, + // const std::vector& templateParameterNames + //); CxxDeclName( - std::string name, - std::vector templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames + ); + + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr parent + //); + + CxxDeclName( + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr parent ); - virtual ~CxxDeclName(); virtual NameHierarchy toNameHierarchy() const; std::string getName() const; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp index 3de6e6e0..57c47799 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp @@ -1,42 +1,71 @@ #include "data/parser/cxx/name/CxxFunctionDeclName.h" +//CxxFunctionDeclName::CxxFunctionDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr returnTypeName, +// const std::vector>& parameterTypeNames, +// const bool isConst, +// const bool isStatic +//) +// : CxxDeclName(name, templateParameterNames) +// , m_returnTypeName(returnTypeName) +// , m_parameterTypeNames(parameterTypeNames) +// , m_isConst(isConst) +// , m_isStatic(isStatic) +//{ +//} + CxxFunctionDeclName::CxxFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, + std::vector>&& parameterTypeNames, const bool isConst, const bool isStatic ) - : CxxDeclName(name, templateParameterNames) + : CxxDeclName(std::move(name), std::move(templateParameterNames)) , m_returnTypeName(returnTypeName) - , m_parameterTypeNames(parameterTypeNames) + , m_parameterTypeNames(std::move(parameterTypeNames)) , m_isConst(isConst) , m_isStatic(isStatic) { } +//CxxFunctionDeclName::CxxFunctionDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr returnTypeName, +// const std::vector>& parameterTypeNames, +// const bool isConst, +// const bool isStatic, +// std::shared_ptr parent +//) +// : CxxDeclName(name, templateParameterNames, parent) +// , m_returnTypeName(returnTypeName) +// , m_parameterTypeNames(parameterTypeNames) +// , m_isConst(isConst) +// , m_isStatic(isStatic) +//{ +//} + CxxFunctionDeclName::CxxFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, + std::vector>&& parameterTypeNames, const bool isConst, const bool isStatic, std::shared_ptr parent ) - : CxxDeclName(name, templateParameterNames, parent) + : CxxDeclName(std::move(name), std::move(templateParameterNames), parent) , m_returnTypeName(returnTypeName) - , m_parameterTypeNames(parameterTypeNames) + , m_parameterTypeNames(std::move(parameterTypeNames)) , m_isConst(isConst) , m_isStatic(isStatic) { } -CxxFunctionDeclName::~CxxFunctionDeclName() -{ -} - NameHierarchy CxxFunctionDeclName::toNameHierarchy() const { std::string signaturePrefix; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h index 8aa44716..613f36d3 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h @@ -10,27 +10,46 @@ class CxxFunctionDeclName: public CxxDeclName { public: + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxFunctionDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr returnTypeName, + // const std::vector>& parameterTypeNames, + // const bool isConst, + // const bool isStatic + //); + CxxFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, + std::vector>&& parameterTypeNames, const bool isConst, const bool isStatic ); + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxFunctionDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr returnTypeName, + // const std::vector>& parameterTypeNames, + // const bool isConst, + // const bool isStatic, + // std::shared_ptr parent + //); + CxxFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, + std::vector>&& parameterTypeNames, const bool isConst, const bool isStatic, std::shared_ptr parent ); - virtual ~CxxFunctionDeclName(); - virtual NameHierarchy toNameHierarchy() const; private: diff --git a/src/lib_cxx/data/parser/cxx/name/CxxName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxName.cpp index 56de4eb5..06207c1a 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxName.cpp @@ -9,10 +9,6 @@ CxxName::CxxName(std::shared_ptr parent) { } -CxxName::~CxxName() -{ -} - void CxxName::setParent(std::shared_ptr parent) { m_parent = parent; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxName.h b/src/lib_cxx/data/parser/cxx/name/CxxName.h index e7dc971f..dbea5460 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxName.h @@ -13,7 +13,7 @@ public: CxxName(); CxxName(std::shared_ptr parent); - virtual ~CxxName(); + virtual ~CxxName() = default; void setParent(std::shared_ptr parent); std::shared_ptr getParent() const; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp index 97cd6a44..32e66064 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp @@ -1,31 +1,52 @@ #include "data/parser/cxx/name/CxxStaticFunctionDeclName.h" +//CxxStaticFunctionDeclName::CxxStaticFunctionDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr returnTypeName, +// const std::vector>& parameterTypeNames, +// const std::string& translationUnitFileName +//) +// : CxxFunctionDeclName(name, templateParameterNames, returnTypeName, parameterTypeNames, false, true) +// , m_translationUnitFileName(translationUnitFileName) +//{ +//} + CxxStaticFunctionDeclName::CxxStaticFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, - const std::string& translationUnitFileName + std::vector>&& parameterTypeNames, + std::string&& translationUnitFileName ) - : CxxFunctionDeclName(name, templateParameterNames, returnTypeName, parameterTypeNames, false, true) - , m_translationUnitFileName(translationUnitFileName) + : CxxFunctionDeclName(std::move(name), std::move(templateParameterNames), returnTypeName, std::move(parameterTypeNames), false, true) + , m_translationUnitFileName(std::move(translationUnitFileName)) { } +//CxxStaticFunctionDeclName::CxxStaticFunctionDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr returnTypeName, +// const std::vector>& parameterTypeNames, +// const std::string& translationUnitFileName, +// std::shared_ptr parent +//) +// : CxxFunctionDeclName(name, templateParameterNames, returnTypeName, parameterTypeNames, false, true, parent) +// , m_translationUnitFileName(translationUnitFileName) +//{ +//} + CxxStaticFunctionDeclName::CxxStaticFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, - const std::string& translationUnitFileName, + std::vector>&& parameterTypeNames, + std::string&& translationUnitFileName, std::shared_ptr parent ) - : CxxFunctionDeclName(name, templateParameterNames, returnTypeName, parameterTypeNames, false, true, parent) - , m_translationUnitFileName(translationUnitFileName) -{ -} - -CxxStaticFunctionDeclName::~CxxStaticFunctionDeclName() + : CxxFunctionDeclName(std::move(name), std::move(templateParameterNames), returnTypeName, std::move(parameterTypeNames), false, true, parent) + , m_translationUnitFileName(std::move(translationUnitFileName)) { } diff --git a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h index 6f7e036e..14c974eb 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h @@ -6,25 +6,42 @@ class CxxStaticFunctionDeclName: public CxxFunctionDeclName { public: - CxxStaticFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, - std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, - const std::string& translationUnitFileName - ); + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxStaticFunctionDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr returnTypeName, + // const std::vector>& parameterTypeNames, + // const std::string& translationUnitFileName + //); CxxStaticFunctionDeclName( - const std::string& name, - const std::vector& templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr returnTypeName, - const std::vector>& parameterTypeNames, - const std::string& translationUnitFileName, + std::vector>&& parameterTypeNames, + std::string&& translationUnitFileName + ); + + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxStaticFunctionDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr returnTypeName, + // const std::vector>& parameterTypeNames, + // const std::string& translationUnitFileName, + // std::shared_ptr parent + //); + + CxxStaticFunctionDeclName( + std::string&& name, + std::vector&& templateParameterNames, + std::shared_ptr returnTypeName, + std::vector>&& parameterTypeNames, + std::string&& translationUnitFileName, std::shared_ptr parent ); - virtual ~CxxStaticFunctionDeclName(); - virtual NameHierarchy toNameHierarchy() const; private: diff --git a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp index 3312e6d4..2da0554c 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp @@ -11,29 +11,42 @@ std::shared_ptr CxxTypeName::makeUnsolvedIfNull(std::shared_ptr templateArguments) - : m_name(name) - , m_templateArguments(templateArguments) +//CxxTypeName::CxxTypeName(const std::string& name, const std::vector& templateArguments) +// : m_name(name) +// , m_templateArguments(templateArguments) +//{ +//} + +CxxTypeName::CxxTypeName(std::string&& name, std::vector&& templateArguments) + : m_name(std::move(name)) + , m_templateArguments(std::move(templateArguments)) { } +//CxxTypeName::CxxTypeName( +// const std::string& name, +// const std::vector& templateArguments, +// std::shared_ptr parent +//) +// : CxxName(parent) +// , m_name(name) +// , m_templateArguments(templateArguments) +//{ +//} + CxxTypeName::CxxTypeName( - std::string name, - std::vector templateArguments, + std::string&& name, + std::vector&& templateArguments, std::shared_ptr parent ) : CxxName(parent) - , m_name(name) - , m_templateArguments(templateArguments) -{ -} - -CxxTypeName::~CxxTypeName() + , m_name(std::move(name)) + , m_templateArguments(std::move(templateArguments)) { } diff --git a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h index 72070be0..3b77e7b0 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h @@ -16,23 +16,35 @@ public: struct Modifier { - Modifier(std::string symbol); + Modifier(std::string&& symbol); std::string symbol; CxxQualifierFlags qualifierFlags; }; - CxxTypeName( - std::string name, - std::vector templateArguments - ); + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxTypeName( + // const std::string& name, + // const std::vector& templateArguments + //); CxxTypeName( - std::string name, - std::vector templateArguments, + std::string&& name, + std::vector&& templateArguments + ); + + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxTypeName( + // const std::string& name, + // const std::vector& templateArguments, + // std::shared_ptr parent + //); + + CxxTypeName( + std::string&& name, + std::vector&& templateArguments, std::shared_ptr parent ); - virtual ~CxxTypeName(); virtual NameHierarchy toNameHierarchy() const; void addQualifier(const CxxQualifierFlags::QualifierType qualifier); diff --git a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp index 2d0f156a..569252be 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp @@ -1,34 +1,55 @@ #include "data/parser/cxx/name/CxxVariableDeclName.h" +//CxxVariableDeclName::CxxVariableDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr typeName, +// bool isStatic +//) +// : CxxDeclName(name, templateParameterNames) +// , m_typeName(typeName) +// , m_isStatic(isStatic) +//{ +//} + CxxVariableDeclName::CxxVariableDeclName( - std::string name, - std::vector templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr typeName, bool isStatic ) - : CxxDeclName(name, templateParameterNames) + : CxxDeclName(std::move(name), std::move(templateParameterNames)) , m_typeName(typeName) , m_isStatic(isStatic) { } +//CxxVariableDeclName::CxxVariableDeclName( +// const std::string& name, +// const std::vector& templateParameterNames, +// std::shared_ptr typeName, +// bool isStatic, +// std::shared_ptr parent +//) +// : CxxDeclName(name, templateParameterNames, parent) +// , m_typeName(typeName) +// , m_isStatic(isStatic) +//{ +//} + CxxVariableDeclName::CxxVariableDeclName( - std::string name, - std::vector templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr typeName, bool isStatic, std::shared_ptr parent ) - : CxxDeclName(name, templateParameterNames, parent) + : CxxDeclName(std::move(name), std::move(templateParameterNames), parent) , m_typeName(typeName) , m_isStatic(isStatic) { } -CxxVariableDeclName::~CxxVariableDeclName() -{ -} - NameHierarchy CxxVariableDeclName::toNameHierarchy() const { std::string signaturePrefix; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h index 8e356bd9..4bacb866 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h @@ -10,23 +10,38 @@ class CxxVariableDeclName: public CxxDeclName { public: + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxVariableDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr typeName, + // bool isStatic + //); + CxxVariableDeclName( - std::string name, - std::vector templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr typeName, bool isStatic ); + // uncomment this constructor if required, but try to use the one using move constructors for the members + //CxxVariableDeclName( + // const std::string& name, + // const std::vector& templateParameterNames, + // std::shared_ptr typeName, + // bool isStatic, + // std::shared_ptr parent + //); + CxxVariableDeclName( - std::string name, - std::vector templateParameterNames, + std::string&& name, + std::vector&& templateParameterNames, std::shared_ptr typeName, bool isStatic, std::shared_ptr parent ); - virtual ~CxxVariableDeclName(); - virtual NameHierarchy toNameHierarchy() const; private: diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp index 4ff2c740..60cb0047 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp @@ -217,10 +217,12 @@ std::shared_ptr CxxDeclNameResolver::getDeclName(const clang::Named } else if (clang::isa(declaration)) { - const std::vector templateParameterNames = getTemplateParameterStringsOfPatrialSpecialitarion( - clang::dyn_cast(declaration) + return std::make_shared( + std::move(declNameString), + getTemplateParameterStringsOfPatrialSpecialitarion( + clang::dyn_cast(declaration) + ) ); - return std::make_shared(declNameString, templateParameterNames); } else if (clang::isa(declaration)) { @@ -230,7 +232,7 @@ std::shared_ptr CxxDeclNameResolver::getDeclName(const clang::Named { templateArguments.push_back(getTemplateArgumentName(templateArgumentList.get(i))); } - return std::make_shared(declNameString, templateArguments); + return std::make_shared(std::move(declNameString), std::move(templateArguments)); } } } @@ -289,19 +291,19 @@ std::shared_ptr CxxDeclNameResolver::getDeclName(const clang::Named if (!clang::isa(declaration) && isStatic) { return std::make_shared( - functionName, - templateArguments, + std::move(functionName), + std::move(templateArguments), returnTypeName, - parameterTypeNames, + std::move(parameterTypeNames), getTranslationUnitMainFileName(declaration) ); } return std::make_shared( - functionName, - templateArguments, + std::move(functionName), + std::move(templateArguments), returnTypeName, - parameterTypeNames, + std::move(parameterTypeNames), isConst, isStatic ); @@ -317,7 +319,7 @@ std::shared_ptr CxxDeclNameResolver::getDeclName(const clang::Named CxxTypeNameResolver typenNameResolver(getCanonicalFilePathCache(), getIgnoredContextDecls()); typenNameResolver.ignoreContextDecl(fieldDecl); std::shared_ptr typeName = CxxTypeName::makeUnsolvedIfNull(typenNameResolver.getName(fieldDecl->getType())); - return std::make_shared(declNameString, std::vector(), typeName, false); + return std::make_shared(std::move(declNameString), std::vector(), typeName, false); } else if (clang::isa(declaration) && clang::dyn_cast(declaration)->isAnonymousNamespace()) { @@ -406,7 +408,7 @@ std::shared_ptr CxxDeclNameResolver::getDeclName(const clang::Named } } - return std::make_shared(varName, templateParameterNames, typeName, isStatic); + return std::make_shared(std::move(varName), std::move(templateParameterNames), typeName, isStatic); } } else if (clang::isa(declaration)) @@ -416,12 +418,12 @@ std::shared_ptr CxxDeclNameResolver::getDeclName(const clang::Named } else if (clang::isa(declaration)) // also triggers on TemplateTemplateParmDecl { - return std::make_shared(declNameString, getTemplateParameterStrings(clang::dyn_cast(declaration))); + return std::make_shared(std::move(declNameString), getTemplateParameterStrings(clang::dyn_cast(declaration))); } if (!declNameString.empty()) { - return std::make_shared(declNameString, std::vector(), std::shared_ptr()); + return std::make_shared(std::move(declNameString), std::vector(), std::shared_ptr()); } } diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp index be304c85..1b5ebf28 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp @@ -178,7 +178,7 @@ std::shared_ptr CxxTypeNameResolver::getName(const clang::Type* typ typeName = std::make_shared( declName->getName(), - templateArguments, + std::move(templateArguments), declName->getParent() ); } @@ -235,7 +235,7 @@ std::shared_ptr CxxTypeNameResolver::getName(const clang::Type* typ } typeName = std::make_shared( - dependentType->getIdentifier()->getName().str(), templateArguments, specifierName + dependentType->getIdentifier()->getName().str(), std::move(templateArguments), specifierName ); break; } @@ -280,7 +280,7 @@ std::shared_ptr CxxTypeNameResolver::getName(const clang::Type* typ nameString += ")"; typeName = std::make_shared( - nameString, std::vector() + std::move(nameString), std::vector() ); break; } @@ -304,7 +304,7 @@ std::shared_ptr CxxTypeNameResolver::getName(const clang::Type* typ std::string nameString = StrOS.str(); typeName = std::make_shared( - nameString, std::vector() + std::move(nameString), std::vector() ); break; } diff --git a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp index 488a4f16..ed97d8b8 100644 --- a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp +++ b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp @@ -34,7 +34,7 @@ void JavaEnvironmentFactory::createInstance(std::string classPath, std::string& errorString ); - if (!createInstanceFunction && errorString.size() > 0) + if (!createInstanceFunction && !errorString.empty()) { return; } diff --git a/src/lib_java/data/parser/java/JavaParser.cpp b/src/lib_java/data/parser/java/JavaParser.cpp index dc6c3035..301af8b5 100644 --- a/src/lib_java/data/parser/java/JavaParser.cpp +++ b/src/lib_java/data/parser/java/JavaParser.cpp @@ -35,7 +35,7 @@ JavaParser::JavaParser(std::shared_ptr client, std::shared_ptr 0) + if (!errorString.empty()) { LOG_ERROR(errorString); } diff --git a/src/lib_java/data/parser/java/JavaParser.h b/src/lib_java/data/parser/java/JavaParser.h index 186f214c..4802dd0c 100644 --- a/src/lib_java/data/parser/java/JavaParser.h +++ b/src/lib_java/data/parser/java/JavaParser.h @@ -191,7 +191,7 @@ private: jint jAccess, jint jDefinitionKind ); - void doRecordReference(jint jRefType, jstring jReferencedName, jstring jContextName, jint beginLine, jint beginColumn, jint endLine, jint endColumn); + void doRecordReference(jint jReferenceKind, jstring jReferencedName, jstring jContextName, jint beginLine, jint beginColumn, jint endLine, jint endColumn); void doRecordQualifierLocation(jstring jQualifierName, jint beginLine, jint beginColumn, jint endLine, jint endColumn); void doRecordLocalSymbol(jstring jSymbolName, jint beginLine, jint beginColumn, jint endLine, jint endColumn); void doRecordComment(jint beginLine, jint beginColumn, jint endLine, jint endColumn); diff --git a/src/lib_license/License.cpp b/src/lib_license/License.cpp index eacbfb42..bbb499bd 100644 --- a/src/lib_license/License.cpp +++ b/src/lib_license/License.cpp @@ -189,25 +189,25 @@ std::string License::getLicenseInfo() const info += m_type + "\n"; info += getExpireLine() + "\n"; - // get info depending on license type + // get info depending on license type if (isNonCommercialLicenseType()) - { - info += "not registered for commercial development"; - } + { + info += "not registered for commercial development"; + } else if (m_type == LicenseConstants::TEST_LICENSE_STRING) - { - info += "unlimited Seats"; - } + { + info += "unlimited Seats"; + } else if (m_seats > 1) - { + { info += std::to_string(m_seats) + " Seats"; - } - else - { - info += "1 Seat"; - } + } + else + { + info += "1 Seat"; + } - return info; + return info; } std::string License::getUser() const @@ -355,7 +355,7 @@ bool License::isValid() const } try { - if (m_signature.size() <= 0) + if (m_signature.empty()) { std::cout << "Could not read signature" << std::endl; return false; @@ -395,14 +395,14 @@ bool License::isValid() const bool License::isExpired() const { if ( getType() == LicenseConstants::TEST_LICENSE_STRING) - { - return (getTimeLeft()==-1); - } - else - { + { + return (getTimeLeft()==-1); + } + else + { Version version = Version::fromString(m_expire); return Version::getApplicationVersion() > version; - } + } } std::string License::getPublicKeyFilename() const @@ -423,7 +423,7 @@ bool License::loadPublicKeyFromFile(const std::string& filename) if(boost::filesystem::exists(getPublicKeyFilename())) { - Botan::RSA_PublicKey *rsaPublicKey = dynamic_cast(Botan::X509::load_key(getPublicKeyFilename())); + Botan::RSA_PublicKey* rsaPublicKey = dynamic_cast(Botan::X509::load_key(getPublicKeyFilename())); if (!rsaPublicKey) { @@ -499,7 +499,7 @@ std::string License::hashLocation(const std::string& location) const bool License::checkLocation(const std::string& location, const std::string& hash) { - if (!location.size() || !hash.size()) + if (location.empty() || hash.empty()) { return true; } @@ -509,7 +509,7 @@ bool License::checkLocation(const std::string& location, const std::string& hash std::string License::getLicenseEncodedString(const std::string& applicationLocation) const { - if (applicationLocation.size() <= 0) + if (applicationLocation.empty()) { std::cout << "No application location was given" << std::endl; return ""; @@ -555,13 +555,13 @@ std::string License::getLicenseEncodedString(const std::string& applicationLocat bool License::loadFromEncodedString(const std::string& encodedLicense, const std::string& applicationLocation) { - if (encodedLicense.size() <= 0) + if (encodedLicense.empty()) { std::cout << "No license string given" << std::endl; return false; } - if (applicationLocation.size() <= 0) + if (applicationLocation.empty()) { std::cout << "No application location given" << std::endl; return false; @@ -593,7 +593,7 @@ std::string License::getHashedLicense() const std::string License::getEncodeKey(const std::string applicationLocation) const { - if (applicationLocation.size() <= 0) + if (applicationLocation.empty()) { std::cout << "No application location given" << std::endl; return ""; diff --git a/src/lib_license/License.h b/src/lib_license/License.h index f73540a5..a9d3bdf8 100644 --- a/src/lib_license/License.h +++ b/src/lib_license/License.h @@ -105,7 +105,7 @@ public: private: std::string getEncodeKey(const std::string applicationLocation) const; - bool extractData(const std::string& string, LICENSE_LINE line); + bool extractData(const std::string& data, LICENSE_LINE line); std::string removeCaption(const std::string& line, const std::string& caption) const; std::string m_publicKeyFilename; diff --git a/src/lib_license/utility/Version.cpp b/src/lib_license/utility/Version.cpp index a129af6d..1f5f7790 100644 --- a/src/lib_license/utility/Version.cpp +++ b/src/lib_license/utility/Version.cpp @@ -33,7 +33,7 @@ Version Version::fromString(const std::string& versionString) Version version; std::vector parts = split>(versionString, "."); - if (parts.size()) + if (!parts.empty()) { version.m_year = std::stoi(parts[0]); } @@ -46,7 +46,7 @@ Version Version::fromString(const std::string& versionString) if (parts.size() > 2) { std::vector hashParts = split>(parts[2], "-"); - if (hashParts.size()) + if (!hashParts.empty()) { version.m_commitNumber = std::stoi(hashParts[0]); } @@ -92,12 +92,7 @@ bool Version::isEmpty() const bool Version::isValid() const { - if (m_minorNumber < 5 && m_minorNumber > 0 - && m_year > 2016) - { - return true; - } - return false; + return (0 < m_minorNumber && m_minorNumber < 5 && m_year > 2016); } std::string Version::toShortString() const