ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: Fixed clang errors and warnings

Browse Source
This commit is contained in:
Eberhard Graether
2017-11-24 00:55:29 +01:00
parent 1a9d2b8eab
commit e4f30555e6
8 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/view/GraphViewStyle.cpp
+11 -9
View File
@@ -156,8 +156,10 @@ size_t GraphViewStyle::getFontSizeForStyleType(NodeType::StyleType type)
case NodeType::STYLE_PACKAGE:
case NodeType::STYLE_SMALL_NODE:
return s_fontSize - 3;
default:
return s_fontSize;
}
return s_fontSize;
}
size_t GraphViewStyle::getFontSizeOfAccessNode()
@@ -336,8 +338,8 @@ GraphViewStyle::NodeStyle GraphViewStyle::getStyleForNodeType(
}
GraphViewStyle::NodeStyle GraphViewStyle::getStyleForNodeType(
NodeType::StyleType type, const std::string& underscoredTypeString,
const FilePath& iconPath, bool defined, bool isActive, bool isFocused,
NodeType::StyleType type, const std::string& underscoredTypeString,
const FilePath& iconPath, bool defined, bool isActive, bool isFocused,
bool hasChildren, bool hasQualifier
){
NodeStyle style;
@@ -483,12 +485,12 @@ GraphViewStyle::NodeStyle GraphViewStyle::getStyleOfBundleNode(bool isFocused)
{
return getStyleForNodeType(
NodeType::STYLE_BIG_NODE,
"bundle",
ResourcePaths::getGuiPath().concat(FilePath("graph_view/images/bundle.png")),
true,
false,
isFocused,
false,
"bundle",
ResourcePaths::getGuiPath().concat(FilePath("graph_view/images/bundle.png")),
true,
false,
isFocused,
false,
false
);
}
src/lib/data/NodeType.h
+2 -2
View File
@@ -12,7 +12,7 @@
class NodeType
{
public:
typedef int NodeType::TypeMask;
typedef int TypeMask;
enum Type : NodeType::TypeMask
{ // make sure that the value of 0x0 is not used here because it doesn't work for bitmasking.
NODE_SYMBOL = 0x1,
@@ -66,7 +66,7 @@ public:
bool isCollapsible() const;
bool isVisibleAsParentInGraph() const;
FilePath getIconPath() const;
bool hasIcon() const;
StyleType getNodeStyle() const;
src/lib/data/storage/PersistentStorage.h
+43 -43
View File
@@ -42,8 +42,8 @@ public:
virtual void forEachCommentLocation(std::function<void(const StorageCommentLocationData& /*data*/)> callback) const override;
virtual void forEachError(std::function<void(const StorageErrorData& /*data*/)> callback) const override;
virtual void startInjection();
virtual void finishInjection();
virtual void startInjection() override;
virtual void finishInjection() override;
void setMode(const SqliteIndexStorage::StorageModeType mode);
@@ -70,78 +70,78 @@ public:
void optimizeMemory();
// StorageAccess implementation
virtual Id getNodeIdForFileNode(const FilePath& filePath) const;
virtual Id getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const;
virtual std::vector<Id> getNodeIdsForNameHierarchies(const std::vector<NameHierarchy> nameHierarchies) const;
virtual Id getNodeIdForFileNode(const FilePath& filePath) const override;
virtual Id getNodeIdForNameHierarchy(const NameHierarchy& nameHierarchy) const override;
virtual std::vector<Id> getNodeIdsForNameHierarchies(const std::vector<NameHierarchy> nameHierarchies) const override;
virtual NameHierarchy getNameHierarchyForNodeId(Id nodeId) const;
virtual std::vector<NameHierarchy> getNameHierarchiesForNodeIds(const std::vector<Id>& nodeIds) const;
virtual NameHierarchy getNameHierarchyForNodeId(Id nodeId) const override;
virtual std::vector<NameHierarchy> getNameHierarchiesForNodeIds(const std::vector<Id>& nodeIds) const override;
virtual NodeType getNodeTypeForNodeWithId(Id nodeId) const;
virtual NodeType getNodeTypeForNodeWithId(Id nodeId) const override;
virtual Id getIdForEdge(
Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const;
virtual StorageEdge getEdgeById(Id edgeId) const;
Edge::EdgeType type, const NameHierarchy& fromNameHierarchy, const NameHierarchy& toNameHierarchy) const override;
virtual StorageEdge getEdgeById(Id edgeId) const override;
virtual std::shared_ptr<SourceLocationCollection> getFullTextSearchLocations(
const std::string& searchTerm, bool caseSensitive) const;
const std::string& searchTerm, bool caseSensitive) const override;
virtual std::vector<SearchMatch> getAutocompletionMatches(const std::string& query, NodeType::TypeMask filter) const;
virtual std::vector<SearchMatch> getAutocompletionMatches(const std::string& query, NodeType::TypeMask filter) const override;
std::vector<SearchMatch> getAutocompletionSymbolMatches(
const std::string& query, NodeType::TypeMask filter, size_t maxResultsCount, size_t maxBestScoredResultsLength) const;
std::vector<SearchMatch> getAutocompletionFileMatches(const std::string& query, size_t maxResultsCount) const;
std::vector<SearchMatch> getAutocompletionCommandMatches(const std::string& query, NodeType::TypeMask filter) const;
virtual std::vector<SearchMatch> getSearchMatchesForTokenIds(const std::vector<Id>& elementIds) const;
virtual std::vector<SearchMatch> getSearchMatchesForTokenIds(const std::vector<Id>& elementIds) const override;
virtual std::shared_ptr<Graph> getGraphForAll() const;
virtual std::shared_ptr<Graph> getGraphForFilter(NodeType::TypeMask filter) const;
virtual std::shared_ptr<Graph> getGraphForAll() const override;
virtual std::shared_ptr<Graph> getGraphForFilter(NodeType::TypeMask filter) const override;
virtual std::shared_ptr<Graph> getGraphForActiveTokenIds(
const std::vector<Id>& tokenIds, const std::vector<Id>& expandedNodeIds, bool* isActiveNamespace = nullptr) const;
virtual std::shared_ptr<Graph> getGraphForChildrenOfNodeId(Id nodeId) const;
virtual std::shared_ptr<Graph> getGraphForTrail(Id originId, Id targetId, Edge::TypeMask trailType, size_t depth) const;
const std::vector<Id>& tokenIds, const std::vector<Id>& expandedNodeIds, bool* isActiveNamespace = nullptr) const override;
virtual std::shared_ptr<Graph> getGraphForChildrenOfNodeId(Id nodeId) const override;
virtual std::shared_ptr<Graph> getGraphForTrail(Id originId, Id targetId, Edge::TypeMask trailType, size_t depth) const override;
virtual std::vector<Id> getActiveTokenIdsForId(Id tokenId, Id* declarationId) const;
virtual std::vector<Id> getNodeIdsForLocationIds(const std::vector<Id>& locationIds) const;
virtual std::vector<Id> getActiveTokenIdsForId(Id tokenId, Id* declarationId) const override;
virtual std::vector<Id> getNodeIdsForLocationIds(const std::vector<Id>& locationIds) const override;
virtual std::shared_ptr<SourceLocationCollection> getSourceLocationsForTokenIds(const std::vector<Id>& tokenIds) const;
virtual std::shared_ptr<SourceLocationCollection> getSourceLocationsForLocationIds(const std::vector<Id>& locationIds) const;
virtual std::shared_ptr<SourceLocationCollection> getSourceLocationsForTokenIds(const std::vector<Id>& tokenIds) const override;
virtual std::shared_ptr<SourceLocationCollection> getSourceLocationsForLocationIds(const std::vector<Id>& locationIds) const override;
virtual std::shared_ptr<SourceLocationFile> getSourceLocationsForFile(const FilePath& filePath) const;
virtual std::shared_ptr<SourceLocationFile> getSourceLocationsForFile(const FilePath& filePath) const override;
virtual std::shared_ptr<SourceLocationFile> getSourceLocationsForLinesInFile(
const FilePath& filePath, uint firstLineNumber, uint lastLineNumber
) const;
) const override;
virtual std::shared_ptr<SourceLocationFile> getCommentLocationsInFile(const FilePath& filePath) const;
virtual std::shared_ptr<SourceLocationFile> getCommentLocationsInFile(const FilePath& filePath) const override;
virtual std::shared_ptr<TextAccess> getFileContent(const FilePath& filePath) const;
virtual std::shared_ptr<TextAccess> getFileContent(const FilePath& filePath) const override;
virtual FileInfo getFileInfoForFilePath(const FilePath& filePath) const;
virtual std::vector<FileInfo> getFileInfosForFilePaths(const std::vector<FilePath>& filePaths) const;
virtual FileInfo getFileInfoForFilePath(const FilePath& filePath) const override;
virtual std::vector<FileInfo> getFileInfosForFilePaths(const std::vector<FilePath>& filePaths) const override;
virtual StorageStats getStorageStats() const;
virtual StorageStats getStorageStats() const override;
virtual ErrorCountInfo getErrorCount() const;
virtual ErrorCountInfo getErrorCount() const override;
virtual ErrorCountInfo getErrorCount(const std::vector<ErrorInfo>& errors) const;
virtual std::vector<ErrorInfo> getErrors() const;
virtual std::vector<ErrorInfo> getErrorsLimited() const;
virtual std::shared_ptr<SourceLocationCollection> getErrorSourceLocationsLimited(std::vector<ErrorInfo>* errors) const;
virtual std::vector<ErrorInfo> getErrorsLimited() const override;
virtual std::shared_ptr<SourceLocationCollection> getErrorSourceLocationsLimited(std::vector<ErrorInfo>* errors) const override;
virtual Id addNodeBookmark(const NodeBookmark& bookmark);
virtual Id addEdgeBookmark(const EdgeBookmark& bookmark);
virtual Id addBookmarkCategory(const std::string& categoryName);
virtual Id addNodeBookmark(const NodeBookmark& bookmark) override;
virtual Id addEdgeBookmark(const EdgeBookmark& bookmark) override;
virtual Id addBookmarkCategory(const std::string& categoryName) override;
virtual void updateBookmark(const Id bookmarkId, const std::string& name, const std::string& comment, const std::string& categoryName);
virtual void removeBookmark(const Id id);
virtual void removeBookmarkCategory(const Id id);
virtual void updateBookmark(const Id bookmarkId, const std::string& name, const std::string& comment, const std::string& categoryName) override;
virtual void removeBookmark(const Id id) override;
virtual void removeBookmarkCategory(const Id id) override;
virtual std::vector<NodeBookmark> getAllNodeBookmarks() const;
virtual std::vector<EdgeBookmark> getAllEdgeBookmarks() const;
virtual std::vector<BookmarkCategory> getAllBookmarkCategories() const;
virtual std::vector<NodeBookmark> getAllNodeBookmarks() const override;
virtual std::vector<EdgeBookmark> getAllEdgeBookmarks() const override;
virtual std::vector<BookmarkCategory> getAllBookmarkCategories() const override;
virtual TooltipInfo getTooltipInfoForTokenIds(const std::vector<Id>& tokenIds, TooltipOrigin origin) const;
virtual TooltipInfo getTooltipInfoForTokenIds(const std::vector<Id>& tokenIds, TooltipOrigin origin) const override;
TooltipSnippet getTooltipSnippetForNode(const StorageNode& node) const;
virtual TooltipInfo getTooltipInfoForSourceLocationIdsAndLocalSymbolIds(
const std::vector<Id>& locationIds, const std::vector<Id>& localSymbolIds) const;
const std::vector<Id>& locationIds, const std::vector<Id>& localSymbolIds) const override;
private:
Id getFileNodeId(const FilePath& filePath) const;
src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp
+5 -6
View File
@@ -1,6 +1,5 @@
#include "data/parser/cxx/name_resolver/CxxDeclNameResolver.h"
#include <clang/AST/DeclTemplate.h>
#include <clang/AST/ASTContext.h>
#include "data/parser/cxx/name/CxxFunctionDeclName.h"
@@ -22,7 +21,7 @@ CxxDeclNameResolver::CxxDeclNameResolver(std::shared_ptr<CanonicalFilePathCache>
}
CxxDeclNameResolver::CxxDeclNameResolver(
std::shared_ptr<CanonicalFilePathCache> canonicalFilePathCache,
std::shared_ptr<CanonicalFilePathCache> canonicalFilePathCache,
std::vector<const clang::Decl*> ignoredContextDecls
)
: CxxNameResolver(canonicalFilePathCache, ignoredContextDecls)
@@ -111,7 +110,7 @@ std::shared_ptr<CxxDeclName> CxxDeclNameResolver::getName(const clang::NamedDecl
}
break;
}
if (const clang::DeclContext* parentDeclContext = parentDecl->getDeclContext())
{
if (ignoresContext(parentDeclContext))
@@ -285,7 +284,7 @@ std::shared_ptr<CxxDeclName> CxxDeclNameResolver::getDeclName(const clang::Named
functionName,
templateArguments,
returnTypeName,
parameterTypeNames,
parameterTypeNames,
getTranslationUnitMainFileName(declaration)
);
}
@@ -357,9 +356,9 @@ std::shared_ptr<CxxDeclName> CxxDeclNameResolver::getDeclName(const clang::Named
if (utility::getSymbolKind(varDecl) == SYMBOL_GLOBAL_VARIABLE &&
varDecl->getStorageClass() == clang::SC_Static)
{
// if a global variable is static it is only visible in the current translation unit. Therefore if multiple instances of that global variable
// if a global variable is static it is only visible in the current translation unit. Therefore if multiple instances of that global variable
// may be generated (one for each translation unit) we add the name of the translation unit's source file.
// If that global variable definition is const, we add the name of the (maybe header) file that variable is defined in instead. This causes
// If that global variable definition is const, we add the name of the (maybe header) file that variable is defined in instead. This causes
// different instances of the variable that all MUST contain the same value to be merged into a single node in Sourcetrail.
std::string scopeFileName = "";
{
src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
+2
View File
@@ -1,6 +1,8 @@
#ifndef CXX_DECL_NAME_RESOLVER_H
#define CXX_DECL_NAME_RESOLVER_H
#include "clang/AST/DeclTemplate.h"
#include "data/parser/cxx/name/CxxDeclName.h"
#include "data/parser/cxx/name_resolver/CxxNameResolver.h"
src/lib_gui/qt/element/QtCodeField.cpp
+8 -3
View File
@@ -53,7 +53,7 @@ QtCodeField::QtCodeField(
{
QString convertedDisplayCode(codec->toUnicode(displayCode.c_str()));
setPlainText(convertedDisplayCode);
if (displayCode.size() != convertedDisplayCode.length())
if (displayCode.size() != size_t(convertedDisplayCode.length()))
{
LOG_INFO("Converting displayed code to " + codec->name().toStdString() + " resulted in offset of source locations. Correcting this now.");
createMultibyteCharacterLocationCache();
@@ -685,9 +685,14 @@ void QtCodeField::createMultibyteCharacterLocationCache()
}
}
int QtCodeField::getColumnCorrectedForMultibyteCharacters(const int line, int column) const
int QtCodeField::getColumnCorrectedForMultibyteCharacters(int line, int column) const
{
const int relativeLineNumber = line - m_startLineNumber;
if (line < int(m_startLineNumber))
{
return column;
}
const size_t relativeLineNumber = line - m_startLineNumber;
if (relativeLineNumber < m_multibyteCharacterLocations.size())
{
for (const std::pair<int, int> m_multibyteCharacterLocation : m_multibyteCharacterLocations[relativeLineNumber])
src/lib_gui/qt/element/QtCodeField.h
+1 -1
View File
@@ -106,7 +106,7 @@ private:
void createLineLengthCache();
void createMultibyteCharacterLocationCache();
int getColumnCorrectedForMultibyteCharacters(const int line, int column) const;
int getColumnCorrectedForMultibyteCharacters(int line, int column) const;
const uint m_startLineNumber;
const std::string m_code;
src/lib_gui/utility/utilityApp.cpp
+2 -2
View File
@@ -40,8 +40,8 @@ std::string utility::executeProcess(const std::string& command, const std::strin
s_runningProcesses.erase(&process);
}
QProcess::ProcessError error = process.error();
// QProcess::ProcessError error = process.error();
std::string processoutput = process.readAll().toStdString();
process.close();
processoutput = utility::trim(processoutput);