mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00
Code

Merge pull request #254 from HatEmU/master

Browse Source 
Replaced the deprecated Q_ENUMS() with the currently supported Q_ENUM()
This commit is contained in:
Alexander Arin 2020-03-04 11:38:47 +03:00 committed by GitHub
commit 2960c5c53e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 112 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/lrglobal.h
View File

@ -33,6 +33,7 @@
#include <stdexcept>
#include <QString>
#include <QStyleOptionViewItem>
#include <QtGlobal>
#if defined(LIMEREPORT_EXPORTS)
# define LIMEREPORT_EXPORT Q_DECL_EXPORT
@ -157,7 +158,11 @@ namespace Const{
{
public:
enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(VariableDataType)
#else
Q_ENUMS(VariableDataType)
#endif
private:
Enums(){}
Q_GADGET

7
limereport/items/lrabstractlayout.h
View File

@ -3,16 +3,21 @@
#include "lritemdesignintf.h"
#include "lrlayoutmarker.h"
#include <QtGlobal>
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};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(LayoutType)
#else
Q_ENUMS(LayoutType)
#endif
AbstractLayout(QString xmlTag, QObject *owner = 0, QGraphicsItem *parent = 0);
~AbstractLayout();
QList<BaseDesignIntf*>& layoutsChildren();

15
limereport/items/lrbarcodeitem.h
View File

@ -30,14 +30,12 @@
#ifndef LRBARCODEITEM_H
#define LRBARCODEITEM_H
#include "lritemdesignintf.h"
#include <QtGlobal>
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 +142,9 @@ public:
UPNQR =143
};
enum AngleType{Angle0,Angle90,Angle180,Angle270};
enum InputMode{
DATA_INPUT_MODE = 0,
UNICODE_INPUT_MODE = 1,
@ -152,6 +152,15 @@ public:
KANJI_INPUT_MODE = 3,
SJIS_INPUT_MODE = 4
};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(BarcodeType)
Q_ENUM(AngleType)
Q_ENUM(InputMode)
#else
Q_ENUMS(BarcodeType)
Q_ENUMS(AngleType)
Q_ENUMS(InputMode)
#endif
BarcodeItem(QObject *owner, QGraphicsItem *parent);
~BarcodeItem();
virtual BaseDesignIntf* createSameTypeItem(QObject *owner, QGraphicsItem *parent);

19
limereport/items/lrchartitem.h
View File

@ -2,6 +2,7 @@
#define LRCHARTITEM_H
#include "lritemdesignintf.h"
#include "lrglobal.h"
#include <QtGlobal>
namespace LimeReport{
@ -30,9 +31,13 @@ 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};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(SeriesItemPreferredType)
#else
Q_ENUMS(SeriesItemPreferredType)
#endif
SeriesItem(QObject* parent = 0) : QObject(parent), m_preferredType(Bar){}
QString name() const;
void setName(const QString &name);
@ -114,9 +119,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)
@ -131,6 +133,15 @@ 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))
Q_ENUM(LegendAlign)
Q_ENUM(TitleAlign)
Q_ENUM(ChartType)
#else
Q_ENUMS(LegendAlign)
Q_ENUMS(TitleAlign)
Q_ENUMS(ChartType)
#endif
ChartItem(QObject* owner, QGraphicsItem* parent);
~ChartItem();

7
limereport/items/lrimageitem.h
View File

@ -30,13 +30,13 @@
#ifndef LRIMAGEITEM_H
#define LRIMAGEITEM_H
#include "lritemdesignintf.h"
#include <QtGlobal>
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 +57,11 @@ public:
Hex = 1,
Base64 = 2
};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(Format)
#else
Q_ENUMS(Format)
#endif
ImageItem(QObject *owner, QGraphicsItem *parent);
virtual void paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget);

7
limereport/items/lrshapeitem.h
View File

