From c910c425fd26b13770a523c2ebac07e5d0282653 Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 21:58:10 -0300 Subject: [PATCH 1/7] Fix zint version --- 3rdparty/zint-2.6.1/backend_qt/backend_qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro index 1efb6b2..4612c9e 100644 --- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro +++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro @@ -24,7 +24,7 @@ unix{ } INCLUDEPATH += $$PWD/../backend -DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" +DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$ZINT_VERSION\\\" CONFIG(release, debug|release){ TARGET = QtZint } else { From ffd82a18ca2b6c4e0c0d5615ccc3560659a5ad56 Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 22:06:42 -0300 Subject: [PATCH 2/7] Fix if --- limereport/lrreportengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index 70fda8e..62788c2 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -1383,7 +1383,7 @@ ReportPages ReportEnginePrivate::renderToPages() ReportPages ReportEnginePrivate::appendPages(ReportPages s1, ReportPages s2, AppendType appendType) { - if (!s1.isEmpty()>0 && s1.size() == s2.size() && appendType == MixPages){ + if (!s1.isEmpty() && s1.size() == s2.size() && appendType == MixPages){ ReportPages result; ReportPages::Iterator s1It; ReportPages::Iterator s2It; From 9ce7e4dfbfebf3e750c95ec8ba66bd2344f85b26 Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 22:13:45 -0300 Subject: [PATCH 3/7] Disable warnings for 3rdparty code --- 3rdparty/3rdparty.pro | 3 +++ 3rdparty/zint-2.6.1/backend_qt/backend_qt.pro | 12 +++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/3rdparty/3rdparty.pro b/3rdparty/3rdparty.pro index 75d28ff..7ec6a29 100644 --- a/3rdparty/3rdparty.pro +++ b/3rdparty/3rdparty.pro @@ -3,3 +3,6 @@ ZINT_VERSION = 2.6.1 INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt include($${ZINT_PATH}/backend_qt/backend_qt.pro) + +CONFIG -= warn_on +CONFIG += warn_off diff --git a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro index 4612c9e..13e5114 100644 --- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro +++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro @@ -24,7 +24,9 @@ unix{ } INCLUDEPATH += $$PWD/../backend -DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$ZINT_VERSION\\\" + +DEFINES += ZINT_VERSION=\\\"$$ZINT_VERSION\\\" + CONFIG(release, debug|release){ TARGET = QtZint } else { @@ -36,14 +38,6 @@ CONFIG(release, debug|release){ LIBS += -lpng } - -win32-msvc* { - DEFINES += _CRT_SECURE_NO_WARNINGS - #QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 - #QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 -} - - INCLUDEPATH += zint zint/backend zint/backend_qt HEADERS += $$PWD/../backend/aztec.h \ From bf7e26bc0df0dce21dccff1a318053f71f78ab5a Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 22:26:58 -0300 Subject: [PATCH 4/7] Update travis.yml --- .travis.yml | 66 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 065513a..eec76b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -520,7 +520,7 @@ matrix: - make - make check - - env: Qt5.12.6_Ubuntu_18.04 + - env: Qt5.12.10_Ubuntu_18.04 os: linux dist: bionic language: cpp @@ -529,7 +529,7 @@ matrix: addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt-5.12.6-bionic' + - sourceline: 'ppa:beineri/opt-qt-5.12.10-bionic' packages: - qt512base - qt512script @@ -544,7 +544,7 @@ matrix: - make - make check - - env: Qt5.12.6_Ubuntu_18.04 + - env: Qt5.12.10_Ubuntu_18.04 os: linux dist: bionic language: cpp @@ -553,7 +553,7 @@ matrix: addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt-5.12.6-bionic' + - sourceline: 'ppa:beineri/opt-qt-5.12.10-bionic' packages: - qt512base - qt512script @@ -616,7 +616,7 @@ matrix: - make - make check - - env: Qt5.14.0_Ubuntu_18.04 + - env: Qt5.14.2_Ubuntu_18.04 os: linux dist: bionic language: cpp @@ -625,7 +625,7 @@ matrix: addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt-5.14.0-bionic' + - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic' packages: - qt514base - qt514script @@ -640,7 +640,7 @@ matrix: - make - make check - - env: Qt5.14.0_Ubuntu_18.04 + - env: Qt5.14.2_Ubuntu_18.04 os: linux dist: bionic language: cpp @@ -649,7 +649,7 @@ matrix: addons: apt: sources: - - sourceline: 'ppa:beineri/opt-qt-5.14.0-bionic' + - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic' packages: - qt514base - qt514script @@ -662,7 +662,55 @@ matrix: - source /opt/qt514/bin/qt514-env.sh - /opt/qt514/bin/qmake -r limereport.pro - make - - make check + - make check + + - env: Qt5.15.2_Ubuntu_18.04 + os: linux + dist: bionic + language: cpp + compiler: gcc + cache: ccache + addons: + apt: + sources: + - sourceline: 'ppa:beineri/opt-qt-5.15.2-bionic' + packages: + - qt515base + - qt515script + - qt515tools + - qt515svg + - mesa-common-dev + - libgl1-mesa-dev + + script: + - source /opt/qt515/bin/qt515-env.sh + - /opt/qt515/bin/qmake -r limereport.pro + - make + - make check + + - env: Qt5.15.2_Ubuntu_18.04 + os: linux + dist: bionic + language: cpp + compiler: clang + cache: ccache + addons: + apt: + sources: + - sourceline: 'ppa:beineri/opt-qt-5.15.2-bionic' + packages: + - qt515base + - qt515script + - qt515tools + - qt515svg + - mesa-common-dev + - libgl1-mesa-dev + + script: + - source /opt/qt515/bin/qt515-env.sh + - /opt/qt515/bin/qmake -r limereport.pro + - make + - make check notifications: email: false From df7670d13626dccd6877687f8aafcac28378069a Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 22:28:41 -0300 Subject: [PATCH 5/7] Fix compilation in old Qt versions --- limereport/lrreportrender.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 58f0bd9..01e7c87 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -1352,7 +1352,7 @@ void ReportRender::cutGroups() m_popupedExpression.clear(); m_popupedValues.clear(); //foreach(BandDesignIntf* groupBand,m_childBands.keys()){ - for(BandDesignIntf* groupBand : m_childBands.keys()){ + foreach(BandDesignIntf* groupBand, m_childBands.keys()){ if (m_childBands.value(groupBand)->tryToKeepTogether()){ foreach(BandDesignIntf* band, *m_childBands.value(groupBand)){ m_renderPageItem->removeBand(band); From 9705fb970c5c5b81d0855c1015051363323954f3 Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 22:20:38 -0300 Subject: [PATCH 6/7] Fix some warnings --- limereport/lrreportdesignwidget.cpp | 1 + .../objectinspector/propertyItems/lrmarginpropitem.cpp | 5 ++++- limereport/objectinspector/propertyItems/lrrectproptem.cpp | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/limereport/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp index acd6298..2cbfcd9 100644 --- a/limereport/lrreportdesignwidget.cpp +++ b/limereport/lrreportdesignwidget.cpp @@ -147,6 +147,7 @@ QWidget *ReportDesignWidget::toolWindow(ReportDesignWidget::ToolWindowType windo case SignalSlotEditor: return dialogDesignerManager()->signalSlotEditor(); } + return NULL; } #endif diff --git a/limereport/objectinspector/propertyItems/lrmarginpropitem.cpp b/limereport/objectinspector/propertyItems/lrmarginpropitem.cpp index 66bbc25..469cfda 100644 --- a/limereport/objectinspector/propertyItems/lrmarginpropitem.cpp +++ b/limereport/objectinspector/propertyItems/lrmarginpropitem.cpp @@ -42,6 +42,7 @@ QString MarginPropItem::displayValue() const return QString("%1 %2").arg((propertyValue().toDouble() * Const::mmFACTOR) / (item->unitFactor() * 10), 0, 'f', 2) .arg(QObject::tr("''")); } + return QString(); } QWidget *MarginPropItem::createProperyEditor(QWidget *parent) const @@ -74,6 +75,7 @@ qreal MarginPropItem::valueInUnits(qreal value) const case LimeReport::BaseDesignIntf::Inches: return (value * Const::mmFACTOR) / (item->unitFactor() * 10); } + return 0; } qreal MarginPropItem::valueInReportUnits(qreal value) const @@ -84,8 +86,8 @@ qreal MarginPropItem::valueInReportUnits(qreal value) const return value; case LimeReport::BaseDesignIntf::Inches: return (value * (item->unitFactor() * 10)) / Const::mmFACTOR; - } + return 0; } QString MarginPropItem::unitShortName() const @@ -97,6 +99,7 @@ QString MarginPropItem::unitShortName() const case LimeReport::BaseDesignIntf::Inches: return QObject::tr("''"); } + return QString(); } } // namespace LimeReport diff --git a/limereport/objectinspector/propertyItems/lrrectproptem.cpp b/limereport/objectinspector/propertyItems/lrrectproptem.cpp index a5503f7..a364c5f 100644 --- a/limereport/objectinspector/propertyItems/lrrectproptem.cpp +++ b/limereport/objectinspector/propertyItems/lrrectproptem.cpp @@ -171,6 +171,7 @@ qreal LimeReport::RectUnitValuePropItem::valueInUnits(qreal value) const case LimeReport::BaseDesignIntf::Inches: return value / (item->unitFactor() * 10); } + return 0; } qreal LimeReport::RectUnitValuePropItem::valueInReportUnits(qreal value) const @@ -182,6 +183,7 @@ qreal LimeReport::RectUnitValuePropItem::valueInReportUnits(qreal value) const case LimeReport::BaseDesignIntf::Inches: return value * (item->unitFactor() * 10); } + return 0; } QString LimeReport::RectUnitValuePropItem::unitShortName() const @@ -193,6 +195,7 @@ QString LimeReport::RectUnitValuePropItem::unitShortName() const case LimeReport::BaseDesignIntf::Inches: return QObject::tr("''"); } + return QString(); } QString LimeReport::RectUnitValuePropItem::displayValue() const @@ -258,6 +261,7 @@ QRectF LimeReport::RectUnitPropItem::rectInUnits(QRectF rect) const rect.width() / (item->unitFactor() * 10), rect.height() / (item->unitFactor() * 10)); } + return QRectF(); } QString LimeReport::RectUnitPropItem::unitShortName() const @@ -269,4 +273,5 @@ QString LimeReport::RectUnitPropItem::unitShortName() const case LimeReport::BaseDesignIntf::Inches: return QObject::tr("''"); } + return QString(); } From 0561598df22402108928fca987336f352f6b9c84 Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Tue, 17 Aug 2021 23:32:45 -0300 Subject: [PATCH 7/7] Consistency --- include/lrglobal.h | 2 +- limereport/bands/lrdataband.h | 10 +++++----- limereport/bands/lrreportheader.h | 2 +- limereport/bands/lrsubdetailband.h | 8 ++++---- limereport/items/lrabstractlayout.h | 2 +- limereport/items/lrbarcodeitem.h | 4 ++-- limereport/items/lrchartitem.h | 8 ++++---- limereport/items/lrimageitem.h | 2 +- limereport/items/lrshapeitem.h | 2 +- limereport/items/lrtextitem.h | 10 +++++----- limereport/lrbanddesignintf.h | 12 ++++++------ limereport/lrbasedesignintf.h | 2 +- limereport/lrdatadesignintf.h | 4 ++-- limereport/lrglobal.h | 2 +- limereport/lritemdesignintf.h | 2 +- limereport/lrpagedesignintf.h | 2 +- limereport/lrpageitemdesignintf.h | 2 +- limereport/lrreportdesignwidget.h | 2 +- limereport/lrreportengine_p.h | 2 +- limereport/lrreportrender.h | 2 +- 20 files changed, 41 insertions(+), 41 deletions(-) diff --git a/include/lrglobal.h b/include/lrglobal.h index 8a312d8..3388fe9 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -158,7 +158,7 @@ namespace Const{ { public: enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(VariableDataType) #else Q_ENUMS(VariableDataType) diff --git a/limereport/bands/lrdataband.h b/limereport/bands/lrdataband.h index c44c93c..a35ec60 100644 --- a/limereport/bands/lrdataband.h +++ b/limereport/bands/lrdataband.h @@ -40,11 +40,11 @@ class DataBand : public DataBandDesignIntf { Q_OBJECT Q_PROPERTY(bool keepSubdetailTogether READ tryToKeepTogether WRITE setTryToKeepTogether) - Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable ) + Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable) Q_PROPERTY(bool keepFooterTogether READ keepFooterTogether WRITE setKeepFooterTogether) Q_PROPERTY(bool sliceLastRow READ sliceLastRow WRITE setSliceLastRow) Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount) - Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) + Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) Q_PROPERTY(bool startNewPage READ startNewPage WRITE setStartNewPage) Q_PROPERTY(bool startFromNewPage READ startFromNewPage WRITE setStartFromNewPage) Q_PROPERTY(QColor alternateBackgroundColor READ alternateBackgroundColor WRITE setAlternateBackgroundColor) @@ -66,8 +66,8 @@ class DataHeaderBand : public BandDesignIntf Q_OBJECT Q_PROPERTY(bool reprintOnEachPage READ reprintOnEachPage WRITE setReprintOnEachPage) Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount) - Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) - Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways()) + Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) + Q_PROPERTY(bool printAlways READ printAlways WRITE setPrintAlways) Q_PROPERTY(bool repeatOnEachRow READ repeatOnEachRow WRITE setRepeatOnEachRow) public: DataHeaderBand(QObject* owner=0, QGraphicsItem* parent=0); @@ -88,7 +88,7 @@ class DataFooterBand : public BandDesignIntf Q_OBJECT Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount) Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable) - Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) + Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) Q_PROPERTY(bool printAlways READ printAlways WRITE setPrintAlways) public: DataFooterBand(QObject* owner=0, QGraphicsItem* parent=0); diff --git a/limereport/bands/lrreportheader.h b/limereport/bands/lrreportheader.h index d532ff9..27d8518 100644 --- a/limereport/bands/lrreportheader.h +++ b/limereport/bands/lrreportheader.h @@ -38,7 +38,7 @@ namespace LimeReport{ class ReportHeader : public LimeReport::BandDesignIntf { Q_OBJECT - Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable ) + Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable) Q_PROPERTY(bool printBeforePageHeader READ printBeforePageHeader WRITE setPrintBeforePageHeader) public: ReportHeader(QObject* owner = 0, QGraphicsItem *parent=0); diff --git a/limereport/bands/lrsubdetailband.h b/limereport/bands/lrsubdetailband.h index d64eee9..7ff6127 100644 --- a/limereport/bands/lrsubdetailband.h +++ b/limereport/bands/lrsubdetailband.h @@ -40,7 +40,7 @@ class SubDetailBand : public DataBandDesignIntf Q_OBJECT Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable) Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount) - Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) + Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) Q_PROPERTY(bool keepFooterTogether READ keepFooterTogether WRITE setKeepFooterTogether) Q_PROPERTY(QColor alternateBackgroundColor READ alternateBackgroundColor WRITE setAlternateBackgroundColor) Q_PROPERTY(bool useAlternateBackgroundColor READ useAlternateBackgroundColor WRITE setUseAlternateBackgroundColor) @@ -60,7 +60,7 @@ class SubDetailHeaderBand : public BandDesignIntf { Q_OBJECT Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount) - Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) + Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) Q_PROPERTY(bool printAlways READ printAlways WRITE setPrintAlways) public: SubDetailHeaderBand(QObject* owner = 0, QGraphicsItem* parent=0); @@ -78,8 +78,8 @@ class SubDetailFooterBand : public BandDesignIntf Q_OBJECT Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount) Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable) - Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) - Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways()) + Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection) + Q_PROPERTY(bool printAlways READ printAlways WRITE setPrintAlways) public: SubDetailFooterBand(QObject* owner = 0, QGraphicsItem* parent=0); virtual bool isUnique() const; diff --git a/limereport/items/lrabstractlayout.h b/limereport/items/lrabstractlayout.h index 14ec715..7e38275 100644 --- a/limereport/items/lrabstractlayout.h +++ b/limereport/items/lrabstractlayout.h @@ -13,7 +13,7 @@ class AbstractLayout: public LayoutDesignIntf Q_PROPERTY(int layoutSpacing READ layoutSpacing WRITE setLayoutSpacing) public: enum LayoutType{Layout,Table}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(LayoutType) #else Q_ENUMS(LayoutType) diff --git a/limereport/items/lrbarcodeitem.h b/limereport/items/lrbarcodeitem.h index c09fbe9..12f1195 100644 --- a/limereport/items/lrbarcodeitem.h +++ b/limereport/items/lrbarcodeitem.h @@ -37,7 +37,7 @@ namespace LimeReport{ class BarcodeItem : public LimeReport::ContentItemDesignIntf { Q_OBJECT Q_PROPERTY(QString content READ content WRITE setContent) - Q_PROPERTY(BarcodeType barcodeType READ barcodeType WRITE setBarcodeType ) + Q_PROPERTY(BarcodeType barcodeType READ barcodeType WRITE setBarcodeType) Q_PROPERTY(QString datasource READ datasource WRITE setDatasource) Q_PROPERTY(QString field READ field WRITE setField) Q_PROPERTY(QString testValue READ designTestValue WRITE setDesignTestValue) @@ -152,7 +152,7 @@ public: KANJI_INPUT_MODE = 3, SJIS_INPUT_MODE = 4 }; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(BarcodeType) Q_ENUM(AngleType) Q_ENUM(InputMode) diff --git a/limereport/items/lrchartitem.h b/limereport/items/lrchartitem.h index 3db73ca..5208bcd 100644 --- a/limereport/items/lrchartitem.h +++ b/limereport/items/lrchartitem.h @@ -27,13 +27,13 @@ private: class SeriesItem : public QObject{ Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QString valuesColumn READ valuesColumn WRITE setValuesColumn ) - Q_PROPERTY(QString labelsColumn READ labelsColumn WRITE setLabelsColumn ) + Q_PROPERTY(QString valuesColumn READ valuesColumn WRITE setValuesColumn) + Q_PROPERTY(QString labelsColumn READ labelsColumn WRITE setLabelsColumn) Q_PROPERTY(QColor color READ color WRITE setColor) Q_PROPERTY(SeriesItemPreferredType preferredType READ preferredType WRITE setPreferredType) public: enum SeriesItemPreferredType {Bar, Line}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(SeriesItemPreferredType) #else Q_ENUMS(SeriesItemPreferredType) @@ -135,7 +135,7 @@ public: enum LegendAlign{LegendAlignTop,LegendAlignCenter,LegendAlignBottom}; enum TitleAlign{TitleAlignLeft, TitleAlignCenter, TitleAlignRight}; enum ChartType{Pie, VerticalBar, HorizontalBar, Lines}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(LegendAlign) Q_ENUM(TitleAlign) Q_ENUM(ChartType) diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h index bf36257..bdcfdc9 100644 --- a/limereport/items/lrimageitem.h +++ b/limereport/items/lrimageitem.h @@ -58,7 +58,7 @@ public: Hex = 1, Base64 = 2 }; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(Format) #else Q_ENUMS(Format) diff --git a/limereport/items/lrshapeitem.h b/limereport/items/lrshapeitem.h index bdfab3b..837d105 100644 --- a/limereport/items/lrshapeitem.h +++ b/limereport/items/lrshapeitem.h @@ -47,7 +47,7 @@ class ShapeItem: public LimeReport::ItemDesignIntf Q_PROPERTY(int cornerRadius READ cornerRadius WRITE setCornerRadius) public: enum ShapeType{HorizontalLine,VerticalLine,Ellipse,Rectangle}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(ShapeType) #else Q_ENUMS(ShapeType) diff --git a/limereport/items/lrtextitem.h b/limereport/items/lrtextitem.h index fbd2bfd..d0611b0 100644 --- a/limereport/items/lrtextitem.h +++ b/limereport/items/lrtextitem.h @@ -46,10 +46,10 @@ class TextItem : public ContentItemDesignIntf, IPageInit { Q_OBJECT Q_PROPERTY(QString content READ content WRITE setContent) Q_PROPERTY(int margin READ marginSize WRITE setMarginSize) - Q_PROPERTY(Qt::Alignment alignment READ alignment() WRITE setAlignment) - Q_PROPERTY(AutoWidth autoWidth READ autoWidth() WRITE setAutoWidth) - Q_PROPERTY(bool autoHeight READ autoHeight() WRITE setAutoHeight) - Q_PROPERTY(QFont font READ font() WRITE setTextItemFont) + Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment) + Q_PROPERTY(AutoWidth autoWidth READ autoWidth WRITE setAutoWidth) + Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight) + Q_PROPERTY(QFont font READ font WRITE setTextItemFont) Q_PROPERTY(int backgroundOpacity READ opacity WRITE setBackgroundOpacity) Q_PROPERTY(BGMode backgroundMode READ backgroundMode WRITE setBackgroundModeProperty) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColorProperty) @@ -79,7 +79,7 @@ public: enum AutoWidth{NoneAutoWidth, MaxWordLength, MaxStringLength}; enum AngleType{Angle0, Angle90, Angle180, Angle270, Angle45, Angle315}; enum ValueType{Default, DateTime, Double}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(AutoWidth) Q_ENUM(AngleType) Q_ENUM(ValueType) diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h index 59bec04..a3f55d6 100644 --- a/limereport/lrbanddesignintf.h +++ b/limereport/lrbanddesignintf.h @@ -103,11 +103,11 @@ private: class BandDesignIntf : public ItemsContainerDesignInft { Q_OBJECT - Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight ) - Q_PROPERTY(int bandIndex READ bandIndex WRITE setBandIndex DESIGNABLE false ) - Q_PROPERTY(bool keepBottomSpace READ keepBottomSpace WRITE setKeepBottomSpace ) + Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight) + Q_PROPERTY(int bandIndex READ bandIndex WRITE setBandIndex DESIGNABLE false) + Q_PROPERTY(bool keepBottomSpace READ keepBottomSpace WRITE setKeepBottomSpace) Q_PROPERTY(bool keepTopSpace READ keepTopSpace WRITE setKeepTopSpace) - Q_PROPERTY(QString parentBand READ parentBandName WRITE setParentBandName DESIGNABLE false ) + Q_PROPERTY(QString parentBand READ parentBandName WRITE setParentBandName DESIGNABLE false) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor) Q_PROPERTY(BrushStyle backgroundBrushStyle READ backgroundBrushStyle WRITE setBackgroundBrushStyle) Q_PROPERTY(bool printIfEmpty READ printIfEmpty WRITE setPrintIfEmpty) @@ -138,7 +138,7 @@ public: enum BandColumnsLayoutType{ Horizontal, Vertical, VerticalUniform }; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(BandColumnsLayoutType) #else Q_ENUMS(BandColumnsLayoutType) @@ -341,7 +341,7 @@ private: class DataBandDesignIntf : public BandDesignIntf{ Q_OBJECT - Q_PROPERTY(QString datasource READ datasourceName WRITE setDataSourceName ) + Q_PROPERTY(QString datasource READ datasourceName WRITE setDataSourceName) public: DataBandDesignIntf(BandsType bandType, QString xmlTypeName, QObject* owner = 0, QGraphicsItem* parent=0); }; diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index 5e502f7..6fac1c2 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -144,7 +144,7 @@ public: enum ItemAlign {LeftItemAlign,RightItemAlign,CenterItemAlign,ParentWidthItemAlign,DesignedItemAlign}; enum UnitType {Millimeters, Inches}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(BGMode) Q_ENUM(BrushStyle) Q_ENUM(ResizeFlags) diff --git a/limereport/lrdatadesignintf.h b/limereport/lrdatadesignintf.h index 71543cb..c5ac77a 100644 --- a/limereport/lrdatadesignintf.h +++ b/limereport/lrdatadesignintf.h @@ -70,7 +70,7 @@ private: class ConnectionDesc : public QObject{ Q_OBJECT - Q_PROPERTY(QString name READ name WRITE setName ) + Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString driver READ driver WRITE setDriver) Q_PROPERTY(QString databaseName READ databaseName WRITE setDatabaseName) Q_PROPERTY(QString userName READ userName WRITE setUserName) @@ -83,7 +83,7 @@ public: typedef QSharedPointer Ptr; ConnectionDesc(QSqlDatabase db, QObject* parent=0); ConnectionDesc(QObject* parent=0); - Ptr create(QSqlDatabase db, QObject* parent=0); + Ptr create(QSqlDatabase db, QObject* parent=0); void setName(const QString &value); QString name(){return m_connectionName;} void setDriver(const QString &value){m_connectionDriver=value;} diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h index 8a312d8..3388fe9 100644 --- a/limereport/lrglobal.h +++ b/limereport/lrglobal.h @@ -158,7 +158,7 @@ namespace Const{ { public: enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(VariableDataType) #else Q_ENUMS(VariableDataType) diff --git a/limereport/lritemdesignintf.h b/limereport/lritemdesignintf.h index ad95e25..73627c1 100644 --- a/limereport/lritemdesignintf.h +++ b/limereport/lritemdesignintf.h @@ -43,7 +43,7 @@ class ItemDesignIntf : public BaseDesignIntf Q_PROPERTY(ItemAlign itemAlign READ itemAlign WRITE setItemAlign) public: enum LocationType{Band,Page}; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(LocationType) #else Q_ENUMS(LocationType) diff --git a/limereport/lrpagedesignintf.h b/limereport/lrpagedesignintf.h index 91d0a68..fb7d4ea 100644 --- a/limereport/lrpagedesignintf.h +++ b/limereport/lrpagedesignintf.h @@ -99,7 +99,7 @@ namespace LimeReport { class PageDesignIntf : public QGraphicsScene, public ObjectLoadingStateIntf{ Q_OBJECT - Q_PROPERTY(QObject* pageItem READ pageItem()) + Q_PROPERTY(QObject* pageItem READ pageItem) public: friend class PropertyChangedCommand; friend class InsertHLayoutCommand; diff --git a/limereport/lrpageitemdesignintf.h b/limereport/lrpageitemdesignintf.h index d297b5f..816bafb 100644 --- a/limereport/lrpageitemdesignintf.h +++ b/limereport/lrpageitemdesignintf.h @@ -82,7 +82,7 @@ public: Ledger = QPrinter::Ledger, Tabloid = QPrinter::Tabloid, Custom = QPrinter::Custom, NPageSize = Custom }; -#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) Q_ENUM(Orientation) Q_ENUM(PrintBehavior) Q_ENUM(PageSize) diff --git a/limereport/lrreportdesignwidget.h b/limereport/lrreportdesignwidget.h index ef3b81b..21090fb 100644 --- a/limereport/lrreportdesignwidget.h +++ b/limereport/lrreportdesignwidget.h @@ -105,7 +105,7 @@ private: class ReportDesignWidget : public QWidget { Q_OBJECT - Q_PROPERTY(QObject* datasourcesManager READ dataManager()) + Q_PROPERTY(QObject* datasourcesManager READ dataManager) public: enum ToolWindowType{ WidgetBox = 1, diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index dd501b9..fafe433 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -138,7 +138,7 @@ class ReportEnginePrivate : public QObject, { Q_OBJECT Q_DECLARE_PUBLIC(ReportEngine) - Q_PROPERTY(ACollectionProperty pages READ fakeCollectionReader()) + Q_PROPERTY(ACollectionProperty pages READ fakeCollectionReader) Q_PROPERTY(QObject* datasourcesManager READ dataManager) Q_PROPERTY(QObject* scriptContext READ scriptContext) Q_PROPERTY(bool suppressFieldAndVarError READ suppressFieldAndVarError WRITE setSuppressFieldAndVarError) diff --git a/limereport/lrreportrender.h b/limereport/lrreportrender.h index 46a35d0..64c85bc 100644 --- a/limereport/lrreportrender.h +++ b/limereport/lrreportrender.h @@ -86,7 +86,7 @@ private: class ReportRender: public QObject { Q_OBJECT - Q_PROPERTY(QObject* datasourcesManager READ datasources()) + Q_PROPERTY(QObject* datasourcesManager READ datasources) public: enum DataRenderMode {StartNewPageAsNeeded, NotStartNewPage, ForcedStartPage}; enum BandPrintMode {PrintAlwaysPrintable, PrintNotAlwaysPrintable };