Changeset 68079 in vbox for trunk

Timestamp:

Jul 21, 2017 11:32:19 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Using Qt5 signal-slot connection notation for VBox Qt extensions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIAdvancedSlider.cpp (modified) (1 diff)
• QIArrowSplitter.cpp (modified) (3 diffs)
• QIComboBox.cpp (modified) (1 diff)
• QIFileDialog.cpp (modified) (3 diffs)
• QILabel.cpp (modified) (1 diff)
• QIMessageBox.cpp (modified) (3 diffs)
• QIRichToolButton.cpp (modified) (1 diff)
• QIStatusBar.cpp (modified) (1 diff)
• QITableView.cpp (modified) (2 diffs)
• QIWidgetValidator.cpp (modified) (1 diff)
• QIWidgetValidator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp

@@ -273 +273 @@
     pMainLayout->addWidget(m_pSlider);
 
-    connect(m_pSlider, SIGNAL(sliderMoved(int)), this, SLOT(sltSliderMoved(int)));
-    connect(m_pSlider, SIGNAL(valueChanged(int)), this, SIGNAL(valueChanged(int)));
-    connect(m_pSlider, SIGNAL(sliderPressed()), this, SIGNAL(sliderPressed()));
-    connect(m_pSlider, SIGNAL(sliderReleased()), this, SIGNAL(sliderReleased()));
+    connect(m_pSlider, &CPrivateSlider::sliderMoved,    this, &QIAdvancedSlider::sltSliderMoved);
+    connect(m_pSlider, &CPrivateSlider::valueChanged,   this, &QIAdvancedSlider::valueChanged);
+    connect(m_pSlider, &CPrivateSlider::sliderPressed,  this, &QIAdvancedSlider::sliderPressed);
+    connect(m_pSlider, &CPrivateSlider::sliderReleased, this, &QIAdvancedSlider::sliderReleased);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

@@ -255 +255 @@
                 m_pSwitchButton->setIcons(UIIconPool::iconSet(":/arrow_right_10px.png"),
                                           UIIconPool::iconSet(":/arrow_down_10px.png"));
-                connect(m_pSwitchButton, SIGNAL(sigClicked()), this, SLOT(sltUpdateNavigationButtonsVisibility()));
-                connect(m_pSwitchButton, SIGNAL(sigClicked()), this, SLOT(sltUpdateDetailsBrowserVisibility()));
+                connect(m_pSwitchButton, &QIArrowButtonSwitch::sigClicked, this, &QIArrowSplitter::sltUpdateNavigationButtonsVisibility);
+                connect(m_pSwitchButton, &QIArrowButtonSwitch::sigClicked, this, &QIArrowSplitter::sltUpdateDetailsBrowserVisibility);
+
                 /* Add switch-button into button-layout: */
                 pButtonLayout->addWidget(m_pSwitchButton);
@@ -269 +270 @@
                 m_pBackButton->setIconSize(QSize(iIconMetric, iIconMetric));
                 m_pBackButton->setIcon(UIIconPool::iconSet(":/arrow_left_10px.png"));
-                connect(m_pBackButton, SIGNAL(sigClicked()), this, SLOT(sltSwitchDetailsPageBack()));
+                connect(m_pBackButton, &QIArrowButtonPress::sigClicked, this, &QIArrowSplitter::sltSwitchDetailsPageBack);
+
                 /* Add back-button into button-layout: */
                 pButtonLayout->addWidget(m_pBackButton);
@@ -280 +282 @@
                 m_pNextButton->setIconSize(QSize(iIconMetric, iIconMetric));
                 m_pNextButton->setIcon(UIIconPool::iconSet(":/arrow_right_10px.png"));
-                connect(m_pNextButton, SIGNAL(sigClicked()), this, SLOT(sltSwitchDetailsPageNext()));
+                connect(m_pNextButton, &QIArrowButtonPress::sigClicked, this, &QIArrowSplitter::sltSwitchDetailsPageNext);
+
                 /* Add next-button into button-layout: */
                 pButtonLayout->addWidget(m_pNextButton);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.cpp

@@ -312 +312 @@
         {
             /* Configure combo-box: */
-            connect(m_pComboBox, SIGNAL(activated(int)), this, SIGNAL(activated(int)));
-            connect(m_pComboBox, SIGNAL(activated(const QString &)), this, SIGNAL(activated(const QString &)));
-            connect(m_pComboBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(currentIndexChanged(int)));
-            connect(m_pComboBox, SIGNAL(currentIndexChanged(const QString &)), this, SIGNAL(currentIndexChanged(const QString &)));
-            connect(m_pComboBox, SIGNAL(currentTextChanged(const QString &)), this, SIGNAL(currentTextChanged(const QString &)));
-            connect(m_pComboBox, SIGNAL(editTextChanged(const QString &)), this, SIGNAL(editTextChanged(const QString &)));
-            connect(m_pComboBox, SIGNAL(highlighted(int)), this, SIGNAL(highlighted(int)));
-            connect(m_pComboBox, SIGNAL(highlighted(const QString &)), this, SIGNAL(highlighted(const QString &)));
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+                    this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated));
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::activated),
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::activated));
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+                    this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged));
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::currentIndexChanged));
+            connect(m_pComboBox, &QComboBox::currentTextChanged, this, &QIComboBox::currentTextChanged);
+            connect(m_pComboBox, &QComboBox::editTextChanged, this, &QIComboBox::editTextChanged);
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::highlighted),
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::highlighted));
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::highlighted),
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::highlighted));
             /* Add combo-box into layout: */
             pLayout->addWidget(m_pComboBox);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp

@@ -357 +357 @@
 
     QEventLoop eventLoop;
