fixed conflicts

limereport/base/lrattribsabstractfactory.h

@@ -54,6 +54,7 @@ private:
     friend class Singleton< AttribsAbstractFactory< AbstractProduct,IdentifierType,ProductCreator,Attribs > >;
 public:
     bool registerCreator(const IdentifierType& id, Attribs attribs, ProductCreator creator){
+        if (m_factoryMap.contains(id)) return true;
         return (m_factoryMap.insert(id,creator).value() == creator) &&
                (m_attribsMap.insert(id,attribs).value() == attribs);
     }

limereport/items/lrbordereditor.cpp

@@ -16,12 +16,14 @@ BorderEditor::BorderEditor(QWidget *parent) :
         ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
         this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
         );
+
+
 }
 
 void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
 {
     m_item = item;
-    qDebug()<<item->metaObject()->className();
+
     emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,
                                             item->borderLines() & LimeReport::BaseDesignIntf::TopLine);
     emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,
@@ -69,11 +71,13 @@ double BorderEditor::borderWidth()
     return m_borderWidth;
 }
 
+
 bool BorderEditor::isPage()
 {
     return QString(m_item->metaObject()->className()) == "LimeReport::PageItemDesignIntf";
 }
 
+
 BorderEditor::~BorderEditor()
 {
     delete ui;
@@ -99,18 +103,22 @@ void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side,
 {
     switch(side)
     {
-    case BaseDesignIntf::BorderSide::TopLine:
-        ui->topLine->setChecked(check);
-        break;
-    case BaseDesignIntf::BorderSide::BottomLine:
-        ui->bottomLine->setChecked(check);
-        break;
-    case BaseDesignIntf::BorderSide::LeftLine:
-        ui->leftLine->setChecked(check);
-        break;
-    case BaseDesignIntf::BorderSide::RightLine:
-        ui->rightLine->setChecked(check);
-        break;
+
+
+
+        case BaseDesignIntf::BorderSide::TopLine:
+            ui->topLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::BottomLine:
+            ui->bottomLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::LeftLine:
+            ui->leftLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::RightLine:
+            ui->rightLine->setChecked(check);
+            break;
+
     }
 }
 

limereport/items/lrbordereditor_BACKUP_426.cpp

@@ -0,0 +1,170 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
+{
+    ui->setupUi(this);
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+        );
+
+
+}
+
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
+{
+    m_item = item;
+
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::TopLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::LeftLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::RightLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::BottomLine);
+
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    m_borderColor = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+}
+
+LimeReport::BaseDesignIntf::BorderLines BorderEditor::borderSides()
+{
+    int borders = 0;
+    borders += (ui->topLine->isChecked()) ? LimeReport::BaseDesignIntf::TopLine : 0;
+    borders += (ui->bottomLine->isChecked()) ? LimeReport::BaseDesignIntf::BottomLine : 0;
+    borders += (ui->leftLine->isChecked()) ? LimeReport::BaseDesignIntf::LeftLine : 0;
+    borders += (ui->rightLine->isChecked()) ? LimeReport::BaseDesignIntf::RightLine : 0;
+    return (LimeReport::BaseDesignIntf::BorderLines) borders;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
+}
+
+QString BorderEditor::borderColor()
+{
+    return m_borderColor;
+}
+
+double BorderEditor::borderWidth()
+{
+    return m_borderWidth;
+}
+
+
+bool BorderEditor::isPage()
+{
+    return QString(m_item->metaObject()->className()) == "LimeReport::PageItemDesignIntf";
+}
+
+
+BorderEditor::~BorderEditor()
+{
+    delete ui;
+}
+
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    m_borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+}
+
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    m_borderWidth = arg1.toDouble();
+}
+
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
+{
+    switch(side)
+    {
+
+
+
+        case BaseDesignIntf::BorderSide::TopLine:
+            ui->topLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::BottomLine:
+            ui->bottomLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::LeftLine:
+            ui->leftLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::RightLine:
+            ui->rightLine->setChecked(check);
+            break;
+
+    }
+}
+
+void BorderEditor::on_topLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, checked);
+}
+
+void BorderEditor::on_bottomLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::BottomLine, checked);
+}
+
+void BorderEditor::on_leftLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::LeftLine, checked);
+}
+
+void BorderEditor::on_rightLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::RightLine, checked);
+}
+
+
+void BorderEditor::on_allLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, true);
+}
+
+void BorderEditor::on_noLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, false);
+}
+
+
+void BorderEditor::on_selectColor_clicked()
+{
+    QColorDialog cd(this);
+    if(cd.exec() == QDialog::Rejected) return;
+    QPen pen = ui->borderFrame->pen();
+    pen.setColor(cd.selectedColor().name());
+    m_borderColor = pen.color().name();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+    ui->borderFrame->setPen(pen);
+}
+
+} // namespace LimeReport

limereport/items/lrbordereditor_BASE_426.cpp

@@ -0,0 +1,182 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+lrbordereditor::lrbordereditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::lrbordereditor)
+{
+    ui->setupUi(this);
+
+    connect(ui->borderFrame,SIGNAL(borderSideClicked(int, bool)), this, SLOT(checkToolButtons(int, bool)));
+}
+
+void lrbordereditor::loadItem(LimeReport::BaseDesignIntf *i)
+{
+    item = i;
+    if(item->borderLines() & LimeReport::BaseDesignIntf::TopLine)
+    {
+        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,true);
+
+    }
+    if(item->borderLines() & LimeReport::BaseDesignIntf::LeftLine)
+    {
+        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,true);
+
+    }
+    if(item->borderLines() & LimeReport::BaseDesignIntf::RightLine)
+    {
+        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,true);
+
+    }
+    if(item->borderLines() & LimeReport::BaseDesignIntf::BottomLine)
+    {
+        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,true);
+    }
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    border_color = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+            borderWidth = ui->comboBox->currentText().toDouble();
+    borderStyle =ui->listWidget->currentRow();
+    ui->pushButton->setStyleSheet(QString("#pushButton{background-color:%1;}").arg(border_color));
+}
+
+LimeReport::BaseDesignIntf::BorderLines lrbordereditor::borderSides()
+{
+    int borders = 0;
+    borders += (ui->topLine->isChecked())?LimeReport::BaseDesignIntf::TopLine:0;
+    borders += (ui->bottomLine->isChecked())?LimeReport::BaseDesignIntf::BottomLine:0;
+    borders += (ui->leftLine->isChecked())?LimeReport::BaseDesignIntf::LeftLine:0;
+    borders += (ui->rightLine->isChecked())?LimeReport::BaseDesignIntf::RightLine:0;
+    return (LimeReport::BaseDesignIntf::BorderLines)borders;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle lrbordereditor::border_style()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle)borderStyle;
+}
+
+QString lrbordereditor::borderColor()
+{
+    return border_color;
+}
+
+double lrbordereditor::border_width()
+{
+    return borderWidth;
+}
+
+lrbordereditor::~lrbordereditor()
+{
+    delete ui;
+}
+
+void lrbordereditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+
+
+}
+
+
+void lrbordereditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    borderWidth = arg1.toDouble();
+}
+
+
+void lrbordereditor::on_pushButton_clicked()
+{
+    QColorDialog cd(this);
+    if(cd.exec() == QDialog::Rejected)return;
+    QPen pen = ui->borderFrame->pen();
+    pen.setColor(cd.selectedColor().name());
+    border_color = pen.color().name();
+
+    ui->pushButton->setStyleSheet(QString("#pushButton{background-color:%1;}").arg(border_color));
+    ui->borderFrame->setPen(pen);
+}
+
+
+void lrbordereditor::on_toolButton_4_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,true);
+    QPen pen = ui->borderFrame->pen();
+
+    ui->borderFrame->setPen(pen);
+}
+
+
+void lrbordereditor::on_noLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,false);
+
+}
+
+
+void lrbordereditor::on_topLine_clicked()
+{
+
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,ui->topLine->isChecked());
+
+}
+
+void lrbordereditor::checkToolButtons(int side, bool check)
+{
+
+    switch(side)
+    {
+    case LimeReport::BaseDesignIntf::BorderSide::TopLine:
+    {
+        ui->topLine->setChecked(check);
+    }break;
+    case LimeReport::BaseDesignIntf::BorderSide::BottomLine:
+    {
+        ui->bottomLine->setChecked(check);
+    }break;
+    case LimeReport::BaseDesignIntf::BorderSide::LeftLine:
+    {
+        ui->leftLine->setChecked(check);
+    }break;
+    case LimeReport::BaseDesignIntf::BorderSide::RightLine:
+    {
+        ui->rightLine->setChecked(check);
+    }break;
+    }
+}
+
+
+void lrbordereditor::on_bottomLine_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,ui->bottomLine->isChecked());
+}
+
+
+void lrbordereditor::on_leftLine_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,ui->leftLine->isChecked());
+}
+
+
+void lrbordereditor::on_toolButton_3_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,ui->rightLine->isChecked());
+}
+

