mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
Code

Some service signals have been renamed.

Browse Source
This commit is contained in:
Arin Alex 2019-06-11 21:55:59 +03:00
parent 9f00119fbc
commit 693e45d6d7
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
designer/main.cpp
View File

@ -38,13 +38,13 @@ int main(int argc, char *argv[])
if (a.arguments().count()>1){
report.loadFromFile(a.arguments().at(1));
}
QObject::connect(&report, SIGNAL(getAvailableLanguages(QList<QLocale::Language>*)),
QObject::connect(&report, SIGNAL(getAvailableDesignerLanguages(QList<QLocale::Language>*)),
&manager, SLOT(getAvailableLanguages(QList<QLocale::Language>*)));
QObject::connect(&report, SIGNAL(getCurrentDefaultLanguage()),
QObject::connect(&report, SIGNAL(getCurrentDefaultDesignerLanguage()),
&manager, SLOT(getCurrentDefaultLanguage()));
QObject::connect(&report, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)),
QObject::connect(&report, SIGNAL(currentDefaultDesignerLanguageChanged(QLocale::Language)),
&manager, SLOT(currentDefaultLanguageChanged(QLocale::Language)));
report.designReport();

6
include/lrreportengine.h
View File

@ -220,9 +220,9 @@ signals:
void loadFinished();
void printedToPDF(QString fileName);
void getAvailableLanguages(QList<QLocale::Language>* languages);
void currentDefaultLanguageChanged(QLocale::Language);
QLocale::Language getCurrentDefaultLanguage();
void getAvailableDesignerLanguages(QList<QLocale::Language>* languages);
void currentDefaultDesignerLanguageChanged(QLocale::Language);
QLocale::Language getCurrentDefaultDesignerLanguage();
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);

18
limereport/lrreportengine.cpp
View File

@ -1080,20 +1080,20 @@ QList<QLocale::Language> ReportEnginePrivate::designerLanguages()
{
QList<QLocale::Language> result;
emit getAvailableLanguages(&result);
emit getAvailableDesignerLanguages(&result);
return result;
}
QLocale::Language ReportEnginePrivate::currentDesignerLanguage()
{
QLocale::Language result = emit getCurrentDefaultLanguage();
QLocale::Language result = emit getCurrentDefaultDesignerLanguage();
return result;
}
void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language)
{
m_currentDesignerLanguage = language;
emit currentDefaultLanguageChanged(language);
emit currentDefaultDesignerLanguageChanged(language);
}
QString ReportEnginePrivate::styleSheet() const
@ -1387,12 +1387,12 @@ ReportEngine::ReportEngine(QObject *parent)
connect(d, SIGNAL(cleared()), this, SIGNAL(cleared()));
connect(d, SIGNAL(printedToPDF(QString)), this, SIGNAL(printedToPDF(QString)));
connect(d, SIGNAL(getAvailableLanguages(QList<QLocale::Language>*)),
this, SIGNAL(getAvailableLanguages(QList<QLocale::Language>*)));
connect(d, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)),
this, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)));
connect(d, SIGNAL(getCurrentDefaultLanguage()),
this, SIGNAL(getCurrentDefaultLanguage()));
connect(d, SIGNAL(getAvailableDesignerLanguages(QList<QLocale::Language>*)),
this, SIGNAL(getAvailableDesignerLanguages(QList<QLocale::Language>*)));
connect(d, SIGNAL(currentDefaultDesignerLanguageChanged(QLocale::Language)),
this, SIGNAL(currentDefaultDesignerLanguageChanged(QLocale::Language)));
connect(d, SIGNAL(getCurrentDefaultDesignerLanguage()),
this, SIGNAL(getCurrentDefaultDesignerLanguage()));
connect(d, SIGNAL(externalPaint(const QString&, QPainter*, const QStyleOptionGraphicsItem*)),
this, SIGNAL(externalPaint(const QString&, QPainter*, const QStyleOptionGraphicsItem*)));

6
limereport/lrreportengine.h
View File

@ -220,9 +220,9 @@ signals:
void loadFinished();
void printedToPDF(QString fileName);
void getAvailableLanguages(QList<QLocale::Language>* languages);
void currentDefaultLanguageChanged(QLocale::Language);
QLocale::Language getCurrentDefaultLanguage();
void getAvailableDesignerLanguages(QList<QLocale::Language>* languages);
void currentDefaultDesignerLanguageChanged(QLocale::Language);
QLocale::Language getCurrentDefaultDesignerLanguage();
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);

6
limereport/lrreportengine_p.h
View File

@ -263,9 +263,9 @@ signals:
void loadFinished();
void printedToPDF(QString fileName);
void getAvailableLanguages(QList<QLocale::Language>* languages);
void currentDefaultLanguageChanged(QLocale::Language);
QLocale::Language getCurrentDefaultLanguage();
void getAvailableDesignerLanguages(QList<QLocale::Language>* languages);
void currentDefaultDesignerLanguageChanged(QLocale::Language);
QLocale::Language getCurrentDefaultDesignerLanguage();
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
public slots: