Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Client/MemoryStorages.cpp4
-rw-r--r--Swiften/Elements/JingleContentPayload.h3
-rw-r--r--Swiften/Elements/JingleIBBTransportPayload.h5
-rw-r--r--Swiften/Elements/PubSubRetract.cpp2
-rw-r--r--Swiften/Elements/PubSubSubscribeOptions.cpp2
-rw-r--r--Swiften/Elements/StreamManagementEnabled.cpp4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardLineElement.h9
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardRectElement.h8
-rw-r--r--Swiften/FileTransfer/FileTransfer.cpp4
-rw-r--r--Swiften/Network/BOSHConnection.cpp1
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnection.cpp9
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnection.h3
12 files changed, 41 insertions, 13 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index 885d74f..850c1b2 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -20,6 +20,8 @@ MemoryStorages::MemoryStorages(CryptoProvider* crypto) {
rosterStorage = new RosterMemoryStorage();
#ifdef SWIFT_EXPERIMENTAL_HISTORY
historyStorage = new SQLiteHistoryStorage(":memory:");
+#else
+ historyStorage = NULL;
#endif
}
@@ -28,9 +30,7 @@ MemoryStorages::~MemoryStorages() {
delete avatarStorage;
delete capsStorage;
delete vcardStorage;
-#ifdef SWIFT_EXPERIMENTAL_HISTORY
delete historyStorage;
-#endif
}
VCardStorage* MemoryStorages::getVCardStorage() const {
diff --git a/Swiften/Elements/JingleContentPayload.h b/Swiften/Elements/JingleContentPayload.h
index 547fc70..ac62866 100644
--- a/Swiften/Elements/JingleContentPayload.h
+++ b/Swiften/Elements/JingleContentPayload.h
@@ -26,6 +26,9 @@ namespace Swift {
ResponderCreator
};
+ JingleContentPayload() : creator(UnknownCreator) {
+ }
+
/*enum Senders {
NoSenders,
InitiatorSender,
diff --git a/Swiften/Elements/JingleIBBTransportPayload.h b/Swiften/Elements/JingleIBBTransportPayload.h
index a329ff0..5704c00 100644
--- a/Swiften/Elements/JingleIBBTransportPayload.h
+++ b/Swiften/Elements/JingleIBBTransportPayload.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013 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.
*/
@@ -22,6 +22,9 @@ namespace Swift {
MessageStanza
};
+ JingleIBBTransportPayload() : stanzaType(IQStanza) {
+ }
+
void setStanzaType(StanzaType stanzaType) {
this->stanzaType = stanzaType;
}
diff --git a/Swiften/Elements/PubSubRetract.cpp b/Swiften/Elements/PubSubRetract.cpp
index 7e5b720..41b9346 100644
--- a/Swiften/Elements/PubSubRetract.cpp
+++ b/Swiften/Elements/PubSubRetract.cpp
@@ -8,7 +8,7 @@
using namespace Swift;
-PubSubRetract::PubSubRetract() {
+PubSubRetract::PubSubRetract() : notify(false) {
}
PubSubRetract::~PubSubRetract() {
diff --git a/Swiften/Elements/PubSubSubscribeOptions.cpp b/Swiften/Elements/PubSubSubscribeOptions.cpp
index 3423d02..19cf084 100644
--- a/Swiften/Elements/PubSubSubscribeOptions.cpp
+++ b/Swiften/Elements/PubSubSubscribeOptions.cpp
@@ -8,7 +8,7 @@
using namespace Swift;
-PubSubSubscribeOptions::PubSubSubscribeOptions() {
+PubSubSubscribeOptions::PubSubSubscribeOptions() : required(false) {
}
PubSubSubscribeOptions::~PubSubSubscribeOptions() {
diff --git a/Swiften/Elements/StreamManagementEnabled.cpp b/Swiften/Elements/StreamManagementEnabled.cpp
index bab7516..1f1a1f5 100644
--- a/Swiften/Elements/StreamManagementEnabled.cpp
+++ b/Swiften/Elements/StreamManagementEnabled.cpp
@@ -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.
*/
@@ -8,7 +8,7 @@
using namespace Swift;
-StreamManagementEnabled::StreamManagementEnabled() {
+StreamManagementEnabled::StreamManagementEnabled() : resumeSupported(false) {
}
StreamManagementEnabled::~StreamManagementEnabled() {
diff --git a/Swiften/Elements/Whiteboard/WhiteboardLineElement.h b/Swiften/Elements/Whiteboard/WhiteboardLineElement.h
index 3c63afc..df6e7d6 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardLineElement.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardLineElement.h
@@ -4,6 +4,13 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+
#pragma once
#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
@@ -14,7 +21,7 @@ namespace Swift {
public:
typedef boost::shared_ptr<WhiteboardLineElement> ref;
public:
- WhiteboardLineElement(int x1, int y1, int x2, int y2) {
+ WhiteboardLineElement(int x1, int y1, int x2, int y2) : penWidth_(1) {
x1_ = x1;
y1_ = y1;
x2_ = x2;
diff --git a/Swiften/Elements/Whiteboard/WhiteboardRectElement.h b/Swiften/Elements/Whiteboard/WhiteboardRectElement.h
index 233b3fa..0fd1338 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardRectElement.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardRectElement.h
@@ -4,6 +4,12 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
#pragma once
#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
@@ -14,7 +20,7 @@ namespace Swift {
public:
typedef boost::shared_ptr<WhiteboardRectElement> ref;
public:
- WhiteboardRectElement(int x, int y, int width, int height) {
+ WhiteboardRectElement(int x, int y, int width, int height) : penWidth_(1) {
x_ = x;
y_ = y;
width_ = width;
diff --git a/Swiften/FileTransfer/FileTransfer.cpp b/Swiften/FileTransfer/FileTransfer.cpp
index c11e8e4..912a78a 100644
--- a/Swiften/FileTransfer/FileTransfer.cpp
+++ b/Swiften/FileTransfer/FileTransfer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Remko Tronçon
+ * Copyright (c) 2013-2014 Remko Tronçon
* Licensed under the GNU General Public License.
* See the COPYING file for more information.
*/
@@ -8,7 +8,7 @@
using namespace Swift;
-FileTransfer::FileTransfer() {
+FileTransfer::FileTransfer() : fileSizeInBytes(0) {
}
FileTransfer::~FileTransfer() {
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index 83f12f7..bde689e 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -32,6 +32,7 @@ BOSHConnection::BOSHConnection(const URL& boshURL, Connector::ref connector, XML
parserFactory_(parserFactory),
sid_(),
waitingForStartResponse_(false),
+ rid_(~0ULL),
pending_(false),
connectionReady_(false)
{
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.cpp b/Swiften/Network/SOCKS5ProxiedConnection.cpp
index a9243d6..3fd8184 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.cpp
+++ b/Swiften/Network/SOCKS5ProxiedConnection.cpp
@@ -4,6 +4,12 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2014 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
#include <Swiften/Network/SOCKS5ProxiedConnection.h>
#include <iostream>
@@ -24,7 +30,8 @@ SOCKS5ProxiedConnection::SOCKS5ProxiedConnection(
TimerFactory* timerFactory,
const std::string& proxyHost,
int proxyPort) :
- ProxiedConnection(resolver, connectionFactory, timerFactory, proxyHost, proxyPort) {
+ ProxiedConnection(resolver, connectionFactory, timerFactory, proxyHost, proxyPort),
+ proxyState_(Initial) {
}
void SOCKS5ProxiedConnection::initializeProxy() {
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.h b/Swiften/Network/SOCKS5ProxiedConnection.h
index 7906879..2c93468 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.h
+++ b/Swiften/Network/SOCKS5ProxiedConnection.h
@@ -29,7 +29,8 @@ namespace Swift {
private:
enum {
- ProxyAuthenticating = 0,
+ Initial = 0,
+ ProxyAuthenticating,
ProxyConnecting
} proxyState_;
};