diff --git a/designer/designersettingmanager.cpp b/designer/designersettingmanager.cpp index 02251b2..550772e 100644 --- a/designer/designersettingmanager.cpp +++ b/designer/designersettingmanager.cpp @@ -11,7 +11,7 @@ DesignerSettingManager::~DesignerSettingManager() delete m_setting; } -void DesignerSettingManager::getAviableLanguages(QList* languages) +void DesignerSettingManager::getAvailableLanguages(QList* languages) { languages->append(QLocale::Russian); languages->append(QLocale::English); @@ -33,7 +33,7 @@ QLocale::Language DesignerSettingManager::getCurrentDefaultLanguage() } } -void DesignerSettingManager::currentDefaulLanguageChanged(QLocale::Language language) +void DesignerSettingManager::currentDefaultLanguageChanged(QLocale::Language language) { QMessageBox::information(0, tr("Warning") , tr("The language will change after the application is restarted")); m_setting->beginGroup("ReportDesigner"); diff --git a/designer/designersettingmanager.h b/designer/designersettingmanager.h index 2443718..d5c13c9 100644 --- a/designer/designersettingmanager.h +++ b/designer/designersettingmanager.h @@ -14,9 +14,9 @@ public: ~DesignerSettingManager(); void setApplicationInstance(QApplication* application); public slots: - void getAviableLanguages(QList* languages); + void getAvailableLanguages(QList* languages); QLocale::Language getCurrentDefaultLanguage(); - void currentDefaulLanguageChanged(QLocale::Language language); + void currentDefaultLanguageChanged(QLocale::Language language); private: QApplication* m_app; QSettings* m_setting; diff --git a/designer/main.cpp b/designer/main.cpp index 413f33f..9795432 100644 --- a/designer/main.cpp +++ b/designer/main.cpp @@ -38,14 +38,14 @@ int main(int argc, char *argv[]) if (a.arguments().count()>1){ report.loadFromFile(a.arguments().at(1)); } - QObject::connect(&report, SIGNAL(getAviableLanguages(QList*)), - &manager, SLOT(getAviableLanguages(QList*))); + QObject::connect(&report, SIGNAL(getAvailableLanguages(QList*)), + &manager, SLOT(getAvailableLanguages(QList*))); QObject::connect(&report, SIGNAL(getCurrentDefaultLanguage()), &manager, SLOT(getCurrentDefaultLanguage())); - QObject::connect(&report, SIGNAL(currentDefaulLanguageChanged(QLocale::Language)), - &manager, SLOT(currentDefaulLanguageChanged(QLocale::Language))); + QObject::connect(&report, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)), + &manager, SLOT(currentDefaultLanguageChanged(QLocale::Language))); report.designReport(); return a.exec(); diff --git a/include/lrreportengine.h b/include/lrreportengine.h index c36d7bb..d2097ad 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -191,8 +191,8 @@ public: void setPrintVisible(bool value); bool printIsVisible(); bool isBusy(); - void setPassPharse(QString& passPharse); - QList aviableLanguages(); + void setPassPhrase(QString& passPhrase); + QList availableLanguages(); bool setReportLanguage(QLocale::Language language); Qt::LayoutDirection previewLayoutDirection(); void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); @@ -220,8 +220,8 @@ signals: void loadFinished(); void printedToPDF(QString fileName); - void getAviableLanguages(QList* languages); - void currentDefaulLanguageChanged(QLocale::Language); + void getAvailableLanguages(QList* languages); + void currentDefaultLanguageChanged(QLocale::Language); QLocale::Language getCurrentDefaultLanguage(); void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index 6f189c7..6a7fb72 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -1080,7 +1080,7 @@ QList ReportEnginePrivate::designerLanguages() { QList result; - emit getAviableLanguages(&result); + emit getAvailableLanguages(&result); return result; } @@ -1093,7 +1093,7 @@ QLocale::Language ReportEnginePrivate::currentDesignerLanguage() void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language) { m_currentDesignerLanguage = language; - emit currentDefaulLanguageChanged(language); + emit currentDefaultLanguageChanged(language); } QString ReportEnginePrivate::styleSheet() const @@ -1387,10 +1387,10 @@ ReportEngine::ReportEngine(QObject *parent) connect(d, SIGNAL(cleared()), this, SIGNAL(cleared())); connect(d, SIGNAL(printedToPDF(QString)), this, SIGNAL(printedToPDF(QString))); - connect(d, SIGNAL(getAviableLanguages(QList*)), - this, SIGNAL(getAviableLanguages(QList*))); - connect(d, SIGNAL(currentDefaulLanguageChanged(QLocale::Language)), - this, SIGNAL(currentDefaulLanguageChanged(QLocale::Language))); + 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())); @@ -1548,13 +1548,13 @@ bool ReportEngine::isBusy() return d->isBusy(); } -void ReportEngine::setPassPharse(QString &passPharse) +void ReportEngine::setPassPhrase(QString &passPhrase) { Q_D(ReportEngine); - d->setPassPhrase(passPharse); + d->setPassPhrase(passPhrase); } -QList ReportEngine::aviableLanguages() +QList ReportEngine::availableLanguages() { Q_D(ReportEngine); return d->aviableLanguages(); diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index c36d7bb..d2097ad 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -191,8 +191,8 @@ public: void setPrintVisible(bool value); bool printIsVisible(); bool isBusy(); - void setPassPharse(QString& passPharse); - QList aviableLanguages(); + void setPassPhrase(QString& passPhrase); + QList availableLanguages(); bool setReportLanguage(QLocale::Language language); Qt::LayoutDirection previewLayoutDirection(); void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); @@ -220,8 +220,8 @@ signals: void loadFinished(); void printedToPDF(QString fileName); - void getAviableLanguages(QList* languages); - void currentDefaulLanguageChanged(QLocale::Language); + void getAvailableLanguages(QList* languages); + void currentDefaultLanguageChanged(QLocale::Language); QLocale::Language getCurrentDefaultLanguage(); void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*); diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index 82a7bd4..bd812f0 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -263,8 +263,8 @@ signals: void loadFinished(); void printedToPDF(QString fileName); - void getAviableLanguages(QList* languages); - void currentDefaulLanguageChanged(QLocale::Language); + void getAvailableLanguages(QList* languages); + void currentDefaultLanguageChanged(QLocale::Language); QLocale::Language getCurrentDefaultLanguage(); void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);