Changeset 80914 in vbox

Timestamp:

Sep 20, 2019 6:16:55 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938. Changing connection syntax in UILineTextEdit and UIPopupPane related classes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UILineTextEdit.cpp (modified) (3 diffs)
• UIPopupBox.cpp (modified) (2 diffs)
• UIPopupPane.cpp (modified) (4 diffs)
• UIPopupPaneButtonPane.cpp (modified) (2 diffs)
• UIPopupPaneDetails.cpp (modified) (3 diffs)
• UIPopupPaneMessage.cpp (modified) (3 diffs)
• UIPopupPaneMessage.h (modified) (2 diffs)
• UIPopupStack.cpp (modified) (1 diff)
• UIPopupStackViewport.cpp (modified) (2 diffs)

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

@@ -49 +49 @@
     pMainLayout->addWidget(m_pButtonBox);
     /* Connect the buttons so that they are useful */
-    connect(m_pButtonBox, SIGNAL(accepted()),
-            this, SLOT(accept()));
-    connect(m_pButtonBox, SIGNAL(rejected()),
-            this, SLOT(reject()));
-    connect(m_pOpenButton, SIGNAL(clicked()),
-            this, SLOT(open()));
+    connect(m_pButtonBox, &QDialogButtonBox::accepted,
+            this, &UITextEditor::accept);
+    connect(m_pButtonBox, &QDialogButtonBox::rejected,
+            this, &UITextEditor::reject);
+    connect(m_pOpenButton, &QPushButton::clicked,
+            this, &UITextEditor::open);
 
     /* Applying language settings */
@@ -98 +98 @@
   : QIWithRetranslateUI<QPushButton>(pParent)
 {
-    connect(this, SIGNAL(clicked()),
-            this, SLOT(edit()));
+    connect(this, &UILineTextEdit::clicked,
+        this, &UILineTextEdit::edit);
 
     /* Don't interpret the Enter Key. */
@@ -125 +125 @@
     }
 }
-

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

@@ -446 +446 @@
 
     /* Connect got-hover signal of the popup-box to hover-change slot of the popup-box group: */
-    connect(pPopupBox, SIGNAL(sigGotHover()), this, SLOT(sltHoverChanged()));
+    connect(pPopupBox, &UIPopupBox::sigGotHover, this, &UIPopupBoxGroup::sltHoverChanged);
 }
 
@@ -466 +466 @@
         list[i]->revokeHover();
 }
-

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

@@ -251 +251 @@
     {
         /* Configure message-pane: */
-        connect(this, SIGNAL(sigProposePaneWidth(int)), m_pMessagePane, SLOT(sltHandleProposalForWidth(int)));
-        connect(m_pMessagePane, SIGNAL(sigSizeHintChanged()), this, SLOT(sltUpdateSizeHint()));
+        connect(this, &UIPopupPane::sigProposePaneWidth, m_pMessagePane, &UIPopupPaneMessage::sltHandleProposalForWidth);
+        connect(m_pMessagePane, &UIPopupPaneMessage::sigSizeHintChanged, this, &UIPopupPane::sltUpdateSizeHint);
         m_pMessagePane->installEventFilter(this);
     }
@@ -260 +260 @@
     {
         /* Configure button-box: */
-        connect(m_pButtonPane, SIGNAL(sigButtonClicked(int)), this, SLOT(sltButtonClicked(int)));
+        connect(m_pButtonPane, &UIPopupPaneButtonPane::sigButtonClicked, this, &UIPopupPane::sltButtonClicked);
         m_pButtonPane->installEventFilter(this);
         m_pButtonPane->setButtons(m_buttonDescriptions);
@@ -294 +294 @@
     m_pShowAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "hiddenSizeHint", "shownSizeHint",
                                                              SIGNAL(sigShow()), SIGNAL(sigHide()));
-    connect(m_pShowAnimation, SIGNAL(sigStateEnteredFinal()), this, SLOT(sltMarkAsShown()));
+    connect(m_pShowAnimation, &UIAnimation::sigStateEnteredFinal, this, &UIPopupPane::sltMarkAsShown);
 
     /* Install 'hover' animation for 'opacity' property: */
@@ -540 +540 @@
     }
 }
-

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

@@ -110 +110 @@
             m_pButtonLayout->addWidget(pButton);
             m_buttons[iButtonID] = pButton;
-            connect(pButton, SIGNAL(clicked(bool)), this, SLOT(sltButtonClicked()));
+            connect(pButton, &QIToolButton::clicked, this, &UIPopupPaneButtonPane::sltButtonClicked);
             if (pButton->property("default").toBool())
                 m_iDefaultButton = iButtonID;
@@ -231 +231 @@
     return icon;
 }
-

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

@@ -23 +23 @@
 /* GUI includes: */
 #include "UIAnimationFramework.h"
+#include "UIPopupPane.h"
 #include "UIPopupPaneDetails.h"
 
+/* Other VBox includes: */
+#include <iprt/assert.h>
 
 UIPopupPaneDetails::UIPopupPaneDetails(QWidget *pParent, const QString &strText, bool fFocused)
@@ -187 +190 @@
 void UIPopupPaneDetails::prepareAnimation()
 {
-    /* Propagate parent signals: */
-    connect(parent(), SIGNAL(sigFocusEnter()), this, SLOT(sltFocusEnter()));
-    connect(parent(), SIGNAL(sigFocusLeave()), this, SLOT(sltFocusLeave()));
+    UIPopupPane *pPopupPane = qobject_cast<UIPopupPane*>(parent());
+    AssertReturnVoid(pPopupPane);
+    {
+        /* Propagate parent signals: */
+        connect(pPopupPane, &UIPopupPane::sigFocusEnter, this, &UIPopupPaneDetails::sltFocusEnter);
+        connect(pPopupPane, &UIPopupPane::sigFocusLeave, this, &UIPopupPaneDetails::sltFocusLeave);
+    }
     /* Install geometry animation for 'minimumSizeHint' property: */
     m_pAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
@@ -251 +258 @@
     return font;
 }
-

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

@@ -22 +22 @@
 /* GUI includes: */
 #include "UIAnimationFramework.h"
+#include "UIPopupPane.h"
 #include "UIPopupPaneMessage.h"
 
+/* Other VBox includes: */
+#include <iprt/assert.h>
 
 UIPopupPaneMessage::UIPopupPaneMessage(QWidget *pParent, const QString &strText, bool fFocused)
@@ -155 +158 @@
 void UIPopupPaneMessage::prepareAnimation()
 {
-    /* Propagate parent signals: */
-    connect(parent(), SIGNAL(sigFocusEnter()), this, SLOT(sltFocusEnter()));
-    connect(parent(), SIGNAL(sigFocusLeave()), this, SLOT(sltFocusLeave()));
+    UIPopupPane *pPopupPane = qobject_cast<UIPopupPane*>(parent());
+    AssertReturnVoid(pPopupPane);
+    {
+        /* Propagate parent signals: */
+        connect(pPopupPane, &UIPopupPane::sigFocusEnter, this, &UIPopupPaneMessage::sltFocusEnter);
+        connect(pPopupPane, &UIPopupPane::sigFocusLeave, this, &UIPopupPaneMessage::sltFocusLeave);
+    }
     /* Install geometry animation for 'minimumSizeHint' property: */
     m_pAnimation = UIAnimation::installPropertyAnimation(this, "minimumSizeHint", "collapsedSizeHint", "expandedSizeHint",
@@ -201 +208 @@
     return font;
 }
-

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

@@ -72 +72 @@
     QSize expandedSizeHint() const { return m_expandedSizeHint; }
 
-private slots:
+public slots:
 
     /** Handles proposal for @a iWidth. */
     void sltHandleProposalForWidth(int iWidth);
+
+private slots:
 
     /** Handles focus enter. */
@@ -128 +130 @@
 
 #endif /* !FEQT_INCLUDED_SRC_widgets_UIPopupPaneMessage_h */
-

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

@@ -263 +263 @@
                 connect(this, &UIPopupStack::sigProposeStackViewportSize,
                         m_pScrollViewport, &UIPopupStackViewport::sltHandleProposalForSize);
-                connect(m_pScrollViewport, SIGNAL(sigSizeHintChanged()),
-                        this, SLOT(sltAdjustGeometry()));
-                connect(m_pScrollViewport, SIGNAL(sigPopupPaneDone(QString, int)),
-                        this, SIGNAL(sigPopupPaneDone(QString, int)));
-                connect(m_pScrollViewport, SIGNAL(sigPopupPaneRemoved(QString)),
-                        this, SLOT(sltPopupPaneRemoved(QString)));
-                connect(m_pScrollViewport, SIGNAL(sigPopupPanesRemoved()),
-                        this, SLOT(sltPopupPanesRemoved()));
+                connect(m_pScrollViewport, &UIPopupStackViewport::sigSizeHintChanged,
+                        this, &UIPopupStack::sltAdjustGeometry);
+                connect(m_pScrollViewport, &UIPopupStackViewport::sigPopupPaneDone,
+                        this, &UIPopupStack::sigPopupPaneDone);
+                connect(m_pScrollViewport, &UIPopupStackViewport::sigPopupPaneRemoved,
+                        this, &UIPopupStack::sltPopupPaneRemoved);
+                connect(m_pScrollViewport, &UIPopupStackViewport::sigPopupPanesRemoved,
+                        this, &UIPopupStack::sltPopupPanesRemoved);
             }
             /* Assign scroll-viewport to scroll-area: */

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

@@ -54 +54 @@
     /* Attach popup-pane connection: */
     connect(this, &UIPopupStackViewport::sigProposePopupPaneSize, pPopupPane, &UIPopupPane::sltHandleProposalForSize);
-    connect(pPopupPane, SIGNAL(sigSizeHintChanged()), this, SLOT(sltAdjustGeometry()));
-    connect(pPopupPane, SIGNAL(sigDone(int)), this, SLOT(sltPopupPaneDone(int)));
+    connect(pPopupPane, &UIPopupPane::sigSizeHintChanged, this, &UIPopupStackViewport::sltAdjustGeometry);
+    connect(pPopupPane, &UIPopupPane::sigDone, this, &UIPopupStackViewport::sltPopupPaneDone);
 
     /* Show popup-pane: */
@@ -209 +209 @@
     }
 }
-