whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSqlRelation: mark shared-come-qt6 

... and plaster API with nothrow (well, one function).

Change-Id: I36fd64c6fda5390954c82bba307c720d3b3215df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2016-02-20 19:36:45 +01:00
parent 18ed6f20ad
commit 1b98ce1986
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/models/qsqlrelationaltablemodel.h
View File

@ -43,6 +43,8 @@
#include <QtSql/qtsqlglobal.h>
#include <QtSql/qsqltablemodel.h>
#include <QtCore/qtypeinfo.h>
QT_BEGIN_NAMESPACE
@ -53,17 +55,26 @@ public:
QSqlRelation(const QString &aTableName, const QString &indexCol,
const QString &displayCol)
: tName(aTableName), iColumn(indexCol), dColumn(displayCol) {}
void swap(QSqlRelation &other) Q_DECL_NOTHROW
{
qSwap(tName, other.tName);
qSwap(iColumn, other.iColumn);
qSwap(dColumn, other.dColumn);
}
inline QString tableName() const
{ return tName; }
inline QString indexColumn() const
{ return iColumn; }
inline QString displayColumn() const
{ return dColumn; }
inline bool isValid() const
bool isValid() const Q_DECL_NOTHROW
{ return !(tName.isEmpty() || iColumn.isEmpty() || dColumn.isEmpty()); }
private:
QString tName, iColumn, dColumn;
};
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QSqlRelation)
class QSqlRelationalTableModelPrivate;