-    QObject::connect(&dlg, SIGNAL(finished(int)),
-                     &eventLoop, SLOT(quit()));
+    QObject::connect(&dlg, &QFileDialog::finished,
+                     &eventLoop, &QEventLoop::quit);
     dlg.open();
     eventLoop.exec();
@@ -593 +593 @@
 
     QEventLoop eventLoop;
-    QObject::connect(&dlg, SIGNAL(finished(int)),
-                     &eventLoop, SLOT(quit()));
+    QObject::connect(&dlg, &QFileDialog::finished,
+                     &eventLoop, &QEventLoop::quit);
     dlg.open();
     eventLoop.exec();
@@ -851 +851 @@
 
     QEventLoop eventLoop;
-    QObject::connect(&dlg, SIGNAL(finished(int)),
-                     &eventLoop, SLOT(quit()));
+    QObject::connect(&dlg, &QFileDialog::finished,
+                     &eventLoop, &QEventLoop::quit);
     dlg.open();
     eventLoop.exec();

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp

@@ -255 +255 @@
     mCopyAction->setShortcut (QKeySequence (QKeySequence::Copy));
     mCopyAction->setShortcutContext (Qt::WidgetShortcut);
-    connect (mCopyAction, SIGNAL (triggered()), this, SLOT (copy()));
+    connect(mCopyAction, &QAction::triggered, this, &QILabel::copy);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp

@@ -217 +217 @@
         {
             /* Configure container: */
-            connect(m_pDetailsContainer, SIGNAL(sigSizeHintChange()), this, SLOT(sltUpdateSize()));
+            connect(m_pDetailsContainer, &QIArrowSplitter::sigSizeHintChange, 
+                    this, &QIMessageBox::sltUpdateSize);
             /* Add details-container into main-layout: */
             pMainLayout->addWidget(m_pDetailsContainer);
@@ -242 +243 @@
             m_pButton1 = createButton(m_iButton1);
             if (m_pButton1)
-                connect(m_pButton1, SIGNAL(clicked()), SLOT(sltDone1()));
+                connect(m_pButton1, &QPushButton::clicked, this, &QIMessageBox::sltDone1);
             m_pButton2 = createButton(m_iButton2);
             if (m_pButton2)
-                connect(m_pButton2, SIGNAL(clicked()), SLOT(sltDone2()));
+                connect(m_pButton2, &QPushButton::clicked, this, &QIMessageBox::sltDone2);
             m_pButton3 = createButton(m_iButton3);
             if (m_pButton3)
-                connect(m_pButton3, SIGNAL(clicked()), SLOT(sltDone3()));
+                connect(m_pButton3, &QPushButton::clicked, this, &QIMessageBox::sltDone3);
             /* Make sure Escape button always set: */
             Assert(m_iButtonEsc);
@@ -256 +257 @@
                 QPushButton *pCopyButton = createButton(AlertButton_Copy);
                 pCopyButton->setToolTip(tr("Copy all errors to the clipboard"));
-                connect(pCopyButton, SIGNAL(clicked()), SLOT(sltCopy()));
+                connect(pCopyButton, &QPushButton::clicked, this, &QIMessageBox::sltCopy);
             }
             /* Add button-box into main-layout: */

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp

@@ -121 +121 @@
             m_pButton->removeBorder();
             m_pButton->setFocusPolicy(Qt::NoFocus);
-            connect(m_pButton, SIGNAL(clicked(bool)), this, SLOT(sltButtonClicked()));
-            connect(m_pButton, SIGNAL(clicked(bool)), this, SIGNAL(sigClicked()));
+            connect(m_pButton, &QIToolButton::clicked, this, &QIRichToolButton::sltButtonClicked);
+            connect(m_pButton, &QIToolButton::clicked, this, &QIRichToolButton::sigClicked);
             /* Add tool-button into main-layout: */
             pMainLayout->addWidget(m_pButton);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp

@@ -62 +62 @@
 
     /* Make sure we remember the last one status message: */
-    connect(this, SIGNAL(messageChanged(const QString &)),
-            this, SLOT(sltRememberLastMessage(const QString &)));
+    connect(this, &QIStatusBar::messageChanged,
+            this, &QIStatusBar::sltRememberLastMessage);
 
     /* Remove that ugly border around the status-bar items on every platform: */

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp

@@ -433 +433 @@
 {
     /* Connect created editor to the table and store it: */
-    connect(pEditor, SIGNAL(destroyed(QObject *)), this, SLOT(sltEditorDestroyed(QObject *)));
+    connect(pEditor, &QWidget::destroyed, this, &QITableView::sltEditorDestroyed);
     m_editors[index] = pEditor;
 }
@@ -471 +471 @@
         setItemDelegate(pStyledItemDelegate);
         /* Connect newly created delegate to the table: */
-        connect(pStyledItemDelegate, SIGNAL(sigEditorCreated(QWidget *, const QModelIndex &)),
-                this, SLOT(sltEditorCreated(QWidget *, const QModelIndex &)));
-    }
-}
-
+        connect(pStyledItemDelegate, &QIStyledItemDelegate::sigEditorCreated,
+                this, &QITableView::sltEditorCreated);
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp

@@ -88 +88 @@
 
     /* Attach object-validator to group: */
-    connect(pObjectValidator, SIGNAL(sigValidityChange(QValidator::State)),
-            this, SLOT(sltValidate(QValidator::State)));
+    connect(pObjectValidator, &QObjectValidator::sigValidityChange,
+            this, &QObjectValidatorGroup::sltValidate);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h

@@ -54 +54 @@
     QValidator::State state() const { return m_state; }
 
-private slots:
+public slots:
 
     /** Performs validation: */