python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-25 04:54:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Qt 4 build fixed

Browse Source
This commit is contained in:
Arin Alexandex 2020-08-17 10:04:17 +03:00
parent 1e44b7bd5b
commit bed346552e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/lrpagedesignintf.cpp
View File

@ -2093,7 +2093,7 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
if (page()->reportItemsByName(item->objectName()).size()>1){ if (page()->reportItemsByName(item->objectName()).size()>1){
item->setObjectName(objectName); item->setObjectName(objectName);
} }
foreach(QObject* child, item->children()){ foreach (BaseDesignIntf* child, item->childBaseItems()){
changeName(page(), child); changeName(page(), child);
}; };
m_itemNames.push_back(item->objectName()); m_itemNames.push_back(item->objectName());
@ -2103,10 +2103,10 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
return false; return false;
} }
void PasteCommand::changeName(PageDesignIntf *page, QObject* item) void PasteCommand::changeName(PageDesignIntf *page, BaseDesignIntf* item)
{ {
item->setObjectName(page->genObjectName(*item)); item->setObjectName(page->genObjectName(*item));
foreach(QObject* child, item->children()){ foreach(BaseDesignIntf* child, item->childBaseItems()){
changeName(page, child); changeName(page, child);
}; };
} }

2
limereport/lrpagedesignintf.h
View File

@ -430,7 +430,7 @@ namespace LimeReport {
void setItemsXML(const QString& itemsXML); void setItemsXML(const QString& itemsXML);
void setParent(BaseDesignIntf* parent){m_parentItemName = parent->objectName();} void setParent(BaseDesignIntf* parent){m_parentItemName = parent->objectName();}
bool insertItem(ItemsReaderIntf::Ptr reader); bool insertItem(ItemsReaderIntf::Ptr reader);
void changeName(PageDesignIntf* page, QObject *item); void changeName(PageDesignIntf* page, BaseDesignIntf *item);
private: private:
QString m_itemsXML; QString m_itemsXML;
QString m_parentItemName; QString m_parentItemName;