limereport/items/lrbordereditor_LOCAL_426.cpp

@@ -0,0 +1,162 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
+{
+    ui->setupUi(this);
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+        );
+}
+
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
+{
+    m_item = item;
+    qDebug()<<item->metaObject()->className();
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::TopLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::LeftLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::RightLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::BottomLine);
+
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    m_borderColor = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+}
+
+LimeReport::BaseDesignIntf::BorderLines BorderEditor::borderSides()
+{
+    int borders = 0;
+    borders += (ui->topLine->isChecked()) ? LimeReport::BaseDesignIntf::TopLine : 0;
+    borders += (ui->bottomLine->isChecked()) ? LimeReport::BaseDesignIntf::BottomLine : 0;
+    borders += (ui->leftLine->isChecked()) ? LimeReport::BaseDesignIntf::LeftLine : 0;
+    borders += (ui->rightLine->isChecked()) ? LimeReport::BaseDesignIntf::RightLine : 0;
+    return (LimeReport::BaseDesignIntf::BorderLines) borders;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
+}
+
+QString BorderEditor::borderColor()
+{
+    return m_borderColor;
+}
+
+double BorderEditor::borderWidth()
+{
+    return m_borderWidth;
+}
+
+bool BorderEditor::isPage()
+{
+    return QString(m_item->metaObject()->className()) == "LimeReport::PageItemDesignIntf";
+}
+
+BorderEditor::~BorderEditor()
+{
+    delete ui;
+}
+
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    m_borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+}
+
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    m_borderWidth = arg1.toDouble();
+}
+
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
+{
+    switch(side)
+    {
+    case BaseDesignIntf::BorderSide::TopLine:
+        ui->topLine->setChecked(check);
+        break;
+    case BaseDesignIntf::BorderSide::BottomLine:
+        ui->bottomLine->setChecked(check);
+        break;
+    case BaseDesignIntf::BorderSide::LeftLine:
+        ui->leftLine->setChecked(check);
+        break;
+    case BaseDesignIntf::BorderSide::RightLine:
+        ui->rightLine->setChecked(check);
+        break;
+    }
+}
+
+void BorderEditor::on_topLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, checked);
+}
+
+void BorderEditor::on_bottomLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::BottomLine, checked);
+}
+
+void BorderEditor::on_leftLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::LeftLine, checked);
+}
+
+void BorderEditor::on_rightLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::RightLine, checked);
+}
+
+
+void BorderEditor::on_allLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, true);
+}
+
+void BorderEditor::on_noLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, false);
+}
+
+
+void BorderEditor::on_selectColor_clicked()
+{
+    QColorDialog cd(this);
+    if(cd.exec() == QDialog::Rejected) return;
+    QPen pen = ui->borderFrame->pen();
+    pen.setColor(cd.selectedColor().name());
+    m_borderColor = pen.color().name();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+    ui->borderFrame->setPen(pen);
+}
+
+} // namespace LimeReport

limereport/items/lrbordereditor_REMOTE_426.cpp

@@ -0,0 +1,156 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
+{
+    ui->setupUi(this);
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+    );
+}
+
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
+{
+    m_item = item;
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::TopLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::LeftLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::RightLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::BottomLine);
+
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    m_borderColor = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+}
+
+LimeReport::BaseDesignIntf::BorderLines BorderEditor::borderSides()
+{
+    int borders = 0;
+    borders += (ui->topLine->isChecked()) ? LimeReport::BaseDesignIntf::TopLine : 0;
+    borders += (ui->bottomLine->isChecked()) ? LimeReport::BaseDesignIntf::BottomLine : 0;
+    borders += (ui->leftLine->isChecked()) ? LimeReport::BaseDesignIntf::LeftLine : 0;
+    borders += (ui->rightLine->isChecked()) ? LimeReport::BaseDesignIntf::RightLine : 0;
+    return (LimeReport::BaseDesignIntf::BorderLines) borders;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
+}
+
+QString BorderEditor::borderColor()
+{
+    return m_borderColor;
+}
+
+double BorderEditor::borderWidth()
+{
+    return m_borderWidth;
+}
+
+BorderEditor::~BorderEditor()
+{
+    delete ui;
+}
+
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    m_borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+}
+
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    m_borderWidth = arg1.toDouble();
+}
+
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
+{
+    switch(side)
+    {
+        case BaseDesignIntf::BorderSide::TopLine:
+            ui->topLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::BottomLine:
+            ui->bottomLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::LeftLine:
+            ui->leftLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::RightLine:
+            ui->rightLine->setChecked(check);
+            break;
+    }
+}
+
+void BorderEditor::on_topLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, checked);
+}
+
+void BorderEditor::on_bottomLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::BottomLine, checked);
+}
+
+void BorderEditor::on_leftLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::LeftLine, checked);
+}
+
+void BorderEditor::on_rightLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::RightLine, checked);
+}
+
+
+void BorderEditor::on_allLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, true);
+}
+
+void BorderEditor::on_noLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, false);
+}
+
+
+void BorderEditor::on_selectColor_clicked()
+{
+    QColorDialog cd(this);
+    if(cd.exec() == QDialog::Rejected) return;
+    QPen pen = ui->borderFrame->pen();
+    pen.setColor(cd.selectedColor().name());
+    m_borderColor = pen.color().name();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+    ui->borderFrame->setPen(pen);
+}
+
+} // namespace LimeReport

limereport/items/lrtextitem.cpp

@@ -175,21 +175,25 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
 
     qreal hOffset = 0, vOffset = 0;
     switch (m_angle){
-    case Angle0:
-        hOffset = marginSize();
-        if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){
-            vOffset = tmpSize.height() / 2;
-        }
-        if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignBottom)) // allow html
-            vOffset = tmpSize.height();
-        painter->translate(hOffset,vOffset);
+
+
+
+        case Angle0:
+            hOffset = marginSize();
+            if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){
+                vOffset = tmpSize.height() / 2;
+            }
+            if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignBottom)) // allow html
+                vOffset = tmpSize.height();
+            painter->translate(hOffset,vOffset);
         break;
-    case Angle90:
-        hOffset = width() - marginSize();
-        vOffset = marginSize();
-        if (m_alignment & Qt::AlignVCenter){
-            hOffset = (width() - text->size().height()) / 2 + text->size().height();
-        }
+        case Angle90:
+            hOffset = width() - marginSize();
+            vOffset = marginSize();
+            if (m_alignment & Qt::AlignVCenter){
+                hOffset = (width() - text->size().height()) / 2 + text->size().height();
+            }
+
 
         if (m_alignment & Qt::AlignBottom){
             hOffset = (text->size().height());
@@ -197,6 +201,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
         painter->translate(hOffset,vOffset);
         painter->rotate(90);
         break;
+
     case Angle180:
         hOffset = width() - marginSize();
         vOffset = height() - marginSize();
@@ -216,6 +221,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
             hOffset = (width() - text->size().height())/2;
         }
 
+
         if (m_alignment & Qt::AlignBottom){
             hOffset = (width() - text->size().height());
         }
