Changeset 79126 in vbox

Timestamp:

Jun 13, 2019 10:55:00 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Build fix.

File:

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

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

@@ -285 +285 @@
 
 public:
-
+    UISoftKeyboardLayout()
+        :m_pPhysicalLayout(0){}
     /** The physical layout used by this layout. */
     UISoftKeyboardPhysicalLayout *m_pPhysicalLayout;
@@ -385 +386 @@
     int   m_iRightMargin;
     int   m_iBottomMargin;
-    bool  m_fInKeyCapEditMode;
 
     QMenu   *m_pContextMenu;
@@ -434 +434 @@
     };
 
-    bool  parseFile(const QString &strFileName, UISoftKeyboardLayout &layout, QUuid &physicalLayoutUid);
+    bool  parseFile(const QString &strFileName);
 
 private:
 
-
-    void  parseKey(QMap<int, KeyCaptions> &keyCapMap);
+    void  parseKey();
     QXmlStreamReader m_xmlReader;
+    /** Map key is the key position and the value is the captions of the key. */
+    QMap<int, KeyCaptions> m_keyCapMap;
+    QUuid m_physicalLayoutUid;
+    QString m_strName;
 };
 
@@ -980 +983 @@
     , m_iRightMargin(10)
     , m_iBottomMargin(10)
-    , m_fInKeyCapEditMode(false)
     , m_pContextMenu(0)
     , m_pShowPositionsAction(0)
@@ -1517 +1519 @@
         return false;
 
-    m_layouts.append(UISoftKeyboardLayout());
-    UISoftKeyboardLayout &newLayout = m_layouts.back();
     UIKeyboardLayoutReader keyboardLayoutReader;
-    QUuid physicalLayoutUid;
-    if (!keyboardLayoutReader.parseFile(strLayoutName, newLayout, physicalLayoutUid))
-    {
-        m_layouts.removeLast();
+
+    if (!keyboardLayoutReader.parseFile(strLayoutName))
         return false;
-    }
+
+    // m_layouts.append(UISoftKeyboardLayout());
+    // UISoftKeyboardLayout &newLayout = m_layouts.back();
+
+
+    /* Search for the physical layout among the one stored in m_pPhysicalLayout: */
+    // for (int i = 0; i < m_physicalLayouts.size(); ++i)
+    // {
+    //     if (physicalLayoutUid == m_physicalLayouts[i].m_uId)
+    //         newLayout.m_pPhysicalLayout = &(m_physicalLayouts[i]);
+    // }
+
+    // /* If no pyhsical layout with the UUID the keyboard layout refers is found then cancel loading the keyboard layout: */
+    // if (!newLayout.m_pPhysicalLayout)
+    // {
+    //     m_layouts.removeLast();
+    //     return false;
+    // }
     return true;
-//     //const QMap<int, QString> &keyCapMap = keyCapReader.keyCapMap();
-
-//     //for (int i = 0; i < m_rows.size(); ++i)
-//     {
-//         //QVector<UISoftKeyboardKey> &keys = m_rows[i].keys();
-//         // for (int j = 0; j < keys.size(); ++j)
-//         // {
-//         //     UISoftKeyboardKey &key = keys[j];
-//         //     if (keyCapMap.contains(key.position()))
-//         //         key.setKeyCap(keyCapMap[key.position()]);
-//         // }
-//     }
-//     emit sigKeyCapChange(strFileName);
 
 }
@@ -1856 +1858 @@
 *********************************************************************************************************************************/
 
-bool UIKeyboardLayoutReader::parseFile(const QString &strFileName, UISoftKeyboardLayout &layout, QUuid &physicalLayoutUid)
+bool UIKeyboardLayoutReader::parseFile(const QString &strFileName)
 {
     QFile xmlFile(strFileName);
@@ -1870 +1872 @@
         return false;
 
-    /** Map key is the key position and the value is the captions of the key. */
-    QMap<int, KeyCaptions> keyCapMap;
-
     while (m_xmlReader.readNextStartElement())
     {
         if (m_xmlReader.name() == "key")
-            parseKey(keyCapMap);
+            parseKey();
         else if (m_xmlReader.name() == "name")
-            layout.m_strName = m_xmlReader.readElementText();
+            m_strName = m_xmlReader.readElementText();
         else if (m_xmlReader.name() == "physicallayoutid")
-            physicalLayoutUid = QUuid(m_xmlReader.readElementText());
+            m_physicalLayoutUid = QUuid(m_xmlReader.readElementText());
         else
             m_xmlReader.skipCurrentElement();
@@ -1887 +1886 @@
 }
 
-void  UIKeyboardLayoutReader::parseKey(QMap<int, KeyCaptions> &keyCapMap)
+void  UIKeyboardLayoutReader::parseKey()
 {
     KeyCaptions keyCaptions;
@@ -1904 +1903 @@
             m_xmlReader.skipCurrentElement();
     }
-    keyCapMap.insert(iKeyPosition, keyCaptions);
+    m_keyCapMap.insert(iKeyPosition, keyCaptions);
 }