diff options
author | Michael Winkelmann <Michael.winkelmann@qt.io> | 2017-07-20 16:39:01 +0200 |
---|---|---|
committer | Topi Reiniö <topi.reinio@qt.io> | 2017-09-14 10:48:48 +0000 |
commit | 3d67793a9ec01f15e3dcf6b59e6e0df5f59bdfad (patch) | |
tree | e8bd72349e2580e2dfb4908a96653f3fa3644922 /examples/sql/masterdetail/main.cpp | |
parent | 590e71a69cc74b4e7da1ccb19a1304047dbaecb8 (diff) |
Revamp SQL examples to C++11
Changed signals and slots to new syntax, used nullptr and replaced
foreach with new C++11 range based for loops.
Also fixed a few minor flaws.
Task-number: QTBUG-60633
Change-Id: Ice4030133971912f96752d9d84c638c70fd73e35
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/sql/masterdetail/main.cpp')
-rw-r--r-- | examples/sql/masterdetail/main.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/examples/sql/masterdetail/main.cpp b/examples/sql/masterdetail/main.cpp index cc1a1c4a21..9a4172e55f 100644 --- a/examples/sql/masterdetail/main.cpp +++ b/examples/sql/masterdetail/main.cpp @@ -48,11 +48,14 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "database.h" #include "mainwindow.h" +#include <QApplication> +#include <QFile> + +#include <stdlib.h> + int main(int argc, char *argv[]) { Q_INIT_RESOURCE(masterdetail); @@ -60,10 +63,10 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); if (!createConnection()) - return 1; + return EXIT_FAILURE; - QFile *albumDetails = new QFile("albumdetails.xml"); - MainWindow window("artists", "albums", albumDetails); + QFile albumDetails("albumdetails.xml"); + MainWindow window("artists", "albums", &albumDetails); window.show(); return app.exec(); } |