0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00

typo has been fixed

This commit is contained in:
Arin Alexander 2016-02-18 22:27:06 +03:00
parent 62905e639a
commit 8d6e9d36e4
2 changed files with 3 additions and 2 deletions

View File

@ -377,7 +377,7 @@ void SubQueryHolder::setMasterDatasource(const QString &value)
void SubQueryHolder::extractParams() void SubQueryHolder::extractParams()
{ {
if (!dataManager()->containsDatasource(m_masterDatasource)){ if (!dataManager()->containsDatasource(m_masterDatasource)){
setLastError(QObject::tr("Master datasource \"%1\" not found!!!").arg(m_masterDatasource)); setLastError(QObject::tr("Master datasource \"%1\" not found!").arg(m_masterDatasource));
setPrepared(false); setPrepared(false);
} else { } else {
m_preparedSQL = replaceFields(replaceVariables(queryText())); m_preparedSQL = replaceFields(replaceVariables(queryText()));
@ -485,7 +485,7 @@ void ProxyHolder::filterModel()
m_lastError.clear(); m_lastError.clear();
} else { } else {
m_lastError.clear(); m_lastError.clear();
if(!master) m_lastError+=QObject::tr("Master datasouce \"%1\" not found!").arg(m_desc->master()); if(!master) m_lastError+=QObject::tr("Master datasource \"%1\" not found!").arg(m_desc->master());
if(!child) m_lastError+=((m_lastError.isEmpty())?QObject::tr("Child"):QObject::tr(" and child "))+ if(!child) m_lastError+=((m_lastError.isEmpty())?QObject::tr("Child"):QObject::tr(" and child "))+
QObject::tr("datasouce \"%1\" not found!").arg(m_desc->child()); QObject::tr("datasouce \"%1\" not found!").arg(m_desc->child());
} }

View File

@ -282,6 +282,7 @@ private:
}; };
class MasterDetailProxyModel : public QSortFilterProxyModel{ class MasterDetailProxyModel : public QSortFilterProxyModel{
Q_OBJECT
public: public:
MasterDetailProxyModel(DataSourceManager* dataManager):m_maps(0),m_dataManager(dataManager){} MasterDetailProxyModel(DataSourceManager* dataManager):m_maps(0),m_dataManager(dataManager){}
void setMaster(QString name); void setMaster(QString name);