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