Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7621959..a2d377d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,35 +13,36 @@
*.so
*.pdb
*.swp
*.nib
*.exe
*.dll
*.lib
*.exp
*.ilk
*.res
*.moc
*.patch
*~
_CL_*
*.manifest
moc_*
qrc_*
ui_*
config.py
checker
config.log
.sconf_temp
.sconsign.dblite
Swiften/Examples/TuneBot/TuneBot
Swift/QtUI/swift
Swift/QtUI/DefaultTheme.qrc
checker-report.xml
VERSION.*
cppcheck.log
/build
/.settings/
/nbproject/private/
3rdParty/LibMiniUPnPc/src/miniupnpc/miniupnpcstrings.h
*.sublime-workspace
/xmppbench
+/.metadata
diff --git a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
index 25d35ff..023f11a 100644
--- a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
@@ -64,81 +64,83 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action
case JinglePayload::ContentAccept:
return "content-accept";
case JinglePayload::ContentAdd:
return "content-add";
case JinglePayload::ContentModify:
return "content-modify";
case JinglePayload::ContentReject:
return "content-reject";
case JinglePayload::ContentRemove:
return "content-remove";
case JinglePayload::DescriptionInfo:
return "description-info";
case JinglePayload::SecurityInfo:
return "security-info";
case JinglePayload::SessionAccept:
return "session-accept";
case JinglePayload::SessionInfo:
return "session-info";
case JinglePayload::SessionInitiate:
return "session-initiate";
case JinglePayload::SessionTerminate:
return "session-terminate";
case JinglePayload::TransportAccept:
return "transport-accept";
case JinglePayload::TransportInfo:
return "transport-info";
case JinglePayload::TransportReject:
return "transport-reject";
case JinglePayload::TransportReplace:
return "transport-replace";
case JinglePayload::UnknownAction:
std::cerr << "Serializing unknown action value." << std::endl;
return "";
}
assert(false);
+ return "";
}
std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::Type type) const {
switch(type) {
case JinglePayload::Reason::UnknownType:
std::cerr << "Unknown jingle reason type!" << std::endl;
return "";
case JinglePayload::Reason::AlternativeSession:
return "alternative-session";
case JinglePayload::Reason::Busy:
return "busy";
case JinglePayload::Reason::Cancel:
return "cancel";
case JinglePayload::Reason::ConnectivityError:
return "connectivity-error";
case JinglePayload::Reason::Decline:
return "decline";
case JinglePayload::Reason::Expired:
return "expired";
case JinglePayload::Reason::FailedApplication:
return "failed-application";
case JinglePayload::Reason::FailedTransport:
return "failed-transport";
case JinglePayload::Reason::GeneralError:
return "general-error";
case JinglePayload::Reason::Gone:
return "gone";
case JinglePayload::Reason::IncompatibleParameters:
return "incompatible-parameters";
case JinglePayload::Reason::MediaError:
return "media-error";
case JinglePayload::Reason::SecurityError:
return "security-error";
case JinglePayload::Reason::Success:
return "success";
case JinglePayload::Reason::Timeout:
return "timeout";
case JinglePayload::Reason::UnsupportedApplications:
return "unsupported-applications";
case JinglePayload::Reason::UnsupportedTransports:
return "unsupported-transports";
}
assert(false);
+ return "";
}
}