summaryrefslogtreecommitdiffstats
path: root/src/charts/barchart/qbarmodelmapper.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Port from container::count() and length() to size() - V4Marc Mutz2022-10-101-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to handle typedefs and accesses through pointers, too: const std::string o = "object"; auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); }; auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) { auto exprOfDeclaredType = [&](auto decl) { return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o); }; return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes)))); }; auto renameMethod = [&] (ArrayRef<StringRef> classes, StringRef from, StringRef to) { return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)), callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))), changeTo(cat(access(o, cat(to)), "()")), cat("use '", to, "' instead of '", from, "'")); }; renameMethod(<classes>, "count", "size"); renameMethod(<classes>, "length", "size"); a.k.a qt-port-to-std-compatible-api V4 with config Scope: 'Container'. Change-Id: I8187f4b3a16ff78f2a5e5a9158d9437f06a43252 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-161-28/+2
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: Ibb797d52859b5c504f7300f4a5dc956a7b44ac11 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Remove charts namespace for Qt6Michal Klocek2020-11-061-2/+2
| | | | | | | | | This auto refactor to remove charts namespace, just use qt one. [ChangeLog] Use QT_NAMESPACE as other modules. Change-Id: I7722ed2ff5cd84c594ea96db15e5df50a24f06b4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-261-12/+12
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I0d9e3a48056294137f1465f091802b4b7c32c8bf Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notice the following API changes: -void QXYSeries::replace(QVector<QPointF> points); +void QXYSeries::replace(const QList<QPointF> &points); -bool QAbstractBarSeries::append(QVector<QBarSet *> sets); +bool QAbstractBarSeries::append(const QList<QBarSet *> &sets); -void QAbstractBarSeries::barsetsAdded(QVector<QBarSet *> sets); +void QAbstractBarSeries::barsetsAdded(const QList<QBarSet *> &sets); -void QAbstractBarSeries::barsetsRemoved(QVector<QBarSet *> sets); +void QAbstractBarSeries::barsetsRemoved(const QList<QBarSet *> &sets); -bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes); +bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes); -bool QBoxPlotSeries::append(QVector<QBoxSet *> boxes); +bool QBoxPlotSeries::append(const QList<QBoxSet *> &boxes); -void QBoxPlotSeries::boxsetsAdded(QVector<QBoxSet *> sets); +void QBoxPlotSeries::boxsetsAdded(const QList<QBoxSet *> &sets); -void QBoxPlotSeries::boxsetsRemoved(QVector<QBoxSet *> sets); +void QBoxPlotSeries::boxsetsRemoved(const QList<QBoxSet *> &sets); -bool QPieSeries::append(QVector<QPieSlice *> slices); +bool QPieSeries::append(const QList<QPieSlice *> &slices); -QPieSlice *QPieSeries::append(QString label, qreal value); +QPieSlice *QPieSeries::append(const QString &label, qreal value); -void QPieSeries::added(QVector<QPieSlice *> slices); +void QPieSeries::added(const QList<QPieSlice *> &slices); -void QPieSeries::removed(QVector<QPieSlice *> slices); +void QPieSeries::removed(const QList<QPieSlice *> &slices); These should be source compatible changes. Task-number: QTBUG-84469 Change-Id: I153796e9d8244c8e22819993ef26aa91e7b71f99 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Switch export macros to standard formv5.13.0-beta2Kai Koehne2019-04-011-1/+1
| | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Task-number: QTBUG-73752 Change-Id: I4ee654eadbbfc6f5c25f3bb0a8123c8c17235c12 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-251-1/+8
|\ | | | | | | Change-Id: Ia7ebd3f99652dd5d871ed991a5ff45e07c4ac262
| * Fix access to bar sets instantiated inside the moduleMaurice Kalinowski2018-12-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QBarModelMapper allocates QBarSet instances during initialization. While this works for pure C++ applications, on the QML side these need to be of type DeclarativeBarSet to be accessible, but also expose additional properties. The C++ module is not aware of QML, also the QBarModelMapper cannot expose a dynamic allocator without breaking binary compatibility. Hence, the approach is to create a custom allocator function and export it from the C++ module. In case a declarative chart is created, the allocator is replaced with the QML one. Fixes: QTBUG-71013 Change-Id: I1864d637df37f8cd38d28fdba75da0c5608a612c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Fix namespaced buildLiang Qi2018-10-041-2/+2
|/ | | | | | | | | | | It is not allowed to include files within Qt namespace. This amends a93849d0. See 5b99f3a3 in qtbase dev. Task-number: QTBUG-70907 Change-Id: I37f0924429313f2251f656bcd5b6b248a22ccfbb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Rename C++ module from 'Qt Charts' to 'QtCharts'Topi Reinio2018-06-281-1/+1
| | | | | | | | | | This is the convention for documentating Qt C++ modules. It has no effect on the user-visible output except for the html file name, while avoiding certain problem for external tools such as PySide/Shiboken. Change-Id: Ibaec4f8a05ef34bf8a8aff2c9695f859f24858db Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: Edit bar series model mapper class and type docsLeena Miettinen2016-11-171-0/+10
| | | | | Change-Id: I9fb47cc6741f089aa9d8f9224f483448a911c249 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
| * Fix model resetting in with model mappersJoni Poikelin2016-03-021-0/+1
| | | | | | | | | | Change-Id: I22afd1d361aaf0561b4d94b6a3656bfe7b0d9812 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Updated licenseMiikka Heikkinen2016-01-131-9/+17
|/ | | | | | Change-Id: I7ad9838039b56b9e3a7fe2c42a2d8ff818f393fb Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Updated license headersTitta Heikkala2015-10-201-11/+14
| | | | | Change-Id: Ic72ee3c9723c2b3f3368c79219b7468f5d95aa84 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Copyright header changesTitta Heikkala2015-04-231-3/+3
| | | | | | | Copyright header changes for Qt 5.5. Change-Id: I2b8e9356997de2c87a7436bcefd4d0948d566259 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Updated license headersTitta Heikkala2014-11-121-9/+7
| | | | | | | Updated new license headers and added missing ones to qdoc files. Change-Id: I9f2af2a8b44c3ebf19fd494628dfaa8775a47b06 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix include syntaxTitta Heikkala2014-10-201-6/+6
| | | | | | | | | The includes for the whole project are changed to syntax: '#include <module/class> Change-Id: If32f8b6c3f47516ad6bc30ed40789ea9042d5664 Task-number: QTRD-3373 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Qt Charts project file structure changeTitta Heikkala2014-10-141-0/+561
Charts repository structure is changed to follow the structure of a Qt Add-On module. The task includes following changes: - All macros and definitions named 'commercial' have been renamed. - Compile errors related to QString and qSort usage have been fixed. - Old demos are moved under examples. The QML examples now support only Qt Quick 2.0, the support for Qt Quick 1 is removed. - The QML examples with multiple views are updated so that they are usable also with touch devices. - Unnecessary version checks are removed from examples. - The build stamp has been removed as it was only meant for Charts development purposes and it's no longer needed. Also development build related debug prints are removed as __DATE__ can't be used for all OS thus it doesn't make much sense. - Documentation structure has been updated based on the new module structure. The raw HTML files have been removed. Demos are combined to examples. - Unnecessary .qdocinc files are no longer needed. The content is moved to the corresponding .cpp files. - The Charts widget designer plugin is updated according to the module change. - The test cases updated according to the project structure change. Tests are added also for version 2.0. - cmake modules generation is not needed with Qt 5.4 and Qt Charts so it's disabled. - The new module name and version are updated to the plugin.qmltypes file. Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228, QTRD-2526, QTRD-3233, QTRD-3222 Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>