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

build: Treat warnings as errors (#923)

Browse Source 
* squash and rebase andronov-alexey:treat_warnings_as_errors from pull request #850
* fix remaining warnings in java lib
This commit is contained in:
Malte Langkabel
2020-02-14 16:34:04 +01:00
committed by GitHub
parent e5c1a118d7
commit a30f47e27f
112 changed files with 634 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/graphics/graph/QtGraphNode.cpp
+15 -11
View File
@@ -95,7 +95,7 @@ const std::list<QtGraphNode*>& QtGraphNode::getSubNodes() const
Vec2i QtGraphNode::getPosition() const
{
return Vec2i(this->scenePos().x(), this->scenePos().y());
return Vec2i(static_cast<int>(this->scenePos().x()), static_cast<int>(this->scenePos().y()));
}
bool QtGraphNode::setPosition(const Vec2i& position)
@@ -578,7 +578,7 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
if (!m_icon && !style.iconPath.empty())
{
QtDeviceScaledPixmap pixmap(QString::fromStdWString(style.iconPath.wstr()));
pixmap.scaleToHeight(style.iconSize);
pixmap.scaleToHeight(static_cast<int>(style.iconSize));
m_icon = new QGraphicsPixmapItem(
utility::colorizePixmap(pixmap.pixmap(), style.color.icon.c_str()), this);
@@ -588,7 +588,7 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
}
QFont font(style.fontName.c_str());
font.setPixelSize(style.fontSize);
font.setPixelSize(static_cast<int>(style.fontSize));
if (style.fontBold)
{
font.setWeight(QFont::Bold);
@@ -596,7 +596,9 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
m_text->setFont(font);
m_text->setBrush(QBrush(style.color.text.c_str()));
m_text->setPos(style.iconOffset.x + style.iconSize + style.textOffset.x, style.textOffset.y);
m_text->setPos(
static_cast<qreal>(style.iconOffset.x + style.iconSize + style.textOffset.x),
static_cast<qreal>(style.textOffset.y));
if (m_matchLength)
{
@@ -605,16 +607,18 @@ void QtGraphNode::setStyle(const GraphViewStyle::NodeStyle& style)
m_matchText->setFont(font);
m_matchText->setBrush(QBrush(color.text.c_str()));
m_matchText->setPos(
style.iconOffset.x + style.iconSize + style.textOffset.x, style.textOffset.y);
static_cast<qreal>(style.iconOffset.x + style.iconSize + style.textOffset.x),
static_cast<qreal>(style.textOffset.y));
float charWidth =
const float charWidth =
QFontMetrics(font).width(QStringLiteral("QtGraphNode::QtGraphNode::QtGraphNode")) / 37.0f;
float charHeight = QFontMetrics(font).height();
const float charHeight = static_cast<float>(QFontMetrics(font).height());
m_matchRect->setRect(
style.iconOffset.x + style.iconSize + style.textOffset.x + m_matchPos * charWidth,
style.textOffset.y,
m_matchLength * charWidth,
charHeight);
static_cast<qreal>(
style.iconOffset.x + style.iconSize + style.textOffset.x + m_matchPos * charWidth),
static_cast<qreal>(style.textOffset.y),
static_cast<qreal>(m_matchLength * charWidth),
static_cast<qreal>(charHeight));
m_matchRect->setPen(QPen(color.border.c_str()));
m_matchRect->setBrush(QBrush(color.fill.c_str()));
m_matchRect->setRadius(3);