diff --git a/designer/main.cpp b/designer/main.cpp index 9795432..8d06579 100644 --- a/designer/main.cpp +++ b/designer/main.cpp @@ -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*)), + QObject::connect(&report, SIGNAL(getAvailableDesignerLanguages(QList*)), &manager, SLOT(getAvailableLanguages(QList*))); - 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(); diff --git a/include/lrreportengine.h b/include/lrreportengine.h index d2097ad..aaa77d7 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -220,9 +220,9 @@ signals: void loadFinished(); void printedToPDF(QString fileName); - void getAvailableLanguages(QList* languages); - void currentDefaultLanguageChanged(QLocale::Language); - QLocale::Language getCurrentDefaultLanguage(); + void getAvailableDesignerLanguages(QList* languages); + void currentDefaultDesignerLanguageChanged(QLocale::Language); + QLocale::Language getCurrentDefaultDesignerLanguage(); void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index 6a7fb72..e5deb00 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -1080,20 +1080,20 @@ QList ReportEnginePrivate::designerLanguages() { QList 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*)), - this, SIGNAL(getAvailableLanguages(QList*))); - connect(d, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)), - this, SIGNAL(currentDefaultLanguageChanged(QLocale::Language))); - connect(d, SIGNAL(getCurrentDefaultLanguage()), - this, SIGNAL(getCurrentDefaultLanguage())); + connect(d, SIGNAL(getAvailableDesignerLanguages(QList*)), + this, SIGNAL(getAvailableDesignerLanguages(QList*))); + 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*))); diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index d2097ad..aaa77d7 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -220,9 +220,9 @@ signals: void loadFinished(); void printedToPDF(QString fileName); - void getAvailableLanguages(QList* languages); - void currentDefaultLanguageChanged(QLocale::Language); - QLocale::Language getCurrentDefaultLanguage(); + void getAvailableDesignerLanguages(QList* languages); + void currentDefaultDesignerLanguageChanged(QLocale::Language); + QLocale::Language getCurrentDefaultDesignerLanguage(); void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*); diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index bd812f0..3ffec70 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -263,9 +263,9 @@ signals: void loadFinished(); void printedToPDF(QString fileName); - void getAvailableLanguages(QList* languages); - void currentDefaultLanguageChanged(QLocale::Language); - QLocale::Language getCurrentDefaultLanguage(); + void getAvailableDesignerLanguages(QList* languages); + void currentDefaultDesignerLanguageChanged(QLocale::Language); + QLocale::Language getCurrentDefaultDesignerLanguage(); void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*); public slots: