CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into wip/shared_pointer

This commit is contained in:
Hamed Masafi 2019-06-19 11:31:46 +04:30 committed by GitHub
parent c4e1b61984 251fc50d53
commit 02ab615005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/header_copier
View File

@ -37,5 +37,6 @@ while read line; do
echo "#include \"../$src_dir/$header.h\"" >> "$Ns" echo "#include \"../$src_dir/$header.h\"" >> "$Ns"
echo "#include \"../$src_dir/$header.h\"" >> "$ns.h" echo "#include \"../$src_dir/$header.h\"" >> "$ns.h"
fi fi
echo $Ns
done <&3 done <&3
exec 3<&- exec 3<&-

3
include/nut.h
View File

@ -1,6 +1,7 @@
#include "../src/table.h" #include "../src/table.h"
#include "../src/database.h" #include "../src/database.h"
#include "../src/sqlmodel.h"
#include "../src/tableset.h" #include "../src/tableset.h"
#include "../src/dbgeography.h" #include "../src/tablemodel.h"
#include "../src/query.h" #include "../src/query.h"

1
src/query.h
View File

@ -346,7 +346,6 @@ qDebug()<<d->sql;
if (m_autoDelete) if (m_autoDelete)
deleteLater(); deleteLater();
#endif #endif
qDebug() << "len="<<returnList.count();
return returnList; return returnList;
} }

4
src/sqlmodel.h
View File

@ -49,7 +49,7 @@ public:
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const;
template<class T> template<class T>
void setTable(QList<QSharedPointer<T>> rows); void setTable(RowList<T> rows);
void setRows(RowList<Table> rows); void setRows(RowList<Table> rows);
void append(Row<Table> table); void append(Row<Table> table);
@ -68,7 +68,7 @@ signals:
}; };
template<class T> template<class T>
Q_OUTOFLINE_TEMPLATE void SqlModel::setTable(QList<QSharedPointer<T> > rows) Q_OUTOFLINE_TEMPLATE void SqlModel::setTable(RowList<T> rows)
{ {
Q_D(SqlModel); Q_D(SqlModel);