summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/qtresourceview.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 08:49:58 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-11 09:23:57 +0200
commitfac0dcbeef6a0c23e780b9751c17883ec9918d6f (patch)
tree82ba10f4f93ebb02968c0e65a90f3daeea552b83 /src/designer/src/lib/shared/qtresourceview.cpp
parentdbbe4be100e757ff17ca6b8533946c7b55880f8d (diff)
Qt Designer: introduce member initialization
Fix warnings emitted by clang, use default constructors where applicable. Initialize remaining member variables about which clang warns about missing initialization in the constructor. Change-Id: Ic23a1f36f7507dc728ca6daf0d2067727125c0a9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared/qtresourceview.cpp')
-rw-r--r--src/designer/src/lib/shared/qtresourceview.cpp28
1 files changed, 10 insertions, 18 deletions
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index f79926d88..db9e4e4f8 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -123,7 +123,7 @@ void ResourceListWidget::startDrag(Qt::DropActions supportedActions)
// ---------------------------- QtResourceViewPrivate
class QtResourceViewPrivate
{
- QtResourceView *q_ptr;
+ QtResourceView *q_ptr = nullptr;
Q_DECLARE_PUBLIC(QtResourceView)
public:
QtResourceViewPrivate(QDesignerFormEditorInterface *core);
@@ -152,12 +152,12 @@ public:
QPixmap makeThumbnail(const QPixmap &pix) const;
QDesignerFormEditorInterface *m_core;
- QtResourceModel *m_resourceModel;
+ QtResourceModel *m_resourceModel = nullptr;
QToolBar *m_toolBar;
- QWidget *m_filterWidget;
+ QWidget *m_filterWidget = nullptr;
QTreeWidget *m_treeWidget;
QListWidget *m_listWidget;
- QSplitter *m_splitter;
+ QSplitter *m_splitter = nullptr;
QMap<QString, QStringList> m_pathToContents; // full path to contents file names (full path to its resource filenames)
QMap<QString, QString> m_pathToParentPath; // full path to full parent path
QMap<QString, QStringList> m_pathToSubPaths; // full path to full sub paths
@@ -165,31 +165,23 @@ public:
QMap<QTreeWidgetItem *, QString> m_itemToPath;
QMap<QString, QListWidgetItem *> m_resourceToItem;
QMap<QListWidgetItem *, QString> m_itemToResource;
- QAction *m_editResourcesAction;
- QAction *m_reloadResourcesAction;
- QAction *m_copyResourcePathAction;
+ QAction *m_editResourcesAction = nullptr;
+ QAction *m_reloadResourcesAction = nullptr;
+ QAction *m_copyResourcePathAction = nullptr;
QMap<QString, bool> m_expansionState;
- bool m_ignoreGuiSignals;
QString m_settingsKey;
- bool m_resourceEditingEnabled;
QString m_filterPattern;
+ bool m_ignoreGuiSignals = false;
+ bool m_resourceEditingEnabled = true;
};
QtResourceViewPrivate::QtResourceViewPrivate(QDesignerFormEditorInterface *core) :
- q_ptr(0),
m_core(core),
- m_resourceModel(0),
m_toolBar(new QToolBar),
m_treeWidget(new QTreeWidget),
- m_listWidget(new ResourceListWidget),
- m_splitter(0),
- m_editResourcesAction(0),
- m_reloadResourcesAction(0),
- m_copyResourcePathAction(0),
- m_ignoreGuiSignals(false),
- m_resourceEditingEnabled(true)
+ m_listWidget(new ResourceListWidget)
{
m_toolBar->setIconSize(QSize(22, 22));
}