From 0779dc2ad0a7e087de71eadf64423e9610d3cc0a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 17 Nov 2016 22:08:19 +0100
Subject: Contact List: cosmetic cleanup

Change-Id: I5782451235269cac8c4e6aaf319a30151cb599ef
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 examples/quickcontrols2/contactlist/ContactDelegate.ui.qml | 14 +++++---------
 examples/quickcontrols2/contactlist/ContactDialog.qml      |  7 ++++---
 .../quickcontrols2/contactlist/ContactDialogForm.ui.qml    |  4 +---
 examples/quickcontrols2/contactlist/addressmodel.cpp       |  3 +--
 examples/quickcontrols2/contactlist/addressmodel.h         |  1 -
 examples/quickcontrols2/contactlist/contactlist.pro        | 14 +++++---------
 examples/quickcontrols2/contactlist/main.cpp               |  5 ++---
 7 files changed, 18 insertions(+), 30 deletions(-)

(limited to 'examples/quickcontrols2/contactlist')

diff --git a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
index 8c8c4722..cab26e63 100644
--- a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
+++ b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml
@@ -52,16 +52,16 @@ import QtQuick 2.7
 import QtQuick.Controls 2.1
 
 AbstractButton {
-    clip: true
-    checkable: true
-    autoExclusive: true
-
     id: delegate
 
-    height: 50
     property alias remove: remove
     property alias edit: edit
+
     width: 300
+    height: 50
+    clip: true
+    checkable: true
+    autoExclusive: true
 
     Column {
         id: column1
@@ -157,10 +157,6 @@ AbstractButton {
     }
 
     states: [
-        State {
-            name: "collapsed"
-            when: !delegate.checked
-        },
         State {
             name: "expanded"
             when: delegate.checked
diff --git a/examples/quickcontrols2/contactlist/ContactDialog.qml b/examples/quickcontrols2/contactlist/ContactDialog.qml
index ed781282..d8fa4f74 100644
--- a/examples/quickcontrols2/contactlist/ContactDialog.qml
+++ b/examples/quickcontrols2/contactlist/ContactDialog.qml
@@ -53,11 +53,12 @@ import QtQuick.Window 2.2
 import QtQuick.Controls 2.1
 
 Dialog {
-    standardButtons: Dialog.Ok | Dialog.Cancel
-    modal: true
+    id: dialog
 
     x: parent.width / 2 - width / 2
     y: parent.height / 2 - height / 2
+    standardButtons: Dialog.Ok | Dialog.Cancel
+    modal: true
 
     property int lastIndex
     property QtObject lastModel
@@ -86,7 +87,7 @@ Dialog {
         dialog.open();
     }
 
-   contentItem: ContactDialogForm {
+    contentItem: ContactDialogForm {
         id: form
     }
 
diff --git a/examples/quickcontrols2/contactlist/ContactDialogForm.ui.qml b/examples/quickcontrols2/contactlist/ContactDialogForm.ui.qml
index e1f31943..3dd57875 100644
--- a/examples/quickcontrols2/contactlist/ContactDialogForm.ui.qml
+++ b/examples/quickcontrols2/contactlist/ContactDialogForm.ui.qml
@@ -1,4 +1,3 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -66,7 +65,7 @@ GridLayout {
     columns: 2
 
     Label {
-        text: qsTr("Full Name:")
+        text: qsTr("Full Name")
         Layout.alignment: Qt.AlignLeft | Qt.AlignBaseline
     }
 
@@ -117,4 +116,3 @@ GridLayout {
         placeholderText: grid.placeholderText
     }
 }
-
diff --git a/examples/quickcontrols2/contactlist/addressmodel.cpp b/examples/quickcontrols2/contactlist/addressmodel.cpp
index fb83186e..f5234b7a 100644
--- a/examples/quickcontrols2/contactlist/addressmodel.cpp
+++ b/examples/quickcontrols2/contactlist/addressmodel.cpp
@@ -79,8 +79,7 @@ QVariant AddressModel::data(const QModelIndex &index, int role) const
         case CityRole: return m_data.at(index.row()).city;
         case NumberRole: return m_data.at(index.row()).number;
         default: return QVariant();
-
-        }
+    }
     return QVariant();
 }
 
diff --git a/examples/quickcontrols2/contactlist/addressmodel.h b/examples/quickcontrols2/contactlist/addressmodel.h
index 04417b95..f1c92ea2 100644
--- a/examples/quickcontrols2/contactlist/addressmodel.h
+++ b/examples/quickcontrols2/contactlist/addressmodel.h
@@ -64,7 +64,6 @@ public:
         CityRole,
         NumberRole
     };
-
     Q_ENUM(AdressModelRoles)
 
     AddressModel(QObject *parent = nullptr);
diff --git a/examples/quickcontrols2/contactlist/contactlist.pro b/examples/quickcontrols2/contactlist/contactlist.pro
index 8125d020..418aacab 100644
--- a/examples/quickcontrols2/contactlist/contactlist.pro
+++ b/examples/quickcontrols2/contactlist/contactlist.pro
@@ -1,23 +1,19 @@
 TEMPLATE = app
 TARGET = contactlist
-
-QT += quick quickcontrols2
-CONFIG += c++11
+QT += quick
 
 HEADERS += \
     addressmodel.h
 
-SOURCES += main.cpp \
+SOURCES += \
+    main.cpp \
     addressmodel.cpp
 
 RESOURCES += \
-   $$files(*.qml) \
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH=$$PWD/imports
+   $$files(*.qml)
 
 # Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH=$$PWD/designer
+QML_DESIGNER_IMPORT_PATH = $$PWD/designer
 
 OTHER_FILES += \
     designer/Backend/*.qml
diff --git a/examples/quickcontrols2/contactlist/main.cpp b/examples/quickcontrols2/contactlist/main.cpp
index 9c75d7b3..268a750a 100644
--- a/examples/quickcontrols2/contactlist/main.cpp
+++ b/examples/quickcontrols2/contactlist/main.cpp
@@ -48,11 +48,11 @@
 **
 ****************************************************************************/
 
-#include "addressmodel.h"
-
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
+#include "addressmodel.h"
+
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
@@ -60,7 +60,6 @@ int main(int argc, char *argv[])
     qmlRegisterType<AddressModel>("Backend", 1, 0, "AddressModel");
 
     QQmlApplicationEngine engine;
-    engine.addImportPath(":/imports");
     engine.load(QUrl(QStringLiteral("qrc:/contactlist.qml")));
 
     return app.exec();
-- 
cgit v1.2.3