diff options
| author | Black Hat <bhat@encom.eu.org> | 2019-09-26 22:22:36 -0700 |
|---|---|---|
| committer | Black Hat <bhat@encom.eu.org> | 2019-09-26 22:22:36 -0700 |
| commit | 363cf452bcdbaf6ff1cf94a83ca66cbb31122346 (patch) | |
| tree | c64c8fda885e4e1785130e8ee3e7c47fd18cbf67 /lib/converters.cpp | |
| parent | 412e2cf19449e73aa7da729e9c5de6502687aade (diff) | |
| parent | 944653463fe4134c82d85e2d01e2bc0fa43fd727 (diff) | |
| download | libquotient-363cf452bcdbaf6ff1cf94a83ca66cbb31122346.tar.gz libquotient-363cf452bcdbaf6ff1cf94a83ca66cbb31122346.zip | |
Merge branch 'master' of https://github.com/quotient-im/libQuotient into
bhat-libqtolm-update
Diffstat (limited to 'lib/converters.cpp')
| -rw-r--r-- | lib/converters.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/converters.cpp b/lib/converters.cpp index 88f5267e..9f4b9360 100644 --- a/lib/converters.cpp +++ b/lib/converters.cpp @@ -1,26 +1,26 @@ /****************************************************************************** -* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net> -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* 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 -*/ + * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ #include "converters.h" #include <QtCore/QVariant> -using namespace QMatrixClient; +using namespace Quotient; QJsonValue JsonConverter<QVariant>::dump(const QVariant& v) { |