Procházet zdrojové kódy

switching to using std::string instead of KString, as unicode wasnt being preserved properly

logicp před 4 roky
rodič
revize
2c7cdc37fa
3 změnil soubory, kde provedl 11 přidání a 13 odebrání
  1. 0 1
      include/client/client.hpp
  2. 0 1
      ky_gui.pro
  3. 11 11
      src/client.cpp

+ 0 - 1
include/client/client.hpp

@@ -14,7 +14,6 @@
 #include <QUuid>
 #include <QVector>
 #include <headers/util.hpp>
-#include <headers/kstring.hpp>
 #include <include/task/task.hpp>
 #include <string>
 #include <thread>

+ 0 - 1
ky_gui.pro

@@ -49,7 +49,6 @@ HEADERS += \
         include/task/instagram_task.hpp\
         headers/kmessage_codec.hpp \
         headers/instatask_generated.h \
-        headers/kstring.hpp \
         headers/util.hpp \
         headers/kiq_types.hpp \
         headers/rapidjson/writer.h \

+ 11 - 11
src/client.cpp

@@ -250,25 +250,25 @@ void Client::sendTaskEncoded(Scheduler::Task* task) {
             builder.CreateString(
 /*0*/           getTaskFileInfo(sent_files)),
             builder.CreateString(
-/*1*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("datetime"))}),
+/*1*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("datetime")).toUtf8().constData()}),
             builder.CreateString(
-/*2*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("description"))}),
+/*2*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("description")).toUtf8().constData()}),
             builder.CreateString(
-/*3*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("hashtags_string"))}),
+/*3*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("hashtags_string")).toUtf8().constData()}),
             builder.CreateString(
-/*4*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_string"))}),
+/*4*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_string")).toUtf8().constData()}),
             builder.CreateString(
-/*5*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_phrase"))}),
+/*5*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_phrase")).toUtf8().constData()}),
             builder.CreateString(
-/*6*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("promote_share"))}),
+/*6*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("promote_share")).toUtf8().constData()}),
             builder.CreateString(
-/*7*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("link_in_bio"))}),
-/*8*/                   std::get<Scheduler::VariantIndex::BOOLEAN>(task->getTaskArgument("is_video")),
-/*9*/                   getSelectedApp(),
+/*7*/           std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("link_in_bio")).toUtf8().constData()}),
+/*8*/           std::get<Scheduler::VariantIndex::BOOLEAN>(task->getTaskArgument("is_video")),
+/*9*/           getSelectedApp(),
             builder.CreateString(
-/*10*/          KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("header"))}),
+/*10*/          std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("header")).toUtf8().constData()}),
             builder.CreateString(
-/*11*/          KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("user"))}));
+/*11*/          std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("user")).toUtf8().constData()}));
     builder.Finish(ig_task);
 
     uint8_t* encoded_message_buffer = builder.GetBufferPointer();