From a69a3e9f4fda4d8569e22f0ce96eb99a31357c9a 2012-08-29 13:08:34 From: Tero Ahola Date: 2012-08-29 13:08:34 Subject: [PATCH] Removed a few unnecessary TODOs --- diff --git a/plugins/declarative/declarative.pro b/plugins/declarative/declarative.pro index b8fa2d6..77e1211 100644 --- a/plugins/declarative/declarative.pro +++ b/plugins/declarative/declarative.pro @@ -6,11 +6,6 @@ QT += declarative } INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR -contains(QT_MAJOR_VERSION, 5) { - # TODO: QtQuick2 not supported by the implementation currently - DEFINES += QTQUICK2 -} - CONFIG(debug, debug|release) { mac: TARGET = $$join(TARGET,,,_debug) win32: TARGET = $$join(TARGET,,,d) diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index 94e76e4..cb0cf36 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -28,8 +28,6 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class DeclarativeChart : public QDeclarativeItem -// TODO: for QTQUICK2: extend QQuickPainterItem instead -//class DeclarativeChart : public QQuickPaintedItem, public Chart { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme) diff --git a/plugins/declarative/declarativepieseries.cpp b/plugins/declarative/declarativepieseries.cpp index fb6db8b..1c207d1 100644 --- a/plugins/declarative/declarativepieseries.cpp +++ b/plugins/declarative/declarativepieseries.cpp @@ -83,7 +83,6 @@ QPieSlice* DeclarativePieSeries::find(QString label) QPieSlice* DeclarativePieSeries::append(QString label, qreal value) { - // TODO: parameter order is wrong, switch it: QPieSlice *slice = new QPieSlice(this); slice->setLabel(label); slice->setValue(value); diff --git a/plugins/declarative/declarativexypoint.h b/plugins/declarative/declarativexypoint.h index fca2563..7573884 100644 --- a/plugins/declarative/declarativexypoint.h +++ b/plugins/declarative/declarativexypoint.h @@ -30,9 +30,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class DeclarativeXYPoint : public QObject, public QPointF { Q_OBJECT - // TODO: make the setters change the value, if parented by a series - Q_PROPERTY(qreal x READ x WRITE setX /*NOTIFY dataXChanged*/) - Q_PROPERTY(qreal y READ y WRITE setY /*NOTIFY dataYChanged*/) + Q_PROPERTY(qreal x READ x WRITE setX) + Q_PROPERTY(qreal y READ y WRITE setY) public: explicit DeclarativeXYPoint(QObject *parent = 0); diff --git a/src/themes/chartthemesystem_p.h b/src/themes/chartthemesystem_p.h index fd98dba..c131b1c 100644 --- a/src/themes/chartthemesystem_p.h +++ b/src/themes/chartthemesystem_p.h @@ -45,11 +45,8 @@ public: ChartThemeSystem() : ChartTheme(QChart::ChartThemeLight /*QChart::ChartThemeSystem*/) { #ifdef Q_OS_WIN - // TODO: use theme specific window frame color as a series base color (it would give more + // We could also use theme specific window frame color as a series base color (it would give more // variation to the base colors in addition to the blue and black used now) - // TODO: COLOR_WINDOWTEXT for text color? - // TODO: COLOR_INFOTEXT for tooltip text color? - // TODO: COLOR_INFOBK for tooltip background color? // First series base color from COLOR_HIGHLIGHT DWORD colorHighlight; @@ -104,7 +101,7 @@ public: m_backgroundShades = BackgroundShadesNone; #elif defined(Q_OS_LINUX) - // TODO: replace this dummy theme with linux specific theme + // Using a hard coded theme for Linux system theme m_seriesColors << QRgb(0x60a6e6); m_seriesColors << QRgb(0x92ca66); m_seriesColors << QRgb(0xeba85f); @@ -127,7 +124,7 @@ public: m_backgroundShades = BackgroundShadesNone; #elif defined(Q_OS_MAC) - // TODO: replace this dummy theme with OSX specific theme + // Using a hard coded theme for OSX system theme; the colors match the OSX 10.7 colors m_seriesColors << QRgb(0x60a6e6); m_seriesColors << QRgb(0x92ca66); m_seriesColors << QRgb(0xeba85f); @@ -150,7 +147,7 @@ public: m_backgroundShades = BackgroundShadesNone; #else - // TODO: replace this dummy theme with generic (not OS specific) theme + // Hard coded theme m_seriesColors << QRgb(0x60a6e6); m_seriesColors << QRgb(0x92ca66); m_seriesColors << QRgb(0xeba85f);