@ -30,13 +30,13 @@
#ifndef LRSHAPEITEM_H
#define LRSHAPEITEM_H
#include "lritemdesignintf.h"
#include <QtGlobal>
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 +47,11 @@ 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))
Q_ENUM(ShapeType)
#else
Q_ENUMS(ShapeType)
#endif
ShapeItem(QObject *owner, QGraphicsItem *parent);
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
void setShapeColor(QColor value);

13
limereport/items/lrtextitem.h
View File

@ -33,6 +33,7 @@
#include <QtGui>
#include <QLabel>
#include <QTextDocument>
#include <QtGlobal>
#include "lritemdesignintf.h"
#include "lritemdesignintf.h"
@ -43,9 +44,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)
@ -81,6 +79,15 @@ 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))
Q_ENUM(AutoWidth)
Q_ENUM(AngleType)
Q_ENUM(ValueType)
#else
Q_ENUMS(AutoWidth)
Q_ENUMS(AngleType)
Q_ENUMS(ValueType)
#endif
void Init();
TextItem(QObject* owner=0, QGraphicsItem* parent=0);

6
limereport/lrbanddesignintf.h
View File

@ -114,7 +114,6 @@ class BandDesignIntf : public ItemsContainerDesignInft
Q_PROPERTY(BGMode backgroundMode READ backgroundMode WRITE setBackgroundModeProperty)
Q_PROPERTY(int backgroundOpacity READ opacity WRITE setBackgroundOpacity)
Q_PROPERTY(int shiftItems READ shiftItems WRITE setShiftItems)
Q_ENUMS(BandColumnsLayoutType)
friend class BandMarker;
friend class BandNameLabel;
friend class ReportRender;
@ -139,6 +138,11 @@ public:
enum BandColumnsLayoutType{
Horizontal, Vertical, VerticalUniform
};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(BandColumnsLayoutType)
#else
Q_ENUMS(BandColumnsLayoutType)
#endif
BandDesignIntf(BandsType bandType, const QString& xmlTypeName, QObject* owner = 0, QGraphicsItem* parent=0);
~BandDesignIntf();

31
limereport/lrbasedesignintf.h
View File

