diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-20 16:55:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-21 17:29:40 +0200 |
| commit | 910b446fb22c9c5ab3cc65d4025efc5102d0c45e (patch) | |
| tree | 02b1470ccdbe09bfc8a24694447a7a136fd9b7fb /examples/itemviews | |
| parent | fcec903da7ce0ec2b95d0b1d639885c6fc71f9c3 (diff) | |
Examples: Don't use deprecated methods
Change-Id: Ib6e795f6b5bb6a3ac19882a5fb224460ef1fc8ad
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'examples/itemviews')
| -rw-r--r-- | examples/itemviews/chart/pieview.cpp | 2 | ||||
| -rw-r--r-- | examples/itemviews/fetchmore/filelistmodel.cpp | 3 | ||||
| -rw-r--r-- | examples/itemviews/interview/main.cpp | 4 | ||||
| -rw-r--r-- | examples/itemviews/pixelator/imagemodel.cpp | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/examples/itemviews/chart/pieview.cpp b/examples/itemviews/chart/pieview.cpp index dcf3aca3fb..b60d7ed879 100644 --- a/examples/itemviews/chart/pieview.cpp +++ b/examples/itemviews/chart/pieview.cpp @@ -478,7 +478,7 @@ void PieView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlag for (int column = 0; column < columns; ++column) { QModelIndex index = model()->index(row, column, rootIndex()); QRegion region = itemRegion(index); - if (!region.intersect(contentsRect).isEmpty()) + if (region.intersects(contentsRect)) indexes.append(index); } } diff --git a/examples/itemviews/fetchmore/filelistmodel.cpp b/examples/itemviews/fetchmore/filelistmodel.cpp index 42146f8edc..d9678191d9 100644 --- a/examples/itemviews/fetchmore/filelistmodel.cpp +++ b/examples/itemviews/fetchmore/filelistmodel.cpp @@ -107,9 +107,10 @@ void FileListModel::setDirPath(const QString &path) { QDir dir(path); + beginResetModel(); fileList = dir.entryList(); fileCount = 0; - reset(); + endResetModel(); } //![0] diff --git a/examples/itemviews/interview/main.cpp b/examples/itemviews/interview/main.cpp index 92239c9bdb..fa059cdb53 100644 --- a/examples/itemviews/interview/main.cpp +++ b/examples/itemviews/interview/main.cpp @@ -61,8 +61,8 @@ int main(int argc, char *argv[]) QTableView *table = new QTableView; table->setModel(data); table->setSelectionModel(selections); - table->horizontalHeader()->setMovable(true); - table->verticalHeader()->setMovable(true); + table->horizontalHeader()->setSectionsMovable(true); + table->verticalHeader()->setSectionsMovable(true); // Set StaticContents to enable minimal repaints on resizes. table->viewport()->setAttribute(Qt::WA_StaticContents); page.addWidget(table); diff --git a/examples/itemviews/pixelator/imagemodel.cpp b/examples/itemviews/pixelator/imagemodel.cpp index 5b64fb26e2..efbf2d35bc 100644 --- a/examples/itemviews/pixelator/imagemodel.cpp +++ b/examples/itemviews/pixelator/imagemodel.cpp @@ -52,8 +52,9 @@ ImageModel::ImageModel(QObject *parent) //! [1] void ImageModel::setImage(const QImage &image) { + beginResetModel(); modelImage = image; - reset(); + endResetModel(); } //! [1] |