HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r194:c7a6b069859c

src/scatterseries/scatter.pri created 644 +13 0

@@ -0,0 +1,13
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	SOURCES += \
	5	$$PWD/qscatterseries.cpp \
	6	$$PWD/scatterpresenter.cpp
	7
	8	PRIVATE_HEADERS += \
	9	$$PWD/scatterpresenter_p.h \
	10	$$PWD/scatterseries_p.h
	11
	12	PUBLIC_HEADERS += \
	13	$$PWD/qscatterseries.h

src/chartpresenter.cpp +1 -1

             #include "percentbargroup.h"
             #include "linechartanimationitem_p.h"
             #include "piepresenter.h"
-            #include "scatterpresenter.h"
+            #include "scatterpresenter_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/charttheme.cpp +1 -1

             #include "stackedbargroup.h"
             #include "linechartitem_p.h"
             #include "percentbargroup.h"
-            #include "scatterpresenter.h"
+            #include "scatterpresenter_p.h"
             #include "piepresenter.h"
             //themes

src/qchart.cpp +3 -3

             #include "qchart.h"
-            #include "qscatterseries.h"
-            #include "qscatterseries_p.h"
-            #include "qpieseries.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
             #include "qlinechartseries.h"
+            #include "qscatterseries.h"
+            //#include "scatterseries_p.h"
+            #include "qpieseries.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>

src/scatterseries/qscatterseries.cpp ~~src/qscatterseries.cpp~~ renamed +1 -1

             #include "qscatterseries.h"
-            #include "qscatterseries_p.h"
+            #include "scatterseries_p.h"
             #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/scatterseries/qscatterseries.h ~~src/qscatterseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/qscatterseries.h to src/scatterseries/qscatterseries.h

src/scatterseries/scatterpresenter.cpp ~~src/scatterpresenter.cpp~~ renamed +2 -2

-            #include "scatterpresenter.h"
+            #include "scatterpresenter_p.h"
             #include "qscatterseries.h"
             #include <QPen>
             #include <QPainter>
                 }
             }
-            #include "moc_scatterpresenter.cpp"
+            #include "moc_scatterpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterpresenter_p.h ~~src/scatterpresenter.h~~ renamed 0 0

NO CONTENT: file renamed from src/scatterpresenter.h to src/scatterseries/scatterpresenter_p.h

src/scatterseries/scatterseries_p.h ~~src/qscatterseries_p.h~~ renamed 0 0

NO CONTENT: file renamed from src/qscatterseries_p.h to src/scatterseries/scatterseries_p.h

src/src.pro +5 -10

                 linechart/linechartanimationitem.cpp \
                 linechart/linechartitem.cpp \
                 linechart/qlinechartseries.cpp \
-                qscatterseries.cpp \
-                #scatterpresentation.cpp \
                 qchart.cpp \
                 axisitem.cpp \
                 qchartview.cpp \
                 charttheme.cpp \
                 chartdataset.cpp \
                 chartpresenter.cpp \
-                domain.cpp \
+                domain.cpp
-                scatterpresenter.cpp
             PRIVATE_HEADERS += linechart/linechartitem_p.h \
                 linechart/linechartanimationitem_p.h \
                 barchart/barlabel_p.h \
                 barchart/bar_p.h \
                 barchart/separator_p.h \
                 barchart/barchartmodel_p.h \
-                qscatterseries_p.h \
-                #scatterpresentation.h \
                 axisitem_p.h \
                 chartitem_p.h \
                 charttheme_p.h \
                 barchart/qbarset.h \
                 barchart/qbarcategory.h \
                 qchartseries.h \
-                qscatterseries.h \
                 qchart.h \
                 qchartglobal.h \
                 qchartview.h \
                 qchartaxis.h
             include(piechart/piechart.pri)
+            include(scatterseries/scatter.pri)
             THEMES += themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 themes/chartthemevanilla_p.h
-            HEADERS += $$PUBLIC_HEADERS \
+            HEADERS += $$PUBLIC_HEADERS
-                scatterpresenter.h
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += linechart \
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR

	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