Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-04-09 07:53:12 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-04-22 21:12:21 (GMT) |
| commit | a7fb55381ab4a5c470bf891b31ac6e201611a2c1 (patch) | |
| tree | 475b3b7fc0142946863580506b00aa250ef8ca14 /Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp | |
| parent | 4444aeb255f8d1712b794c31166f362bb3ec335a (diff) | |
| download | swift-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.zip swift-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.tar.bz2 | |
Fix crash in QtUserSearchWindow.
Avoid storing pointers to items in vectors. Using shared_ptr for Contact items.
Change-Id: I3baa05fc058011b2beca14dc620ab794988a2b37
Diffstat (limited to 'Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp index de935d9..a4a4610 100644 --- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp +++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp @@ -4,6 +4,12 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h> #include <Swift/QtUI/UserSearch/ContactListDelegate.h> #include <Swift/Controllers/Settings/SettingsProvider.h> @@ -23,7 +29,7 @@ namespace Swift { -QtSuggestingJIDInput::QtSuggestingJIDInput(QWidget* parent, SettingsProvider* settings) : QLineEdit(parent), settings_(settings), currentContact_(NULL) { +QtSuggestingJIDInput::QtSuggestingJIDInput(QWidget* parent, SettingsProvider* settings) : QLineEdit(parent), settings_(settings) { treeViewPopup_ = new QTreeView(); treeViewPopup_->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint); //treeViewPopup_->setAttribute(Qt::WA_ShowWithoutActivating); @@ -57,30 +63,31 @@ QtSuggestingJIDInput::~QtSuggestingJIDInput() { delete treeViewPopup_; } -const Contact* QtSuggestingJIDInput::getContact() { - if (currentContact_ != NULL) { +Contact::ref QtSuggestingJIDInput::getContact() { + if (!!currentContact_) { return currentContact_; - } else { - if (!text().isEmpty()) { - JID jid(Q2PSTRING(text())); - if (jid.isValid()) { - manualContact_.name = jid.toString(); - manualContact_.jid = jid; - return &manualContact_; - } + } + + if (!text().isEmpty()) { + JID jid(Q2PSTRING(text())); + if (jid.isValid()) { + Contact::ref manualContact = boost::make_shared<Contact>(); + manualContact->name = jid.toString(); + manualContact->jid = jid; + return manualContact; } - return NULL; } + return boost::shared_ptr<Contact>(); } -void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact>& suggestions) { +void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact::ref>& suggestions) { contactListModel_->setList(suggestions); positionPopup(); if (!suggestions.empty()) { treeViewPopup_->setCurrentIndex(contactListModel_->index(0, 0)); showPopup(); } else { - currentContact_ = NULL; + currentContact_.reset(); } } @@ -100,12 +107,12 @@ void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) { } else if (event->key() == Qt::Key_Return && treeViewPopup_->isVisible()) { QModelIndex index = treeViewPopup_->currentIndex(); if (!contactListModel_->getList().empty() && index.isValid()) { - currentContact_ = &contactListModel_->getList()[index.row()]; + currentContact_ = contactListModel_->getContact(index.row()); setText(P2QSTRING(currentContact_->jid.toString())); hidePopup(); clearFocus(); } else { - currentContact_ = NULL; + currentContact_.reset(); } editingDone(); } else { @@ -130,7 +137,7 @@ void QtSuggestingJIDInput::handleSettingsChanged(const std::string& setting) { void QtSuggestingJIDInput::handleClicked(const QModelIndex& index) { if (index.isValid()) { - currentContact_ = &contactListModel_->getList()[index.row()]; + currentContact_ = contactListModel_->getContact(index.row()); setText(""); onUserSelected(currentContact_->jid); hidePopup(); |