diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 14:23:33 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 18:33:47 +0000 |
commit | b96bf86f180ea3a90bf396b8a45b587a9fb0539d (patch) | |
tree | 403f9e712388030dc4a6ff4575b33a911f2b7826 /src/shared | |
parent | f9c1795d3b14d32d750661dd4dfb55520742fe63 (diff) |
Qt Designer: Fix some clang warnings
- Use using instead of typedef
- User member initialization
- Use nullptr
- Do not use else after return
- Delete pointers unconditionally
- Fix some integer conversion warnings
- Use auto for new/casts to avoid type name repetition
- Use = default for trivial destructors
Task-number: QTCREATORBUG-23248
Change-Id: I0a7465d3aa200b5c862bec82636d2d22ddf8297b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/designerintegrationv2/formresizer.cpp | 7 | ||||
-rw-r--r-- | src/shared/designerintegrationv2/formresizer.h | 4 | ||||
-rw-r--r-- | src/shared/designerintegrationv2/widgethost.cpp | 6 | ||||
-rw-r--r-- | src/shared/designerintegrationv2/widgethost.h | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp index 34de90a477..354c7b4f46 100644 --- a/src/shared/designerintegrationv2/formresizer.cpp +++ b/src/shared/designerintegrationv2/formresizer.cpp @@ -42,14 +42,13 @@ using namespace SharedTools::Internal; FormResizer::FormResizer(QWidget *parent) : QWidget(parent), - m_frame(new QFrame), - m_formWindow(0) + m_frame(new QFrame) { // Make the resize grip of a mainwindow form find us as resizable window. setWindowFlags(windowFlags() | Qt::SubWindow); setBackgroundRole(QPalette::Base); - QVBoxLayout *handleLayout = new QVBoxLayout(this); + auto handleLayout = new QVBoxLayout(this); handleLayout->setContentsMargins(SELECTION_MARGIN, SELECTION_MARGIN, SELECTION_MARGIN, SELECTION_MARGIN); handleLayout->addWidget(m_frame); @@ -166,7 +165,7 @@ QWidget *FormResizer::mainContainer() { if (m_formWindow) return m_formWindow->mainContainer(); - return 0; + return nullptr; } void FormResizer::mainContainerChanged() diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h index aad1a57b0f..a1bdf02161 100644 --- a/src/shared/designerintegrationv2/formresizer.h +++ b/src/shared/designerintegrationv2/formresizer.h @@ -60,7 +60,7 @@ class FormResizer : public QWidget Q_OBJECT public: - FormResizer(QWidget *parent = 0); + FormResizer(QWidget *parent = nullptr); void updateGeometry(); void setState(SelectionHandleState st); @@ -84,7 +84,7 @@ private: QFrame *m_frame; typedef QVector<SizeHandleRect*> Handles; Handles m_handles; - QDesignerFormWindowInterface * m_formWindow; + QDesignerFormWindowInterface *m_formWindow = nullptr; }; } diff --git a/src/shared/designerintegrationv2/widgethost.cpp b/src/shared/designerintegrationv2/widgethost.cpp index ed7f2fb91d..3ce7975c03 100644 --- a/src/shared/designerintegrationv2/widgethost.cpp +++ b/src/shared/designerintegrationv2/widgethost.cpp @@ -41,7 +41,6 @@ using namespace SharedTools; // ---------- WidgetHost WidgetHost::WidgetHost(QWidget *parent, QDesignerFormWindowInterface *formWindow) : QScrollArea(parent), - m_formWindow(0), m_formResizer(new Internal::FormResizer) { setWidget(m_formResizer); @@ -52,8 +51,7 @@ WidgetHost::WidgetHost(QWidget *parent, QDesignerFormWindowInterface *formWindow WidgetHost::~WidgetHost() { - if (m_formWindow) - delete m_formWindow; + delete m_formWindow; } void WidgetHost::setFormWindow(QDesignerFormWindowInterface *fw) @@ -75,7 +73,7 @@ void WidgetHost::setFormWindow(QDesignerFormWindowInterface *fw) QSize WidgetHost::formWindowSize() const { if (!m_formWindow || !m_formWindow->mainContainer()) - return QSize(); + return {}; return m_formWindow->mainContainer()->size(); } diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h index ccf8590e91..1545509493 100644 --- a/src/shared/designerintegrationv2/widgethost.h +++ b/src/shared/designerintegrationv2/widgethost.h @@ -60,7 +60,7 @@ private slots: private: QSize formWindowSize() const; - QDesignerFormWindowInterface *m_formWindow; + QDesignerFormWindowInterface *m_formWindow = nullptr; Internal::FormResizer *m_formResizer; QSize m_oldFakeWidgetSize; }; |