From 9e238e0768530bab6a91742db806a0214e5dcbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Thu, 26 Sep 2019 15:41:10 +0800 Subject: Tidy up code --- controller.cxx | 11 ++++++----- larva | 2 +- qrtclient | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/controller.cxx b/controller.cxx index c4b8ca3..df10b20 100644 --- a/controller.cxx +++ b/controller.cxx @@ -10,16 +10,17 @@ Controller::Controller(QObject* parent) : QObject{parent} { #ifdef ANDROID - QDir location{QStandardPaths::writableLocation - (QStandardPaths::AppDataLocation)}; + QDir location{QStandardPaths::writableLocation(QStandardPaths + ::AppDataLocation)}; QString path{location.absolutePath() % "/ca-certificates.crt"}; QFile file{"assets:/certs/ca-certificates.crt"}; file.copy(path); +#endif auto client = new RTClient::Client{"https://darapsa.co.id/rt" - , path.toLatin1().constData()}; -#else - auto client = new RTClient::Client{"https://darapsa.co.id/rt"}; +#ifdef ANDROID + , path.toLatin1().constData() #endif + }; client->moveToThread(&thread); connect(&thread, &QThread::finished, client, &QObject::deleteLater); diff --git a/larva b/larva index af814b7..c09d129 160000 --- a/larva +++ b/larva @@ -1 +1 @@ -Subproject commit af814b7312868cbfb54ebc994a7996c81d0f9670 +Subproject commit c09d129ea53dfc267a808dd15667453eb9177e57 diff --git a/qrtclient b/qrtclient index cb7242b..5cf0593 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit cb7242bea8ea6ecf0bdb45a2654e3d24d83eb593 +Subproject commit 5cf059304cbae2b0af4a2a8f5ea6196fc01b1588 -- cgit v1.2.3