Replaced the deprecated Q_ENUMS() with the currently supported Q_ENUM()

limereport/items/lrabstractlayout.h

@@ -8,11 +8,11 @@ namespace LimeReport{
 class AbstractLayout: public LayoutDesignIntf
 {
     Q_OBJECT
-    Q_ENUMS(LayoutType)
     Q_PROPERTY(bool hideEmptyItems READ hideEmptyItems WRITE setHideEmptyItems)
     Q_PROPERTY(int layoutSpacing READ layoutSpacing WRITE setLayoutSpacing)
 public:
     enum LayoutType{Layout,Table};
+    Q_ENUM(LayoutType)
     AbstractLayout(QString xmlTag, QObject *owner = 0, QGraphicsItem *parent = 0);
     ~AbstractLayout();
     QList<BaseDesignIntf*>& layoutsChildren();

limereport/items/lrbarcodeitem.h

@@ -35,9 +35,6 @@ namespace LimeReport{
 
 class BarcodeItem : public LimeReport::ContentItemDesignIntf {
     Q_OBJECT
-    Q_ENUMS(BarcodeType)
-    Q_ENUMS(AngleType)
-    Q_ENUMS(InputMode)
     Q_PROPERTY(QString content READ content WRITE setContent)
     Q_PROPERTY(BarcodeType barcodeType READ barcodeType WRITE setBarcodeType )
     Q_PROPERTY(QString datasource READ datasource WRITE setDatasource)
@@ -144,7 +141,9 @@ public:
         UPNQR           =143
 
     };
+    Q_ENUM(BarcodeType)
     enum AngleType{Angle0,Angle90,Angle180,Angle270};
+    Q_ENUM(AngleType)
     enum InputMode{
         DATA_INPUT_MODE     = 0,
         UNICODE_INPUT_MODE  = 1,
@@ -152,6 +151,7 @@ public:
         KANJI_INPUT_MODE    = 3,
         SJIS_INPUT_MODE     = 4
     };
+    Q_ENUM(InputMode)
     BarcodeItem(QObject *owner, QGraphicsItem *parent);
     ~BarcodeItem();
     virtual BaseDesignIntf* createSameTypeItem(QObject *owner, QGraphicsItem *parent);

limereport/items/lrchartitem.h

@@ -30,9 +30,9 @@ class SeriesItem : public QObject{
     Q_PROPERTY(QString labelsColumn READ labelsColumn WRITE setLabelsColumn )
     Q_PROPERTY(QColor color READ color WRITE setColor)
     Q_PROPERTY(SeriesItemPreferredType preferredType READ preferredType WRITE setPreferredType)
-    Q_ENUMS(SeriesItemPreferredType)
 public:
     enum SeriesItemPreferredType {Bar, Line};
+    Q_ENUM(SeriesItemPreferredType)
     SeriesItem(QObject* parent = 0) : QObject(parent), m_preferredType(Bar){}
     QString name() const;
     void setName(const QString &name);
@@ -114,9 +114,6 @@ protected:
 class ChartItem : public LimeReport::ItemDesignIntf
 {
     Q_OBJECT
-    Q_ENUMS(LegendAlign)
-    Q_ENUMS(TitleAlign)
-    Q_ENUMS(ChartType)
     Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader WRITE setSeries)
     Q_PROPERTY(QString datasource READ datasource WRITE setDatasource)
     Q_PROPERTY(QString chartTitle READ chartTitle WRITE setChartTitle)
@@ -129,8 +126,11 @@ class ChartItem : public LimeReport::ItemDesignIntf
 public:
 
     enum LegendAlign{LegendAlignTop,LegendAlignCenter,LegendAlignBottom};
+    Q_ENUM(LegendAlign)
     enum TitleAlign{TitleAlignLeft, TitleAlignCenter, TitleAlignRight};
+    Q_ENUM(TitleAlign)
     enum ChartType{Pie, VerticalBar, HorizontalBar, Lines};
+    Q_ENUM(ChartType)
 
     ChartItem(QObject* owner, QGraphicsItem* parent);
     ~ChartItem();

limereport/items/lrimageitem.h

@@ -36,7 +36,6 @@ namespace LimeReport{
 class ImageItem : public ItemDesignIntf, public IPainterProxy
 {
     Q_OBJECT
-    Q_ENUMS(Format)
     Q_PROPERTY(QImage image READ image WRITE setImage)
     Q_PROPERTY(int opacity READ opacity WRITE setOpacity)
     Q_PROPERTY(QString datasource READ datasource WRITE setDatasource)
@@ -57,6 +56,7 @@ public:
         Hex     = 1,
         Base64  = 2
     };
+    Q_ENUM(Format)
 
     ImageItem(QObject *owner, QGraphicsItem *parent);
     virtual void paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget);

limereport/items/lrshapeitem.h

@@ -36,7 +36,6 @@ namespace LimeReport{
 class ShapeItem: public LimeReport::ItemDesignIntf
 {
     Q_OBJECT
-    Q_ENUMS(ShapeType)
     Q_PROPERTY(ShapeType shape READ shapeType WRITE setShapeType)
     Q_PROPERTY(QColor shapeColor READ shapeColor WRITE setShapeColor)
     Q_PROPERTY(QColor shapeBrushColor READ shapeBrushColor WRITE setShapeBrushColor)
@@ -47,6 +46,7 @@ class ShapeItem: public LimeReport::ItemDesignIntf
     Q_PROPERTY(int cornerRadius READ cornerRadius WRITE setCornerRadius)
 public:
     enum ShapeType{HorizontalLine,VerticalLine,Ellipse,Rectangle};
+    Q_ENUM(ShapeType)
     ShapeItem(QObject *owner, QGraphicsItem *parent);
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     void    setShapeColor(QColor value);

limereport/items/lrtextitem.h

@@ -43,9 +43,6 @@ namespace LimeReport {
 class Tag;
 class TextItem : public ContentItemDesignIntf, IPageInit {
     Q_OBJECT
-    Q_ENUMS(AutoWidth)
-    Q_ENUMS(AngleType)
-    Q_ENUMS(ValueType)
     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)
@@ -79,8 +76,11 @@ class TextItem : public ContentItemDesignIntf, IPageInit {
 public:
 
     enum AutoWidth{NoneAutoWidth, MaxWordLength, MaxStringLength};
+    Q_ENUM(AutoWidth)
     enum AngleType{Angle0, Angle90, Angle180, Angle270, Angle45, Angle315};
+    Q_ENUM(AngleType)
     enum ValueType{Default, DateTime, Double};
+    Q_ENUM(ValueType)
 
     void Init();
     TextItem(QObject* owner=0, QGraphicsItem* parent=0);