3 files changed, 13 insertions, 11 deletions
diff --git a/Swiften/Elements/PubSubItem.cpp b/Swiften/Elements/PubSubItem.cpp
index 4dc0907..b5f17cc 100644
--- a/Swiften/Elements/PubSubItem.cpp
+++ b/Swiften/Elements/PubSubItem.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
  * All rights reserved.
@@ -13,2 +13,5 @@ PubSubItem::PubSubItem() {
 
+PubSubItem::PubSubItem(const std::string& id) : id_(id) {
+}
+
 PubSubItem::~PubSubItem() {
diff --git a/Swiften/Elements/PubSubItem.h b/Swiften/Elements/PubSubItem.h
index ba13150..161b733 100644
--- a/Swiften/Elements/PubSubItem.h
+++ b/Swiften/Elements/PubSubItem.h
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2013-2017 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
  * All rights reserved.
@@ -20,2 +20,3 @@ namespace Swift {
             PubSubItem();
+            PubSubItem(const std::string& id);
 
@@ -24,3 +25,3 @@ namespace Swift {
             const std::vector< std::shared_ptr<Payload> >& getData() const {
-                return data;
+                return data_;
             }
@@ -28,3 +29,3 @@ namespace Swift {
             void setData(const std::vector< std::shared_ptr<Payload> >& value) {
-                this->data = value ;
+                this->data_ = value ;
             }
@@ -32,3 +33,3 @@ namespace Swift {
             void addData(std::shared_ptr<Payload> value) {
-                this->data.push_back(value);
+                this->data_.push_back(value);
             }
@@ -36,3 +37,3 @@ namespace Swift {
             const std::string& getID() const {
-                return id;
+                return id_;
             }
@@ -40,9 +41,8 @@ namespace Swift {
             void setID(const std::string& value) {
-                this->id = value ;
+                this->id_ = value ;
             }
 
-
         private:
-            std::vector< std::shared_ptr<Payload> > data;
-            std::string id;
+            std::vector< std::shared_ptr<Payload> > data_;
+            std::string id_;
     };
diff --git a/Swiften/Elements/PubSubItems.h b/Swiften/Elements/PubSubItems.h
index c60adca..c8b7f53 100644
--- a/Swiften/Elements/PubSubItems.h
+++ b/Swiften/Elements/PubSubItems.h
@@ -63,3 +63,2 @@ namespace Swift {
 
-
         private: