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

Examples: Don't use deprecated methods

Browse Source 
Change-Id: Ib6e795f6b5bb6a3ac19882a5fb224460ef1fc8ad
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Olivier Goffart 2012-04-20 16:55:59 +02:00 committed by Qt by Nokia
parent fcec903da7
commit 910b446fb2
14 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dialogs/findfiles/window.cpp
View File

@ -225,7 +225,7 @@ void Window::createFilesTable()
QStringList labels; QStringList labels;
labels << tr("Filename") << tr("Size"); labels << tr("Filename") << tr("Size");
filesTable->setHorizontalHeaderLabels(labels); filesTable->setHorizontalHeaderLabels(labels);
filesTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch); filesTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
filesTable->verticalHeader()->hide(); filesTable->verticalHeader()->hide();
filesTable->setShowGrid(false); filesTable->setShowGrid(false);

2
examples/graphicsview/elasticnodes/graphwidget.cpp
View File

@ -199,7 +199,7 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
QLinearGradient gradient(sceneRect.topLeft(), sceneRect.bottomRight()); QLinearGradient gradient(sceneRect.topLeft(), sceneRect.bottomRight());
gradient.setColorAt(0, Qt::white); gradient.setColorAt(0, Qt::white);
gradient.setColorAt(1, Qt::lightGray); gradient.setColorAt(1, Qt::lightGray);
painter->fillRect(rect.intersect(sceneRect), gradient); painter->fillRect(rect.intersected(sceneRect), gradient);
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->drawRect(sceneRect); painter->drawRect(sceneRect);

2
examples/itemviews/chart/pieview.cpp
View File

@ -478,7 +478,7 @@ void PieView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlag
for (int column = 0; column < columns; ++column) { for (int column = 0; column < columns; ++column) {
QModelIndex index = model()->index(row, column, rootIndex()); QModelIndex index = model()->index(row, column, rootIndex());
QRegion region = itemRegion(index); QRegion region = itemRegion(index);
if (!region.intersect(contentsRect).isEmpty()) if (region.intersects(contentsRect))
indexes.append(index); indexes.append(index);
} }
} }

3
examples/itemviews/fetchmore/filelistmodel.cpp
View File

@ -107,9 +107,10 @@ void FileListModel::setDirPath(const QString &path)
{ {
QDir dir(path); QDir dir(path);
beginResetModel();
fileList = dir.entryList(); fileList = dir.entryList();
fileCount = 0; fileCount = 0;
reset(); endResetModel();
} }
//![0] //![0]

4
examples/itemviews/interview/main.cpp
View File

@ -61,8 +61,8 @@ int main(int argc, char *argv[])
QTableView *table = new QTableView; QTableView *table = new QTableView;
table->setModel(data); table->setModel(data);
table->setSelectionModel(selections); table->setSelectionModel(selections);
table->horizontalHeader()->setMovable(true); table->horizontalHeader()->setSectionsMovable(true);
table->verticalHeader()->setMovable(true); table->verticalHeader()->setSectionsMovable(true);
// Set StaticContents to enable minimal repaints on resizes. // Set StaticContents to enable minimal repaints on resizes.
table->viewport()->setAttribute(Qt::WA_StaticContents); table->viewport()->setAttribute(Qt::WA_StaticContents);
page.addWidget(table); page.addWidget(table);

3
examples/itemviews/pixelator/imagemodel.cpp
View File

@ -52,8 +52,9 @@ ImageModel::ImageModel(QObject *parent)
//! [1] //! [1]
void ImageModel::setImage(const QImage &image) void ImageModel::setImage(const QImage &image)
{ {
beginResetModel();
modelImage = image; modelImage = image;
reset(); endResetModel();
} }
//! [1] //! [1]

2
examples/sql/masterdetail/mainwindow.cpp
View File

@ -410,7 +410,7 @@ void MainWindow::updateHeader(QModelIndex, int, int)
void MainWindow::adjustHeader() void MainWindow::adjustHeader()
{ {
albumView->hideColumn(0); albumView->hideColumn(0);
albumView->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch); albumView->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
albumView->resizeColumnToContents(2); albumView->resizeColumnToContents(2);
albumView->resizeColumnToContents(3); albumView->resizeColumnToContents(3);
} }

4
examples/tools/completer/mainwindow.cpp
View File

@ -242,8 +242,8 @@ void MainWindow::changeModel()
treeView->setRootIsDecorated(false); treeView->setRootIsDecorated(false);
treeView->header()->hide(); treeView->header()->hide();
treeView->header()->setStretchLastSection(false); treeView->header()->setStretchLastSection(false);
treeView->header()->setResizeMode(0, QHeaderView::Stretch); treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
treeView->header()->setResizeMode(1, QHeaderView::ResizeToContents); treeView->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
contentsLabel->setText(tr("Enter name of your country")); contentsLabel->setText(tr("Enter name of your country"));
} }
break; break;

