diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-08-04 09:49:45 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-08-06 07:29:55 +0000 |
| commit | 86bf0357feeb9049b82114b3ef13de7282d774f0 (patch) | |
| tree | f85ed9e134b4a222e6a1fe07fae12ee2476e8fd3 /ui/qt/qcustomplot.cpp | |
| parent | 0eee62affe9e6b935fdc37a0d72d5c27c5c7651a (diff) | |
| download | wireshark-86bf0357feeb9049b82114b3ef13de7282d774f0.tar.gz | |
Remove old Qt code.
Our minimum version has been 4.7 for a while. Remove dead
QT_VERSION_CHECK code.
Change-Id: Ia003c1aa4275eefdda707975774d886643ff1538
Reviewed-on: https://code.wireshark.org/review/16888
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/qcustomplot.cpp')
| -rw-r--r-- | ui/qt/qcustomplot.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ui/qt/qcustomplot.cpp b/ui/qt/qcustomplot.cpp index 8cba9e1cf7..a289e3ea7e 100644 --- a/ui/qt/qcustomplot.cpp +++ b/ui/qt/qcustomplot.cpp @@ -2174,9 +2174,7 @@ QList<QCPLayoutElement*> QCPLayout::elements(bool recursive) const { const int c = elementCount(); QList<QCPLayoutElement*> result; -#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) result.reserve(c); -#endif for (int i=0; i<c; ++i) result.append(elementAt(i)); if (recursive) @@ -2900,9 +2898,7 @@ QList<QCPLayoutElement*> QCPLayoutGrid::elements(bool recursive) const QList<QCPLayoutElement*> result; int colC = columnCount(); int rowC = rowCount(); -#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) result.reserve(colC*rowC); -#endif for (int row=0; row<rowC; ++row) { for (int col=0; col<colC; ++col) @@ -5592,11 +5588,7 @@ void QCPAxis::setupTickVectors() { for (int i=mLowestVisibleTick; i<=mHighestVisibleTick; ++i) { -#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0) // use fromMSecsSinceEpoch function if available, to gain sub-second accuracy on tick labels (e.g. for format "hh:mm:ss:zzz") - mTickVectorLabels[i] = mParentPlot->locale().toString(QDateTime::fromTime_t(mTickVector.at(i)).toTimeSpec(mDateTimeSpec), mDateTimeFormat); -#else mTickVectorLabels[i] = mParentPlot->locale().toString(QDateTime::fromMSecsSinceEpoch(mTickVector.at(i)*1000).toTimeSpec(mDateTimeSpec), mDateTimeFormat); -#endif } } } else // mAutoTickLabels == false |