Changing the addressbook tutorial so it doesn't leak.

Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>

15 files changed, 34 insertions, 31 deletions

diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc
index 3b0d2bc..38200b0 100644
--- a/doc/src/tutorials/addressbook.qdoc
+++ b/doc/src/tutorials/addressbook.qdoc
@@ -242,12 +242,15 @@
 
     \snippet tutorials/addressbook/part1/main.cpp main function
 
-    We construct a new \c AddressBook widget on the heap using the \c new
-    keyword and invoke its \l{QWidget::show()}{show()} function to display it.
+    We construct a new \c AddressBook widget on the stack and invoke
+    its \l{QWidget::show()}{show()} function to display it.
     However, the widget will not be shown until the application's event loop
     is started. We start the event loop by calling the application's
     \l{QApplication::}{exec()} function; the result returned by this function
-    is used as the return value from the \c main() function.
+    is used as the return value from the \c main() function. At this point,
+    it becomes apparent why we instanciated \c AddressBook on the stack: It
+    will now go out of scope. Therefore, \c AddressBook and all its child widgets
+    will be deleted, thus preventing memory leaks.
 */
 
 /*!
diff --git a/examples/tutorials/addressbook-fr/part1/main.cpp b/examples/tutorials/addressbook-fr/part1/main.cpp
index 22bfd3e..9c96882 100644
--- a/examples/tutorials/addressbook-fr/part1/main.cpp
+++ b/examples/tutorials/addressbook-fr/part1/main.cpp
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook-fr/part2/main.cpp b/examples/tutorials/addressbook-fr/part2/main.cpp
index 22bfd3e..9c96882 100644
--- a/examples/tutorials/addressbook-fr/part2/main.cpp
+++ b/examples/tutorials/addressbook-fr/part2/main.cpp
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook-fr/part3/main.cpp b/examples/tutorials/addressbook-fr/part3/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook-fr/part3/main.cpp
+++ b/examples/tutorials/addressbook-fr/part3/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook-fr/part4/main.cpp b/examples/tutorials/addressbook-fr/part4/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook-fr/part4/main.cpp
+++ b/examples/tutorials/addressbook-fr/part4/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook-fr/part5/main.cpp b/examples/tutorials/addressbook-fr/part5/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook-fr/part5/main.cpp
+++ b/examples/tutorials/addressbook-fr/part5/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook-fr/part6/main.cpp b/examples/tutorials/addressbook-fr/part6/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook-fr/part6/main.cpp
+++ b/examples/tutorials/addressbook-fr/part6/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook-fr/part7/main.cpp b/examples/tutorials/addressbook-fr/part7/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook-fr/part7/main.cpp
+++ b/examples/tutorials/addressbook-fr/part7/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part1/main.cpp b/examples/tutorials/addressbook/part1/main.cpp
index 22bfd3e..9c96882 100644
--- a/examples/tutorials/addressbook/part1/main.cpp
+++ b/examples/tutorials/addressbook/part1/main.cpp
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part2/main.cpp b/examples/tutorials/addressbook/part2/main.cpp
index 22bfd3e..9c96882 100644
--- a/examples/tutorials/addressbook/part2/main.cpp
+++ b/examples/tutorials/addressbook/part2/main.cpp
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part3/main.cpp b/examples/tutorials/addressbook/part3/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook/part3/main.cpp
+++ b/examples/tutorials/addressbook/part3/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part4/main.cpp b/examples/tutorials/addressbook/part4/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook/part4/main.cpp
+++ b/examples/tutorials/addressbook/part4/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part5/main.cpp b/examples/tutorials/addressbook/part5/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook/part5/main.cpp
+++ b/examples/tutorials/addressbook/part5/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part6/main.cpp b/examples/tutorials/addressbook/part6/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook/part6/main.cpp
+++ b/examples/tutorials/addressbook/part6/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }
diff --git a/examples/tutorials/addressbook/part7/main.cpp b/examples/tutorials/addressbook/part7/main.cpp
index b25d656..46f6f03 100644
--- a/examples/tutorials/addressbook/part7/main.cpp
+++ b/examples/tutorials/addressbook/part7/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    AddressBook *addressBook = new AddressBook;
-    addressBook->show();
+    AddressBook addressBook;
+    addressBook.show();
 
     return app.exec();
 }