Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Elements
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-01-18 18:33:52 (GMT)
committerSwift Review <review@swift.im>2014-02-13 10:56:56 (GMT)
commitba0a79a6fa68f2757795e96a22ff310ebe41a715 (patch)
tree905b4645ce2141c2b63dc574cb3a9ac751fe0e63 /Swiften/Elements
parentf44ea24fda0f08195180215a30bc626d7c1907c5 (diff)
downloadswift-ba0a79a6fa68f2757795e96a22ff310ebe41a715.zip
swift-ba0a79a6fa68f2757795e96a22ff310ebe41a715.tar.bz2
Fix clang warnings
Change-Id: I7cd26f00f626b64da934e9f5594db393d6184b9c
Diffstat (limited to 'Swiften/Elements')
-rw-r--r--Swiften/Elements/Element.h4
-rw-r--r--Swiften/Elements/JinglePayload.h4
-rw-r--r--Swiften/Elements/Payload.h6
-rw-r--r--Swiften/Elements/Presence.h4
-rw-r--r--Swiften/Elements/Stanza.h1
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h3
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h3
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardOperation.h3
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h3
9 files changed, 17 insertions, 14 deletions
diff --git a/Swiften/Elements/Element.h b/Swiften/Elements/Element.h
index 638418d..14539c1 100644
--- a/Swiften/Elements/Element.h
+++ b/Swiften/Elements/Element.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -11,6 +11,8 @@
namespace Swift {
class SWIFTEN_API Element {
public:
+ Element() {}
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Element)
virtual ~Element();
};
}
diff --git a/Swiften/Elements/JinglePayload.h b/Swiften/Elements/JinglePayload.h
index 5f12e90..7d7160b 100644
--- a/Swiften/Elements/JinglePayload.h
+++ b/Swiften/Elements/JinglePayload.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Remko Tronçon
+ * Copyright (c) 2011-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -11,6 +11,7 @@
#include <boost/optional.hpp>
#include <string>
+#include <Swiften/Base/API.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Elements/Payload.h>
#include <Swiften/Elements/JingleContentPayload.h>
@@ -42,7 +43,6 @@ namespace Swift {
};
Reason() : type(UnknownType), text("") {}
Reason(Type type, const std::string& text = "") : type(type), text(text) {}
- ~Reason() {}
Type type;
std::string text;
};
diff --git a/Swiften/Elements/Payload.h b/Swiften/Elements/Payload.h
index 15a72d5..1459837 100644
--- a/Swiften/Elements/Payload.h
+++ b/Swiften/Elements/Payload.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -15,6 +15,10 @@ namespace Swift {
public:
typedef boost::shared_ptr<Payload> ref;
public:
+ Payload() {}
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Payload)
virtual ~Payload();
+
+ SWIFTEN_DEFAULT_COPY_ASSIGMNENT_OPERATOR(Payload)
};
}
diff --git a/Swiften/Elements/Presence.h b/Swiften/Elements/Presence.h
index 2e9e224..d16be2a 100644
--- a/Swiften/Elements/Presence.h
+++ b/Swiften/Elements/Presence.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -12,6 +12,7 @@
#include <Swiften/Elements/Stanza.h>
#include <Swiften/Elements/StatusShow.h>
+
namespace Swift {
class SWIFTEN_API Presence : public Stanza {
public:
@@ -21,6 +22,7 @@ namespace Swift {
Presence();
Presence(const std::string& status);
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Presence)
virtual ~Presence();
static ref create() {
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h
index bd0d7e9..f1c9e00 100644
--- a/Swiften/Elements/Stanza.h
+++ b/Swiften/Elements/Stanza.h
@@ -25,6 +25,7 @@ namespace Swift {
Stanza();
virtual ~Stanza();
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Stanza)
template<typename T>
boost::shared_ptr<T> getPayload() const {
diff --git a/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h b/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
index 091ee30..95015c9 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
@@ -15,9 +15,6 @@ namespace Swift {
public:
typedef boost::shared_ptr<WhiteboardDeleteOperation> ref;
public:
- ~WhiteboardDeleteOperation() {
- }
-
std::string getElementID() const {
return elementID_;
}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h b/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
index 8c20044..fd52405 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
@@ -15,9 +15,6 @@ namespace Swift {
public:
typedef boost::shared_ptr<WhiteboardInsertOperation> ref;
public:
- ~WhiteboardInsertOperation() {
- }
-
WhiteboardElement::ref getElement() const {
return element_;
}
diff --git a/Swiften/Elements/Whiteboard/WhiteboardOperation.h b/Swiften/Elements/Whiteboard/WhiteboardOperation.h
index 75f6e6a..497d551 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardOperation.h
@@ -6,6 +6,7 @@
#pragma once
+#include <Swiften/Base/API.h>
#include <boost/smart_ptr/shared_ptr.hpp>
#include <string>
@@ -14,6 +15,8 @@ namespace Swift {
public:
typedef boost::shared_ptr<WhiteboardOperation> ref;
public:
+ WhiteboardOperation() {}
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(WhiteboardOperation)
virtual ~WhiteboardOperation(){}
std::string getID() const {
diff --git a/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h b/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
index a52a341..a68cc7d 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
@@ -15,9 +15,6 @@ namespace Swift {
public:
typedef boost::shared_ptr<WhiteboardUpdateOperation> ref;
public:
- ~WhiteboardUpdateOperation() {
- }
-
WhiteboardElement::ref getElement() const {
return element_;
}