aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2019-08-11 09:31:59 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2019-08-11 09:31:59 +0900
commit0c425aedbf3729941e40b1606a7c54169b84cf97 (patch)
tree51e1ac123daf96135c85d6daae79762e8468cb86
parent01570f70926c716441cdb62928231a35af72ebc3 (diff)
downloadlibquotient-0c425aedbf3729941e40b1606a7c54169b84cf97.tar.gz
libquotient-0c425aedbf3729941e40b1606a7c54169b84cf97.zip
Cleanup
[skip ci]
-rw-r--r--.appveyor.yml2
-rw-r--r--lib/events/accountdataevents.h2
-rw-r--r--lib/events/encryptedevent.cpp2
-rw-r--r--lib/events/encryptionevent.cpp2
-rw-r--r--lib/events/reactionevent.cpp2
-rw-r--r--lib/networksettings.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index f596b856..76f6b70f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ environment:
init:
- call "%QTDIR%\bin\qtenv2.bat"
- set PATH=C:\Qt\Tools\QtCreator\bin;%PATH%
-- call "%VCVARS%" %platform%
+- call "%VCVARS%" %PLATFORM%
- cd /D "%APPVEYOR_BUILD_FOLDER%"
before_build:
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index 600fa5be..68392a32 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -48,7 +48,7 @@ struct JsonObjectConverter<TagRecord> {
static void fillFrom(const QJsonObject& jo, TagRecord& rec)
{
// Parse a float both from JSON double and JSON string because
- // libqmatrixclient previously used to use strings to store order.
+ // the library previously used to use strings to store order.
const auto orderJv = jo.value("order"_ls);
if (orderJv.isDouble())
rec.order = fromJson<float>(orderJv);
diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp
index dac245fa..b5cedc69 100644
--- a/lib/events/encryptedevent.cpp
+++ b/lib/events/encryptedevent.cpp
@@ -2,7 +2,7 @@
#include "room.h"
-using namespace QMatrixClient;
+using namespace Quotient;
using namespace QtOlm;
EncryptedEvent::EncryptedEvent(const QJsonObject& ciphertext,
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index 945e6696..073303b0 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -30,7 +30,7 @@ struct JsonConverter<EncryptionType> {
return EncryptionType::Undefined;
}
};
-} // namespace QMatrixClient
+} // namespace Quotient
using namespace Quotient;
diff --git a/lib/events/reactionevent.cpp b/lib/events/reactionevent.cpp
index df8910fe..003c8ead 100644
--- a/lib/events/reactionevent.cpp
+++ b/lib/events/reactionevent.cpp
@@ -18,7 +18,7 @@
#include "reactionevent.h"
-using namespace QMatrixClient;
+using namespace Quotient;
void JsonObjectConverter<EventRelation>::dumpTo(
QJsonObject& jo, const EventRelation& pod)
diff --git a/lib/networksettings.h b/lib/networksettings.h
index a82a44d0..a6a13f93 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -40,4 +40,4 @@ public:
Q_INVOKABLE void setupApplicationProxy() const;
};
-} // namespace QMatrixClient
+} // namespace Quotient