Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 15 insertions, 16 deletions

diff --git a/lib/events/callanswerevent.cpp b/lib/events/callanswerevent.cpp
index d2862241..d6622b30 100644
--- a/lib/events/callanswerevent.cpp
+++ b/lib/events/callanswerevent.cpp
@@ -13,13 +13,12 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "callanswerevent.h"
 
 #include "event.h"
-
 #include "logging.h"
 
 #include <QtCore/QJsonDocument>
@@ -45,7 +44,7 @@ m.call.answer
 }
 */
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 CallAnswerEvent::CallAnswerEvent(const QJsonObject& obj)
     : CallEventBase(typeId(), obj)
@@ -55,18 +54,18 @@ CallAnswerEvent::CallAnswerEvent(const QJsonObject& obj)
 
 CallAnswerEvent::CallAnswerEvent(const QString& callId, const int lifetime,
                                  const QString& sdp)
-    : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                    { { QStringLiteral("lifetime"), lifetime }
-                    , { QStringLiteral("answer"), QJsonObject {
-                        { QStringLiteral("type"), QStringLiteral("answer") },
-                        { QStringLiteral("sdp"), sdp } } }
-                    })
-{ }
+    : CallEventBase(
+        typeId(), matrixTypeId(), callId, 0,
+        { { QStringLiteral("lifetime"), lifetime },
+          { QStringLiteral("answer"),
+            QJsonObject { { QStringLiteral("type"), QStringLiteral("answer") },
+                          { QStringLiteral("sdp"), sdp } } } })
+{}
 
 CallAnswerEvent::CallAnswerEvent(const QString& callId, const QString& sdp)
-    : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                    { { QStringLiteral("answer"), QJsonObject {
-                        { QStringLiteral("type"), QStringLiteral("answer") },
-                        { QStringLiteral("sdp"), sdp } } }
-                    })
-{ }
+    : CallEventBase(
+        typeId(), matrixTypeId(), callId, 0,
+        { { QStringLiteral("answer"),
+            QJsonObject { { QStringLiteral("type"), QStringLiteral("answer") },
+                          { QStringLiteral("sdp"), sdp } } } })
+{}