@ -84,12 +84,7 @@ class BaseDesignIntf :
public QObject, public QGraphicsItem, public ICollectionContainer, public ObjectLoadingStateIntf {
Q_OBJECT
Q_INTERFACES(QGraphicsItem)
Q_ENUMS(BGMode)
Q_ENUMS(Qt::BrushStyle)
Q_ENUMS(BrushStyle)
Q_ENUMS(ItemAlign)
Q_FLAGS(BorderLines)
Q_ENUMS(UnitType)
Q_PROPERTY(QRect geometry READ geometry WRITE setGeometryProperty NOTIFY geometryChanged)
Q_PROPERTY(ACollectionProperty children READ fakeCollectionReader DESIGNABLE false)
Q_PROPERTY(qreal zOrder READ zValue WRITE setZValueProperty DESIGNABLE false)
@ -104,6 +99,7 @@ class BaseDesignIntf :
public:
enum BGMode { TransparentMode, OpaqueMode};
enum BrushStyle{ NoBrush,
SolidPattern,
Dense1Pattern,
@ -119,6 +115,7 @@ public:
BDiagPattern,
FDiagPattern };
enum ResizeFlags { Fixed = 0,
ResizeLeft = 1,
ResizeRight = 2,
@ -126,11 +123,13 @@ public:
ResizeBottom = 8,
AllDirections = 15
};
enum MoveFlags { None = 0,
LeftRight=1,
TopBotom=2,
All=3
};
enum BorderSide {
NoLine = 0,
TopLine = 1,
@ -139,9 +138,31 @@ public:
RightLine = 8,
AllLines = 15
};
enum ObjectState {ObjectLoading, ObjectLoaded, ObjectCreated};
enum ItemAlign {LeftItemAlign,RightItemAlign,CenterItemAlign,ParentWidthItemAlign,DesignedItemAlign};
enum UnitType {Millimeters, Inches};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(BGMode)
Q_ENUM(BrushStyle)
Q_ENUM(ResizeFlags)
Q_ENUM(MoveFlags)
Q_ENUM(BorderSide)
Q_ENUM(ObjectState)
Q_ENUM(ItemAlign)
Q_ENUM(UnitType)
#else
Q_ENUMS(BGMode)
Q_ENUMS(BrushStyle)
Q_ENUMS(ResizeFlags)
Q_ENUMS(MoveFlags)
Q_ENUMS(BorderSide)
Q_ENUMS(ObjectState)
Q_ENUMS(ItemAlign)
Q_ENUMS(UnitType)
#endif
// enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols};
Q_DECLARE_FLAGS(BorderLines, BorderSide)
Q_DECLARE_FLAGS(ItemMode,ItemModes)

5
limereport/lrglobal.h
View File

@ -33,6 +33,7 @@
#include <stdexcept>
#include <QString>
#include <QStyleOptionViewItem>
#include <QtGlobal>
#if defined(LIMEREPORT_EXPORTS)
# define LIMEREPORT_EXPORT Q_DECL_EXPORT
@ -157,7 +158,11 @@ namespace Const{
{
public:
enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(VariableDataType)
#else
Q_ENUMS(VariableDataType)
#endif
private:
Enums(){}
Q_GADGET

6
limereport/lritemdesignintf.h
View File

@ -41,9 +41,13 @@ class ItemDesignIntf : public BaseDesignIntf
Q_PROPERTY(LocationType itemLocation READ itemLocation WRITE setItemLocation)
Q_PROPERTY(bool stretchToMaxHeight READ stretchToMaxHeight WRITE setStretchToMaxHeight)
Q_PROPERTY(ItemAlign itemAlign READ itemAlign WRITE setItemAlign)
Q_ENUMS(LocationType)
public:
enum LocationType{Band,Page};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(LocationType)
#else
Q_ENUMS(LocationType)
#endif
ItemDesignIntf(const QString& xmlTypeName, QObject* owner = 0,QGraphicsItem* parent = 0);
LocationType itemLocation(){return m_itemLocation;}
void setItemLocation(LocationType location);

14
limereport/lrpageitemdesignintf.h
View File

@ -42,9 +42,6 @@ class ReportRender;
class PageItemDesignIntf : public ItemsContainerDesignInft
{
Q_OBJECT
Q_ENUMS(Orientation)
Q_ENUMS(PageSize)
Q_ENUMS(PrintBehavior)
Q_PROPERTY(int topMargin READ topMargin WRITE setTopMargin)
Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin)
Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin)
@ -67,7 +64,9 @@ class PageItemDesignIntf : public ItemsContainerDesignInft
friend class ReportRender;
public:
enum Orientation { Portrait = QPrinter::Portrait, Landscape = QPrinter::Landscape };
enum PrintBehavior {Scale, Split};
enum PageSize {
A4 = QPrinter::A4, B5 = QPrinter::B5, Letter = QPrinter::Letter,
Legal = QPrinter::Legal, Executive = QPrinter::Executive,
@ -80,6 +79,15 @@ public:
Ledger = QPrinter::Ledger, Tabloid = QPrinter::Tabloid, Custom = QPrinter::Custom,
NPageSize = Custom
};
#if (QT_VERSION >= QT_VERSION_CHECK(5,5, 0))
Q_ENUM(Orientation)
Q_ENUM(PrintBehavior)
Q_ENUM(PageSize)
#else
Q_ENUMS(Orientation)
Q_ENUMS(PrintBehavior)
Q_ENUMS(PageSize)
#endif
typedef QList<BandDesignIntf*> BandsList;
typedef QList<BandDesignIntf*>::const_iterator BandsIterator;
typedef QSharedPointer<PageItemDesignIntf> Ptr;