diff options
Diffstat (limited to 'src/widgets/doc')
10 files changed, 51 insertions, 39 deletions
diff --git a/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp b/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp index 7fbcc493de..91851f8f07 100644 --- a/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp +++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp @@ -51,7 +51,7 @@ qApp->setStyleSheet("ns--MyPushButton { background: yellow; }"); void CustomWidget::paintEvent(QPaintEvent *) { QStyleOption opt; - opt.init(this); + opt.initFrom(this); QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp index dbf776cf70..197c23f247 100644 --- a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp +++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp @@ -110,5 +110,7 @@ QFileDialog::getOpenFileContent("Images (*.png *.xpm *.jpg)", fileContentReady) //! [16] QByteArray imageData; // obtained from e.g. QImage::save() -QFileDialog::saveFile("myimage.png", imageData); +QFileDialog::saveFileContent(imageData, "myimage.png"); // with filename hint +// OR +QFileDialog::saveFileContent(imageData); // no filename hint //! [16] diff --git a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp index 70fb1fe62d..b0b0500fab 100644 --- a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp +++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp @@ -34,7 +34,7 @@ exec(e->globalPos()); //! [6] QMenu menu; QAction *at = actions[0]; // Assumes actions is not empty -for (QAction *a : qAsConst(actions)) +for (QAction *a : std::as_const(actions)) menu.addAction(a); menu.exec(pos, at); //! [6] diff --git a/src/widgets/doc/snippets/qlistview-dnd/model.cpp b/src/widgets/doc/snippets/qlistview-dnd/model.cpp index 045d1e81f9..be2189d1be 100644 --- a/src/widgets/doc/snippets/qlistview-dnd/model.cpp +++ b/src/widgets/doc/snippets/qlistview-dnd/model.cpp @@ -74,7 +74,7 @@ bool DragDropListModel::dropMimeData(const QMimeData *data, //! [6] insertRows(beginRow, rows, QModelIndex()); - for (const QString &text : qAsConst(newItems)) { + for (const QString &text : std::as_const(newItems)) { QModelIndex idx = index(beginRow, 0, QModelIndex()); setData(idx, text); beginRow++; diff --git a/src/widgets/doc/snippets/simplemodel-use/main.cpp b/src/widgets/doc/snippets/simplemodel-use/main.cpp index 62739b1f99..5a3d6ecce0 100644 --- a/src/widgets/doc/snippets/simplemodel-use/main.cpp +++ b/src/widgets/doc/snippets/simplemodel-use/main.cpp @@ -7,55 +7,61 @@ A simple example of how to access items from an existing model. */ -#include <QtGui> +#include <QApplication> +#include <QLabel> +#include <QVBoxLayout> +#include <QWidget> + +#include <QFileSystemModel> +#include <QPalette> + +#include <QDir> +#include <QModelIndex> /*! Create a default directory model and, using the index-based interface to the model and some QLabel widgets, populate the window's layout with the names of objects in the directory. - - Note that we only want to read the filenames in the highest level of the - directory, so we supply a default (invalid) QModelIndex to the model in - order to indicate that we want top-level items. */ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QWidget *window = new QWidget; - QVBoxLayout *layout = new QVBoxLayout(window); - QLabel *title = new QLabel("Some items from the directory model", window); + QWidget window; + auto *layout = new QVBoxLayout(&window); + auto *title = new QLabel("Some items from the directory model", &window); title->setBackgroundRole(QPalette::Base); title->setMargin(8); layout->addWidget(title); //! [0] - QFileSystemModel *model = new QFileSystemModel; - connect(model, &QFileSystemModel::directoryLoaded, [model](const QString &directory) { - QModelIndex parentIndex = model->index(directory); - int numRows = model->rowCount(parentIndex); - }); - model->setRootPath(QDir::currentPath); -//! [0] + auto *model = new QFileSystemModel; + auto onDirectoryLoaded = [model, layout, &window](const QString &directory) { + QModelIndex parentIndex = model->index(directory); + const int numRows = model->rowCount(parentIndex); //! [1] - for (int row = 0; row < numRows; ++row) { - QModelIndex index = model->index(row, 0, parentIndex); + for (int row = 0; row < numRows; ++row) { + QModelIndex index = model->index(row, 0, parentIndex); //! [1] //! [2] - QString text = model->data(index, Qt::DisplayRole).toString(); - // Display the text in a widget. + QString text = model->data(index, Qt::DisplayRole).toString(); //! [2] - - QLabel *label = new QLabel(text, window); - layout->addWidget(label); + // Display the text in a widget. + auto *label = new QLabel(text, &window); + layout->addWidget(label); //! [3] - } + } //! [3] + }; + + QObject::connect(model, &QFileSystemModel::directoryLoaded, onDirectoryLoaded); + model->setRootPath(QDir::currentPath()); +//! [0] - window->setWindowTitle("A simple model example"); - window->show(); + window.setWindowTitle("A simple model example"); + window.show(); return app.exec(); } diff --git a/src/widgets/doc/snippets/updating-selections/window.cpp b/src/widgets/doc/snippets/updating-selections/window.cpp index b47e15e084..b965b81008 100644 --- a/src/widgets/doc/snippets/updating-selections/window.cpp +++ b/src/widgets/doc/snippets/updating-selections/window.cpp @@ -42,7 +42,7 @@ void MainWindow::updateSelection(const QItemSelection &selected, { QModelIndexList items = selected.indexes(); - for (const QModelIndex &index : qAsConst(items)) { + for (const QModelIndex &index : std::as_const(items)) { QString text = QString("(%1,%2)").arg(index.row()).arg(index.column()); model->setData(index, text); //! [0] //! [1] @@ -52,7 +52,7 @@ void MainWindow::updateSelection(const QItemSelection &selected, //! [2] items = deselected.indexes(); - for (const QModelIndex &index : qAsConst(items)) { + for (const QModelIndex &index : std::as_const(items)) { model->setData(index, QString()); } //! [2] diff --git a/src/widgets/doc/src/cmake-macros.qdoc b/src/widgets/doc/src/cmake-macros.qdoc index 4e947694f8..34bc254962 100644 --- a/src/widgets/doc/src/cmake-macros.qdoc +++ b/src/widgets/doc/src/cmake-macros.qdoc @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! -\page qt_wrap_ui.html +\page qt-wrap-ui.html \ingroup cmake-macros-qtwidgets \title qt_wrap_ui diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index e0febae255..5c09fd0445 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -449,11 +449,13 @@ \snippet simplemodel-use/main.cpp 0 In this case, we start by setting up a default QFileSystemModel. We connect - it to a lambda, in which we will obtain a parent index using a specific + its signal \c directoryLoaded(QString) to a lambda, in which we will + obtain a parent index for the directory using a specific implementation of \l{QFileSystemModel::}{index()} provided by that model. - In the lambda, we count the number of rows in the model using the - \l{QFileSystemModel::}{rowCount()} function. Finally, we set the root path - of the QFileSystemModel so it starts loading data and triggers the lambda. + + In the lambda, we determine the number of rows in the model using the + \l{QFileSystemModel::}{rowCount()} function. + For simplicity, we are only interested in the items in the first column of the model. We examine each row in turn, obtaining a model index for @@ -474,6 +476,9 @@ \codeline \snippet simplemodel-use/main.cpp 3 + Finally, we set the root path of the QFileSystemModel so it starts + loading data and triggers the lambda. + The above example demonstrates the basic principles used to retrieve data from a model: diff --git a/src/widgets/doc/src/qtwidgets-index.qdoc b/src/widgets/doc/src/qtwidgets-index.qdoc index cbdd4b2a44..c0fa5cf3e0 100644 --- a/src/widgets/doc/src/qtwidgets-index.qdoc +++ b/src/widgets/doc/src/qtwidgets-index.qdoc @@ -115,6 +115,7 @@ interfaces \list \li \l{Qt Widgets Examples} \li \l{Layout Examples} + \li \l{Tools Examples} \endlist \section1 API Reference diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc index 4214f025f1..6b4d119663 100644 --- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc @@ -131,9 +131,7 @@ shortcuts for each of its pages, so the user can press e.g. \uicontrol Alt+P to step to the \underline{P}rinting page. It is easy to overdo this: there are only a few keys, and it's also important - to provide keyboard shortcuts for commands. \uicontrol Alt+P is also - used for Paste, Play, Print, and Print Here in the \l{Standard - Accelerator Keys} list, for example. + to provide keyboard shortcuts for commands. \section2 The User Rotates the Mouse Wheel |