summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-08-26 05:58:41 (GMT)
committerTobias Markmann <tm@ayena.de>2016-08-26 05:58:41 (GMT)
commit376ca804405347f8dfd242856fa5b0b352c69d90 (patch)
tree1a54c7db08b5679a1282aa6e6b656f24965039eb /Swift/QtUI/MUCSearch
parent5a4e7d9518e91cf39b96f14b3b310fe5b9a27594 (diff)
downloadswift-376ca804405347f8dfd242856fa5b0b352c69d90.zip
swift-376ca804405347f8dfd242856fa5b0b352c69d90.tar.bz2
Improve API clarity of MUCSearchItem::setParent
Change MUCSearchItem::setParent to take weak_ptr over shared_ptr and converting it to weak_ptr in the method. Test-Information: Builds on OS X 10.11.6. Tested that various MUC room searches still work. Change-Id: I26d62861c99957759127c18a629bdda3635012c7
Diffstat (limited to 'Swift/QtUI/MUCSearch')
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchEmptyItem.cpp2
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchEmptyItem.h2
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchItem.h2
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchRoomItem.cpp2
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchRoomItem.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.cpp b/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.cpp
index ce6e8f9..3a3b841 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.cpp
+++ b/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.cpp
@@ -17,7 +17,7 @@ namespace Swift {
MUCSearchEmptyItem::MUCSearchEmptyItem() {
}
-void MUCSearchEmptyItem::setParent(std::shared_ptr<MUCSearchServiceItem> parent) {
+void MUCSearchEmptyItem::setParent(std::weak_ptr<MUCSearchServiceItem> parent) {
parent_ = parent;
}
diff --git a/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.h b/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.h
index 06c7c4e..8a5bb06 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.h
+++ b/Swift/QtUI/MUCSearch/MUCSearchEmptyItem.h
@@ -17,7 +17,7 @@ namespace Swift {
public:
MUCSearchEmptyItem();
- void setParent(std::shared_ptr<MUCSearchServiceItem> parent);
+ void setParent(std::weak_ptr<MUCSearchServiceItem> parent);
std::shared_ptr<MUCSearchServiceItem> getParent();
QVariant data(int role);
diff --git a/Swift/QtUI/MUCSearch/MUCSearchItem.h b/Swift/QtUI/MUCSearch/MUCSearchItem.h
index d0e2a88..08daa21 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchItem.h
+++ b/Swift/QtUI/MUCSearch/MUCSearchItem.h
@@ -17,7 +17,7 @@ class MUCSearchServiceItem;
class MUCSearchItem {
public:
virtual ~MUCSearchItem() {}
- virtual void setParent(std::shared_ptr<MUCSearchServiceItem>) { }
+ virtual void setParent(std::weak_ptr<MUCSearchServiceItem>) { }
virtual QVariant data(int role) = 0;
};
}
diff --git a/Swift/QtUI/MUCSearch/MUCSearchRoomItem.cpp b/Swift/QtUI/MUCSearch/MUCSearchRoomItem.cpp
index 3b786b6..9c3ef2c 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchRoomItem.cpp
+++ b/Swift/QtUI/MUCSearch/MUCSearchRoomItem.cpp
@@ -16,7 +16,7 @@ MUCSearchRoomItem::MUCSearchRoomItem(const QString& node) : node_(node) {
}
-void MUCSearchRoomItem::setParent(std::shared_ptr<MUCSearchServiceItem> parent) {
+void MUCSearchRoomItem::setParent(std::weak_ptr<MUCSearchServiceItem> parent) {
parent_ = parent;
}
diff --git a/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h b/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h
index 281b555..5ecb7d7 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h
+++ b/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h
@@ -15,7 +15,7 @@ namespace Swift {
class MUCSearchRoomItem : public MUCSearchItem {
public:
MUCSearchRoomItem(const QString& node);
- void setParent(std::shared_ptr<MUCSearchServiceItem> parent);
+ void setParent(std::weak_ptr<MUCSearchServiceItem> parent);
std::shared_ptr<MUCSearchServiceItem> getParent();
QVariant data(int role);
QString getNode() const {return node_;}