diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 09:10:45 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 10:23:44 +0200 |
commit | ab683bcbde7e01c74a46d7b6222fd406c9325428 (patch) | |
tree | 21661e6ea64dfb63debc0815b801c9c3dcf13504 /src | |
parent | 878d6226f2472b3dff192207aa0c2a03eb4d3465 (diff) |
Fix clang warnings about class definitions
Use member initialization, add override, use "= default" for trivial
constructors and destructors.
Change-Id: I30f64f3d39c1656d52e21653f75935e5c41bca71
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader_p.h | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist.cpp | 6 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist_p.h | 10 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistcategory.cpp | 6 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistcategory_p.h | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistitem.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquicktaskbarbutton.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar.cpp | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar_p.h | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbutton.cpp | 4 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton.h | 2 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 3 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar_p.h | 14 |
14 files changed, 26 insertions, 41 deletions
diff --git a/src/imports/winextras/qquickdwmfeatures.cpp b/src/imports/winextras/qquickdwmfeatures.cpp index 5d1f565..fc3231d 100644 --- a/src/imports/winextras/qquickdwmfeatures.cpp +++ b/src/imports/winextras/qquickdwmfeatures.cpp @@ -71,9 +71,7 @@ QQuickDwmFeatures::QQuickDwmFeatures(QQuickItem *parent) : QWinEventFilter::setup(); } -QQuickDwmFeatures::~QQuickDwmFeatures() -{ -} +QQuickDwmFeatures::~QQuickDwmFeatures() = default; void QQuickDwmFeatures::setCompositionEnabled(bool enabled) { diff --git a/src/imports/winextras/qquickiconloader_p.h b/src/imports/winextras/qquickiconloader_p.h index ad359ee..a6c97e8 100644 --- a/src/imports/winextras/qquickiconloader_p.h +++ b/src/imports/winextras/qquickiconloader_p.h @@ -86,7 +86,7 @@ public: Object *receiver, void (Object::*function)(const QVariant &)); private: - QQuickIconLoader() {} + QQuickIconLoader() = default; static QVariant loadFromFile(const QUrl &url, QVariant::Type type); static QVariant loadFromImageProvider(const QUrl &url, const QQmlEngine *engine, QVariant::Type type, QSize requestedSize); diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp index 0f210c7..fada87f 100644 --- a/src/imports/winextras/qquickjumplist.cpp +++ b/src/imports/winextras/qquickjumplist.cpp @@ -65,13 +65,11 @@ QT_BEGIN_NAMESPACE */ QQuickJumpList::QQuickJumpList(QObject *parent) : - QObject(parent), m_recent(0), m_frequent(0), m_tasks(0) + QObject(parent) { } -QQuickJumpList::~QQuickJumpList() -{ -} +QQuickJumpList::~QQuickJumpList() = default; /*! \qmlproperty JumpListCategory JumpList::recent diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h index 8efb2bc..e36e26a 100644 --- a/src/imports/winextras/qquickjumplist_p.h +++ b/src/imports/winextras/qquickjumplist_p.h @@ -84,8 +84,8 @@ public: QQmlListProperty<QObject> data(); QQmlListProperty<QQuickJumpListCategory> categories(); - void classBegin(); - void componentComplete(); + void classBegin() override; + void componentComplete() override; Q_SIGNALS: void tasksChanged(); @@ -99,9 +99,9 @@ private: static int categories_count(QQmlListProperty<QQuickJumpListCategory> *property); static QQuickJumpListCategory *categories_at(QQmlListProperty<QQuickJumpListCategory> *property, int index); - QQuickJumpListCategory *m_recent; - QQuickJumpListCategory *m_frequent; - QQuickJumpListCategory *m_tasks; + QQuickJumpListCategory *m_recent = nullptr; + QQuickJumpListCategory *m_frequent = nullptr; + QQuickJumpListCategory *m_tasks = nullptr; QList<QQuickJumpListCategory *> m_categories; }; diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp index 052a4e6..d395ea8 100644 --- a/src/imports/winextras/qquickjumplistcategory.cpp +++ b/src/imports/winextras/qquickjumplistcategory.cpp @@ -61,13 +61,11 @@ QT_BEGIN_NAMESPACE */ QQuickJumpListCategory::QQuickJumpListCategory(QObject *parent) : - QObject(parent), m_visible(true) + QObject(parent) { } -QQuickJumpListCategory::~QQuickJumpListCategory() -{ -} +QQuickJumpListCategory::~QQuickJumpListCategory() = default; /*! \qmlproperty list<QtObject> JumpListCategory::data diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h index 9ae4922..5b76292 100644 --- a/src/imports/winextras/qquickjumplistcategory_p.h +++ b/src/imports/winextras/qquickjumplistcategory_p.h @@ -95,7 +95,7 @@ private: static int items_count(QQmlListProperty<QQuickJumpListItem> *property); static QQuickJumpListItem *items_at(QQmlListProperty<QQuickJumpListItem> *property, int index); - bool m_visible; + bool m_visible = true; QString m_title; QList<QQuickJumpListItem *> m_items; }; diff --git a/src/imports/winextras/qquickjumplistitem.cpp b/src/imports/winextras/qquickjumplistitem.cpp index 86b917a..bcf0162 100644 --- a/src/imports/winextras/qquickjumplistitem.cpp +++ b/src/imports/winextras/qquickjumplistitem.cpp @@ -48,9 +48,7 @@ QQuickJumpListItem::QQuickJumpListItem(QObject *parent) : { } -QQuickJumpListItem::~QQuickJumpListItem() -{ -} +QQuickJumpListItem::~QQuickJumpListItem() = default; int QQuickJumpListItem::type() const { diff --git a/src/imports/winextras/qquicktaskbarbutton.cpp b/src/imports/winextras/qquicktaskbarbutton.cpp index 7e8fd88..688ef35 100644 --- a/src/imports/winextras/qquicktaskbarbutton.cpp +++ b/src/imports/winextras/qquicktaskbarbutton.cpp @@ -123,9 +123,7 @@ QQuickTaskbarButton::QQuickTaskbarButton(QQuickItem *parent) : QQuickItem(parent { } -QQuickTaskbarButton::~QQuickTaskbarButton() -{ -} +QQuickTaskbarButton::~QQuickTaskbarButton() = default; /*! \qmlpropertygroup ::TaskbarButton::progress diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp index 00eb1b5..6e0beb8 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp @@ -74,9 +74,7 @@ QQuickThumbnailToolBar::QQuickThumbnailToolBar(QQuickItem *parent) : this, &QQuickThumbnailToolBar::iconicLivePreviewRequested); } -QQuickThumbnailToolBar::~QQuickThumbnailToolBar() -{ -} +QQuickThumbnailToolBar::~QQuickThumbnailToolBar() = default; int QQuickThumbnailToolBar::count() const { diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h index 2b01849..6e05bff 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar_p.h +++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h @@ -109,7 +109,7 @@ private Q_SLOTS: void iconicLivePreviewLoaded(const QVariant &); protected: - void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data); + void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; private: static void addData(QQmlListProperty<QObject> *property, QObject *button); diff --git a/src/imports/winextras/qquickthumbnailtoolbutton.cpp b/src/imports/winextras/qquickthumbnailtoolbutton.cpp index 268b303..e4a1f81 100644 --- a/src/imports/winextras/qquickthumbnailtoolbutton.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbutton.cpp @@ -67,9 +67,7 @@ QQuickThumbnailToolButton::QQuickThumbnailToolButton(QObject *parent) : connect(m_button, &QWinThumbnailToolButton::clicked, this, &QQuickThumbnailToolButton::clicked); } -QQuickThumbnailToolButton::~QQuickThumbnailToolButton() -{ -} +QQuickThumbnailToolButton::~QQuickThumbnailToolButton() = default; /*! \qmlproperty url ThumbnailToolButton::iconSource diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h index dc4d469..627beee 100644 --- a/src/winextras/qwintaskbarbutton.h +++ b/src/winextras/qwintaskbarbutton.h @@ -70,7 +70,7 @@ public: QWinTaskbarProgress *progress() const; - bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) override; public Q_SLOTS: void setOverlayIcon(const QIcon &icon); diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index de65ff0..5afccda 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -441,8 +441,7 @@ static inline ITaskbarList4 *createTaskbarList() } QWinThumbnailToolBarPrivate::QWinThumbnailToolBarPrivate() : - QObject(0), updateScheduled(false), window(0), pTbList(createTaskbarList()), q_ptr(0), - withinIconicThumbnailRequest(false), withinIconicLivePreviewRequest(false) + QObject(nullptr), pTbList(createTaskbarList()) { buttonList.reserve(windowsLimitedThumbbarSize); QCoreApplication::instance()->installNativeEventFilter(this); diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h index 6639d09..c3180f3 100644 --- a/src/winextras/qwinthumbnailtoolbar_p.h +++ b/src/winextras/qwinthumbnailtoolbar_p.h @@ -69,7 +69,7 @@ public: class IconicPixmapCache { public: - IconicPixmapCache() : m_bitmap(0) {} + IconicPixmapCache() = default; ~IconicPixmapCache() { deleteBitmap(); } operator bool() const { return !m_pixmap.isNull(); } @@ -84,7 +84,7 @@ public: QPixmap m_pixmap; QSize m_size; - HBITMAP m_bitmap; + HBITMAP m_bitmap = nullptr; }; QWinThumbnailToolBarPrivate(); @@ -106,9 +106,9 @@ public: static int makeButtonMask(const QWinThumbnailToolButton *button); static QString msgComFailed(const char *function, HRESULT hresult); - bool updateScheduled; + bool updateScheduled = false; QList<QWinThumbnailToolButton *> buttonList; - QWindow *window; + QWindow *window = nullptr; ITaskbarList4 * const pTbList; IconicPixmapCache iconicThumbnail; @@ -121,10 +121,10 @@ private: void updateIconicThumbnail(const MSG *message); void updateIconicLivePreview(const MSG *message); - QWinThumbnailToolBar *q_ptr; + QWinThumbnailToolBar *q_ptr = nullptr; Q_DECLARE_PUBLIC(QWinThumbnailToolBar) - bool withinIconicThumbnailRequest; - bool withinIconicLivePreviewRequest; + bool withinIconicThumbnailRequest = false; + bool withinIconicLivePreviewRequest = false; }; QT_END_NAMESPACE |