summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 14:31:18 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 15:10:15 +0200
commit20f6c67635240865d33a370230a156de0f051d07 (patch)
treed2f6780e02d00de161bca1391db8d1acb1678d56 /tools
parentf1c8d2893d385ccfec2049655392ffca309675bd (diff)
Introduce member initialization
Fix warnings emitted by clang, use default constructors where applicable. Remove some unused members. Change-Id: I287ffa4d884be253ec5272e4266a1645376e7235 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/dumpcpp/main.cpp8
-rw-r--r--tools/testcon/mainwindow.cpp4
-rw-r--r--tools/testcon/mainwindow.h12
3 files changed, 9 insertions, 15 deletions
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index eb6f70a..61ee3b1 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1433,11 +1433,11 @@ QT_USE_NAMESPACE
struct Options
{
- Options() : mode(GenerateMode), category(DefaultObject), dispatchEqualsIDispatch(false) {}
+ Options() = default;
- ProgramMode mode;
- ObjectCategories category;
- bool dispatchEqualsIDispatch;
+ ProgramMode mode = GenerateMode;
+ ObjectCategories category = DefaultObject;
+ bool dispatchEqualsIDispatch = false;
QString outname;
QString typeLib;
diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index 0c3d3e8..d77b589 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -70,10 +70,6 @@ MainWindow *MainWindow::m_instance = nullptr;
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
- , m_dlgInvoke(nullptr)
- , m_dlgProperties(nullptr)
- , m_dlgAmbient(nullptr)
- , m_scripts(nullptr)
{
setupUi(this);
MainWindow::m_instance = this; // Logging handler needs the UI
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h
index e980d06..091aac1 100644
--- a/tools/testcon/mainwindow.h
+++ b/tools/testcon/mainwindow.h
@@ -100,13 +100,11 @@ private:
static MainWindow *m_instance;
- InvokeMethod *m_dlgInvoke;
- ChangeProperties *m_dlgProperties;
- AmbientProperties *m_dlgAmbient;
- QAxScriptManager *m_scripts;
- QMdiArea *m_mdiArea;
-
- QtMessageHandler m_oldDebugHandler;
+ InvokeMethod *m_dlgInvoke = nullptr;
+ ChangeProperties *m_dlgProperties = nullptr;
+ AmbientProperties *m_dlgAmbient = nullptr;
+ QAxScriptManager *m_scripts = nullptr;
+ QMdiArea *m_mdiArea = nullptr;
private slots:
void updateGUI();