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

Fix compilation

Browse Source 
Qt4 still have one remaining compiler error
This commit is contained in:
Rodrigo Torres 2019-08-10 18:45:27 -03:00
parent 6c44ce86d2
commit c549035c76
8 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
limereport.pro
View File

@ -16,9 +16,14 @@ SUBDIRS += \
limereport \ limereport \
demo_r1 \ demo_r1 \
demo_r2 \ demo_r2 \
console \
designer designer
greaterThan(QT_MAJOR_VERSION, 4){
greaterThan(QT_MINOR_VERSION, 1){
SUBDIRS += console
}
}
!contains(CONFIG, embedded_designer){ !contains(CONFIG, embedded_designer){
!contains(CONFIG, static_build){ !contains(CONFIG, static_build){
SUBDIRS += designer_plugin SUBDIRS += designer_plugin

2
limereport/exporters/lrpdfexporter.h
View File

@ -11,7 +11,7 @@ class PDFExporter : public QObject, public ReportExporterInterface
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit PDFExporter(ReportEnginePrivate *parent = nullptr); explicit PDFExporter(ReportEnginePrivate *parent = NULL);
// ReportExporterInterface interface // ReportExporterInterface interface
bool exportPages(ReportPages pages, const QString &fileName, const QMap<QString, QVariant> &params); bool exportPages(ReportPages pages, const QString &fileName, const QMap<QString, QVariant> &params);
QString exporterName() QString exporterName()

2
limereport/items/lrimageitemeditor.h
View File

@ -16,7 +16,7 @@ class ImageItemEditor : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = nullptr); explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = NULL);
~ImageItemEditor(); ~ImageItemEditor();
private: private:
void updateImage(); void updateImage();

2
limereport/lrbanddesignintf.cpp
View File

@ -176,7 +176,7 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
if (parentItem) setWidth(parentItem->width()); if (parentItem) setWidth(parentItem->width());
} }
setBackgroundMode(BGMode::TransparentMode); setBackgroundMode(BaseDesignIntf::TransparentMode);
setFillTransparentInDesignMode(false); setFillTransparentInDesignMode(false);
setHeight(100); setHeight(100);
setFixedPos(true); setFixedPos(true);

4
limereport/lrreportdesignwidget.h
View File

@ -82,12 +82,12 @@ private:
class PageView: public QGraphicsView{ class PageView: public QGraphicsView{
public: public:
PageView(QWidget *parent = nullptr): QGraphicsView(parent), PageView(QWidget *parent = NULL): QGraphicsView(parent),
m_horizontalRuller(0), m_verticalRuller(0) m_horizontalRuller(0), m_verticalRuller(0)
{ {
setViewportMargins(20,20,0,0); setViewportMargins(20,20,0,0);
} }
PageView(QGraphicsScene *scene, QWidget *parent = nullptr): PageView(QGraphicsScene *scene, QWidget *parent = NULL):
QGraphicsView(scene, parent), QGraphicsView(scene, parent),
m_horizontalRuller(0), m_verticalRuller(0) m_horizontalRuller(0), m_verticalRuller(0)
{ {

4
limereport/lrreportengine.cpp
View File

@ -299,7 +299,7 @@ void ReportEnginePrivate::printReport(ItemsReaderIntf::Ptr reader, QPrinter& pri
void ReportEnginePrivate::printReport(ReportPages pages, QPrinter &printer) void ReportEnginePrivate::printReport(ReportPages pages, QPrinter &printer)
{ {
int currenPage = 1; int currenPage = 1;
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors; QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer))); printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer)));
foreach(PageItemDesignIntf::Ptr page, pages){ foreach(PageItemDesignIntf::Ptr page, pages){
if ( if (
@ -320,7 +320,7 @@ void ReportEnginePrivate::printReport(ReportPages pages, QMap<QString, QPrinter*
{ {
if (printers.values().isEmpty()) return; if (printers.values().isEmpty()) return;
int currenPage = 1; int currenPage = 1;
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors; QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
for (int i = 0; i < printers.keys().count(); ++i) { for (int i = 0; i < printers.keys().count(); ++i) {
printProcessors.insert(printers.keys()[i],QSharedPointer<PrintProcessor>(new PrintProcessor(printers[printers.keys()[i]]))); printProcessors.insert(printers.keys()[i],QSharedPointer<PrintProcessor>(new PrintProcessor(printers[printers.keys()[i]])));
} }

2
limereport/lrscriptenginemanager.cpp
View File

@ -1930,7 +1930,7 @@ bool DatasourceFunctions::isEOF(const QString &datasourceName)
bool DatasourceFunctions::invalidate(const QString& datasourceName) bool DatasourceFunctions::invalidate(const QString& datasourceName)
{ {
if (m_dataManager && m_dataManager->dataSource(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 true;
} }
return false; return false;

5
limereport/objectinspector/lrobjectpropitem.h
View File

@ -99,7 +99,7 @@ namespace LimeReport{
#endif #endif
private: private:
bool m_valid; 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: protected:
void beginChangeValue(){ m_changingValue = true; } void beginChangeValue(){ m_changingValue = true; }
@ -140,4 +140,7 @@ namespace LimeReport{
}; };
} }
Q_DECLARE_METATYPE(LimeReport::ObjectPropItem*)
#endif // LROBJECTPROPITEM_H #endif // LROBJECTPROPITEM_H