summaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
authorMontel Laurent <kdeqt@yahoo.fr>2012-11-30 12:50:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-30 23:56:02 +0100
commitc565ef6d72ea4b95cfc72edbb67af27f8ef35fb5 (patch)
tree3c4395624a8a789226d55f58c31b274412bd41ef /examples/widgets
parent930207fc1f66566d563b820af5d2efc7bec3b610 (diff)
Fix memory leak. PrinterDialog is not deleted when close it
Change-Id: I9f0a300cdaf9803bc2ad723946ac4d0f825cc28b Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/itemviews/pixelator/mainwindow.cpp7
-rw-r--r--examples/widgets/mainwindows/dockwidgets/mainwindow.cpp6
-rw-r--r--examples/widgets/richtext/orderform/mainwindow.cpp9
-rw-r--r--examples/widgets/widgets/scribble/scribblearea.cpp4
4 files changed, 14 insertions, 12 deletions
diff --git a/examples/widgets/itemviews/pixelator/mainwindow.cpp b/examples/widgets/itemviews/pixelator/mainwindow.cpp
index cae9711135..18c1266252 100644
--- a/examples/widgets/itemviews/pixelator/mainwindow.cpp
+++ b/examples/widgets/itemviews/pixelator/mainwindow.cpp
@@ -167,11 +167,12 @@ void MainWindow::printImage()
QPrinter printer(QPrinter::HighResolution);
- QPrintDialog *dlg = new QPrintDialog(&printer, this);
- dlg->setWindowTitle(tr("Print Image"));
+ QPrintDialog dlg(&printer, this);
+ dlg.setWindowTitle(tr("Print Image"));
- if (dlg->exec() != QDialog::Accepted)
+ if (dlg.exec() != QDialog::Accepted) {
return;
+ }
QPainter painter;
painter.begin(&printer);
diff --git a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp
index d3b05f0a29..4228282554 100644
--- a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp
+++ b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp
@@ -121,12 +121,12 @@ void MainWindow::print()
QTextDocument *document = textEdit->document();
QPrinter printer;
- QPrintDialog *dlg = new QPrintDialog(&printer, this);
- if (dlg->exec() != QDialog::Accepted)
+ QPrintDialog dlg(&printer, this);
+ if (dlg.exec() != QDialog::Accepted) {
return;
+ }
document->print(&printer);
-
statusBar()->showMessage(tr("Ready"), 2000);
#endif
}
diff --git a/examples/widgets/richtext/orderform/mainwindow.cpp b/examples/widgets/richtext/orderform/mainwindow.cpp
index 4334e8bb71..e6e7e3bd6f 100644
--- a/examples/widgets/richtext/orderform/mainwindow.cpp
+++ b/examples/widgets/richtext/orderform/mainwindow.cpp
@@ -240,12 +240,13 @@ void MainWindow::printFile()
//! [18]
QPrinter printer;
- QPrintDialog *dialog = new QPrintDialog(&printer, this);
- dialog->setWindowTitle(tr("Print Document"));
+ QPrintDialog dialog(&printer, this);
+ dialog.setWindowTitle(tr("Print Document"));
if (editor->textCursor().hasSelection())
- dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection);
- if (dialog->exec() != QDialog::Accepted)
+ dialog.addEnabledOption(QAbstractPrintDialog::PrintSelection);
+ if (dialog.exec() != QDialog::Accepted) {
return;
+ }
//! [18]
editor->print(&printer);
diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp
index ad17b535f2..f5ccb52b83 100644
--- a/examples/widgets/widgets/scribble/scribblearea.cpp
+++ b/examples/widgets/widgets/scribble/scribblearea.cpp
@@ -203,9 +203,9 @@ void ScribbleArea::print()
#ifndef QT_NO_PRINTER
QPrinter printer(QPrinter::HighResolution);
- QPrintDialog *printDialog = new QPrintDialog(&printer, this);
+ QPrintDialog printDialog(&printer, this);
//! [21] //! [22]
- if (printDialog->exec() == QDialog::Accepted) {
+ if (printDialog.exec() == QDialog::Accepted) {
QPainter painter(&printer);
QRect rect = painter.viewport();
QSize size = image.size();