summaryrefslogtreecommitdiffstats
path: root/examples/scroller/plot/main.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-01-26 13:17:08 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-01-26 13:17:08 (GMT)
commitb0390e68893dd04076434695be5e676b87bc067c (patch)
tree60543fd8cf8c72f530a8865fa8fc2306bb52b9ba /examples/scroller/plot/main.cpp
parent537312d5dea24bd404666789119a5ad1bab04396 (diff)
parent57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff)
downloadQt-b0390e68893dd04076434695be5e676b87bc067c.zip
Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.gz
Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.bz2
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'examples/scroller/plot/main.cpp')
-rw-r--r--examples/scroller/plot/main.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/examples/scroller/plot/main.cpp b/examples/scroller/plot/main.cpp
index acf83ee..6166505 100644
--- a/examples/scroller/plot/main.cpp
+++ b/examples/scroller/plot/main.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -208,15 +208,14 @@ int main(int argc, char **argv)
if (a.arguments().contains(QLatin1String("--touch")))
touch = true;
- MainWindow *mw = new MainWindow(smallscreen, touch);
+ MainWindow mw(smallscreen, touch);
if (smallscreen)
- mw->showMaximized();
+ mw.showMaximized();
else
- mw->show();
+ mw.show();
#if defined(Q_WS_MAC)
mw->raise();
#endif
-
return a.exec();
}