summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-03-04 13:23:10 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-03-04 16:03:53 (GMT)
commitca7a45a25c2fe332fad1ee3f7a2822415c249206 (patch)
tree268c6d37f087935a307061f9d5ef507ddd5162cf /Swiften
parent836925a5cdc7017da7fb84416c803e652b48e399 (diff)
downloadswift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.zip
swift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.tar.bz2
Qt5 support & warning fixes.
Change-Id: I62c7d5ca44c915e36c797c798294b7c34b465514
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Base/Error.h2
-rw-r--r--Swiften/Base/SafeAllocator.h2
-rw-r--r--Swiften/Base/String.h2
-rw-r--r--Swiften/Client/BlockList.h2
-rw-r--r--Swiften/Client/ClientSession.h2
-rw-r--r--Swiften/Component/ComponentConnector.cpp2
-rw-r--r--Swiften/Component/ComponentConnector.h2
-rw-r--r--Swiften/Component/ComponentError.h2
-rw-r--r--Swiften/Component/ComponentSession.h2
-rw-r--r--Swiften/Elements/FormField.h20
-rw-r--r--Swiften/Elements/IBB.h4
-rw-r--r--Swiften/Elements/JingleContentPayload.h2
-rw-r--r--Swiften/Elements/JingleIBBTransportPayload.h2
-rw-r--r--Swiften/Elements/JingleS5BTransportPayload.h4
-rw-r--r--Swiften/Elements/StreamError.h2
-rw-r--r--Swiften/FileTransfer/FileTransfer.h2
-rw-r--r--Swiften/FileTransfer/FileTransferError.h2
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamClientSession.h2
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServerSession.h2
-rw-r--r--Swiften/IDN/StringPrep.cpp2
-rw-r--r--Swiften/IDN/StringPrep.h2
-rw-r--r--Swiften/Network/ChainedConnector.h2
-rw-r--r--Swiften/Network/Connector.cpp2
-rw-r--r--Swiften/Network/Connector.h2
-rw-r--r--Swiften/Network/NATPortMapping.h2
-rw-r--r--Swiften/Network/NATTraversalRemovePortForwardingRequest.h2
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnection.h2
-rw-r--r--Swiften/Parser/PayloadParsers/BytestreamsParser.h2
-rw-r--r--Swiften/Parser/PayloadParsers/IBBParser.h2
-rw-r--r--Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h2
-rw-r--r--Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h2
-rw-r--r--Swiften/Parser/PayloadParsers/JingleParser.h2
-rw-r--r--Swiften/Parser/PayloadParsers/SearchPayloadParser.h2
-rw-r--r--Swiften/Parser/PayloadParsers/StreamInitiationParser.h2
-rw-r--r--Swiften/SASL/DIGESTMD5ClientAuthenticator.h2
-rw-r--r--Swiften/Session/BOSHSessionStream.cpp2
-rw-r--r--Swiften/Session/BasicSessionStream.cpp2
-rw-r--r--Swiften/Session/SessionStream.cpp2
-rw-r--r--Swiften/StringCodecs/HMAC.h2
39 files changed, 50 insertions, 50 deletions
diff --git a/Swiften/Base/Error.h b/Swiften/Base/Error.h
index 906c1d9..d9f3b91 100644
--- a/Swiften/Base/Error.h
+++ b/Swiften/Base/Error.h
@@ -13,4 +13,4 @@ namespace Swift {
public:
virtual ~Error();
};
-};
+}
diff --git a/Swiften/Base/SafeAllocator.h b/Swiften/Base/SafeAllocator.h
index 9f9dd42..f59119e 100644
--- a/Swiften/Base/SafeAllocator.h
+++ b/Swiften/Base/SafeAllocator.h
@@ -27,4 +27,4 @@ namespace Swift {
std::allocator<T>::deallocate(p, num);
}
};
-};
+}
diff --git a/Swiften/Base/String.h b/Swiften/Base/String.h
index de181a1..5ce6c3d 100644
--- a/Swiften/Base/String.h
+++ b/Swiften/Base/String.h
@@ -32,7 +32,7 @@ namespace Swift {
std::string convertIntToHexString(int h);
int convertHexStringToInt(const std::string& s);
- };
+ }
class SWIFTEN_API makeString {
public:
diff --git a/Swiften/Client/BlockList.h b/Swiften/Client/BlockList.h
index 39a211d..d8cff60 100644
--- a/Swiften/Client/BlockList.h
+++ b/Swiften/Client/BlockList.h
@@ -17,7 +17,7 @@ namespace Swift {
enum State {
Requesting,
Available,
- Error,
+ Error
};
virtual ~BlockList();
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 2553546..c17ec9b 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.h
@@ -53,7 +53,7 @@ namespace Swift {
SessionStartError,
TLSClientCertificateError,
TLSError,
- StreamError,
+ StreamError
} type;
Error(Type type) : type(type) {}
};
diff --git a/Swiften/Component/ComponentConnector.cpp b/Swiften/Component/ComponentConnector.cpp
index b7bdd34..0dd8e82 100644
--- a/Swiften/Component/ComponentConnector.cpp
+++ b/Swiften/Component/ComponentConnector.cpp
@@ -104,4 +104,4 @@ void ComponentConnector::handleTimeout() {
finish(boost::shared_ptr<Connection>());
}
-};
+}
diff --git a/Swiften/Component/ComponentConnector.h b/Swiften/Component/ComponentConnector.h
index 549457b..0e35ab2 100644
--- a/Swiften/Component/ComponentConnector.h
+++ b/Swiften/Component/ComponentConnector.h
@@ -62,4 +62,4 @@ namespace Swift {
std::deque<HostAddress> addressQueryResults;
boost::shared_ptr<Connection> currentConnection;
};
-};
+}
diff --git a/Swiften/Component/ComponentError.h b/Swiften/Component/ComponentError.h
index 928af2a..9c54b53 100644
--- a/Swiften/Component/ComponentError.h
+++ b/Swiften/Component/ComponentError.h
@@ -16,7 +16,7 @@ namespace Swift {
ConnectionWriteError,
XMLError,
AuthenticationFailedError,
- UnexpectedElementError,
+ UnexpectedElementError
};
ComponentError(Type type = UnknownError) : type_(type) {}
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h
index 073c3f4..bc1ea5f 100644
--- a/Swiften/Component/ComponentSession.h
+++ b/Swiften/Component/ComponentSession.h
@@ -35,7 +35,7 @@ namespace Swift {
struct Error : public Swift::Error {
enum Type {
AuthenticationFailedError,
- UnexpectedElementError,
+ UnexpectedElementError
} type;
Error(Type type) : type(type) {}
};
diff --git a/Swiften/Elements/FormField.h b/Swiften/Elements/FormField.h
index e8fe3a0..fbd1ebe 100644
--- a/Swiften/Elements/FormField.h
+++ b/Swiften/Elements/FormField.h
@@ -101,14 +101,14 @@ namespace Swift {
name##FormField() : GenericFormField< valueType >() {} \
};
- SWIFTEN_DECLARE_FORM_FIELD(Boolean, bool);
- SWIFTEN_DECLARE_FORM_FIELD(Fixed, std::string);
- SWIFTEN_DECLARE_FORM_FIELD(Hidden, std::string);
- SWIFTEN_DECLARE_FORM_FIELD(ListSingle, std::string);
- SWIFTEN_DECLARE_FORM_FIELD(TextMulti, std::string);
- SWIFTEN_DECLARE_FORM_FIELD(TextPrivate, std::string);
- SWIFTEN_DECLARE_FORM_FIELD(TextSingle, std::string);
- SWIFTEN_DECLARE_FORM_FIELD(JIDSingle, JID);
- SWIFTEN_DECLARE_FORM_FIELD(JIDMulti, std::vector<JID>);
- SWIFTEN_DECLARE_FORM_FIELD(ListMulti, std::vector<std::string>);
+ SWIFTEN_DECLARE_FORM_FIELD(Boolean, bool)
+ SWIFTEN_DECLARE_FORM_FIELD(Fixed, std::string)
+ SWIFTEN_DECLARE_FORM_FIELD(Hidden, std::string)
+ SWIFTEN_DECLARE_FORM_FIELD(ListSingle, std::string)
+ SWIFTEN_DECLARE_FORM_FIELD(TextMulti, std::string)
+ SWIFTEN_DECLARE_FORM_FIELD(TextPrivate, std::string)
+ SWIFTEN_DECLARE_FORM_FIELD(TextSingle, std::string)
+ SWIFTEN_DECLARE_FORM_FIELD(JIDSingle, JID)
+ SWIFTEN_DECLARE_FORM_FIELD(JIDMulti, std::vector<JID>)
+ SWIFTEN_DECLARE_FORM_FIELD(ListMulti, std::vector<std::string>)
}
diff --git a/Swiften/Elements/IBB.h b/Swiften/Elements/IBB.h
index 64c9f14..fb33eaf 100644
--- a/Swiften/Elements/IBB.h
+++ b/Swiften/Elements/IBB.h
@@ -21,11 +21,11 @@ namespace Swift {
enum Action {
Open,
Close,
- Data,
+ Data
};
enum StanzaType {
IQStanza,
- MessageStanza,
+ MessageStanza
};
IBB(Action action = Open, const std::string& streamID = "") : action(action), streamID(streamID), stanzaType(IQStanza), blockSize(-1), sequenceNumber(-1) {
diff --git a/Swiften/Elements/JingleContentPayload.h b/Swiften/Elements/JingleContentPayload.h
index 183b8eb..547fc70 100644
--- a/Swiften/Elements/JingleContentPayload.h
+++ b/Swiften/Elements/JingleContentPayload.h
@@ -23,7 +23,7 @@ namespace Swift {
enum Creator {
UnknownCreator,
InitiatorCreator,
- ResponderCreator,
+ ResponderCreator
};
/*enum Senders {
diff --git a/Swiften/Elements/JingleIBBTransportPayload.h b/Swiften/Elements/JingleIBBTransportPayload.h
index 7633f6b..3124f35 100644
--- a/Swiften/Elements/JingleIBBTransportPayload.h
+++ b/Swiften/Elements/JingleIBBTransportPayload.h
@@ -18,7 +18,7 @@ namespace Swift {
enum StanzaType {
IQStanza,
- MessageStanza,
+ MessageStanza
};
void setStanzaType(StanzaType stanzaType) {
diff --git a/Swiften/Elements/JingleS5BTransportPayload.h b/Swiften/Elements/JingleS5BTransportPayload.h
index 995933c..41bf809 100644
--- a/Swiften/Elements/JingleS5BTransportPayload.h
+++ b/Swiften/Elements/JingleS5BTransportPayload.h
@@ -20,7 +20,7 @@ namespace Swift {
public:
enum Mode {
TCPMode, // default case
- UDPMode,
+ UDPMode
};
struct Candidate {
@@ -28,7 +28,7 @@ namespace Swift {
DirectType, // default case
AssistedType,
TunnelType,
- ProxyType,
+ ProxyType
};
Candidate() : priority(0), type(DirectType) {}
diff --git a/Swiften/Elements/StreamError.h b/Swiften/Elements/StreamError.h
index 0d0551c..a58d3ae 100644
--- a/Swiften/Elements/StreamError.h
+++ b/Swiften/Elements/StreamError.h
@@ -41,7 +41,7 @@ namespace Swift {
UndefinedCondition,
UnsupportedEncoding,
UnsupportedStanzaType,
- UnsupportedVersion,
+ UnsupportedVersion
};
StreamError(Type type = UndefinedCondition, const std::string& text = std::string()) : type_(type), text_(text) { }
diff --git a/Swiften/FileTransfer/FileTransfer.h b/Swiften/FileTransfer/FileTransfer.h
index 01c9449..29b4ebf 100644
--- a/Swiften/FileTransfer/FileTransfer.h
+++ b/Swiften/FileTransfer/FileTransfer.h
@@ -25,7 +25,7 @@ public:
Negotiating,
Transferring,
WaitingForStart,
- WaitingForAccept,
+ WaitingForAccept
};
FTState state;
diff --git a/Swiften/FileTransfer/FileTransferError.h b/Swiften/FileTransfer/FileTransferError.h
index 6a6b454..eb1e8f8 100644
--- a/Swiften/FileTransfer/FileTransferError.h
+++ b/Swiften/FileTransfer/FileTransferError.h
@@ -13,7 +13,7 @@ namespace Swift {
UnknownError,
PeerError,
ReadError,
- ClosedError,
+ ClosedError
};
FileTransferError(Type type = UnknownError) : type(type) {}
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
index a832796..61d0c0e 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
@@ -38,7 +38,7 @@ public:
Ready,
Writing,
Reading,
- Finished,
+ Finished
};
public:
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h
index 60a404b..7e13ddd 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h
@@ -30,7 +30,7 @@ namespace Swift {
ReadyForTransfer,
ReadingData,
WritingData,
- Finished,
+ Finished
};
SOCKS5BytestreamServerSession(boost::shared_ptr<Connection> connection, SOCKS5BytestreamRegistry* registry);
diff --git a/Swiften/IDN/StringPrep.cpp b/Swiften/IDN/StringPrep.cpp
index 3ab7088..a0d067e 100644
--- a/Swiften/IDN/StringPrep.cpp
+++ b/Swiften/IDN/StringPrep.cpp
@@ -14,7 +14,7 @@
#elif defined(HAVE_LIBIDN)
extern "C" {
#include <stringprep.h>
-};
+}
#endif
#include <vector>
diff --git a/Swiften/IDN/StringPrep.h b/Swiften/IDN/StringPrep.h
index 688600c..35c4593 100644
--- a/Swiften/IDN/StringPrep.h
+++ b/Swiften/IDN/StringPrep.h
@@ -17,7 +17,7 @@ namespace Swift {
NamePrep,
XMPPNodePrep,
XMPPResourcePrep,
- SASLPrep,
+ SASLPrep
};
static std::string getPrepared(const std::string& s, Profile profile);
diff --git a/Swiften/Network/ChainedConnector.h b/Swiften/Network/ChainedConnector.h
index 4110522..03462bc 100644
--- a/Swiften/Network/ChainedConnector.h
+++ b/Swiften/Network/ChainedConnector.h
@@ -49,4 +49,4 @@ namespace Swift {
boost::shared_ptr<Connector> currentConnector;
boost::shared_ptr<Error> lastError;
};
-};
+}
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index 5ab3b92..a0155cf 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -183,4 +183,4 @@ void Connector::handleTimeout() {
handleConnectionConnectFinished(true);
}
-};
+}
diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h
index 26a98b8..49ac271 100644
--- a/Swiften/Network/Connector.h
+++ b/Swiften/Network/Connector.h
@@ -71,4 +71,4 @@ namespace Swift {
boost::shared_ptr<Connection> currentConnection;
bool foundSomeDNS;
};
-};
+}
diff --git a/Swiften/Network/NATPortMapping.h b/Swiften/Network/NATPortMapping.h
index db14500..a7982d6 100644
--- a/Swiften/Network/NATPortMapping.h
+++ b/Swiften/Network/NATPortMapping.h
@@ -13,7 +13,7 @@ namespace Swift {
public:
enum Protocol {
TCP,
- UDP,
+ UDP
};
NATPortMapping(int localPort, int publicPort, Protocol protocol = TCP, int leaseInSeconds = 60 * 60 * 24) : publicPort(publicPort), localPort(localPort), protocol(protocol), leaseInSeconds(leaseInSeconds) {
diff --git a/Swiften/Network/NATTraversalRemovePortForwardingRequest.h b/Swiften/Network/NATTraversalRemovePortForwardingRequest.h
index cf349b1..c82ae03 100644
--- a/Swiften/Network/NATTraversalRemovePortForwardingRequest.h
+++ b/Swiften/Network/NATTraversalRemovePortForwardingRequest.h
@@ -15,7 +15,7 @@ namespace Swift {
struct PortMapping {
enum Protocol {
TCP,
- UDP,
+ UDP
};
unsigned int publicPort;
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.h b/Swiften/Network/SOCKS5ProxiedConnection.h
index 61092e0..7906879 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.h
+++ b/Swiften/Network/SOCKS5ProxiedConnection.h
@@ -30,7 +30,7 @@ namespace Swift {
private:
enum {
ProxyAuthenticating = 0,
- ProxyConnecting,
+ ProxyConnecting
} proxyState_;
};
}
diff --git a/Swiften/Parser/PayloadParsers/BytestreamsParser.h b/Swiften/Parser/PayloadParsers/BytestreamsParser.h
index 4785913..5c151c2 100644
--- a/Swiften/Parser/PayloadParsers/BytestreamsParser.h
+++ b/Swiften/Parser/PayloadParsers/BytestreamsParser.h
@@ -24,7 +24,7 @@ namespace Swift {
private:
enum Level {
TopLevel = 0,
- PayloadLevel = 1,
+ PayloadLevel = 1
};
int level;
};
diff --git a/Swiften/Parser/PayloadParsers/IBBParser.h b/Swiften/Parser/PayloadParsers/IBBParser.h
index d899475..59011b4 100644
--- a/Swiften/Parser/PayloadParsers/IBBParser.h
+++ b/Swiften/Parser/PayloadParsers/IBBParser.h
@@ -23,7 +23,7 @@ namespace Swift {
private:
enum Level {
- TopLevel = 0,
+ TopLevel = 0
};
int level;
std::string currentText;
diff --git a/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h b/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h
index ae8d36c..1f85c85 100644
--- a/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h
@@ -27,7 +27,7 @@ namespace Swift {
private:
enum Level {
TopLevel = 0,
- PayloadLevel = 1,
+ PayloadLevel = 1
};
int level;
FormParserFactory* formParserFactory;
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h b/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h
index 93560c6..7ea22b4 100644
--- a/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h
@@ -26,7 +26,7 @@ class JingleFileTransferDescriptionParser : public GenericPayloadParser<JingleFi
enum CurrentParseElement {
UnknownElement,
RequestElement,
- OfferElement,
+ OfferElement
};
PayloadParserFactoryCollection* factories;
diff --git a/Swiften/Parser/PayloadParsers/JingleParser.h b/Swiften/Parser/PayloadParsers/JingleParser.h
index 188ead9..c7bd58c 100644
--- a/Swiften/Parser/PayloadParsers/JingleParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleParser.h
@@ -29,5 +29,5 @@ class JingleParser : public GenericPayloadParser<JinglePayload> {
boost::shared_ptr<PayloadParser> currentPayloadParser;
};
-};
+}
diff --git a/Swiften/Parser/PayloadParsers/SearchPayloadParser.h b/Swiften/Parser/PayloadParsers/SearchPayloadParser.h
index 006e0d9..d456eb8 100644
--- a/Swiften/Parser/PayloadParsers/SearchPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/SearchPayloadParser.h
@@ -28,7 +28,7 @@ namespace Swift {
enum Level {
TopLevel = 0,
PayloadLevel = 1,
- ItemLevel = 2,
+ ItemLevel = 2
};
int level;
FormParserFactory* formParserFactory;
diff --git a/Swiften/Parser/PayloadParsers/StreamInitiationParser.h b/Swiften/Parser/PayloadParsers/StreamInitiationParser.h
index c2ffd07..f7350cd 100644
--- a/Swiften/Parser/PayloadParsers/StreamInitiationParser.h
+++ b/Swiften/Parser/PayloadParsers/StreamInitiationParser.h
@@ -29,7 +29,7 @@ namespace Swift {
TopLevel = 0,
PayloadLevel = 1,
FileOrFeatureLevel = 2,
- FormOrDescriptionLevel = 3,
+ FormOrDescriptionLevel = 3
};
int level;
FormParserFactory* formParserFactory;
diff --git a/Swiften/SASL/DIGESTMD5ClientAuthenticator.h b/Swiften/SASL/DIGESTMD5ClientAuthenticator.h
index 01cdde9..813ded2 100644
--- a/Swiften/SASL/DIGESTMD5ClientAuthenticator.h
+++ b/Swiften/SASL/DIGESTMD5ClientAuthenticator.h
@@ -28,7 +28,7 @@ namespace Swift {
enum Step {
Initial,
Response,
- Final,
+ Final
} step;
std::string host;
std::string cnonce;
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp
index 5dfff3c..62261d0 100644
--- a/Swiften/Session/BOSHSessionStream.cpp
+++ b/Swiften/Session/BOSHSessionStream.cpp
@@ -212,4 +212,4 @@ void BOSHSessionStream::handlePoolBOSHDataWritten(const SafeByteArray& data) {
onDataWritten(data);
}
-};
+}
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index cd6d0e6..2bd8d66 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -207,4 +207,4 @@ void BasicSessionStream::handleDataWritten(const SafeByteArray& data) {
onDataWritten(data);
}
-};
+}
diff --git a/Swiften/Session/SessionStream.cpp b/Swiften/Session/SessionStream.cpp
index 0d73b63..7378680 100644
--- a/Swiften/Session/SessionStream.cpp
+++ b/Swiften/Session/SessionStream.cpp
@@ -11,4 +11,4 @@ namespace Swift {
SessionStream::~SessionStream() {
}
-};
+}
diff --git a/Swiften/StringCodecs/HMAC.h b/Swiften/StringCodecs/HMAC.h
index 72d3bab..8b02d88 100644
--- a/Swiften/StringCodecs/HMAC.h
+++ b/Swiften/StringCodecs/HMAC.h
@@ -49,7 +49,7 @@ namespace Swift {
return hash(y);
}
- };
+ }
template<typename Hash, int BlockSize>
class HMAC {