summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-12-15 19:45:30 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-12-15 19:45:30 (GMT)
commitbf634fe70500d360d478d88ca70743f563673501 (patch)
treee090f1e285002d7ae7cd1e79dadfc5c35db26765 /examples
parenta068f6dd6115b2f950892e5228efe10b7de57a00 (diff)
parent8e504f4709d15f502ca097f6bf4b27880fd9c6c5 (diff)
downloadQt-bf634fe70500d360d478d88ca70743f563673501.zip
Qt-bf634fe70500d360d478d88ca70743f563673501.tar.gz
Qt-bf634fe70500d360d478d88ca70743f563673501.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'examples')
-rw-r--r--examples/webkit/fancybrowser/main.cpp4
-rw-r--r--examples/webkit/googlechat/main.cpp4
-rw-r--r--examples/webkit/previewer/main.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkit/fancybrowser/main.cpp
index 7f3c983..7ca862d 100644
--- a/examples/webkit/fancybrowser/main.cpp
+++ b/examples/webkit/fancybrowser/main.cpp
@@ -45,7 +45,7 @@
int main(int argc, char * argv[])
{
QApplication app(argc, argv);
- MainWindow *browser = new MainWindow;
- browser->show();
+ MainWindow browser;
+ browser.show();
return app.exec();
}
diff --git a/examples/webkit/googlechat/main.cpp b/examples/webkit/googlechat/main.cpp
index 6b5e11f..ca94131 100644
--- a/examples/webkit/googlechat/main.cpp
+++ b/examples/webkit/googlechat/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char * argv[])
QNetworkProxyFactory::setUseSystemConfiguration(true);
- GoogleChat *chat = new GoogleChat;
- chat->show();
+ GoogleChat chat;
+ chat.show();
return app.exec();
}
diff --git a/examples/webkit/previewer/main.cpp b/examples/webkit/previewer/main.cpp
index 183b03f..1c80c19 100644
--- a/examples/webkit/previewer/main.cpp
+++ b/examples/webkit/previewer/main.cpp
@@ -46,8 +46,8 @@
int main(int argc, char * argv[])
{
QApplication app(argc, argv);
- MainWindow *mainWindow = new MainWindow;
- mainWindow->show();
+ MainWindow mainWindow;
+ mainWindow.show();
return app.exec();
}
//! [0]