@@ -385,7 +391,11 @@ void TextItem::setTextFont(TextPtr text, const QFont& value) const {
 void TextItem::adaptFontSize(TextPtr text) const{
     QFont _font = transformToSceneFont(font());
     do{
+
         //        qApp->processEvents();
+
+//        qApp->processEvents();
+
         setTextFont(text,_font);
         if (_font.pixelSize()>2)
             _font.setPixelSize(_font.pixelSize()-1);
@@ -486,23 +496,25 @@ QString TextItem::formatFieldValue()
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     switch (value.type()) {
-    case QVariant::Date:
-    case QVariant::DateTime:
-        return formatDateTime(value.toDateTime());
-    case QVariant::Double:
-        return formatNumber(value.toDouble());
-    default:
-        return value.toString();
+        case QVariant::Date:
+        case QVariant::DateTime:
+            return formatDateTime(value.toDateTime());
+        case QVariant::Double:
+            return formatNumber(value.toDouble());
+        default:
+            return value.toString();
     }
 #else
     switch (value.typeId()) {
-    case QMetaType::QDate:
-    case QMetaType::QDateTime:
-        return formatDateTime(value.toDateTime());
-    case QMetaType::Double:
-        return formatNumber(value.toDouble());
-    default:
-        return value.toString();
+
+        case QMetaType::QDate:
+        case QMetaType::QDateTime:
+            return formatDateTime(value.toDateTime());
+        case QMetaType::Double:
+            return formatNumber(value.toDouble());
+        default:
+            return value.toString();
+
     }
 #endif
 

limereport/lrbasedesignintf.cpp

@@ -1570,7 +1570,9 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     menu.addSeparator();
 
     QAction* copyAction = menu.addAction(QIcon(":/report/images/copy"), tr("Copy"));
+
     QAction* cutAction = menu.addAction(QIcon(":/report/images/cut"), tr("Cut"));
+
     QAction* pasteAction = menu.addAction(QIcon(":/report/images/paste"), tr("Paste"));
     pasteAction->setEnabled(false);
 
@@ -1606,6 +1608,7 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     QAction* noBordersAction = menu.addAction(QIcon(":/report/images/noLines"), tr("No borders"));
     QAction* allBordersAction = menu.addAction(QIcon(":/report/images/allLines"), tr("All borders"));
     QAction* editBorderAction = menu.addAction(QIcon(":/report/images/borderEditor"), tr("Edit borders..."));
+
     QMenu *alignement = menu.addMenu(tr("Align items"));
     QAction* alignLeft = new QAction(QIcon(":/report/images/alignToLeft"),tr("Align to left"));
     QAction* alignRight = new QAction(QIcon(":/report/images/alignToRight"),tr("Align to right"));

limereport/lrdatasourcemanager.cpp

@@ -1751,6 +1751,7 @@ int DataSourceManager::columnCount(const QString &datasourceName)
     return -1;
 }
 
+
 int DataSourceManager::columnIndex(const QString &datasourceName, const QString &columnName)
 {
     IDataSource *ds = dataSource(datasourceName);

limereport/lrdatasourcemanager.h

@@ -184,7 +184,10 @@ public:
     QVariant headerData(const QString &fieldName, const QString &roleName);
     QString columnName(const QString &datasourceName, int index);
     int columnCount(const QString &datasourceName);
+
     int columnIndex(const QString &datasourceName,const QString& columnName);
+
+
     void    reopenDatasource(const QString& datasourceName);
 
     QString extractDataSource(const QString& fieldName);

limereport/lrpreviewreportwindow.cpp

@@ -29,8 +29,6 @@
  ****************************************************************************/
 #include "lrpreviewreportwindow.h"
 #include "ui_lrpreviewreportwindow.h"
-#include "serializators/lrxmlreader.h"
-#include "serializators/lrxmlwriter.h"
 #include "lrreportengine_p.h"
 #include "lrpreviewreportwidget.h"
 #include "lrpreviewreportwidget_p.h"
@@ -179,7 +177,6 @@ PreviewReportWindow::~PreviewReportWindow()
 {
     if (m_ownedSettings)
         delete m_settings;
-    //delete m_previewPage;
     delete ui;
 }
 
@@ -266,17 +263,6 @@ QSettings*PreviewReportWindow::settings()
     }
 }
 
-void PreviewReportWindow::setReportReader(ItemsReaderIntf::Ptr /*reader*/)
-{
-//    m_reader=reader;
-//    if (!reader.isNull()){
-//        if (reader->first()) reader->readItem(m_previewPage->pageItem());
-//        int pagesCount = reader->firstLevelItemsCount();
-//        m_previewPage->pageItem()->setItemMode(PreviewMode);
-//        initPreview(pagesCount);
-//    }
-}
-
 void PreviewReportWindow::setPages(ReportPages pages)
 {
     m_previewReportWidget->d_ptr->setPages(pages);

limereport/lrpreviewreportwindow.h

@@ -62,7 +62,6 @@ class PreviewReportWindow : public QMainWindow
 public:
     explicit PreviewReportWindow(ReportEngine *report, QWidget *parent = 0, QSettings* settings=0, Qt::WindowFlags flags=Qt::WindowFlags());
     ~PreviewReportWindow();
-    void setReportReader(ItemsReaderIntf::Ptr reader);
     void setPages(ReportPages pages);
     void setDefaultPrinter(QPrinter* printer);
     void exec();

limereport/lrreportengine.cpp

@@ -1848,7 +1848,11 @@ bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
 
     QRectF printerPageRect = m_printer->pageRect(QPrinter::Millimeter);
     printerPageRect = QRectF(0,0,(printerPageRect.size().width() + rightMargin + leftMargin) * page->unitFactor(),
+
                              (printerPageRect.size().height() + bottomMargin + topMargin) * page->unitFactor());
+
+
+
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
     if  (page->printBehavior() == PageItemDesignIntf::Split &&
         m_printer->pageSize() != static_cast<QPrinter::PageSize>(page->pageSize()) &&
@@ -1859,7 +1863,9 @@ bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
         page->printBehavior() == PageItemDesignIntf::Split &&
         m_printer->pageLayout().pageSize() != QPageSize((QPageSize::PageSizeId)page->pageSize()) &&
         printerPageRect.width() < page->geometry().width()
-        ){
+
+    ){
+
 #endif
         qreal pageWidth = page->geometry().width();
         qreal pageHeight =  page->geometry().height();
@@ -1876,7 +1882,9 @@ bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
                 currentPrintingRect = QRectF(
                     curWidth, 0,
                     printerPageRect.size().width() > (pageWidth - curWidth) ? (pageWidth - curWidth) : printerPageRect.size().width(),  pageHeight
-                    );
+
+                );
+
 
             }
             pageHeight -= printerPageRect.size().height();

limereport/lrreportrender.cpp

@@ -611,7 +611,7 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
         if (patternBand->isFooter())
             m_lastRenderedFooter = patternBand;
 
-        bandClone->setBackgroundColor(makeBackgroundColor(patternBand));
+        bandClone->setBackgroundColor(makeBackgroundColor(bandClone));
         patternBand->emitBandRendered(bandClone);
         m_scriptEngineContext->setCurrentBand(bandClone);
 
@@ -1417,6 +1417,7 @@ BandDesignIntf *ReportRender::renderData(BandDesignIntf *patternBand, bool emitB
     }
 
     emit(patternBand->preparedForRender());
+    bandClone->setBottomSpace(patternBand->height() - patternBand->findMaxBottom());
     bandClone->updateItemSize(m_datasources);
     bandClone->setBottomSpace(patternBand->height() - patternBand->findMaxBottom());
 

limereport/lrscriptenginemanager.cpp

@@ -649,7 +649,9 @@ QVariant ScriptEngineManager::evaluateScript(const QString& script){
     QVariant varValue;
 
     if (script.contains(rx)){
+
 #else
+
     QRegularExpression rx = getScriptRegEx();
     QVariant varValue;
 
@@ -1977,12 +1979,14 @@ int ScriptFunctionsManager::getColumnCount(const QString &datasourceName)
     return dm->columnCount(datasourceName);
 }
 
+
 int ScriptFunctionsManager::columnIndexByName(const QString &datasourceName, const QString &columnName)
 {
     DataSourceManager *dm = scriptEngineManager()->dataManager();
     return dm->columnIndex(datasourceName,columnName);
 }
 
+
 #ifdef USE_QJSENGINE
 
 void ScriptFunctionsManager::addItemsToComboBox(QJSValue object, const QStringList &values)

limereport/lrscriptenginemanager.h

@@ -414,8 +414,10 @@ public:
      * \return возможно -1 при ошибке
     */
     Q_INVOKABLE int getColumnCount(const QString &datasourceName);
+
     Q_INVOKABLE int columnIndexByName(const QString &datasourceName, const QString &columnName);
 
+
 #ifdef USE_QJSENGINE
     Q_INVOKABLE void addItemsToComboBox(QJSValue object, const QStringList& values);
     Q_INVOKABLE void addItemToComboBox(QJSValue object, const QString& value);

limereport/object_script.limereport.Release

@@ -0,0 +1,223 @@
+win32/release/obj/widgethost.o
+win32/release/obj/sizehandlerect.o
+win32/release/obj/formresizer.o
+win32/release/obj/lrdialogdesigner.o
+win32/release/obj/lrdatabrowser.o
+win32/release/obj/lrsqleditdialog.o
+win32/release/obj/lrconnectiondialog.o
+win32/release/obj/lrvariabledialog.o
+win32/release/obj/lrdatabrowsertree.o
+win32/release/obj/lrstringpropitem.o
+win32/release/obj/lrrectproptem.o
+win32/release/obj/lrintpropitem.o
+win32/release/obj/lrenumpropitem.o
+win32/release/obj/lrboolpropitem.o
+win32/release/obj/lrflagspropitem.o
+win32/release/obj/lrfontpropitem.o
+win32/release/obj/lrimagepropitem.o
+win32/release/obj/lrqrealpropitem.o
+win32/release/obj/lrcolorpropitem.o
+win32/release/obj/lrdatasourcepropitem.o
+win32/release/obj/lrgroupfieldpropitem.o
+win32/release/obj/lrcontentpropitem.o
+win32/release/obj/lrmarginpropitem.o
+win32/release/obj/lrseriespropitem.o
+win32/release/obj/lraxispropitem.o
+win32/release/obj/lrtextitempropertyeditor.o
+win32/release/obj/lrcomboboxeditor.o
+win32/release/obj/lrcheckboxeditor.o
+win32/release/obj/lrbuttonlineeditor.o
+win32/release/obj/lrfonteditor.o
+win32/release/obj/lrimageeditor.o
+win32/release/obj/lrcoloreditor.o
+win32/release/obj/lrbasedesignobjectmodel.o
+win32/release/obj/lrobjectinspectorwidget.o
+win32/release/obj/lrobjectitemmodel.o
+win32/release/obj/lrobjectpropitem.o
+win32/release/obj/lrpropertydelegate.o
+win32/release/obj/lrobjectbrowser.o
+win32/release/obj/lrscriptbrowser.o
+win32/release/obj/lrsubitemparentpropitem.o
+win32/release/obj/lralignpropitem.o
+win32/release/obj/lritemsaligneditorwidget.o
+win32/release/obj/translationeditor.o
+win32/release/obj/languageselectdialog.o
+win32/release/obj/lrreportdesignwidget.o
+win32/release/obj/lrreportdesignwindow.o
+win32/release/obj/lrsvgeditor.o
+win32/release/obj/lrsvgpropitem.o
+win32/release/obj/lrcompletermodel.o
+win32/release/obj/lrpageheader.o
+win32/release/obj/lrpagefooter.o
+win32/release/obj/lrreportheader.o
+win32/release/obj/lrreportfooter.o
+win32/release/obj/lrdataband.o
+win32/release/obj/lrgroupbands.o
+win32/release/obj/lrsubdetailband.o
+win32/release/obj/lrtearoffband.o
+win32/release/obj/lrxmlqrectserializator.o
+win32/release/obj/lrxmlbasetypesserializators.o
+win32/release/obj/lrxmlreader.o
+win32/release/obj/lrxmlwriter.o
+win32/release/obj/lrscripteditor.o
+win32/release/obj/lrcodeeditor.o
+win32/release/obj/lrscripthighlighter.o
+win32/release/obj/lrhorizontallayout.o
+win32/release/obj/lritemeditorwidget.o
+win32/release/obj/lrfonteditorwidget.o
+win32/release/obj/lrtextalignmenteditorwidget.o
+win32/release/obj/lritemsborderseditorwidget.o
+win32/release/obj/lrimageitem.o
+win32/release/obj/lrimageitemeditor.o
+win32/release/obj/lrtextitemeditor.o
+win32/release/obj/lrshapeitem.o
+win32/release/obj/lrtextitem.o
+win32/release/obj/lrverticallayout.o
+win32/release/obj/lrlayoutmarker.o
+win32/release/obj/lrabstractlayout.o
+win32/release/obj/lrchartitem.o
+win32/release/obj/lrchartitemeditor.o
+win32/release/obj/lrchartaxiseditor.o
+win32/release/obj/lrhorizontalbarchart.o
+win32/release/obj/lrlineschart.o
+win32/release/obj/lrgridlineschart.o
+win32/release/obj/lrpiechart.o
+win32/release/obj/lrverticalbarchart.o
+win32/release/obj/lrbanddesignintf.o
+win32/release/obj/lrpageitemdesignintf.o
+win32/release/obj/lrpagedesignintf.o
+win32/release/obj/lrbandsmanager.o
+win32/release/obj/lrglobal.o
+win32/release/obj/lritemdesignintf.o
+win32/release/obj/lrdatadesignintf.o
+win32/release/obj/lrbasedesignintf.o
+win32/release/obj/lrreportengine.o
+win32/release/obj/lrdatasourcemanager.o
+win32/release/obj/lrreportrender.o
+win32/release/obj/lrscriptenginemanager.o
+win32/release/obj/lrpreviewreportwindow.o
+win32/release/obj/lrpreviewreportwidget.o
+win32/release/obj/lrgraphicsviewzoom.o
+win32/release/obj/lrvariablesholder.o
+win32/release/obj/lrgroupfunctions.o
+win32/release/obj/lrsimplecrypt.o
+win32/release/obj/lraboutdialog.o
+win32/release/obj/lrsettingdialog.o
+win32/release/obj/lritemscontainerdesignitf.o
+win32/release/obj/lrcolorindicator.o
+win32/release/obj/lrreporttranslation.o
+win32/release/obj/lrpdfexporter.o
+win32/release/obj/lraxisdata.o
+win32/release/obj/lrpreparedpages.o
+win32/release/obj/lrpageeditor.o
+win32/release/obj/lrborderframeeditor.o
+win32/release/obj/lrbordereditor.o
+win32/release/obj/lrbarcodeitem.o
+win32/release/obj/lrsvgitem.o
+win32/release/obj/qrc_dialogdesigner.o
+win32/release/obj/qrc_lobjectinspector.o
+win32/release/obj/qrc_lrdatabrowser.o
+win32/release/obj/qrc_lrscriptbrowser.o
+win32/release/obj/qrc_translationeditor.o
+win32/release/obj/qrc_report.o
+win32/release/obj/qrc_items.o
+win32/release/obj/moc_widgethost.o
+win32/release/obj/moc_sizehandlerect.o
+win32/release/obj/moc_formresizer.o
+win32/release/obj/moc_lrdialogdesigner.o
+win32/release/obj/moc_lrdatabrowser.o
+win32/release/obj/moc_lrsqleditdialog.o
+win32/release/obj/moc_lrconnectiondialog.o
+win32/release/obj/moc_lrvariabledialog.o
+win32/release/obj/moc_lrdatabrowsertree.o
+win32/release/obj/moc_lrscriptbrowser.o
+win32/release/obj/moc_lrstringpropitem.o
+win32/release/obj/moc_lrrectproptem.o
+win32/release/obj/moc_lrdatasourcepropitem.o
+win32/release/obj/moc_lrfontpropitem.o
+win32/release/obj/moc_lrimagepropitem.o
+win32/release/obj/moc_lrintpropitem.o
+win32/release/obj/moc_lrenumpropitem.o
+win32/release/obj/moc_lrboolpropitem.o
+win32/release/obj/moc_lrflagspropitem.o
+win32/release/obj/moc_lrcontentpropitem.o
+win32/release/obj/moc_lrqrealpropitem.o
+win32/release/obj/moc_lrcolorpropitem.o
+win32/release/obj/moc_lrmarginpropitem.o
+win32/release/obj/moc_lrseriespropitem.o
+win32/release/obj/moc_lraxispropitem.o
+win32/release/obj/moc_lrtextitempropertyeditor.o
+win32/release/obj/moc_lrcomboboxeditor.o
+win32/release/obj/moc_lrcheckboxeditor.o
+win32/release/obj/moc_lrbuttonlineeditor.o
+win32/release/obj/moc_lrimageeditor.o
+win32/release/obj/moc_lrcoloreditor.o
+win32/release/obj/moc_lrfonteditor.o
+win32/release/obj/moc_lrobjectinspectorwidget.o
+win32/release/obj/moc_lrobjectitemmodel.o
+win32/release/obj/moc_lrobjectpropitem.o
+win32/release/obj/moc_lrpropertydelegate.o
+win32/release/obj/moc_lrobjectbrowser.o
+win32/release/obj/moc_translationeditor.o
+win32/release/obj/moc_languageselectdialog.o
+win32/release/obj/moc_lritemsaligneditorwidget.o
+win32/release/obj/moc_lrsubitemparentpropitem.o
+win32/release/obj/moc_lralignpropitem.o
+win32/release/obj/moc_lrreportdesignwidget.o
+win32/release/obj/moc_lrreportdesignwindow.o
+win32/release/obj/moc_lrsvgeditor.o
+win32/release/obj/moc_lrsvgpropitem.o
+win32/release/obj/moc_lrpageheader.o
+win32/release/obj/moc_lrpagefooter.o
+win32/release/obj/moc_lrreportheader.o
+win32/release/obj/moc_lrreportfooter.o
+win32/release/obj/moc_lrdataband.o
+win32/release/obj/moc_lrtearoffband.o
+win32/release/obj/moc_lrsubdetailband.o
+win32/release/obj/moc_lrgroupbands.o
+win32/release/obj/moc_lrscripteditor.o
+win32/release/obj/moc_lrcodeeditor.o
+win32/release/obj/moc_lritemeditorwidget.o
+win32/release/obj/moc_lrfonteditorwidget.o
+win32/release/obj/moc_lrtextalignmenteditorwidget.o
+win32/release/obj/moc_lritemsborderseditorwidget.o
+win32/release/obj/moc_lrtextitem.o
+win32/release/obj/moc_lrhorizontallayout.o
+win32/release/obj/moc_lrtextitemeditor.o
+win32/release/obj/moc_lrshapeitem.o
+win32/release/obj/moc_lrimageitem.o
+win32/release/obj/moc_lrimageitemeditor.o
+win32/release/obj/moc_lrverticallayout.o
+win32/release/obj/moc_lrabstractlayout.o
+win32/release/obj/moc_lrchartitem.o
+win32/release/obj/moc_lrchartitemeditor.o
+win32/release/obj/moc_lrchartaxiseditor.o
+win32/release/obj/moc_lrbanddesignintf.o
+win32/release/obj/moc_lrpageitemdesignintf.o
+win32/release/obj/moc_lrglobal.o
+win32/release/obj/moc_lrdatadesignintf.o
+win32/release/obj/moc_lrpagedesignintf.o
+win32/release/obj/moc_lrreportengine_p.o
+win32/release/obj/moc_lrdatasourcemanager.o
+win32/release/obj/moc_lrreportrender.o
+win32/release/obj/moc_lrpreviewreportwindow.o
+win32/release/obj/moc_lrpreviewreportwidget.o
+win32/release/obj/moc_lrgraphicsviewzoom.o
+win32/release/obj/moc_lrbasedesignintf.o
+win32/release/obj/moc_lritemdesignintf.o
+win32/release/obj/moc_lrscriptenginemanager.o
+win32/release/obj/moc_lrvariablesholder.o
+win32/release/obj/moc_lrgroupfunctions.o
+win32/release/obj/moc_lrreportengine.o
+win32/release/obj/moc_lraboutdialog.o
+win32/release/obj/moc_lrcallbackdatasourceintf.o
+win32/release/obj/moc_lrsettingdialog.o
+win32/release/obj/moc_lritemscontainerdesignitf.o
+win32/release/obj/moc_lrcolorindicator.o
+win32/release/obj/moc_lrpdfexporter.o
+win32/release/obj/moc_lraxisdata.o
+win32/release/obj/moc_lrpageeditor.o
+win32/release/obj/moc_lrborderframeeditor.o
+win32/release/obj/moc_lrbordereditor.o
+win32/release/obj/moc_lrbarcodeitem.o
+win32/release/obj/moc_lrsvgitem.o

limereport/object_script.limereportd.Debug

@@ -0,0 +1,223 @@
+win32/debug/obj/widgethost.o
+win32/debug/obj/sizehandlerect.o
+win32/debug/obj/formresizer.o
+win32/debug/obj/lrdialogdesigner.o
+win32/debug/obj/lrdatabrowser.o
+win32/debug/obj/lrsqleditdialog.o
+win32/debug/obj/lrconnectiondialog.o
+win32/debug/obj/lrvariabledialog.o
+win32/debug/obj/lrdatabrowsertree.o
+win32/debug/obj/lrstringpropitem.o
+win32/debug/obj/lrrectproptem.o
+win32/debug/obj/lrintpropitem.o
+win32/debug/obj/lrenumpropitem.o
+win32/debug/obj/lrboolpropitem.o
+win32/debug/obj/lrflagspropitem.o
+win32/debug/obj/lrfontpropitem.o
+win32/debug/obj/lrimagepropitem.o
+win32/debug/obj/lrqrealpropitem.o
+win32/debug/obj/lrcolorpropitem.o
+win32/debug/obj/lrdatasourcepropitem.o
+win32/debug/obj/lrgroupfieldpropitem.o
+win32/debug/obj/lrcontentpropitem.o
+win32/debug/obj/lrmarginpropitem.o
+win32/debug/obj/lrseriespropitem.o
+win32/debug/obj/lraxispropitem.o
+win32/debug/obj/lrtextitempropertyeditor.o
+win32/debug/obj/lrcomboboxeditor.o
+win32/debug/obj/lrcheckboxeditor.o
+win32/debug/obj/lrbuttonlineeditor.o
+win32/debug/obj/lrfonteditor.o
+win32/debug/obj/lrimageeditor.o
+win32/debug/obj/lrcoloreditor.o
+win32/debug/obj/lrbasedesignobjectmodel.o
+win32/debug/obj/lrobjectinspectorwidget.o
+win32/debug/obj/lrobjectitemmodel.o
+win32/debug/obj/lrobjectpropitem.o
+win32/debug/obj/lrpropertydelegate.o
+win32/debug/obj/lrobjectbrowser.o
+win32/debug/obj/lrscriptbrowser.o
+win32/debug/obj/lrsubitemparentpropitem.o
+win32/debug/obj/lralignpropitem.o
+win32/debug/obj/lritemsaligneditorwidget.o
+win32/debug/obj/translationeditor.o
+win32/debug/obj/languageselectdialog.o
+win32/debug/obj/lrreportdesignwidget.o
+win32/debug/obj/lrreportdesignwindow.o
+win32/debug/obj/lrsvgeditor.o
+win32/debug/obj/lrsvgpropitem.o
+win32/debug/obj/lrcompletermodel.o
+win32/debug/obj/lrpageheader.o
+win32/debug/obj/lrpagefooter.o
+win32/debug/obj/lrreportheader.o
+win32/debug/obj/lrreportfooter.o
+win32/debug/obj/lrdataband.o
+win32/debug/obj/lrgroupbands.o
+win32/debug/obj/lrsubdetailband.o
+win32/debug/obj/lrtearoffband.o
+win32/debug/obj/lrxmlqrectserializator.o
+win32/debug/obj/lrxmlbasetypesserializators.o
+win32/debug/obj/lrxmlreader.o
+win32/debug/obj/lrxmlwriter.o
+win32/debug/obj/lrscripteditor.o
+win32/debug/obj/lrcodeeditor.o
+win32/debug/obj/lrscripthighlighter.o
+win32/debug/obj/lrhorizontallayout.o
+win32/debug/obj/lritemeditorwidget.o
+win32/debug/obj/lrfonteditorwidget.o
+win32/debug/obj/lrtextalignmenteditorwidget.o
+win32/debug/obj/lritemsborderseditorwidget.o
+win32/debug/obj/lrimageitem.o
+win32/debug/obj/lrimageitemeditor.o
+win32/debug/obj/lrtextitemeditor.o
+win32/debug/obj/lrshapeitem.o
+win32/debug/obj/lrtextitem.o
+win32/debug/obj/lrverticallayout.o
+win32/debug/obj/lrlayoutmarker.o
+win32/debug/obj/lrabstractlayout.o
+win32/debug/obj/lrchartitem.o
+win32/debug/obj/lrchartitemeditor.o
+win32/debug/obj/lrchartaxiseditor.o
+win32/debug/obj/lrhorizontalbarchart.o
+win32/debug/obj/lrlineschart.o
+win32/debug/obj/lrgridlineschart.o
+win32/debug/obj/lrpiechart.o
+win32/debug/obj/lrverticalbarchart.o
+win32/debug/obj/lrbanddesignintf.o
+win32/debug/obj/lrpageitemdesignintf.o
+win32/debug/obj/lrpagedesignintf.o
+win32/debug/obj/lrbandsmanager.o
+win32/debug/obj/lrglobal.o
+win32/debug/obj/lritemdesignintf.o
+win32/debug/obj/lrdatadesignintf.o
+win32/debug/obj/lrbasedesignintf.o
+win32/debug/obj/lrreportengine.o
+win32/debug/obj/lrdatasourcemanager.o
+win32/debug/obj/lrreportrender.o
+win32/debug/obj/lrscriptenginemanager.o
+win32/debug/obj/lrpreviewreportwindow.o
+win32/debug/obj/lrpreviewreportwidget.o
+win32/debug/obj/lrgraphicsviewzoom.o
+win32/debug/obj/lrvariablesholder.o
+win32/debug/obj/lrgroupfunctions.o
+win32/debug/obj/lrsimplecrypt.o
+win32/debug/obj/lraboutdialog.o
+win32/debug/obj/lrsettingdialog.o
+win32/debug/obj/lritemscontainerdesignitf.o
+win32/debug/obj/lrcolorindicator.o
+win32/debug/obj/lrreporttranslation.o
+win32/debug/obj/lrpdfexporter.o
+win32/debug/obj/lraxisdata.o
+win32/debug/obj/lrpreparedpages.o
+win32/debug/obj/lrpageeditor.o
+win32/debug/obj/lrborderframeeditor.o
+win32/debug/obj/lrbordereditor.o
+win32/debug/obj/lrbarcodeitem.o
+win32/debug/obj/lrsvgitem.o
+win32/debug/obj/qrc_dialogdesigner.o
+win32/debug/obj/qrc_lobjectinspector.o
+win32/debug/obj/qrc_lrdatabrowser.o
+win32/debug/obj/qrc_lrscriptbrowser.o
+win32/debug/obj/qrc_translationeditor.o
+win32/debug/obj/qrc_report.o
+win32/debug/obj/qrc_items.o
+win32/debug/obj/moc_widgethost.o
+win32/debug/obj/moc_sizehandlerect.o
+win32/debug/obj/moc_formresizer.o
+win32/debug/obj/moc_lrdialogdesigner.o
+win32/debug/obj/moc_lrdatabrowser.o
+win32/debug/obj/moc_lrsqleditdialog.o
+win32/debug/obj/moc_lrconnectiondialog.o
+win32/debug/obj/moc_lrvariabledialog.o
+win32/debug/obj/moc_lrdatabrowsertree.o
+win32/debug/obj/moc_lrscriptbrowser.o
+win32/debug/obj/moc_lrstringpropitem.o
+win32/debug/obj/moc_lrrectproptem.o
+win32/debug/obj/moc_lrdatasourcepropitem.o
+win32/debug/obj/moc_lrfontpropitem.o
+win32/debug/obj/moc_lrimagepropitem.o
+win32/debug/obj/moc_lrintpropitem.o
+win32/debug/obj/moc_lrenumpropitem.o
+win32/debug/obj/moc_lrboolpropitem.o
+win32/debug/obj/moc_lrflagspropitem.o
+win32/debug/obj/moc_lrcontentpropitem.o
+win32/debug/obj/moc_lrqrealpropitem.o
+win32/debug/obj/moc_lrcolorpropitem.o
+win32/debug/obj/moc_lrmarginpropitem.o
+win32/debug/obj/moc_lrseriespropitem.o
+win32/debug/obj/moc_lraxispropitem.o
+win32/debug/obj/moc_lrtextitempropertyeditor.o
+win32/debug/obj/moc_lrcomboboxeditor.o
+win32/debug/obj/moc_lrcheckboxeditor.o
+win32/debug/obj/moc_lrbuttonlineeditor.o
+win32/debug/obj/moc_lrimageeditor.o
+win32/debug/obj/moc_lrcoloreditor.o
+win32/debug/obj/moc_lrfonteditor.o
+win32/debug/obj/moc_lrobjectinspectorwidget.o
+win32/debug/obj/moc_lrobjectitemmodel.o
+win32/debug/obj/moc_lrobjectpropitem.o
+win32/debug/obj/moc_lrpropertydelegate.o
+win32/debug/obj/moc_lrobjectbrowser.o
+win32/debug/obj/moc_translationeditor.o
+win32/debug/obj/moc_languageselectdialog.o
+win32/debug/obj/moc_lritemsaligneditorwidget.o
+win32/debug/obj/moc_lrsubitemparentpropitem.o
+win32/debug/obj/moc_lralignpropitem.o
+win32/debug/obj/moc_lrreportdesignwidget.o
+win32/debug/obj/moc_lrreportdesignwindow.o
+win32/debug/obj/moc_lrsvgeditor.o
+win32/debug/obj/moc_lrsvgpropitem.o
+win32/debug/obj/moc_lrpageheader.o
+win32/debug/obj/moc_lrpagefooter.o
+win32/debug/obj/moc_lrreportheader.o
+win32/debug/obj/moc_lrreportfooter.o
+win32/debug/obj/moc_lrdataband.o
+win32/debug/obj/moc_lrtearoffband.o
+win32/debug/obj/moc_lrsubdetailband.o
+win32/debug/obj/moc_lrgroupbands.o
+win32/debug/obj/moc_lrscripteditor.o
+win32/debug/obj/moc_lrcodeeditor.o
+win32/debug/obj/moc_lritemeditorwidget.o
+win32/debug/obj/moc_lrfonteditorwidget.o
+win32/debug/obj/moc_lrtextalignmenteditorwidget.o
+win32/debug/obj/moc_lritemsborderseditorwidget.o
+win32/debug/obj/moc_lrtextitem.o
+win32/debug/obj/moc_lrhorizontallayout.o
+win32/debug/obj/moc_lrtextitemeditor.o
+win32/debug/obj/moc_lrshapeitem.o
+win32/debug/obj/moc_lrimageitem.o
+win32/debug/obj/moc_lrimageitemeditor.o
+win32/debug/obj/moc_lrverticallayout.o
+win32/debug/obj/moc_lrabstractlayout.o
+win32/debug/obj/moc_lrchartitem.o
+win32/debug/obj/moc_lrchartitemeditor.o
+win32/debug/obj/moc_lrchartaxiseditor.o
+win32/debug/obj/moc_lrbanddesignintf.o
+win32/debug/obj/moc_lrpageitemdesignintf.o
+win32/debug/obj/moc_lrglobal.o
+win32/debug/obj/moc_lrdatadesignintf.o
+win32/debug/obj/moc_lrpagedesignintf.o
+win32/debug/obj/moc_lrreportengine_p.o
+win32/debug/obj/moc_lrdatasourcemanager.o
+win32/debug/obj/moc_lrreportrender.o
+win32/debug/obj/moc_lrpreviewreportwindow.o
+win32/debug/obj/moc_lrpreviewreportwidget.o
+win32/debug/obj/moc_lrgraphicsviewzoom.o
+win32/debug/obj/moc_lrbasedesignintf.o
+win32/debug/obj/moc_lritemdesignintf.o
+win32/debug/obj/moc_lrscriptenginemanager.o
+win32/debug/obj/moc_lrvariablesholder.o
+win32/debug/obj/moc_lrgroupfunctions.o
+win32/debug/obj/moc_lrreportengine.o
+win32/debug/obj/moc_lraboutdialog.o
+win32/debug/obj/moc_lrcallbackdatasourceintf.o
+win32/debug/obj/moc_lrsettingdialog.o
+win32/debug/obj/moc_lritemscontainerdesignitf.o
+win32/debug/obj/moc_lrcolorindicator.o
+win32/debug/obj/moc_lrpdfexporter.o
+win32/debug/obj/moc_lraxisdata.o
+win32/debug/obj/moc_lrpageeditor.o
+win32/debug/obj/moc_lrborderframeeditor.o
+win32/debug/obj/moc_lrbordereditor.o
+win32/debug/obj/moc_lrbarcodeitem.o
+win32/debug/obj/moc_lrsvgitem.o

limereport/win32/debug/moc/mocinclude.opt

@@ -0,0 +1,45 @@
+-ID:/Qt5.15/5.15.0/mingw81_32/mkspecs/win32-g++
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/dialogdesigner/3rdparty/qtcreator
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/dialogdesigner/3rdparty/designer
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/objectinspector
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/databrowser
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/items
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/bands
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/base
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/scripteditor
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/3rdparty/zint-2.10.0/backend
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/3rdparty/zint-2.10.0/backend_qt
+-ID:/Qt5.15/5.15.0/mingw81_32/include
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtSvg
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtUiTools
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtPrintSupport
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesignerComponents
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesignerComponents/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesignerComponents/5.15.0/QtDesignerComponents
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesigner/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesigner/5.15.0/QtDesigner
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesigner
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtUiPlugin
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtWidgets/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtWidgets/5.15.0/QtWidgets
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtWidgets
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtGui/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtGui/5.15.0/QtGui
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtGui
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtANGLE
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtXml
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtSql
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtQml
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtNetwork
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtCore/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtCore/5.15.0/QtCore
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtCore
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include/c++
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include/c++/i686-w64-mingw32
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include/c++/backward
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include-fixed
+-Id:/Qt5.15/Tools/mingw810_32/i686-w64-mingw32/include

limereport/win32/release/moc/moc_predefs.h

@@ -0,0 +1,384 @@
+#define __DBL_MIN_EXP__ (-1021)
+#define __FLT32X_MAX_EXP__ 1024
+#define __cpp_attributes 200809
+#define __pentiumpro__ 1
+#define __UINT_LEAST16_MAX__ 0xffff
+#define __ATOMIC_ACQUIRE 2
+#define __FLT128_MAX_10_EXP__ 4932
+#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F
+#define __GCC_IEC_559_COMPLEX 2
+#define __cpp_aggregate_nsdmi 201304
+#define __UINT_LEAST8_TYPE__ unsigned char
+#define __SIZEOF_FLOAT80__ 12
+#define _WIN32 1
+#define __INTMAX_C(c) c ## LL
+#define __CHAR_BIT__ 8
+#define __UINT8_MAX__ 0xff
+#define __WINT_MAX__ 0xffff
+#define __FLT32_MIN_EXP__ (-125)
+#define __cpp_static_assert 200410
+#define __ORDER_LITTLE_ENDIAN__ 1234
+#define __SIZE_MAX__ 0xffffffffU
+#define __WCHAR_MAX__ 0xffff
+#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
+#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
+#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
+#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L)
+#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
+#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
+#define __GCC_IEC_559 2
+#define __FLT32X_DECIMAL_DIG__ 17
+#define __FLT_EVAL_METHOD__ 2
+#define __cpp_binary_literals 201304
+#define __FLT64_DECIMAL_DIG__ 17
+#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
+#define __cpp_variadic_templates 200704
+#define __UINT_FAST64_MAX__ 0xffffffffffffffffULL
+#define __SIG_ATOMIC_TYPE__ int
+#define __DBL_MIN_10_EXP__ (-307)
+#define __FINITE_MATH_ONLY__ 0
+#define __cpp_variable_templates 201304
+#define __GNUC_PATCHLEVEL__ 0
+#define __FLT32_HAS_DENORM__ 1
+#define __UINT_FAST8_MAX__ 0xff
+#define __has_include(STR) __has_include__(STR)
+#define _stdcall __attribute__((__stdcall__))
+#define __DEC64_MAX_EXP__ 385
+#define __INT8_C(c) c
+#define __INT_LEAST8_WIDTH__ 8
+#define __UINT_LEAST64_MAX__ 0xffffffffffffffffULL
+#define __SHRT_MAX__ 0x7fff
+#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L
+#define __FLT64X_MAX_10_EXP__ 4932
+#define __UINT_LEAST8_MAX__ 0xff
+#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
+#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128
+#define __UINTMAX_TYPE__ long long unsigned int
+#define __DEC32_EPSILON__ 1E-6DF
+#define __FLT_EVAL_METHOD_TS_18661_3__ 2
+#define __OPTIMIZE__ 1
+#define __UINT32_MAX__ 0xffffffffU
+#define __GXX_EXPERIMENTAL_CXX0X__ 1
+#define __LDBL_MAX_EXP__ 16384
+#define __FLT128_MIN_EXP__ (-16381)
+#define __WINT_MIN__ 0
+#define __FLT128_MIN_10_EXP__ (-4931)
+#define __INT_LEAST16_WIDTH__ 16
+#define __SCHAR_MAX__ 0x7f
+#define __FLT128_MANT_DIG__ 113
+#define __WCHAR_MIN__ 0
+#define __INT64_C(c) c ## LL
+#define __DBL_DIG__ 15
+#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
+#define __FLT64X_MANT_DIG__ 64
+#define __SIZEOF_INT__ 4
+#define __SIZEOF_POINTER__ 4
+#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
+#define __USER_LABEL_PREFIX__ _
+#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x
+#define __STDC_HOSTED__ 1
+#define __WIN32 1
+#define __LDBL_HAS_INFINITY__ 1
+#define __FLT32_DIG__ 6
+#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F
+#define __GXX_WEAK__ 1
+#define __SHRT_WIDTH__ 16
+#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L
+#define __DEC32_MAX__ 9.999999E96DF
+#define __cpp_threadsafe_static_init 200806
+#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x
+#define __MINGW32__ 1
+#define __FLT32X_HAS_INFINITY__ 1
+#define __INT32_MAX__ 0x7fffffff
+#define __INT_WIDTH__ 32
+#define __SIZEOF_LONG__ 4
+#define __UINT16_C(c) c
+#define __PTRDIFF_WIDTH__ 32
+#define __DECIMAL_DIG__ 21
+#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64
+#define __INTMAX_WIDTH__ 64
+#define __FLT64_MIN_EXP__ (-1021)
+#define __has_include_next(STR) __has_include_next__(STR)
+#define __FLT64X_MIN_10_EXP__ (-4931)
+#define __LDBL_HAS_QUIET_NAN__ 1
+#define __FLT64_MANT_DIG__ 53
+#define _REENTRANT 1
+#define __GNUC__ 8
+#define _cdecl __attribute__((__cdecl__))
+#define __GXX_RTTI 1
+#define __cpp_delegating_constructors 200604
+#define __FLT_HAS_DENORM__ 1
+#define __SIZEOF_LONG_DOUBLE__ 12
+#define __BIGGEST_ALIGNMENT__ 16
+#define __STDC_UTF_16__ 1
+#define __FLT64_MAX_10_EXP__ 308
+#define __i686 1
+#define __FLT32_HAS_INFINITY__ 1
+#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L)
+#define _thiscall __attribute__((__thiscall__))
+#define __cpp_raw_strings 200710
+#define __INT_FAST32_MAX__ 0x7fffffff
+#define __WINNT 1
+#define __DBL_HAS_INFINITY__ 1
+#define __WINNT__ 1
+#define __DEC32_MIN_EXP__ (-94)
+#define __INTPTR_WIDTH__ 32
+#define __FLT32X_HAS_DENORM__ 1
+#define __INT_FAST16_TYPE__ short int
+#define _fastcall __attribute__((__fastcall__))
+#define __LDBL_HAS_DENORM__ 1
+#define __cplusplus 201402L
+#define __cpp_ref_qualifiers 200710
+#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
+#define __INT_LEAST32_MAX__ 0x7fffffff
+#define __DEC32_MIN__ 1E-95DF
+#define __DEPRECATED 1
+#define __cpp_rvalue_references 200610
+#define __DBL_MAX_EXP__ 1024
+#define __WCHAR_WIDTH__ 16
+#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32
+#define __DEC128_EPSILON__ 1E-33DL
+#define __ATOMIC_HLE_RELEASE 131072
+#define __WIN32__ 1
+#define __PTRDIFF_MAX__ 0x7fffffff
+#define __ATOMIC_HLE_ACQUIRE 65536
+#define __FLT32_HAS_QUIET_NAN__ 1
+#define __GNUG__ 8
+#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL
+#define __SIZEOF_SIZE_T__ 4
+#define __cpp_rvalue_reference 200610
+#define __cpp_nsdmi 200809
+#define __FLT64X_MIN_EXP__ (-16381)
+#define __SIZEOF_WINT_T__ 2
+#define __LONG_LONG_WIDTH__ 64
+#define __cpp_initializer_lists 200806
+#define __FLT32_MAX_EXP__ 128
+#define __cpp_hex_float 201603
+#define __GCC_HAVE_DWARF2_CFI_ASM 1
+#define __GXX_ABI_VERSION 1012
+#define __FLT128_HAS_INFINITY__ 1
+#define __FLT_MIN_EXP__ (-125)
+#define __i686__ 1
+#define __cpp_lambdas 200907
+#define __FLT64X_HAS_QUIET_NAN__ 1
+#define __INT_FAST64_TYPE__ long long int
+#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64
+#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L)
+#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x
+#define __DECIMAL_BID_FORMAT__ 1
+#define __GXX_TYPEINFO_EQUALITY_INLINE 0
+#define __FLT64_MIN_10_EXP__ (-307)
+#define __FLT64X_DECIMAL_DIG__ 21
+#define __DEC128_MIN__ 1E-6143DL
+#define __REGISTER_PREFIX__ 
+#define __UINT16_MAX__ 0xffff
+#define __DBL_HAS_DENORM__ 1
+#define __cdecl __attribute__((__cdecl__))
+#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32
+#define __UINT8_TYPE__ unsigned char
+#define __i386 1
+#define __FLT_MANT_DIG__ 24
+#define __LDBL_DECIMAL_DIG__ 21
+#define __VERSION__ "8.1.0"
+#define __UINT64_C(c) c ## ULL
+#define __cpp_unicode_characters 200704
+#define __cpp_decltype_auto 201304
+#define __GCC_ATOMIC_INT_LOCK_FREE 2
+#define __FLT128_MAX_EXP__ 16384
+#define __FLT32_MANT_DIG__ 24
+#define _X86_ 1
+#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__
+#define __FLT128_HAS_DENORM__ 1
+#define __FLT128_DIG__ 33
+#define __SCHAR_WIDTH__ 8
+#define __INT32_C(c) c
+#define __DEC64_EPSILON__ 1E-15DD
+#define __ORDER_PDP_ENDIAN__ 3412
+#define __DEC128_MIN_EXP__ (-6142)
+#define __code_model_32__ 1
+#define __FLT32_MAX_10_EXP__ 38
+#define __INT_FAST32_TYPE__ int
+#define __UINT_LEAST16_TYPE__ short unsigned int
+#define __FLT64X_HAS_INFINITY__ 1
+#define __INT16_MAX__ 0x7fff
+#define __i386__ 1
+#define __cpp_rtti 199711
+#define __SIZE_TYPE__ unsigned int
+#define __UINT64_MAX__ 0xffffffffffffffffULL
+#define __FLT64X_DIG__ 18
+#define __INT8_TYPE__ signed char
+#define __cpp_digit_separators 201309
+#define __GCC_ASM_FLAG_OUTPUTS__ 1
+#define __FLT_RADIX__ 2
+#define __INT_LEAST16_TYPE__ short int
+#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L
+#define __UINTMAX_C(c) c ## ULL
+#define __SIG_ATOMIC_MAX__ 0x7fffffff
+#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
+#define __SIZEOF_PTRDIFF_T__ 4
+#define __FLT32X_MANT_DIG__ 53
+#define __FLT32X_MIN_EXP__ (-1021)
+#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF
+#define __pentiumpro 1
+#define __MSVCRT__ 1
+#define __INT_FAST16_MAX__ 0x7fff
+#define __FLT64_DIG__ 15
+#define __UINT_FAST32_MAX__ 0xffffffffU
+#define __UINT_LEAST64_TYPE__ long long unsigned int
+#define __FLT_HAS_QUIET_NAN__ 1
+#define __FLT_MAX_10_EXP__ 38
+#define __LONG_MAX__ 0x7fffffffL
+#define __FLT64X_HAS_DENORM__ 1
+#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL
+#define __FLT_HAS_INFINITY__ 1
+#define __cpp_unicode_literals 200710
+#define __UINT_FAST16_TYPE__ short unsigned int
+#define __DEC64_MAX__ 9.999999999999999E384DD
+#define __INT_FAST32_WIDTH__ 32
+#define __CHAR16_TYPE__ short unsigned int
+#define __PRAGMA_REDEFINE_EXTNAME 1
+#define __SIZE_WIDTH__ 32
+#define __SEG_FS 1
+#define __INT_LEAST16_MAX__ 0x7fff
+#define __DEC64_MANT_DIG__ 16
+#define __INT64_MAX__ 0x7fffffffffffffffLL
+#define __UINT_LEAST32_MAX__ 0xffffffffU
+#define __SEG_GS 1
+#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32
+#define __GCC_ATOMIC_LONG_LOCK_FREE 2
+#define __SIG_ATOMIC_WIDTH__ 32
+#define __INT_LEAST64_TYPE__ long long int
+#define __INT16_TYPE__ short int
+#define __INT_LEAST8_TYPE__ signed char
+#define __DEC32_MAX_EXP__ 97
+#define __INT_FAST8_MAX__ 0x7f
+#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128
+#define __INTPTR_MAX__ 0x7fffffff
+#define __cpp_sized_deallocation 201309
+#define __GXX_MERGED_TYPEINFO_NAMES 0
+#define __cpp_range_based_for 200907
+#define __FLT64_HAS_QUIET_NAN__ 1
+#define __stdcall __attribute__((__stdcall__))
+#define __FLT32_MIN_10_EXP__ (-37)
+#define __EXCEPTIONS 1
+#define __LDBL_MANT_DIG__ 64
+#define __DBL_HAS_QUIET_NAN__ 1
+#define __FLT64_HAS_INFINITY__ 1
+#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x
+#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1)
+#define __cpp_return_type_deduction 201304
+#define __INTPTR_TYPE__ int
+#define __UINT16_TYPE__ short unsigned int
+#define __WCHAR_TYPE__ short unsigned int
+#define __SIZEOF_FLOAT__ 4
+#define __UINTPTR_MAX__ 0xffffffffU
+#define __INT_FAST64_WIDTH__ 64
+#define __DEC64_MIN_EXP__ (-382)
+#define __cpp_decltype 200707
+#define __FLT32_DECIMAL_DIG__ 9
+#define __INT_FAST64_MAX__ 0x7fffffffffffffffLL
+#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
+#define __FLT_DIG__ 6
+#define __FLT64X_MAX_EXP__ 16384
+#define __UINT_FAST64_TYPE__ long long unsigned int
+#define __INT_MAX__ 0x7fffffff
+#define WIN32 1
+#define __INT64_TYPE__ long long int
+#define __FLT_MAX_EXP__ 128
+#define __DBL_MANT_DIG__ 53
+#define __cpp_inheriting_constructors 201511
+#define __SIZEOF_FLOAT128__ 16
+#define __INT_LEAST64_MAX__ 0x7fffffffffffffffLL
+#define __DEC64_MIN__ 1E-383DD
+#define __WINT_TYPE__ short unsigned int
+#define __UINT_LEAST32_TYPE__ unsigned int
+#define __SIZEOF_SHORT__ 2
+#define __LDBL_MIN_EXP__ (-16381)
+#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64
+#define __WINT_WIDTH__ 16
+#define __INT_LEAST8_MAX__ 0x7f
+#define __FLT32X_MAX_10_EXP__ 308
+#define __WCHAR_UNSIGNED__ 1
+#define __LDBL_MAX_10_EXP__ 4932
+#define __ATOMIC_RELAXED 0
+#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L)
+#define __thiscall __attribute__((__thiscall__))
+#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128
+#define __UINT8_C(c) c
+#define __FLT64_MAX_EXP__ 1024
+#define __INT_LEAST32_TYPE__ int
+#define __SIZEOF_WCHAR_T__ 2
+#define __FLT128_HAS_QUIET_NAN__ 1
+#define __INT_FAST8_TYPE__ signed char
+#define __fastcall __attribute__((__fastcall__))
+#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x
+#define __GNUC_STDC_INLINE__ 1
+#define __FLT64_HAS_DENORM__ 1
+#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32
+#define __DBL_DECIMAL_DIG__ 17
+#define __STDC_UTF_32__ 1
+#define __INT_FAST8_WIDTH__ 8
+#define __DEC_EVAL_METHOD__ 2
+#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x
+#define __ORDER_BIG_ENDIAN__ 4321
+#define __cpp_runtime_arrays 198712
+#define __UINT64_TYPE__ long long unsigned int
+#define __UINT32_C(c) c ## U
+#define __INTMAX_MAX__ 0x7fffffffffffffffLL
+#define __cpp_alias_templates 200704
+#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
+#define WINNT 1
+#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F
+#define __INT8_MAX__ 0x7f
+#define __LONG_WIDTH__ 32
+#define __UINT_FAST32_TYPE__ unsigned int
+#define __CHAR32_TYPE__ unsigned int
+#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F
+#define __cpp_constexpr 201304
+#define __INT32_TYPE__ int
+#define __SIZEOF_DOUBLE__ 8
+#define __cpp_exceptions 199711
+#define __FLT_MIN_10_EXP__ (-37)
+#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64
+#define __INT_LEAST32_WIDTH__ 32
+#define __INTMAX_TYPE__ long long int
+#define i386 1
+#define _INTEGRAL_MAX_BITS 64
+#define __DEC128_MAX_EXP__ 6145
+#define __FLT32X_HAS_QUIET_NAN__ 1
+#define __ATOMIC_CONSUME 1
+#define __GNUC_MINOR__ 1
+#define __INT_FAST16_WIDTH__ 16
+#define __UINTMAX_MAX__ 0xffffffffffffffffULL
+#define __DEC32_MANT_DIG__ 7
+#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x
+#define __DBL_MAX_10_EXP__ 308
+#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L
+#define __INT16_C(c) c
+#define __cpp_generic_lambdas 201304
+#define __STDC__ 1
+#define __FLT32X_DIG__ 15
+#define __PTRDIFF_TYPE__ int
+#define __ATOMIC_SEQ_CST 5
+#define __UINT32_TYPE__ unsigned int
+#define __FLT32X_MIN_10_EXP__ (-307)
+#define __UINTPTR_TYPE__ unsigned int
+#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD
+#define __DEC128_MANT_DIG__ 34
+#define __LDBL_MIN_10_EXP__ (-4931)
+#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128
+#define __SIZEOF_LONG_LONG__ 8
+#define __cpp_user_defined_literals 200809
+#define __FLT128_DECIMAL_DIG__ 36
+#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
+#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x
+#define __LDBL_DIG__ 18
+#define __FLT_DECIMAL_DIG__ 9
+#define __UINT_FAST16_MAX__ 0xffff
+#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
+#define __INT_LEAST64_WIDTH__ 64
+#define __UINT_FAST8_TYPE__ unsigned char
+#define __cpp_init_captures 201304
+#define __ATOMIC_ACQ_REL 4
+#define __ATOMIC_RELEASE 3
+#define __declspec(x) __attribute__((x))

limereport/win32/release/moc/mocinclude.opt

@@ -0,0 +1,45 @@
+-ID:/Qt5.15/5.15.0/mingw81_32/mkspecs/win32-g++
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/dialogdesigner/3rdparty/qtcreator
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/dialogdesigner/3rdparty/designer
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/objectinspector
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/databrowser
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/items
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/bands
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/base
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/limereport/scripteditor
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/3rdparty/zint-2.10.0/backend
+-IC:/Users/yand9/Documents/Qt/Projets/LimeReport-master/3rdparty/zint-2.10.0/backend_qt
+-ID:/Qt5.15/5.15.0/mingw81_32/include
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtSvg
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtUiTools
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtPrintSupport
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesignerComponents
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesignerComponents/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesignerComponents/5.15.0/QtDesignerComponents
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesigner/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesigner/5.15.0/QtDesigner
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtDesigner
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtUiPlugin
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtWidgets/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtWidgets/5.15.0/QtWidgets
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtWidgets
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtGui/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtGui/5.15.0/QtGui
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtGui
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtANGLE
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtXml
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtSql
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtQml
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtNetwork
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtCore/5.15.0
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtCore/5.15.0/QtCore
+-ID:/Qt5.15/5.15.0/mingw81_32/include/QtCore
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include/c++
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include/c++/i686-w64-mingw32
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include/c++/backward
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include
+-Id:/Qt5.15/Tools/mingw810_32/lib/gcc/i686-w64-mingw32/8.1.0/include-fixed
+-Id:/Qt5.15/Tools/mingw810_32/i686-w64-mingw32/include