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

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

Browse Source
This commit is contained in:
HatEmU 2020-02-17 05:17:02 +01:00 committed by HatEmU
parent 0e77d6aab0
commit a8cbf68347
12 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lrglobal.h
View File

@ -157,7 +157,7 @@ namespace Const{
{
public:
enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime};
Q_ENUMS(VariableDataType)
Q_ENUM(VariableDataType)
private:
Enums(){}
Q_GADGET

2
limereport/items/lrabstractlayout.h
View File

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

6
limereport/items/lrbarcodeitem.h
View File

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

8
limereport/items/lrchartitem.h
View File

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

2
limereport/items/lrimageitem.h
View File

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

2
limereport/items/lrshapeitem.h
View File

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

6
limereport/items/lrtextitem.h
View File

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

2
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,7 @@ public:
enum BandColumnsLayoutType{
Horizontal, Vertical, VerticalUniform
};
Q_ENUM(BandColumnsLayoutType)
BandDesignIntf(BandsType bandType, const QString& xmlTypeName, QObject* owner = 0, QGraphicsItem* parent=0);
~BandDesignIntf();

13
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)
@ -103,6 +98,7 @@ class BaseDesignIntf :
friend class ReportRender;
public:
enum BGMode { TransparentMode, OpaqueMode};
Q_ENUM(BGMode)
enum BrushStyle{ NoBrush,
SolidPattern,
@ -118,6 +114,7 @@ public:
CrossPattern,
BDiagPattern,
FDiagPattern };
Q_ENUM(BrushStyle)
enum ResizeFlags { Fixed = 0,
ResizeLeft = 1,
@ -126,11 +123,13 @@ public:
ResizeBottom = 8,
AllDirections = 15
};
Q_ENUM(ResizeFlags)
enum MoveFlags { None = 0,
LeftRight=1,
TopBotom=2,
All=3
};
Q_ENUM(MoveFlags)
enum BorderSide {
NoLine = 0,
TopLine = 1,
@ -139,9 +138,13 @@ public:
RightLine = 8,
AllLines = 15
};
Q_ENUM(BorderSide)
enum ObjectState {ObjectLoading, ObjectLoaded, ObjectCreated};
Q_ENUM(ObjectState)
enum ItemAlign {LeftItemAlign,RightItemAlign,CenterItemAlign,ParentWidthItemAlign,DesignedItemAlign};
Q_ENUM(ItemAlign)
enum UnitType {Millimeters, Inches};
Q_ENUM(UnitType)
// enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols};
Q_DECLARE_FLAGS(BorderLines, BorderSide)
Q_DECLARE_FLAGS(ItemMode,ItemModes)

2
limereport/lrglobal.h
View File

@ -157,7 +157,7 @@ namespace Const{
{
public:
enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime};
Q_ENUMS(VariableDataType)
Q_ENUM(VariableDataType)
private:
Enums(){}
Q_GADGET

2
limereport/lritemdesignintf.h
View File

@ -41,9 +41,9 @@ 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};
Q_ENUM(LocationType)
ItemDesignIntf(const QString& xmlTypeName, QObject* owner = 0,QGraphicsItem* parent = 0);
LocationType itemLocation(){return m_itemLocation;}
void setItemLocation(LocationType location);

6
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 };
Q_ENUM(Orientation)
enum PrintBehavior {Scale, Split};
Q_ENUM(PrintBehavior)
enum PageSize {
A4 = QPrinter::A4, B5 = QPrinter::B5, Letter = QPrinter::Letter,
Legal = QPrinter::Legal, Executive = QPrinter::Executive,
@ -80,6 +79,7 @@ public:
Ledger = QPrinter::Ledger, Tabloid = QPrinter::Tabloid, Custom = QPrinter::Custom,
NPageSize = Custom
};
Q_ENUM(PageSize)
typedef QList<BandDesignIntf*> BandsList;
typedef QList<BandDesignIntf*>::const_iterator BandsIterator;
typedef QSharedPointer<PageItemDesignIntf> Ptr;