python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-02 19:56:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex
2016-07-07 23:52:51 +03:00
parent 826e62abe0 885cd91daa
commit 9243036750
17 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrdatasourcemanager.h
View File

@@ -195,8 +195,7 @@ signals:
void cleared();
void datasourcesChanged();
protected:
void addQueryDesc(QueryDesc *);
void putHolder(QString name, LimeReport::IDataSourceHolder* dataSource);
void putHolder(const QString& name, LimeReport::IDataSourceHolder* dataSource);
void putQueryDesc(QueryDesc *queryDesc);
void putSubQueryDesc(SubQueryDesc *subQueryDesc);
void putProxyDesc(ProxyDesc *proxyDesc);
@@ -217,6 +216,7 @@ protected:
private slots:
void slotConnectionRenamed(const QString& oldName,const QString& newName);
void slotQueryTextChanged(const QString& queryName, const QString& queryText);
private:
explicit DataSourceManager(QObject *parent = 0);
Q_DISABLE_COPY(DataSourceManager)