From 64331fbaeb274f377330ef10dbae559558f3a016 Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Sat, 8 Apr 2017 12:53:05 -0400 Subject: [PATCH 1/2] Corrects spelling of method name --- include/lrdatasourcemanagerintf.h | 2 +- limereport/lrdatasourcemanager.cpp | 2 +- limereport/lrdatasourcemanager.h | 2 +- limereport/lrdatasourcemanagerintf.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/lrdatasourcemanagerintf.h b/include/lrdatasourcemanagerintf.h index 57bd0c1..e3a6ce7 100644 --- a/include/lrdatasourcemanagerintf.h +++ b/include/lrdatasourcemanagerintf.h @@ -54,7 +54,7 @@ public: virtual void removeModel(const QString& name) = 0; virtual bool containsDatasource(const QString& dataSourceName) = 0; virtual void clearUserVariables()=0; - virtual ICallbackDatasource* createCallbackDatasouce(const QString& name) = 0; + virtual ICallbackDatasource* createCallbackDatasource(const QString& name) = 0; virtual void registerDbCredentialsProvider(IDbCredentialsProvider* provider) = 0; //virtual void addCallbackDatasource(ICallbackDatasource* datasource, const QString& name) = 0; }; diff --git a/limereport/lrdatasourcemanager.cpp b/limereport/lrdatasourcemanager.cpp index dc2c32e..d35f670 100644 --- a/limereport/lrdatasourcemanager.cpp +++ b/limereport/lrdatasourcemanager.cpp @@ -314,7 +314,7 @@ void DataSourceManager::removeModel(const QString &name) removeDatasource(name.toLower()); } -ICallbackDatasource *DataSourceManager::createCallbackDatasouce(const QString& name) +ICallbackDatasource *DataSourceManager::createCallbackDatasource(const QString& name) { ICallbackDatasource* ds = new CallbackDatasource(); IDataSourceHolder* holder = new CallbackDatasourceHolder(dynamic_cast(ds),true); diff --git a/limereport/lrdatasourcemanager.h b/limereport/lrdatasourcemanager.h index 77967c5..b6bdad1 100644 --- a/limereport/lrdatasourcemanager.h +++ b/limereport/lrdatasourcemanager.h @@ -114,7 +114,7 @@ public: void addProxy(const QString& name, QString master, QString detail, QList fields); bool addModel(const QString& name, QAbstractItemModel *model, bool owned); void removeModel(const QString& name); - ICallbackDatasource* createCallbackDatasouce(const QString &name); + ICallbackDatasource* createCallbackDatasource(const QString &name); void registerDbCredentialsProvider(IDbCredentialsProvider *provider); void addCallbackDatasource(ICallbackDatasource *datasource, const QString &name); void setReportVariable(const QString& name, const QVariant& value); diff --git a/limereport/lrdatasourcemanagerintf.h b/limereport/lrdatasourcemanagerintf.h index 57bd0c1..e3a6ce7 100644 --- a/limereport/lrdatasourcemanagerintf.h +++ b/limereport/lrdatasourcemanagerintf.h @@ -54,7 +54,7 @@ public: virtual void removeModel(const QString& name) = 0; virtual bool containsDatasource(const QString& dataSourceName) = 0; virtual void clearUserVariables()=0; - virtual ICallbackDatasource* createCallbackDatasouce(const QString& name) = 0; + virtual ICallbackDatasource* createCallbackDatasource(const QString& name) = 0; virtual void registerDbCredentialsProvider(IDbCredentialsProvider* provider) = 0; //virtual void addCallbackDatasource(ICallbackDatasource* datasource, const QString& name) = 0; }; From 42e0e3b70b3f6ce80e07947d8622f35e772dc0f7 Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Sat, 8 Apr 2017 21:44:52 -0400 Subject: [PATCH 2/2] Fix missed uses in the demo --- demo_r1/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo_r1/mainwindow.cpp b/demo_r1/mainwindow.cpp index d695a4e..6deb868 100644 --- a/demo_r1/mainwindow.cpp +++ b/demo_r1/mainwindow.cpp @@ -71,19 +71,19 @@ MainWindow::MainWindow(QWidget *parent) : }; } - LimeReport::ICallbackDatasource * callbackDatasource = report->dataManager()->createCallbackDatasouce("master"); + LimeReport::ICallbackDatasource * callbackDatasource = report->dataManager()->createCallbackDatasource("master"); connect(callbackDatasource, SIGNAL(getCallbackData(LimeReport::CallbackInfo,QVariant&)), this, SLOT(slotGetCallbackData(LimeReport::CallbackInfo,QVariant&))); connect(callbackDatasource, SIGNAL(changePos(const LimeReport::CallbackInfo::ChangePosType&,bool&)), this, SLOT(slotChangePos(const LimeReport::CallbackInfo::ChangePosType&,bool&))); - callbackDatasource = report->dataManager()->createCallbackDatasouce("detail"); + callbackDatasource = report->dataManager()->createCallbackDatasource("detail"); connect(callbackDatasource, SIGNAL(getCallbackData(LimeReport::CallbackInfo,QVariant&)), this, SLOT(slotGetCallbackChildData(LimeReport::CallbackInfo,QVariant&))); connect(callbackDatasource, SIGNAL(changePos(const LimeReport::CallbackInfo::ChangePosType&,bool&)), this, SLOT(slotChangeChildPos(const LimeReport::CallbackInfo::ChangePosType&,bool&))); - callbackDatasource = report->dataManager()->createCallbackDatasouce("oneSlotDS"); + callbackDatasource = report->dataManager()->createCallbackDatasource("oneSlotDS"); connect(callbackDatasource, SIGNAL(getCallbackData(LimeReport::CallbackInfo,QVariant&)), this, SLOT(slotOneSlotDS(LimeReport::CallbackInfo,QVariant&)));