refs #314, renamed convertFromQVariant, convertFromJson

discussion: https://dev.vatsim-germany.org/issues/314#note-19
2026-04-02 06:35:52 +08:00 · 2014-08-24 02:32:44 +02:00
parent f3b68afab5
commit 40b428a315
117 changed files with 324 additions and 324 deletions
--- a/src/blackmisc/audiodevice.cpp
+++ b/src/blackmisc/audiodevice.cpp
@@ -145,7 +145,7 @@ namespace BlackMisc
        /*
         * From Json
         */
-        void CAudioDevice::fromJson(const QJsonObject &json)
+        void CAudioDevice::convertFromJson(const QJsonObject &json)
        {
            BlackMisc::deserializeJson(json, CAudioDevice::jsonMembers(), TupleConverter<CAudioDevice>::toTuple(*this));
        }