8
examples/tools/plugandpaint/mainwindow.cpp
View File

@ -116,10 +116,10 @@ void MainWindow::brushColor()
void MainWindow::brushWidth() void MainWindow::brushWidth()
{ {
bool ok; bool ok;
const int newWidth = QInputDialog::getInteger(this, tr("Plug & Paint"), const int newWidth = QInputDialog::getInt(this, tr("Plug & Paint"),
tr("Select brush width:"), tr("Select brush width:"),
paintArea->brushWidth(), paintArea->brushWidth(),
1, 50, 1, &ok); 1, 50, 1, &ok);
if (ok) if (ok)
paintArea->setBrushWidth(newWidth); paintArea->setBrushWidth(newWidth);
} }

4
examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
View File

@ -73,7 +73,7 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
} }
} else if (filter == tr("Smudge...")) { } else if (filter == tr("Smudge...")) {
bool ok; bool ok;
int numIters = QInputDialog::getInteger(parent, tr("Smudge Filter"), int numIters = QInputDialog::getInt(parent, tr("Smudge Filter"),
tr("Enter number of iterations:"), tr("Enter number of iterations:"),
5, 1, 20, 1, &ok); 5, 1, 20, 1, &ok);
if (ok) { if (ok) {
@ -102,7 +102,7 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
} }
} else if (filter == tr("Threshold...")) { } else if (filter == tr("Threshold...")) {
bool ok; bool ok;
int threshold = QInputDialog::getInteger(parent, tr("Threshold Filter"), int threshold = QInputDialog::getInt(parent, tr("Threshold Filter"),
tr("Enter threshold:"), tr("Enter threshold:"),
10, 1, 256, 1, &ok); 10, 1, 256, 1, &ok);
if (ok) { if (ok) {

2
examples/tools/settingseditor/locationdialog.cpp
View File

@ -89,7 +89,7 @@ LocationDialog::LocationDialog(QWidget *parent)
locationsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); locationsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
locationsTable->setColumnCount(2); locationsTable->setColumnCount(2);
locationsTable->setHorizontalHeaderLabels(labels); locationsTable->setHorizontalHeaderLabels(labels);
locationsTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch); locationsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
locationsTable->horizontalHeader()->resizeSection(1, 180); locationsTable->horizontalHeader()->resizeSection(1, 180);
buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok

4
examples/tools/settingseditor/settingstree.cpp
View File

@ -51,8 +51,8 @@ SettingsTree::SettingsTree(QWidget *parent)
QStringList labels; QStringList labels;
labels << tr("Setting") << tr("Type") << tr("Value"); labels << tr("Setting") << tr("Type") << tr("Value");
setHeaderLabels(labels); setHeaderLabels(labels);
header()->setResizeMode(0, QHeaderView::Stretch); header()->setSectionResizeMode(0, QHeaderView::Stretch);
header()->setResizeMode(2, QHeaderView::Stretch); header()->setSectionResizeMode(2, QHeaderView::Stretch);
settings = 0; settings = 0;
refreshTimer.setInterval(2000); refreshTimer.setInterval(2000);

6
examples/widgets/icons/mainwindow.cpp
View File

@ -285,9 +285,9 @@ void MainWindow::createImagesGroupBox()
imagesTable->horizontalHeader()->setDefaultSectionSize(90); imagesTable->horizontalHeader()->setDefaultSectionSize(90);
imagesTable->setColumnCount(3); imagesTable->setColumnCount(3);
imagesTable->setHorizontalHeaderLabels(labels); imagesTable->setHorizontalHeaderLabels(labels);
imagesTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch); imagesTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
imagesTable->horizontalHeader()->setResizeMode(1, QHeaderView::Fixed); imagesTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);
imagesTable->horizontalHeader()->setResizeMode(2, QHeaderView::Fixed); imagesTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
imagesTable->verticalHeader()->hide(); imagesTable->verticalHeader()->hide();
//! [23] //! [23]

8
examples/widgets/scribble/mainwindow.cpp
View File

@ -107,10 +107,10 @@ void MainWindow::penWidth()
//! [9] //! [10] //! [9] //! [10]
{ {
bool ok; bool ok;
int newWidth = QInputDialog::getInteger(this, tr("Scribble"), int newWidth = QInputDialog::getInt(this, tr("Scribble"),
tr("Select pen width:"), tr("Select pen width:"),
scribbleArea->penWidth(), scribbleArea->penWidth(),
1, 50, 1, &ok); 1, 50, 1, &ok);
if (ok) if (ok)
scribbleArea->setPenWidth(newWidth); scribbleArea->setPenWidth(newWidth);
} }