LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5548 from Jojo-Schmitz/warnings

Browse source 
Fix compiler warnings
This commit is contained in:
anatoly-os 2019-12-26 00:24:58 +02:00 committed by GitHub
commit a4ce8b8555
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/element.cpp
View file

@ -1996,8 +1996,8 @@ void Element::endDrag(EditData& ed)
void Element::updateGrips(EditData& ed) const
{
const auto positions(gripsPositions(ed));
const int ngrips = positions.size();
for (int i = 0; i < ngrips; ++i)
const size_t ngrips = positions.size();
for (int i = 0; i < int(ngrips); ++i)
ed.grip[i].translate(positions[i]);
}

2
mscore/editstyle.cpp
View file

@ -38,7 +38,7 @@ namespace Ms {
//---------------------------------------------------------
EditStyle::EditStyle(Score* s, QWidget* parent)
: cs(s), QDialog(parent)
: QDialog(parent), cs(s)
{
setObjectName("EditStyle");
setupUi(this);

8
mscore/fretcanvas.cpp
View file

@ -128,7 +128,7 @@ void FretCanvas::paintEvent(QPaintEvent* ev)
// Draw barres
p.setPen(pen);
for (auto const& i : diagram->barres()) {
for (auto const& i : diagram->barres()) {
int fret = i.first;
int startString = i.second.startString;
int endString = i.second.endString;
@ -137,7 +137,7 @@ void FretCanvas::paintEvent(QPaintEvent* ev)
qreal newX2 = endString == -1 ? x2 : stringDist * endString;
qreal y = fretDist * (fret - 1) + fretDist * .5;
pen.setWidthF(dotd * diagram->score()->styleD(Sid::barreLineWidth)); // don¡¯t use style barreLineWidth - why not?
pen.setWidthF(dotd * diagram->score()->styleD(Sid::barreLineWidth)); // don't use style barreLineWidth - why not?
pen.setCapStyle(Qt::RoundCap);
p.setPen(pen);
p.drawLine(QLineF(x1, y, newX2, y));
@ -199,7 +199,7 @@ void FretCanvas::paintDotSymbol(QPainter& p, QPen& pen, qreal x, qreal y, qreal
case FretDotType::TRIANGLE:
p.drawLine(QLineF(x, y + dotd, x + .5 * dotd, y));
p.drawLine(QLineF(x + .5 * dotd, y, x + dotd, y + dotd));
p.drawLine(QLineF(x + dotd, y + dotd, x, y + dotd));
p.drawLine(QLineF(x + dotd, y + dotd, x, y + dotd));
break;
case FretDotType::NORMAL:
default:
@ -282,7 +282,7 @@ void FretCanvas::mousePressEvent(QMouseEvent* ev)
if (_automaticDotType && haveCtrl && diagram->dot(string)[0].exists()) {
dtype = FretDotType::TRIANGLE;
std::vector<FretDotType> dtypes {
std::vector<FretDotType> dtypes {
FretDotType::NORMAL,
FretDotType::CROSS,
FretDotType::SQUARE,

6
telemetry/CMakeLists.txt
View file

@ -45,3 +45,9 @@ qt5_add_resources(RCC_SOURCES telemetry_resources.qrc)
add_library(telemetry ${LIBRARY_TYPE} ${telemetry_SOURCES} ${telemetry_HEADERS} ${RCC_SOURCES})
target_link_libraries(telemetry global google_analytics)
if (MSVC)
set_target_properties( telemetry PROPERTIES
COMPILE_FLAGS "/wd4127"
)
endif (MSVC)

6
thirdparty/google_analytics/CMakeLists.txt vendored
View file

@ -24,3 +24,9 @@ file(GLOB_RECURSE google_analytics_HEADERS RELATIVE ${CMAKE_CURRENT_LIST_DIR} *.
add_library(google_analytics ${LIBRARY_TYPE} ${google_analytics_SOURCES} ${google_analytics_HEADERS})
target_link_libraries(google_analytics Qt5::Core Qt5::Network)
if (MSVC)
set_target_properties( google_analytics PROPERTIES
COMPILE_FLAGS "/wd4458"
)
endif (MSVC)