Changeset 79516 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 4, 2019 8:40:43 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131799

Message:

FE/Qt: bugref:6143. Some refactoring

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -116 +116 @@
 public:
 
-    void setName(const QString &strName)
-    {
-        m_strName = strName;
-    }
-
-    const QString &name() const
-    {
-        return m_strName;
-    }
+    void setName(const QString &strName);
+    const QString &name() const;
+
+    void setFileName(const QString &strName);
+    const QString &fileName() const;
+
+    void setUid(const QUuid &uid);
+    const QUuid &uid() const;
+
+    const QVector<UISoftKeyboardRow> &rows() const;
+    QVector<UISoftKeyboardRow> &rows();
+
+private:
 
     QString  m_strFileName;
     QUuid    m_uId;
-
-    const QVector<UISoftKeyboardRow> &rows() const
-    {
-        return m_rows;
-    }
-
-    QVector<UISoftKeyboardRow> &rows()
-    {
-        return m_rows;
-    }
-
-private:
-
     QString  m_strName;
     QVector<UISoftKeyboardRow>  m_rows;
@@ -726 +717 @@
 };
 
+
+/*********************************************************************************************************************************
+*   UISoftKeyboardPhysicalLayout implementation.                                                                                 *
+*********************************************************************************************************************************/
+
+void UISoftKeyboardPhysicalLayout::setName(const QString &strName)
+{
+    m_strName = strName;
+}
+
+const QString &UISoftKeyboardPhysicalLayout::name() const
+{
+    return m_strName;
+}
+
+void UISoftKeyboardPhysicalLayout::setFileName(const QString &strName)
+{
+    m_strFileName = strName;
+}
+
+const QString &UISoftKeyboardPhysicalLayout::fileName() const
+{
+    return m_strFileName;
+}
+
+void UISoftKeyboardPhysicalLayout::setUid(const QUuid &uid)
+{
+    m_uId = uid;
+}
+
+const QUuid &UISoftKeyboardPhysicalLayout::uid() const
+{
+    return m_uId;
+}
+
+const QVector<UISoftKeyboardRow> &UISoftKeyboardPhysicalLayout::rows() const
+{
+    return m_rows;
+}
+
+QVector<UISoftKeyboardRow> &UISoftKeyboardPhysicalLayout::rows()
+{
+    return m_rows;
+}
 
 /*********************************************************************************************************************************
@@ -780 +815 @@
             m_pLayout->setShiftAltGrCaption(m_pKey->position(), m_pShiftAltGrCaptionEdit->text());
     }
-
     m_pKey = pKey;
     if (m_pSelectedKeyGroupBox)
@@ -835 +869 @@
     m_pPhysicalLayoutCombo->clear();
     foreach (const UISoftKeyboardPhysicalLayout &physicalLayout, physicalLayouts)
-        m_pPhysicalLayoutCombo->addItem(physicalLayout.name(), physicalLayout.m_uId);
+        m_pPhysicalLayoutCombo->addItem(physicalLayout.name(), physicalLayout.uid());
 }
 
@@ -2091 +2125 @@
     xmlWriter.writeTextElement("name", m_pCurrentKeyboardLayout->name());
     xmlWriter.writeTextElement("nativename", m_pCurrentKeyboardLayout->nativeName());
-    xmlWriter.writeTextElement("physicallayoutid", pPhysicalLayout->m_uId.toString());
+    xmlWriter.writeTextElement("physicallayoutid", pPhysicalLayout->uid().toString());
     xmlWriter.writeTextElement("id", m_pCurrentKeyboardLayout->uid().toString());
 
@@ -2256 +2290 @@
         return;
 
-    if (m_pCurrentKeyboardLayout->physicalLayoutUuid() == m_physicalLayouts[iIndex].m_uId)
-        return;
-    m_pCurrentKeyboardLayout->setPhysicalLayoutUuid(m_physicalLayouts[iIndex].m_uId);
+    if (m_pCurrentKeyboardLayout->physicalLayoutUuid() == m_physicalLayouts[iIndex].uid())
+        return;
+    m_pCurrentKeyboardLayout->setPhysicalLayoutUuid(m_physicalLayouts[iIndex].uid());
     update();
 }
@@ -2533 +2567 @@
     for (int i = 0; i < m_physicalLayouts.size(); ++i)
     {
-        if (m_physicalLayouts[i].m_uId == uuid)
+        if (m_physicalLayouts[i].uid() == uuid)
             return &(m_physicalLayouts[i]);
     }
@@ -2705 +2739 @@
     if (!m_xmlReader.readNextStartElement() || m_xmlReader.name() != "physicallayout")
         return false;
-    physicalLayout.m_strFileName = strFileName;
+    physicalLayout.setFileName(strFileName);
 
     QXmlStreamAttributes attributes = m_xmlReader.attributes();
@@ -2724 +2758 @@
             physicalLayout.setName(m_xmlReader.readElementText());
         else if (m_xmlReader.name() == "id")
-            physicalLayout.m_uId = m_xmlReader.readElementText();
+            physicalLayout.setUid(m_xmlReader.readElementText());
         else
             m_xmlReader.skipCurrentElement();