Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-29 15:22:52 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-09-29 15:22:52 (GMT) |
| commit | 9abfaaa771f91010dbe01a1b9b5b9e2801956718 (patch) | |
| tree | 618a5f66ea97d3d8552f72aad6a8e1313c56ec6e /Swift/QtUI | |
| parent | 2bf44a1d641c3bc35546cb49d3766f2962f9a984 (diff) | |
| download | swift-9abfaaa771f91010dbe01a1b9b5b9e2801956718.zip swift-9abfaaa771f91010dbe01a1b9b5b9e2801956718.tar.bz2 | |
Fix uninitialised class members
Initialised previously uninitialised class members. Changed
some raw pointers to std::unique_ptr for clearer and
automatically initialised code.
Test-Information:
Builds on macOS 10.12 and unit tests pass in ASAN-enabled
build.
Change-Id: I7900fe6131119c228ca92c79c0ee8125137f2e48
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtHighlightEditor.h | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.h | 2 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/QtTreeWidget.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/QtTreeWidget.h | 8 | ||||
| -rw-r--r-- | Swift/QtUI/Trellis/QtDNDTabBar.h | 4 | ||||
| -rw-r--r-- | Swift/QtUI/Whiteboard/QtWhiteboardWindow.h | 1 |
6 files changed, 9 insertions, 12 deletions
diff --git a/Swift/QtUI/QtHighlightEditor.h b/Swift/QtUI/QtHighlightEditor.h index dbcef4b..c4a12e2 100644 --- a/Swift/QtUI/QtHighlightEditor.h +++ b/Swift/QtUI/QtHighlightEditor.h @@ -68,7 +68,7 @@ namespace Swift { private: Ui::QtHighlightEditor ui_; QtSettingsProvider* settings_; - HighlightManager* highlightManager_; + HighlightManager* highlightManager_ = nullptr; QtSuggestingJIDInput* jid_; int previousRow_; }; diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h index 91b21f6..c42d65d 100644 --- a/Swift/QtUI/QtLoginWindow.h +++ b/Swift/QtUI/QtLoginWindow.h @@ -98,7 +98,7 @@ namespace Swift { QMenuBar* menuBar_; QMenu* swiftMenu_; QMenu* generalMenu_; - QMenu* viewMenu_; + QMenu* viewMenu_ = nullptr; QAction* toggleSoundsAction_; QAction* toggleNotificationsAction_; UIEventStream* uiEventStream_; diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp index f04575d..1264a09 100644 --- a/Swift/QtUI/Roster/QtTreeWidget.cpp +++ b/Swift/QtUI/Roster/QtTreeWidget.cpp @@ -33,9 +33,7 @@ namespace Swift { -QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget messageTarget, QWidget* parent) : QTreeView(parent), tooltipShown_(false), messageTarget_(messageTarget) { - eventStream_ = eventStream; - settings_ = settings; +QtTreeWidget::QtTreeWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget messageTarget, QWidget* parent) : QTreeView(parent), eventStream_(eventStream), settings_(settings), messageTarget_(messageTarget) { model_ = new RosterModel(this, settings_->getSetting(QtUISettingConstants::USE_SCREENREADER)); setModel(model_); delegate_ = new RosterDelegate(this, settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER)); diff --git a/Swift/QtUI/Roster/QtTreeWidget.h b/Swift/QtUI/Roster/QtTreeWidget.h index b22f6bb..331458a 100644 --- a/Swift/QtUI/Roster/QtTreeWidget.h +++ b/Swift/QtUI/Roster/QtTreeWidget.h @@ -68,13 +68,13 @@ class QtTreeWidget : public QTreeView { private: RosterModel* model_; - Roster* roster_; + Roster* roster_ = nullptr; RosterDelegate* delegate_; - QtTreeWidgetItem* treeRoot_; + QtTreeWidgetItem* treeRoot_ = nullptr; SettingsProvider* settings_; - bool tooltipShown_; + bool tooltipShown_ = false; MessageTarget messageTarget_; - bool isOnline_; + bool isOnline_ = false; }; } diff --git a/Swift/QtUI/Trellis/QtDNDTabBar.h b/Swift/QtUI/Trellis/QtDNDTabBar.h index e9b6771..6de04d5 100644 --- a/Swift/QtUI/Trellis/QtDNDTabBar.h +++ b/Swift/QtUI/Trellis/QtDNDTabBar.h @@ -36,9 +36,9 @@ class QtDNDTabBar : public QTabBar { private: int defaultTabHeight; - int dragIndex; + int dragIndex = -1; QString dragText; - QWidget* dragWidget; + QWidget* dragWidget = nullptr; }; } diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h index 3b3f74e..21aa7ca 100644 --- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h +++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.h @@ -76,7 +76,6 @@ namespace Swift { QHBoxLayout* fillLayout; ColorWidget* strokeColor; ColorWidget* fillColor; - QWidget* widget; QPushButton* moveUpButton; QPushButton* moveDownButton; QSpinBox* widthBox; |