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_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])