mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-23 20:22:58 +03:00
Fix compilation
Qt4 still have one remaining compiler error
This commit is contained in:
parent
6c44ce86d2
commit
c549035c76
@ -16,9 +16,14 @@ SUBDIRS += \
|
||||
limereport \
|
||||
demo_r1 \
|
||||
demo_r2 \
|
||||
console \
|
||||
designer
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4){
|
||||
greaterThan(QT_MINOR_VERSION, 1){
|
||||
SUBDIRS += console
|
||||
}
|
||||
}
|
||||
|
||||
!contains(CONFIG, embedded_designer){
|
||||
!contains(CONFIG, static_build){
|
||||
SUBDIRS += designer_plugin
|
||||
|
@ -11,7 +11,7 @@ class PDFExporter : public QObject, public ReportExporterInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PDFExporter(ReportEnginePrivate *parent = nullptr);
|
||||
explicit PDFExporter(ReportEnginePrivate *parent = NULL);
|
||||
// ReportExporterInterface interface
|
||||
bool exportPages(ReportPages pages, const QString &fileName, const QMap<QString, QVariant> ¶ms);
|
||||
QString exporterName()
|
||||
|
@ -16,7 +16,7 @@ class ImageItemEditor : public QWidget
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = nullptr);
|
||||
explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = NULL);
|
||||
~ImageItemEditor();
|
||||
private:
|
||||
void updateImage();
|
||||
|
@ -176,7 +176,7 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
|
||||
if (parentItem) setWidth(parentItem->width());
|
||||
}
|
||||
|
||||
setBackgroundMode(BGMode::TransparentMode);
|
||||
setBackgroundMode(BaseDesignIntf::TransparentMode);
|
||||
setFillTransparentInDesignMode(false);
|
||||
setHeight(100);
|
||||
setFixedPos(true);
|
||||
|
@ -82,12 +82,12 @@ private:
|
||||
|
||||
class PageView: public QGraphicsView{
|
||||
public:
|
||||
PageView(QWidget *parent = nullptr): QGraphicsView(parent),
|
||||
PageView(QWidget *parent = NULL): QGraphicsView(parent),
|
||||
m_horizontalRuller(0), m_verticalRuller(0)
|
||||
{
|
||||
setViewportMargins(20,20,0,0);
|
||||
}
|
||||
PageView(QGraphicsScene *scene, QWidget *parent = nullptr):
|
||||
PageView(QGraphicsScene *scene, QWidget *parent = NULL):
|
||||
QGraphicsView(scene, parent),
|
||||
m_horizontalRuller(0), m_verticalRuller(0)
|
||||
{
|
||||
|
@ -299,7 +299,7 @@ void ReportEnginePrivate::printReport(ItemsReaderIntf::Ptr reader, QPrinter& pri
|
||||
void ReportEnginePrivate::printReport(ReportPages pages, QPrinter &printer)
|
||||
{
|
||||
int currenPage = 1;
|
||||
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors;
|
||||
QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
|
||||
printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer)));
|
||||
foreach(PageItemDesignIntf::Ptr page, pages){
|
||||
if (
|
||||
@ -320,7 +320,7 @@ void ReportEnginePrivate::printReport(ReportPages pages, QMap<QString, QPrinter*
|
||||
{
|
||||
if (printers.values().isEmpty()) return;
|
||||
int currenPage = 1;
|
||||
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors;
|
||||
QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
|
||||
for (int i = 0; i < printers.keys().count(); ++i) {
|
||||
printProcessors.insert(printers.keys()[i],QSharedPointer<PrintProcessor>(new PrintProcessor(printers[printers.keys()[i]])));
|
||||
}
|
||||
|
@ -1930,7 +1930,7 @@ bool DatasourceFunctions::isEOF(const QString &datasourceName)
|
||||
bool DatasourceFunctions::invalidate(const QString& datasourceName)
|
||||
{
|
||||
if (m_dataManager && m_dataManager->dataSource(datasourceName)){
|
||||
m_dataManager->dataSourceHolder(datasourceName)->invalidate(IDataSource::DatasourceMode::RENDER_MODE);
|
||||
m_dataManager->dataSourceHolder(datasourceName)->invalidate(IDataSource::RENDER_MODE);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
@ -99,7 +99,7 @@ namespace LimeReport{
|
||||
#endif
|
||||
private:
|
||||
bool m_valid;
|
||||
void invalidate(){m_object=0; m_objects=0; m_valid = false; m_name = ""; m_value=QVariant(), m_isClass=false;}
|
||||
void invalidate(){m_object=0; m_objects=0; m_valid = false; m_name = ""; m_value=QVariant(); m_isClass=false;}
|
||||
|
||||
protected:
|
||||
void beginChangeValue(){ m_changingValue = true; }
|
||||
@ -140,4 +140,7 @@ namespace LimeReport{
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE(LimeReport::ObjectPropItem*)
|
||||
|
||||
#endif // LROBJECTPROPITEM_H
|
||||
|
Loading…
Reference in New Issue
Block a user