Merge pull request #336 from darktorres/master

Some small changes

.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

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

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=\\\"$$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 \

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)

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(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection)
-    Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways())
+    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);

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);

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(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection)
-    Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways())
+    Q_PROPERTY(bool printAlways READ printAlways WRITE setPrintAlways)
 public:
     SubDetailFooterBand(QObject* owner = 0, QGraphicsItem* parent=0);
     virtual bool isUnique() const;

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)

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)

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 valuesColumn READ valuesColumn WRITE setValuesColumn)
-    Q_PROPERTY(QString labelsColumn READ labelsColumn WRITE setLabelsColumn )
+    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)

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)

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)

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(Qt::Alignment alignment READ alignment WRITE setAlignment)
-    Q_PROPERTY(AutoWidth autoWidth READ autoWidth() WRITE setAutoWidth)
+    Q_PROPERTY(AutoWidth autoWidth READ autoWidth WRITE setAutoWidth)
-    Q_PROPERTY(bool autoHeight READ autoHeight() WRITE setAutoHeight)
+    Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight)
-    Q_PROPERTY(QFont font READ font() WRITE setTextItemFont)
+    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)

limereport/lrbanddesignintf.h

@@ -103,11 +103,11 @@ private:
 class BandDesignIntf : public ItemsContainerDesignInft
 {
     Q_OBJECT
-    Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight )
+    Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight)
-    Q_PROPERTY(int bandIndex READ bandIndex WRITE setBandIndex DESIGNABLE false )
+    Q_PROPERTY(int bandIndex READ bandIndex WRITE setBandIndex DESIGNABLE false)
-    Q_PROPERTY(bool keepBottomSpace READ keepBottomSpace WRITE setKeepBottomSpace )
+    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);
 };

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)

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<ConnectionDesc> 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;}

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)

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)

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;

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)

limereport/lrreportdesignwidget.cpp

@@ -147,6 +147,7 @@ QWidget *ReportDesignWidget::toolWindow(ReportDesignWidget::ToolWindowType windo
     case SignalSlotEditor:
         return dialogDesignerManager()->signalSlotEditor();
     }
+    return NULL;
 }
 
 #endif

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,

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;

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)

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);

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 };

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

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();
 }