HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r311:e1f0c8c24a70

Removed unused DeclarativeSeries class

Tero Ahola -

r311:e1f0c8c24a70

parent child

Context file:

r311:e1f0c8c24a70

Collapse all files

qmlplugin/declarativechart.cpp 0 -1

             #include "declarativechart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this))
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
             DeclarativeChart::ChartTheme DeclarativeChart::theme()
             {
-                if (m_chart)
                 return (ChartTheme) m_chart->chartTheme();
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
                 qDebug() << "geometryChanged " << this << " old geometry: " << oldGeometry;
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         // TODO: setting margin should not be needed to make axis visible?
                         const int margin = 30;
                         if (m_chart->margin() == 0
                                 && newGeometry.width() > (margin * 2)
                                 && newGeometry.height() > (margin * 2)) {
                             m_chart->setMargin(margin);
                             m_chart->resize(newGeometry.width(), newGeometry.height());
                         } else {
                             m_chart->resize(newGeometry.width(), newGeometry.height());
                         }
                     }
                 }
             }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/plugin.cpp 0 -2

             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "declarativechart.h"
-            #include "declarativeseries.h"
             #include "scatterelement.h"
             #include "declarativescatterseries.h"
             #include "declarativelineseries.h"
             #include "declarativepieseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartQmlPlugin : public QDeclarativeExtensionPlugin
             {
                 Q_OBJECT
             public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "Chart");
-                    qmlRegisterType<DeclarativeSeries>(uri, 1, 0, "Series");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "ChartPieElement");
                     // TODO: rename ScatterElement class to something like "PointElement"
                     qmlRegisterType<ScatterElement>(uri, 1, 0, "ChartPointElement");
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))

qmlplugin/qmlplugin.pro 0 -22

             !include( ../common.pri ) {
                 error( "Couldn't find the common.pri file!" )
             }
             !include( ../integrated.pri ) {
                 error( "Couldn't find the integrated.pri file !")
             }
             TEMPLATE = lib
             TARGET = qtcommercialchartqml
             DESTDIR = $$CHART_BUILD_PLUGIN_DIR
             CONFIG += qt plugin
             QT += declarative
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
             OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
             MOC_DIR = $$CHART_BUILD_DIR/plugin
             UI_DIR = $$CHART_BUILD_DIR/plugin
             RCC_DIR = $$CHART_BUILD_DIR/plugin
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
-                declarativeseries.cpp \
                 declarativescatterseries.cpp \
                 scatterelement.cpp \
                 declarativepieseries.cpp \
                 declarativelineseries.cpp
             HEADERS += \
                 declarativechart.h \
-                declarativeseries.h \
                 declarativescatterseries.h \
                 scatterelement.h \
                 declarativepieseries.h \
                 declarativelineseries.h
             QMAKE_POST_LINK = $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir

qmlplugin/declarativeseries.cpp removed 0 -73

NO CONTENT: file was removed

qmlplugin/declarativeseries.h removed 0 -50

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages