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

Timestamp:

Sep 16, 2019 9:33:24 AM (5 years ago)

Author:

vboxsync

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

133384

Message:

FE/Qt: bugref:8938. Changing connection syntaxes in manager details pane code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/details

Files:

• UIDetailsElement.cpp (modified) (3 diffs)
• UIDetailsElements.cpp (modified) (1 diff)
• UIDetailsModel.cpp (modified) (1 diff)
• UIDetailsModel.h (modified) (2 diffs)
• UIMachinePreview.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -1042 +1042 @@
     connect(gpManager, &UIVirtualBoxManager::sigWindowRemapped,
             this, &UIDetailsElement::sltHandleWindowRemapped);
-    connect(this, SIGNAL(sigToggleElement(DetailsElementType, bool)),
-            model(), SLOT(sltToggleElements(DetailsElementType, bool)));
-    connect(this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QUuid &)),
-            model(), SIGNAL(sigLinkClicked(const QString&, const QString&, const QUuid &)));
+    connect(this, &UIDetailsElement::sigToggleElement,
+            model(), &UIDetailsModel::sltToggleElements);
+    connect(this, &UIDetailsElement::sigLinkClicked,
+            model(), &UIDetailsModel::sigLinkClicked);
 }
 
@@ -1053 +1053 @@
     m_pButton = new UIGraphicsRotatorButton(this, "additionalHeight", !m_fClosed, true /* reflected */);
     m_pButton->setAutoHandleButtonClick(false);
-    connect(m_pButton, SIGNAL(sigButtonClicked()), this, SLOT(sltToggleButtonClicked()));
-    connect(m_pButton, SIGNAL(sigRotationStart()), this, SLOT(sltElementToggleStart()));
-    connect(m_pButton, SIGNAL(sigRotationFinish(bool)), this, SLOT(sltElementToggleFinish(bool)));
+    connect(m_pButton, &UIGraphicsRotatorButton::sigButtonClicked, this, &UIDetailsElement::sltToggleButtonClicked);
+    connect(m_pButton, &UIGraphicsRotatorButton::sigRotationStart, this, &UIDetailsElement::sltElementToggleStart);
+    connect(m_pButton, &UIGraphicsRotatorButton::sigRotationFinish, this, &UIDetailsElement::sltElementToggleFinish);
     m_buttonSize = m_pButton->minimumSizeHint().toSize();
 }
@@ -1063 +1063 @@
     /* Create text-pane: */
     m_pTextPane = new UIGraphicsTextPane(this, model()->paintDevice());
-    connect(m_pTextPane, SIGNAL(sigGeometryChanged()), this, SLOT(sltUpdateGeometry()));
-    connect(m_pTextPane, SIGNAL(sigAnchorClicked(const QString&)), this, SLOT(sltHandleAnchorClicked(const QString&)));
+    connect(m_pTextPane, &UIGraphicsTextPane::sigGeometryChanged, this, &UIDetailsElement::sltUpdateGeometry);
+    connect(m_pTextPane, &UIGraphicsTextPane::sigAnchorClicked, this, &UIDetailsElement::sltHandleAnchorClicked);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp

@@ -122 +122 @@
     {
         /* Configure preview: */
-        connect(m_pPreview, SIGNAL(sigSizeHintChanged()),
-                this, SLOT(sltPreviewSizeHintChanged()));
+        connect(m_pPreview, &UIMachinePreview::sigSizeHintChanged,
+                this, &UIDetailsElementPreview::sltPreviewSizeHintChanged);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp

@@ -238 +238 @@
     /* Prepare/configure animation callback: */
     m_pAnimationCallback = new UIDetailsElementAnimationCallback(this, type, fToggled);
-    connect(m_pAnimationCallback, SIGNAL(sigAllAnimationFinished(DetailsElementType, bool)),
-            this, SLOT(sltToggleAnimationFinished(DetailsElementType, bool)), Qt::QueuedConnection);
+    connect(m_pAnimationCallback, &UIDetailsElementAnimationCallback::sigAllAnimationFinished,
+            this, &UIDetailsModel::sltToggleAnimationFinished, Qt::QueuedConnection);
     /* For each the set of the group: */
     foreach (UIDetailsItem *pSetItem, m_pRoot->items())

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.h

@@ -173 +173 @@
     void sltHandleExtraDataOptionsChange(DetailsElementType enmType);
 
+    /** Handles request to start toggle details element of certain @a enmType, making element @a fToggled. */
+    void sltToggleElements(DetailsElementType type, bool fToggled);
+
 protected:
 
@@ -180 +183 @@
 private slots:
 
-    /** Handles request to start toggle details element of certain @a enmType, making element @a fToggled. */
-    void sltToggleElements(DetailsElementType type, bool fToggled);
     /** Handles sigal about details element of certain @a enmType toggling finished, making element @a fToggled. */
     void sltToggleAnimationFinished(DetailsElementType type, bool fToggled);

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp

@@ -419 +419 @@
 
     /* Setup connections: */
-    connect(m_pUpdateTimer, SIGNAL(timeout()), this, SLOT(sltRecreatePreview()));
-    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QUuid, KMachineState)),
-            this, SLOT(sltMachineStateChange(QUuid)));
+    connect(m_pUpdateTimer, &QTimer::timeout, this, &UIMachinePreview::sltRecreatePreview);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
+            this, &UIMachinePreview::sltMachineStateChange);
 
     /* Retranslate the UI */