diff --git a/examples/stockchart/Plot.cpp b/examples/stockchart/Plot.cpp index f2b76b0..9b7a980 100644 --- a/examples/stockchart/Plot.cpp +++ b/examples/stockchart/Plot.cpp @@ -58,8 +58,8 @@ namespace class DateScaleDraw : public QwtDateScaleDraw { public: - DateScaleDraw( Qt::TimeSpec timeSpec ) - : QwtDateScaleDraw( timeSpec ) + DateScaleDraw( QTimeZone timeZone ) + : QwtDateScaleDraw( timeZone ) { // as we have dates from 2010 only we use // format strings without the year @@ -98,8 +98,8 @@ namespace void setInterval( const QDate& date1, const QDate& date2 ) { - const QDateTime dt1( date1, QTime(), Qt::UTC ); - const QDateTime dt2( date2, QTime(), Qt::UTC ); + const QDateTime dt1( date1, QTime(), QTimeZone::UTC ); + const QDateTime dt2( date2, QTime(), QTimeZone::UTC ); QwtPlotZoneItem::setInterval( QwtDate::toDouble( dt1 ), QwtDate::toDouble( dt2 ) ); @@ -112,8 +112,8 @@ Plot::Plot( QWidget* parent ) { setTitle( "Trading Chart" ); - QwtDateScaleDraw* scaleDraw = new DateScaleDraw( Qt::UTC ); - QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( Qt::UTC ); + QwtDateScaleDraw* scaleDraw = new DateScaleDraw( QTimeZone::UTC ); + QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( QTimeZone::UTC ); setAxisTitle( QwtAxis::XBottom, QString( "2010" ) ); setAxisScaleDraw( QwtAxis::XBottom, scaleDraw ); diff --git a/examples/stockchart/QuoteFactory.cpp b/examples/stockchart/QuoteFactory.cpp index bbcc453..2483f59 100644 --- a/examples/stockchart/QuoteFactory.cpp +++ b/examples/stockchart/QuoteFactory.cpp @@ -833,7 +833,7 @@ QVector< QwtOHLCSample > QuoteFactory::samples2010( Stock stock ) QVector< QwtOHLCSample > samples; samples.reserve( numSamples ); - QDateTime year2010( QDate( 2010, 1, 1 ), QTime( 0, 0 ), Qt::UTC ); + QDateTime year2010( QDate( 2010, 1, 1 ), QTime( 0, 0 ), QTimeZone::UTC ); for ( int i = 0; i < numSamples; i++ ) { diff --git a/playground/timescale/MainWindow.cpp b/playground/timescale/MainWindow.cpp index 54e82ac..fb76423 100644 --- a/playground/timescale/MainWindow.cpp +++ b/playground/timescale/MainWindow.cpp @@ -58,8 +58,8 @@ void MainWindow::updatePanel() const QwtScaleDiv scaleDiv = m_plot->axisScaleDiv( QwtAxis::YLeft ); Settings settings = m_panel->settings(); - settings.startDateTime = QwtDate::toDateTime( scaleDiv.lowerBound(), Qt::LocalTime ); - settings.endDateTime = QwtDate::toDateTime( scaleDiv.upperBound(), Qt::LocalTime ); + settings.startDateTime = QwtDate::toDateTime( scaleDiv.lowerBound(), QTimeZone::LocalTime ); + settings.endDateTime = QwtDate::toDateTime( scaleDiv.upperBound(), QTimeZone::LocalTime ); m_panel->setSettings( settings ); } diff --git a/playground/timescale/Plot.cpp b/playground/timescale/Plot.cpp index beb5e56..ba744ea 100644 --- a/playground/timescale/Plot.cpp +++ b/playground/timescale/Plot.cpp @@ -23,9 +23,9 @@ Plot::Plot( QWidget* parent ) plotLayout()->setAlignCanvasToScales( true ); - initAxis( QwtAxis::YLeft, "Local Time", Qt::LocalTime ); + initAxis( QwtAxis::YLeft, "Local Time", QTimeZone::LocalTime ); initAxis( QwtAxis::YRight, - "Coordinated Universal Time ( UTC )", Qt::UTC ); + "Coordinated Universal Time ( UTC )", QTimeZone::UTC ); QwtPlotPanner* panner = new QwtPlotPanner( canvas() ); QwtPlotMagnifier* magnifier = new QwtPlotMagnifier( canvas() ); @@ -51,12 +51,12 @@ Plot::Plot( QWidget* parent ) } void Plot::initAxis( int axis, - const QString& title, Qt::TimeSpec timeSpec ) + const QString& title, QTimeZone timeZone ) { setAxisTitle( axis, title ); - QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( timeSpec ); - QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( timeSpec ); + QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( timeZone ); + QwtDateScaleEngine* scaleEngine = new QwtDateScaleEngine( timeZone ); #if 0 if ( timeSpec == Qt::LocalTime ) diff --git a/playground/timescale/Plot.h b/playground/timescale/Plot.h index 67774e6..ea14d94 100644 --- a/playground/timescale/Plot.h +++ b/playground/timescale/Plot.h @@ -6,6 +6,7 @@ #pragma once #include +#include class Settings; @@ -20,6 +21,6 @@ class Plot : public QwtPlot void applySettings( const Settings& ); private: - void initAxis( int axis, const QString& title, Qt::TimeSpec ); + void initAxis( int axis, const QString& title, QTimeZone ); void applyAxisSettings( int axis, const Settings& ); };