Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements

Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-11-23 08:50:41 -08:00
parent 9e6e83ff7f
commit 2da3ab42fd
21 changed files with 74 additions and 172 deletions
@@ -15,7 +15,6 @@
 #include <GraphCanvas/Editor/EditorTypes.h>
 #include <GraphCanvas/Types/EntitySaveData.h>
 #include <GraphCanvas/Types/GraphCanvasGraphSerialization.h>
-#include <GraphCanvas/Types/TranslationTypes.h>

 #include <GraphCanvas/Components/Slots/SlotBus.h>

@@ -11,7 +11,6 @@
 #include <AzCore/EBus/EBus.h>
 #include <AzCore/std/string/string.h>

-#include <GraphCanvas/Types/TranslationTypes.h>
 #include <GraphCanvas/Components/StyleBus.h>

 #include <GraphCanvas/Types/SceneMemberComponentSaveData.h>
@@ -16,7 +16,6 @@

 #include <GraphCanvas/Types/Endpoint.h>
 #include <GraphCanvas/Types/Types.h>
-#include <GraphCanvas/Types/TranslationTypes.h>

 class QGraphicsLayoutItem;

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <QCoreApplication>
-
-#include <AzCore/Serialization/SerializeContext.h>
-
-namespace GraphCanvas
-{
-    struct TranslationKeyedString
-    {
-    public:
-        AZ_TYPE_INFO(TranslationKeyedString, "{B796685C-0335-4E74-9EF8-A1933E8B2142}");
-        AZ_CLASS_ALLOCATOR(TranslationKeyedString, AZ::SystemAllocator, 0);
-
-        static void Reflect(AZ::ReflectContext* context)
-        {
-            AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-            if (!serializeContext)
-            {
-                return;
-            }
-
-            serializeContext->Class<TranslationKeyedString>()
-                ->Version(1)
-                ->Field("Fallback", &TranslationKeyedString::m_fallback)
-                ->Field("Context", &TranslationKeyedString::m_context)
-                ->Field("Key", &TranslationKeyedString::m_key)
-                ;
-        }
-
-        TranslationKeyedString()
-            : m_dirtyText(true)
-        {
-        }
-
-        ~TranslationKeyedString() = default;
-
-        TranslationKeyedString(const AZStd::string& fallback, const AZStd::string& context = AZStd::string(), const AZStd::string& key = AZStd::string())
-            : m_fallback(fallback)
-            , m_context(context)
-            , m_key(key)
-            , m_dirtyText(true)
-        {
-        }
-
-        const AZStd::string GetDisplayString() const
-        {
-            if (m_dirtyText)
-            {
-                const_cast<TranslationKeyedString*>(this)->TranslateString();
-            }
-
-            return m_display;
-        }
-
-        void TranslateString()
-        {
-            m_display = m_fallback;
-
-            if (!m_context.empty() && !m_key.empty())
-            {
-                AZStd::string translatedText = QCoreApplication::translate(m_context.c_str(), m_key.c_str()).toUtf8().data();
-
-                if (translatedText != m_key)
-                {
-                    m_display = translatedText;
-                }
-            }
-
-            m_dirtyText = false;
-        }
-
-        bool empty() const
-        {
-            return m_fallback.empty() && (m_context.empty() || m_key.empty());
-        }
-
-        bool operator==(const TranslationKeyedString& other) const
-        {
-            return m_fallback == other.m_fallback
-                && m_context == other.m_context
-                && m_key == other.m_key
-                ;
-        }
-
-        void Clear()
-        {
-            m_key.clear();
-            m_context.clear();
-            m_fallback.clear();
-        }
-
-        void SetFallback(const AZStd::string& fallback)
-        {
-            m_fallback = fallback;
-            m_dirtyText = true;
-        }
-        
-        AZStd::string m_context;
-        AZStd::string m_key;
-        AZStd::string m_display;
-
-    private:
-        AZStd::string m_fallback;
-
-        bool m_dirtyText;
-    };
-}