Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2014-01-22 20:20:55 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2014-01-22 21:25:50 (GMT) |
| commit | fe460ca46bff4f9e735db86ca072eafb3a5c8f2d (patch) | |
| tree | 82ac0b3c1c29ec13dd66a7f328a93d0b14db895a /Swift | |
| parent | 4c83aa02da939ee3dc59b6febf70cab87e85f758 (diff) | |
| download | swift-fe460ca46bff4f9e735db86ca072eafb3a5c8f2d.zip swift-fe460ca46bff4f9e735db86ca072eafb3a5c8f2d.tar.bz2 | |
Sluift: Add SecurityLabel convertor
Change-Id: I59357bda2cbfcb044b5c27b41fe0c91c194e7381
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp | 6 | ||||
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp b/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp index 3652e86..7268878 100644 --- a/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp @@ -210,7 +210,7 @@ public: } void testMessageWithLabelItem() { - SecurityLabel::ref label = boost::make_shared<SecurityLabel>(); + boost::shared_ptr<SecurityLabel> label = boost::make_shared<SecurityLabel>(); label->setLabel("a"); SecurityLabelsCatalog::Item labelItem; labelItem.setSelector("Bob"); @@ -237,12 +237,12 @@ public: } void testCorrectMessageWithLabelItem() { - SecurityLabel::ref label = boost::make_shared<SecurityLabel>(); + boost::shared_ptr<SecurityLabel> label = boost::make_shared<SecurityLabel>(); label->setLabel("a"); SecurityLabelsCatalog::Item labelItem; labelItem.setSelector("Bob"); labelItem.setLabel(label); - SecurityLabel::ref label2 = boost::make_shared<SecurityLabel>(); + boost::shared_ptr<SecurityLabel> label2 = boost::make_shared<SecurityLabel>(); label->setLabel("b"); SecurityLabelsCatalog::Item labelItem2; labelItem2.setSelector("Charlie"); diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index df1e619..eeb8093 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h @@ -54,7 +54,7 @@ namespace Swift { if (!index.isValid()) { return QVariant(); } - SecurityLabel::ref label = availableLabels_[index.row()].getLabel(); + boost::shared_ptr<SecurityLabel> label = availableLabels_[index.row()].getLabel(); if (label && role == Qt::TextColorRole) { return P2QSTRING(label->getForegroundColor()); } |