Changeset 44654 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 12, 2013 1:05:12 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6065: Updating UIHostComboEditor API with corresponding properties.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/global/UIGlobalSettingsInput.cpp (modified) (1 diff)
• widgets/UIHostComboEditor.cpp (modified) (2 diffs)
• widgets/UIHostComboEditor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -69 +69 @@
 {
     /* Upload to cache: */
-    m_cache.m_strHostCombo = m_pHostKeyEditor->combo();
+    m_cache.m_strHostCombo = m_pHostKeyEditor->combo().toString();
     m_cache.m_fAutoCapture = m_pEnableAutoGrabCheckbox->isChecked();
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -334 +334 @@
 }
 
-void UIHostComboEditor::setCombo(const QString &strKeyCombo)
+void UIHostComboEditor::setCombo(const UIHostComboWrapper &strCombo)
 {
     /* Cleanup old combo: */
     m_shownKeys.clear();
     /* Parse newly passed combo: */
-    QList<int> keyCodeList = UIHostCombo::toKeyCodeList(strKeyCombo);
+    QList<int> keyCodeList = UIHostCombo::toKeyCodeList(strCombo.toString());
     for (int i = 0; i < keyCodeList.size(); ++i)
         if (int iKeyCode = keyCodeList[i])
@@ -347 +347 @@
 }
 
-QString UIHostComboEditor::combo() const
+UIHostComboWrapper UIHostComboEditor::combo() const
 {
     /* Compose current combination: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.h

@@ -48 +48 @@
 }
 
+/* Host-combo wrapper: */
+class UIHostComboWrapper
+{
+public:
+
+    UIHostComboWrapper(const QString &strHostCombo = QString())
+        : m_strHostCombo(strHostCombo)
+    {}
+
+    const QString& toString() const { return m_strHostCombo; }
+
+private:
+
+    QString m_strHostCombo;
+};
+Q_DECLARE_METATYPE(UIHostComboWrapper);
+
 /* Host-combo editor widget: */
 class UIHostComboEditor : public QLineEdit
 {
     Q_OBJECT;
+    Q_PROPERTY(UIHostComboWrapper combo READ combo WRITE setCombo USER true);
 
 public:
@@ -58 +76 @@
     ~UIHostComboEditor();
 
-    void setCombo(const QString &strKeyCombo);
-    QString combo() const;
+    void setCombo(const UIHostComboWrapper &strCombo);
+    UIHostComboWrapper combo() const;
 
 public slots: