diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-02-28 10:19:28 +0100 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-02-28 11:41:32 +0000 |
| commit | 26e62dfad07a02efc03e4c08c3c6b08e5c5d2076 (patch) | |
| tree | 846ad87bc08c4c242fd55a6d45a1e1fe7c736cd5 /ui/qt/qcustomplot.cpp | |
| parent | 311b1ee70072531352262f3a47181e89472e3109 (diff) | |
| download | wireshark-26e62dfad07a02efc03e4c08c3c6b08e5c5d2076.tar.gz | |
Qt: Fix -Wshorten-64-to-32 warnings
Fix some warnings when building with -Wshorten-64-to-32 flag for
C++ code.
Fixes for warnings from QList, QTimer and QVector has been pushed
upstream, so some time we may be able to enable this flag for C++.
Change-Id: Iae7457f9afc469c63f3edbe23dbf272b5c6c9e5e
Reviewed-on: https://code.wireshark.org/review/20310
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'ui/qt/qcustomplot.cpp')
| -rw-r--r-- | ui/qt/qcustomplot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/qcustomplot.cpp b/ui/qt/qcustomplot.cpp index 006be1ad36..72fb58747d 100644 --- a/ui/qt/qcustomplot.cpp +++ b/ui/qt/qcustomplot.cpp @@ -5624,7 +5624,7 @@ void QCPAxis::generateAutoTicks() // Generate tick positions according to mTickStep: qint64 firstStep = floor(mRange.lower/mTickStep); // do not use qFloor here, or we'll lose 64 bit precision qint64 lastStep = ceil(mRange.upper/mTickStep); // do not use qCeil here, or we'll lose 64 bit precision - int tickcount = lastStep-firstStep+1; + int tickcount = int(lastStep-firstStep+1); if (tickcount < 0) tickcount = 0; mTickVector.resize(tickcount); for (int i=0; i<tickcount; ++i) |