From 0359a82e6ef538316e550e7fa7c6dee8db72a225 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Tue, 28 Jan 2020 12:41:16 +0100
Subject: Doc: make Qt Sql snippets compilable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-81496
Change-Id: Id6206e9179c2e8157c99e777a3de35bd83d49e34
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 src/sql/doc/snippets/sqldatabase/sqldatabase.cpp | 48 +++---------------------
 1 file changed, 6 insertions(+), 42 deletions(-)

(limited to 'src/sql/doc/snippets/sqldatabase/sqldatabase.cpp')

diff --git a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
index a45b5f409a0..2039007c4a0 100644
--- a/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
+++ b/src/sql/doc/snippets/sqldatabase/sqldatabase.cpp
@@ -48,18 +48,13 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QCoreApplication>
 #include <QtSql>
-
+#include <QMap>
 #include <iostream>
 
 using namespace std;
 
-QString tr(const char *text)
-{
-    return QApplication::translate(text, text);
-}
-
 void QSqlDatabase_snippets()
 {
     {
@@ -209,9 +204,8 @@ void QSqlQuery_snippets()
     {
     // examine with named binding
 //! [14]
-    QMapIterator<QString, QVariant> i(query.boundValues());
-    while (i.hasNext()) {
-        i.next();
+    QMap<QString, QVariant> sqlIterator(query.boundValues());
+    for (auto i = sqlIterator.begin(); i != sqlIterator.end(); ++i) {
         cout << i.key().toUtf8().data() << ": "
              << i.value().toString().toUtf8().data() << Qt::endl;
     }
@@ -230,23 +224,6 @@ void QSqlQuery_snippets()
 
 void QSqlQueryModel_snippets()
 {
-    {
-//! [16]
-    QSqlQueryModel *model = new QSqlQueryModel;
-    model->setQuery("SELECT name, salary FROM employee");
-    model->setHeaderData(0, Qt::Horizontal, tr("Name"));
-    model->setHeaderData(1, Qt::Horizontal, tr("Salary"));
-
-//! [17]
-    QTableView *view = new QTableView;
-//! [17] //! [18]
-    view->setModel(model);
-//! [18] //! [19]
-    view->show();
-//! [16] //! [19] //! [20]
-    view->setEditTriggers(QAbstractItemView::NoEditTriggers);
-//! [20]
-    }
 
 //! [21]
     QSqlQueryModel model;
@@ -273,6 +250,7 @@ class MyModel : public QSqlQueryModel
 {
 public:
     QVariant data(const QModelIndex &item, int role) const override;
+    void fetchModel();
 
     int m_specialColumnNo;
 };
@@ -289,20 +267,6 @@ QVariant MyModel::data(const QModelIndex &item, int role) const
 
 void QSqlTableModel_snippets()
 {
-//! [24]
-    QSqlTableModel *model = new QSqlTableModel(parentObject, database);
-    model->setTable("employee");
-    model->setEditStrategy(QSqlTableModel::OnManualSubmit);
-    model->select();
-    model->setHeaderData(0, Qt::Horizontal, tr("Name"));
-    model->setHeaderData(1, Qt::Horizontal, tr("Salary"));
-
-    QTableView *view = new QTableView;
-    view->setModel(model);
-    view->hideColumn(0); // don't show the ID
-    view->show();
-//! [24]
-
     {
 //! [25]
     QSqlTableModel model;
@@ -557,7 +521,7 @@ public:
 
 int main(int argc, char **argv)
 {
-    QApplication app(argc, argv);
+    QCoreApplication app(argc, argv);
 
     QSqlDatabase_snippets();
     QSqlField_snippets();
-- 
cgit v1.2.3