From 984efb1e87c94ef193035f6b980e57acb78dca7e Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Thu, 22 Jun 2017 10:46:52 +0200
Subject: [PATCH] MultipleInheritance: Improve code and documentation
Task-number: QTBUG-61419
Change-Id: I858027db3ca83a4fe41a576919acbb408db35cff
GPush-Base: 8abb03b0d84a3a94f7db41e010f69955488ea893
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
examples/uitools/multipleinheritance/calculatorform.cpp | 4 ++--
examples/uitools/multipleinheritance/calculatorform.h | 4 ++--
examples/uitools/multipleinheritance/main.cpp | 2 +-
examples/uitools/multipleinheritance/multipleinheritance.pro | 5 +++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/examples/uitools/multipleinheritance/calculatorform.cpp b/examples/uitools/multipleinheritance/calculatorform.cpp
index 041c78e45..73bbd4fe5 100644
--- a/examples/uitools/multipleinheritance/calculatorform.cpp
+++ b/examples/uitools/multipleinheritance/calculatorform.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
@@ -48,8 +48,8 @@
**
****************************************************************************/
-#include <QtWidgets>
#include "calculatorform.h"
+#include <QWidget>
//! [0]
diff --git a/examples/uitools/multipleinheritance/calculatorform.h b/examples/uitools/multipleinheritance/calculatorform.h
index cb40e4918..28a885c82 100644
--- a/examples/uitools/multipleinheritance/calculatorform.h
+++ b/examples/uitools/multipleinheritance/calculatorform.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
@@ -61,7 +61,7 @@ class CalculatorForm : public QWidget, private Ui::CalculatorForm
Q_OBJECT
public:
- CalculatorForm(QWidget *parent = 0);
+ explicit CalculatorForm(QWidget *parent = nullptr);
private slots:
void on_inputSpinBox1_valueChanged(int value);
diff --git a/examples/uitools/multipleinheritance/main.cpp b/examples/uitools/multipleinheritance/main.cpp
index 9e85ae479..4a6c600c8 100644
--- a/examples/uitools/multipleinheritance/main.cpp
+++ b/examples/uitools/multipleinheritance/main.cpp
@@ -48,8 +48,8 @@
**
****************************************************************************/
-#include <QApplication>
#include "calculatorform.h"
+#include <QApplication>
//! [0]
int main(int argc, char *argv[])
diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro
index 1baace29c..fd40982ed 100644
--- a/examples/uitools/multipleinheritance/multipleinheritance.pro
+++ b/examples/uitools/multipleinheritance/multipleinheritance.pro
@@ -1,10 +1,11 @@
#! [0]
-SOURCES = calculatorform.cpp main.cpp
+QT += widgets
+
HEADERS = calculatorform.h
+SOURCES = calculatorform.cpp main.cpp
FORMS = calculatorform.ui
#! [0]
target.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
INSTALLS += target
-QT += widgets
--
GitLab