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

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander 2016-10-18 15:00:40 +03:00
commit 2152c3f4f1
35 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo_r1/mainwindow.cpp
View File

@ -173,6 +173,7 @@ void MainWindow::prepareData(QSqlQuery* ds, LimeReport::CallbackInfo info, QVari
case LimeReport::CallbackInfo::ColumnData: case LimeReport::CallbackInfo::ColumnData:
data = ds->value(ds->record().indexOf(info.columnName)); data = ds->value(ds->record().indexOf(info.columnName));
break; break;
default: break;
} }
} }

7
include/lrglobal.h
View File

@ -44,6 +44,13 @@
namespace LimeReport { namespace LimeReport {
#ifdef __GNUC__
#define VARIABLE_IS_NOT_USED __attribute__ ((unused))
#else
#define VARIABLE_IS_NOT_USED
#endif
namespace Const{ namespace Const{
int const RESIZE_HANDLE_SIZE = 10; int const RESIZE_HANDLE_SIZE = 10;
int const SELECTION_PEN_SIZE = 4; int const SELECTION_PEN_SIZE = 4;

6
limereport/bands/lrdataband.cpp
View File

@ -47,17 +47,17 @@ LimeReport::BaseDesignIntf * createFooter(QObject* owner, LimeReport::BaseDesign
return new LimeReport::DataFooterBand(owner,parent); return new LimeReport::DataFooterBand(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("Data"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("Data"),LimeReport::Const::bandTAG),
createBand createBand
); );
bool registredHeader = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredHeader = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagHeader, xmlTagHeader,
LimeReport::ItemAttribs(QObject::tr("DataHeader"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("DataHeader"),LimeReport::Const::bandTAG),
createHeader createHeader
); );
bool registredFooter = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredFooter = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagFooter, xmlTagFooter,
LimeReport::ItemAttribs(QObject::tr("DataFooter"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("DataFooter"),LimeReport::Const::bandTAG),
createFooter createFooter

4
limereport/bands/lrgroupbands.cpp
View File

@ -41,7 +41,7 @@ LimeReport::BaseDesignIntf* createHeader(QObject* owner, LimeReport::BaseDesignI
return new LimeReport::GroupBandHeader(owner,parent); return new LimeReport::GroupBandHeader(owner,parent);
} }
bool registredHeader = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredHeader = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagHeader, xmlTagHeader,
LimeReport::ItemAttribs(QObject::tr("GroupHeader"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("GroupHeader"),LimeReport::Const::bandTAG),
createHeader createHeader
@ -51,7 +51,7 @@ LimeReport::BaseDesignIntf * createFooter(QObject* owner, LimeReport::BaseDesign
return new LimeReport::GroupBandFooter(owner,parent); return new LimeReport::GroupBandFooter(owner,parent);
} }
bool registredFooter = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredFooter = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagFooter, xmlTagFooter,
LimeReport::ItemAttribs(QObject::tr("GroupFooter"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("GroupFooter"),LimeReport::Const::bandTAG),
createFooter createFooter

2
limereport/bands/lrpagefooter.cpp
View File

@ -38,7 +38,7 @@ LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIn
return new LimeReport::PageFooter(owner,parent); return new LimeReport::PageFooter(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("Page Footer"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("Page Footer"),LimeReport::Const::bandTAG),
createBand createBand

2
limereport/bands/lrpagefooter.h
View File

@ -52,8 +52,8 @@ public:
protected: protected:
QColor bandColor() const; QColor bandColor() const;
private: private:
bool m_printOnLastPage;
bool m_printOnFirstPage; bool m_printOnFirstPage;
bool m_printOnLastPage;
}; };
} }

2
limereport/bands/lrpageheader.cpp
View File

@ -42,7 +42,7 @@ LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIn
return new LimeReport::PageHeader(owner,parent); return new LimeReport::PageHeader(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("Page Header"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("Page Header"),LimeReport::Const::bandTAG),
createBand createBand

2
limereport/bands/lrreportfooter.cpp
View File

@ -38,7 +38,7 @@ namespace{
LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::ReportFooter(owner,parent); return new LimeReport::ReportFooter(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("Report Footer"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("Report Footer"),LimeReport::Const::bandTAG),
createBand createBand

2
limereport/bands/lrreportheader.cpp
View File

@ -37,7 +37,7 @@ namespace{
LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::ReportHeader(owner,parent); return new LimeReport::ReportHeader(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("Report Header"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("Report Header"),LimeReport::Const::bandTAG),
createBand createBand

6
limereport/bands/lrsubdetailband.cpp
View File

@ -43,7 +43,7 @@ LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIn
return new LimeReport::SubDetailBand(owner,parent); return new LimeReport::SubDetailBand(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagBand, xmlTagBand,
LimeReport::ItemAttribs(QObject::tr("SubDetail"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("SubDetail"),LimeReport::Const::bandTAG),
createBand createBand
@ -53,7 +53,7 @@ LimeReport::BaseDesignIntf * createHeader(QObject* owner, LimeReport::BaseDesign
return new LimeReport::SubDetailHeaderBand(owner,parent); return new LimeReport::SubDetailHeaderBand(owner,parent);
} }
bool registredHeader = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredHeader = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagHeader, xmlTagHeader,
LimeReport::ItemAttribs(QObject::tr("SubDetailHeader"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("SubDetailHeader"),LimeReport::Const::bandTAG),
createHeader createHeader
@ -63,7 +63,7 @@ LimeReport::BaseDesignIntf * createFooter(QObject* owner, LimeReport::BaseDesign
return new LimeReport::SubDetailFooterBand(owner,parent); return new LimeReport::SubDetailFooterBand(owner,parent);
} }
bool registredFooter = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredFooter = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTagFooter, xmlTagFooter,
LimeReport::ItemAttribs(QObject::tr("SubDetailFooter"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("SubDetailFooter"),LimeReport::Const::bandTAG),
createFooter createFooter

2
limereport/bands/lrtearoffband.cpp
View File

@ -8,7 +8,7 @@ namespace{
LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createBand(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::TearOffBand(owner,parent); return new LimeReport::TearOffBand(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("Tear-off Band"),LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("Tear-off Band"),LimeReport::Const::bandTAG),
createBand createBand

2
limereport/items/lralignpropitem.cpp
View File

@ -39,7 +39,7 @@ namespace{
return new LimeReport::AlignmentPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::AlignmentPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("alignment","LimeReport::TextItem"), LimeReport::APropIdent("alignment","LimeReport::TextItem"),
QObject::tr("alignment"), QObject::tr("alignment"),
createAlignItem createAlignItem

2
limereport/items/lrbarcodeitem.cpp
View File

@ -39,7 +39,7 @@ const QString xmlTag = "BarcodeItem";
LimeReport::BaseDesignIntf * createBarcodeItem(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createBarcodeItem(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::BarcodeItem(owner,parent); return new LimeReport::BarcodeItem(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator(xmlTag, LimeReport::ItemAttribs(QObject::tr("Barcode Item"),"Item"), createBarcodeItem); bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(xmlTag, LimeReport::ItemAttribs(QObject::tr("Barcode Item"),"Item"), createBarcodeItem);
} }

2
limereport/items/lrhorizontallayout.cpp
View File

@ -45,7 +45,7 @@ LimeReport::BaseDesignIntf *createHLayout(QObject *owner, LimeReport::BaseDesign
{ {
return new LimeReport::HorizontalLayout(owner, parent); return new LimeReport::HorizontalLayout(owner, parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, xmlTag,
LimeReport::ItemAttribs(QObject::tr("HLayout"), LimeReport::Const::bandTAG), LimeReport::ItemAttribs(QObject::tr("HLayout"), LimeReport::Const::bandTAG),
createHLayout createHLayout

2
limereport/items/lrimageitem.cpp
View File

@ -39,7 +39,7 @@ const QString xmlTag = "ImageItem";
LimeReport::BaseDesignIntf * createImageItem(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createImageItem(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::ImageItem(owner,parent); return new LimeReport::ImageItem(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, LimeReport::ItemAttribs(QObject::tr("Image Item"),"Item"), createImageItem xmlTag, LimeReport::ItemAttribs(QObject::tr("Image Item"),"Item"), createImageItem
); );
} }

2
limereport/items/lrshapeitem.cpp
View File

@ -39,7 +39,7 @@ const QString xmlTag = "ShapeItem";
LimeReport::BaseDesignIntf * createShapeItem(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createShapeItem(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::ShapeItem(owner,parent); return new LimeReport::ShapeItem(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(
xmlTag, LimeReport::ItemAttribs(QObject::tr("Shape Item"),"Item"), createShapeItem xmlTag, LimeReport::ItemAttribs(QObject::tr("Shape Item"),"Item"), createShapeItem
); );
} }

2
limereport/items/lrsubitemparentpropitem.cpp
View File

@ -41,7 +41,7 @@ namespace{
{ {
return new LimeReport::ItemLocationPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::ItemLocationPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("itemLocation","LimeReport::ItemDesignIntf"),QObject::tr("itemLocation"),createLocationPropItem LimeReport::APropIdent("itemLocation","LimeReport::ItemDesignIntf"),QObject::tr("itemLocation"),createLocationPropItem
); );
} }

3
limereport/items/lrtextitem.cpp
View File

@ -49,7 +49,7 @@ const QString xmlTag = "TextItem";
LimeReport::BaseDesignIntf * createTextItem(QObject* owner, LimeReport::BaseDesignIntf* parent){ LimeReport::BaseDesignIntf * createTextItem(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new LimeReport::TextItem(owner,parent); return new LimeReport::TextItem(owner,parent);
} }
bool registred = LimeReport::DesignElementsFactory::instance().registerCreator(xmlTag, LimeReport::ItemAttribs(QObject::tr("Text Item"),"TextItem"), createTextItem); bool VARIABLE_IS_NOT_USED registred = LimeReport::DesignElementsFactory::instance().registerCreator(xmlTag, LimeReport::ItemAttribs(QObject::tr("Text Item"),"TextItem"), createTextItem);
} }
@ -427,6 +427,7 @@ QString TextItem::formatFieldValue()
double dbl = value.toDouble(&bOk); double dbl = value.toDouble(&bOk);
value = (bOk ? QVariant(dbl) : m_varValue); value = (bOk ? QVariant(dbl) : m_varValue);
} }
default: break;
} }
} }

4
limereport/lrcollection.h
View File

@ -33,6 +33,8 @@
#include <QObject> #include <QObject>
#include <QMetaType> #include <QMetaType>
#include "lrglobal.h"
class ACollectionProperty{ class ACollectionProperty{
public: public:
ACollectionProperty(){} ACollectionProperty(){}
@ -43,7 +45,7 @@ Q_DECLARE_METATYPE(ACollectionProperty)
namespace LimeReport{ namespace LimeReport{
const int COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>(); const int VARIABLE_IS_NOT_USED COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>();
class ICollectionContainer{ class ICollectionContainer{
public: public:
virtual QObject* createElement(const QString& collectionName,const QString& elementType)=0; virtual QObject* createElement(const QString& collectionName,const QString& elementType)=0;

7
limereport/lrglobal.h
View File

@ -44,6 +44,13 @@
namespace LimeReport { namespace LimeReport {
#ifdef __GNUC__
#define VARIABLE_IS_NOT_USED __attribute__ ((unused))
#else
#define VARIABLE_IS_NOT_USED
#endif
namespace Const{ namespace Const{
int const RESIZE_HANDLE_SIZE = 10; int const RESIZE_HANDLE_SIZE = 10;
int const SELECTION_PEN_SIZE = 4; int const SELECTION_PEN_SIZE = 4;

2
limereport/objectinspector/propertyItems/lrboolpropitem.cpp
View File

@ -42,7 +42,7 @@ namespace{
{ {
return new LimeReport::BoolPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::BoolPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("bool",""),QObject::tr("bool"),createBoolPropItem); bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("bool",""),QObject::tr("bool"),createBoolPropItem);
} // namespace } // namespace
namespace LimeReport { namespace LimeReport {

2
limereport/objectinspector/propertyItems/lrcolorpropitem.cpp
View File

@ -37,7 +37,7 @@ namespace{
{ {
return new LimeReport::ColorPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::ColorPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredColorProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QColor",""),QObject::tr("QColor"),createColorPropItem); bool VARIABLE_IS_NOT_USED registredColorProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QColor",""),QObject::tr("QColor"),createColorPropItem);
} }
namespace LimeReport{ namespace LimeReport{

2
limereport/objectinspector/propertyItems/lrcontentpropitem.cpp
View File

@ -10,7 +10,7 @@ namespace{
{ {
return new LimeReport::ContentPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::ContentPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredContentProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("content","LimeReport::TextItem"),QObject::tr("content"),createContentPropItem); bool VARIABLE_IS_NOT_USED registredContentProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("content","LimeReport::TextItem"),QObject::tr("content"),createContentPropItem);
} // namespace } // namespace
namespace LimeReport { namespace LimeReport {

6
limereport/objectinspector/propertyItems/lrdatasourcepropitem.cpp
View File

@ -45,13 +45,13 @@ namespace{
return new LimeReport::FieldPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::FieldPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredDatasouceProp = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredDatasouceProp = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("datasource","LimeReport::DataBandDesignIntf"),QObject::tr("datasource"),createDatasourcePropItem LimeReport::APropIdent("datasource","LimeReport::DataBandDesignIntf"),QObject::tr("datasource"),createDatasourcePropItem
); );
bool registredImageDatasouceProp = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredImageDatasouceProp = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("datasource","LimeReport::ImageItem"),QObject::tr("datasource"),createDatasourcePropItem LimeReport::APropIdent("datasource","LimeReport::ImageItem"),QObject::tr("datasource"),createDatasourcePropItem
); );
bool registredImageFieldProp = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredImageFieldProp = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("field","LimeReport::ImageItem"),QObject::tr("field"),createFieldPropItem LimeReport::APropIdent("field","LimeReport::ImageItem"),QObject::tr("field"),createFieldPropItem
); );
} }

2
limereport/objectinspector/propertyItems/lrenumpropitem.cpp
View File

@ -38,7 +38,7 @@ LimeReport::ObjectPropItem * createEnumPropItem(
{ {
return new LimeReport::EnumPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::EnumPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("enum",""),QObject::tr("enum"),createEnumPropItem LimeReport::APropIdent("enum",""),QObject::tr("enum"),createEnumPropItem
); );

2
limereport/objectinspector/propertyItems/lrflagspropitem.cpp
View File

@ -46,7 +46,7 @@ LimeReport::ObjectPropItem * createFlagsPropItem(
{ {
return new LimeReport::FlagsPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::FlagsPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("flags",""),QObject::tr("flags"),createFlagsPropItem LimeReport::APropIdent("flags",""),QObject::tr("flags"),createFlagsPropItem
); );

2
limereport/objectinspector/propertyItems/lrfontpropitem.cpp
View File

@ -43,7 +43,7 @@ namespace{
{ {
return new LimeReport::FontPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::FontPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredFontProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QFont",""),QObject::tr("QFont"),createFontPropItem); bool VARIABLE_IS_NOT_USED registredFontProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QFont",""),QObject::tr("QFont"),createFontPropItem);
} }

2
limereport/objectinspector/propertyItems/lrgroupfieldpropitem.cpp
View File

@ -36,7 +36,7 @@ namespace {
LimeReport::ObjectPropItem* createFieldPropItem(QObject *object, LimeReport::ObjectPropItem::ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& data, LimeReport::ObjectPropItem* parent, bool readonly){ LimeReport::ObjectPropItem* createFieldPropItem(QObject *object, LimeReport::ObjectPropItem::ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& data, LimeReport::ObjectPropItem* parent, bool readonly){
return new LimeReport::GroupFieldPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::GroupFieldPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredGroupFieldProp = LimeReport::ObjectPropFactory::instance().registerCreator( bool VARIABLE_IS_NOT_USED registredGroupFieldProp = LimeReport::ObjectPropFactory::instance().registerCreator(
LimeReport::APropIdent("groupFieldName","LimeReport::GroupBandHeader"),QObject::tr("field"),createFieldPropItem LimeReport::APropIdent("groupFieldName","LimeReport::GroupBandHeader"),QObject::tr("field"),createFieldPropItem
); );
} }

2
limereport/objectinspector/propertyItems/lrimagepropitem.cpp
View File

@ -36,7 +36,7 @@ namespace{
{ {
return new LimeReport::ImagePropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::ImagePropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredImageProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QImage",""),QObject::tr("QImage"),createImagePropItem); bool VARIABLE_IS_NOT_USED registredImageProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QImage",""),QObject::tr("QImage"),createImagePropItem);
} }
namespace LimeReport{ namespace LimeReport{

2
limereport/objectinspector/propertyItems/lrintpropitem.cpp
View File

@ -37,7 +37,7 @@ namespace{
{ {
return new LimeReport::IntPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::IntPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("int",""),QObject::tr("int"),createIntPropItem); bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("int",""),QObject::tr("int"),createIntPropItem);
} // namespace } // namespace
namespace LimeReport{ namespace LimeReport{

4
limereport/objectinspector/propertyItems/lrqrealpropitem.cpp
View File

@ -38,8 +38,8 @@ namespace{
{ {
return new LimeReport::QRealPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::QRealPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registred = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("qreal",""),QObject::tr("qreal"),createQRealPropItem); bool VARIABLE_IS_NOT_USED registred = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("qreal",""),QObject::tr("qreal"),createQRealPropItem);
bool registredDouble = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("double",""),QObject::tr("qreal"),createQRealPropItem); bool VARIABLE_IS_NOT_USED registredDouble = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("double",""),QObject::tr("qreal"),createQRealPropItem);
} }
namespace LimeReport{ namespace LimeReport{

6
limereport/objectinspector/propertyItems/lrrectproptem.cpp
View File

@ -50,9 +50,9 @@ namespace{
){ ){
return new LimeReport::RectMMPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::RectMMPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredRectProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QRect",""),QObject::tr("QRect"),createReqtItem); bool VARIABLE_IS_NOT_USED registredRectProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QRect",""),QObject::tr("QRect"),createReqtItem);
bool registredRectFProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QRectF",""),QObject::tr("QRectF"),createReqtItem); bool VARIABLE_IS_NOT_USED registredRectFProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QRectF",""),QObject::tr("QRectF"),createReqtItem);
bool registredRectMMProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("geometry","LimeReport::BaseDesignIntf"),QObject::tr("geometry"),createReqtMMItem); bool VARIABLE_IS_NOT_USED registredRectMMProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("geometry","LimeReport::BaseDesignIntf"),QObject::tr("geometry"),createReqtMMItem);
} }
namespace LimeReport{ namespace LimeReport{

2
limereport/objectinspector/propertyItems/lrstringpropitem.cpp
View File

@ -41,7 +41,7 @@ namespace{
{ {
return new LimeReport::StringPropItem(object, objects, name, displayName, data, parent, readonly); return new LimeReport::StringPropItem(object, objects, name, displayName, data, parent, readonly);
} }
bool registredStringProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QString",""),QObject::tr("QString"),createStringPropItem); bool VARIABLE_IS_NOT_USED registredStringProp = LimeReport::ObjectPropFactory::instance().registerCreator(LimeReport::APropIdent("QString",""),QObject::tr("QString"),createStringPropItem);
} // namespace } // namespace
namespace LimeReport{ namespace LimeReport{

24
limereport/serializators/lrxmlbasetypesserializators.cpp
View File

@ -80,18 +80,18 @@ LimeReport::SerializatorIntf* createQVariantSerializator(QDomDocument *doc, QDom
return new LimeReport::XmlQVariantSerializator(doc,node); return new LimeReport::XmlQVariantSerializator(doc,node);
} }
bool registredQString = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QString", createQStringSerializator); bool VARIABLE_IS_NOT_USED registredQString = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QString", createQStringSerializator);
bool registredInt = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("int", createIntSerializator); bool VARIABLE_IS_NOT_USED registredInt = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("int", createIntSerializator);
bool registredEnumAndFlags = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("enumAndFlags",createEnumAndFlagsSerializator); bool VARIABLE_IS_NOT_USED registredEnumAndFlags = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("enumAndFlags",createEnumAndFlagsSerializator);
bool registredBool = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("bool", createBoolSerializator); bool VARIABLE_IS_NOT_USED registredBool = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("bool", createBoolSerializator);
bool registredQFont = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QFont", createFontSerializator); bool VARIABLE_IS_NOT_USED registredQFont = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QFont", createFontSerializator);
bool registredQSizeF = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QSizeF", createQSizeFSerializator); bool VARIABLE_IS_NOT_USED registredQSizeF = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QSizeF", createQSizeFSerializator);
bool registredQImage = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QImage", createQImageSerializator); bool VARIABLE_IS_NOT_USED registredQImage = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QImage", createQImageSerializator);
bool registredQReal = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("qreal", createQRealSerializator); bool VARIABLE_IS_NOT_USED registredQReal = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("qreal", createQRealSerializator);
bool registerDouble = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("double", createQRealSerializator); bool VARIABLE_IS_NOT_USED registerDouble = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("double", createQRealSerializator);
bool registerQColor = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QColor", createQColorSerializator); bool VARIABLE_IS_NOT_USED registerQColor = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QColor", createQColorSerializator);
bool registerQByteArray = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QByteArray", createQByteArraySerializator); bool VARIABLE_IS_NOT_USED registerQByteArray = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QByteArray", createQByteArraySerializator);
bool registerQVariant = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QVariant", createQVariantSerializator); bool VARIABLE_IS_NOT_USED registerQVariant = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QVariant", createQVariantSerializator);
} }

10
limereport/serializators/lrxmlqrectserializator.cpp
View File

@ -40,12 +40,12 @@ LimeReport::SerializatorIntf * createQRectSerializator(QDomDocument *doc, QDomEl
return new LimeReport::XMLQRectSerializator(doc,node); return new LimeReport::XMLQRectSerializator(doc,node);
} }
LimeReport::SerializatorIntf * createQRectFSerializator(QDomDocument *doc, QDomElement *node){ //LimeReport::SerializatorIntf * createQRectFSerializator(QDomDocument *doc, QDomElement *node){
return new LimeReport::XMLQRectFSerializator(doc,node); // return new LimeReport::XMLQRectFSerializator(doc,node);
} //}
bool registredQRect = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QRect", createQRectSerializator); bool VARIABLE_IS_NOT_USED registredQRect = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QRect", createQRectSerializator);
bool registredQRectF = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QRectF", createQRectSerializator); bool VARIABLE_IS_NOT_USED registredQRectF = LimeReport::XMLAbstractSerializatorFactory::instance().registerCreator("QRectF", createQRectSerializator);
} }