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/Elements
parent836925a5cdc7017da7fb84416c803e652b48e399 (diff)
downloadswift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.zip
swift-ca7a45a25c2fe332fad1ee3f7a2822415c249206.tar.bz2
Qt5 support & warning fixes.
Change-Id: I62c7d5ca44c915e36c797c798294b7c34b465514
Diffstat (limited to 'Swiften/Elements')
-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
6 files changed, 17 insertions, 17 deletions
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) { }