1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RelationalTableModel example: use std::unique_ptr instead of QScopedPointer

Browse Source 
There's talk that QScopedPointer may be deprecated. Don't use it
in examples anymore.

Change-Id: I3c4647a569b72cd3a628c9b92ef34c87fd588342
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Marc Mutz 2019-05-14 20:42:01 +02:00
parent 54a93af966
commit e4c0fca194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/sql/relationaltablemodel/relationaltablemodel.cpp
View File

@ -53,6 +53,8 @@
#include "../connection.h" #include "../connection.h"
#include <memory>
void initializeModel(QSqlRelationalTableModel *model) void initializeModel(QSqlRelationalTableModel *model)
{ {
//! [0] //! [0]
@ -76,12 +78,12 @@ void initializeModel(QSqlRelationalTableModel *model)
model->select(); model->select();
} }
QTableView *createView(const QString &title, QSqlTableModel *model) std::unique_ptr<QTableView> createView(const QString &title, QSqlTableModel *model)
{ {
//! [4] //! [4]
QTableView *view = new QTableView; std::unique_ptr<QTableView> view{new QTableView};
view->setModel(model); view->setModel(model);
view->setItemDelegate(new QSqlRelationalDelegate(view)); view->setItemDelegate(new QSqlRelationalDelegate(view.get()));
//! [4] //! [4]
view->setWindowTitle(title); view->setWindowTitle(title);
return view; return view;
@ -118,7 +120,7 @@ int main(int argc, char *argv[])
initializeModel(&model); initializeModel(&model);
QScopedPointer<QTableView> view(createView(QObject::tr("Relational Table Model"), &model)); std::unique_ptr<QTableView> view = createView(QObject::tr("Relational Table Model"), &model);
view->show(); view->show();
return app.exec(); return app.exec();