Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 68347) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 68348) @@ -193,9 +193,9 @@ { /* Create direct (sync) connections for signals of main listener: */ - connect(m_pQtListener->getWrapped(), SIGNAL(sigExtraDataCanChange(QString, QString, QString, bool&, QString&)), - this, SLOT(sltPreprocessExtraDataCanChange(QString, QString, QString, bool&, QString&)), + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigExtraDataCanChange, + this, &UIExtraDataEventHandler::sltPreprocessExtraDataCanChange, Qt::DirectConnection); - connect(m_pQtListener->getWrapped(), SIGNAL(sigExtraDataChange(QString, QString, QString)), - this, SLOT(sltPreprocessExtraDataChange(QString, QString, QString)), + connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigExtraDataChange, + this, &UIExtraDataEventHandler::sltPreprocessExtraDataChange, Qt::DirectConnection); } @@ -476,4 +476,14 @@ /** @} */ +public slots: + + /** @name General + * @{ */ + /** Handles extra-data map acknowledging. */ + void sltExtraDataMapAcknowledging(QString strID); + /** Handles extra-data change. */ + void sltExtraDataChange(QString strID, QString strKey, QString strValue); + /** @} */ + private slots: @@ -482,8 +492,4 @@ /** Handles machine (un)registration. */ void sltMachineRegistered(QString strID, bool fAdded); - /** Handles extra-data map acknowledging. */ - void sltExtraDataMapAcknowledging(QString strID); - /** Handles extra-data change. */ - void sltExtraDataChange(QString strID, QString strKey, QString strValue); /** @} */ @@ -1007,6 +1013,6 @@ { /* Configure key-editor property setter: */ - connect(pEditorKey, SIGNAL(editTextChanged(const QString&)), - pKeyPropertySetter, SLOT(sltAssignProperty(const QString&))); + connect(pEditorKey, &QComboBox::editTextChanged, + pKeyPropertySetter, &QObjectPropertySetter::sltAssignProperty); } /* Create key-editor validator: */ @@ -1015,6 +1021,6 @@ { /* Configure key-editor validator: */ - connect(pEditorKey, SIGNAL(editTextChanged(const QString&)), - pKeyValidator, SLOT(sltValidate(QString))); + connect(pEditorKey, &QComboBox::editTextChanged, + pKeyValidator, &QObjectValidator::sltValidate); /* Add key-editor validator into dialog validator group: */ pValidatorGroup->addObjectValidator(pKeyValidator); @@ -1041,6 +1047,6 @@ { /* Configure value-editor property setter: */ - connect(pEditorValue, SIGNAL(textEdited(const QString&)), - pValuePropertySetter, SLOT(sltAssignProperty(const QString&))); + connect(pEditorValue, &QLineEdit::textEdited, + pValuePropertySetter, &QObjectPropertySetter::sltAssignProperty); } /* Create value-editor validator: */ @@ -1049,6 +1055,6 @@ { /* Configure value-editor validator: */ - connect(pEditorValue, SIGNAL(textEdited(const QString&)), - pValueValidator, SLOT(sltValidate(QString))); + connect(pEditorValue, &QLineEdit::textEdited, + pValueValidator, &QObjectValidator::sltValidate); /* Add value-editor validator into dialog validator group: */ pValidatorGroup->addObjectValidator(pValueValidator); @@ -1071,8 +1077,8 @@ pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(pValidatorGroup->result()); pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape); - connect(pValidatorGroup, SIGNAL(sigValidityChange(bool)), - pButtonBox->button(QDialogButtonBox::Ok), SLOT(setEnabled(bool))); - connect(pButtonBox, SIGNAL(accepted()), pInputDialog, SLOT(accept())); - connect(pButtonBox, SIGNAL(rejected()), pInputDialog, SLOT(reject())); + connect(pValidatorGroup, &QObjectValidatorGroup::sigValidityChange, + pButtonBox->button(QDialogButtonBox::Ok), &QPushButton::setEnabled); + connect(pButtonBox, &QIDialogButtonBox::accepted, pInputDialog, &QIDialog::accept); + connect(pButtonBox, &QIDialogButtonBox::rejected, pInputDialog, &QIDialog::reject); /* Add button-box into main-layout: */ pMainLayout->addWidget(pButtonBox); @@ -1365,6 +1371,6 @@ { /* Prepare connections: */ - connect(gVBoxEvents, SIGNAL(sigMachineRegistered(QString, bool)), - this, SLOT(sltMachineRegistered(QString, bool))); + connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered, + this, &UIExtraDataManagerWindow::sltMachineRegistered); } @@ -1383,5 +1389,5 @@ ":/edata_add_disabled_22px.png", ":/edata_add_disabled_16px.png")); m_pActionAdd->setShortcut(QKeySequence("Ctrl+T")); - connect(m_pActionAdd, SIGNAL(triggered(bool)), this, SLOT(sltAdd())); + connect(m_pActionAdd, &QAction::triggered, this, &UIExtraDataManagerWindow::sltAdd); } /* Create 'Del' action: */ @@ -1393,5 +1399,5 @@ ":/edata_remove_disabled_22px.png", ":/edata_remove_disabled_16px.png")); m_pActionDel->setShortcut(QKeySequence("Ctrl+R")); - connect(m_pActionDel, SIGNAL(triggered(bool)), this, SLOT(sltDel())); + connect(m_pActionDel, &QAction::triggered, this, &UIExtraDataManagerWindow::sltDel); } @@ -1407,5 +1413,5 @@ ":/edata_load_disabled_22px.png", ":/edata_load_disabled_16px.png")); m_pActionLoad->setShortcut(QKeySequence("Ctrl+L")); - connect(m_pActionLoad, SIGNAL(triggered(bool)), this, SLOT(sltLoad())); + connect(m_pActionLoad, &QAction::triggered, this, &UIExtraDataManagerWindow::sltLoad); } /* Create 'Save' action: */ @@ -1417,5 +1423,5 @@ ":/edata_save_disabled_22px.png", ":/edata_save_disabled_16px.png")); m_pActionSave->setShortcut(QKeySequence("Ctrl+S")); - connect(m_pActionSave, SIGNAL(triggered(bool)), this, SLOT(sltSave())); + connect(m_pActionSave, &QAction::triggered, this, &UIExtraDataManagerWindow::sltSave); } } @@ -1506,15 +1512,12 @@ preparePaneData(); /* Link chooser and data panes: */ - connect(m_pViewOfChooser->selectionModel(), - SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(sltChooserHandleCurrentChanged(const QModelIndex&))); - connect(m_pViewOfChooser->selectionModel(), - SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(sltChooserHandleSelectionChanged(const QItemSelection&, const QItemSelection&))); - connect(m_pViewOfData->selectionModel(), - SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(sltDataHandleSelectionChanged(const QItemSelection&, const QItemSelection&))); - connect(m_pModelSourceOfData, SIGNAL(itemChanged(QStandardItem*)), - this, SLOT(sltDataHandleItemChanged(QStandardItem*))); + connect(m_pViewOfChooser->selectionModel(), &QItemSelectionModel::currentChanged, + this, &UIExtraDataManagerWindow::sltChooserHandleCurrentChanged); + connect(m_pViewOfChooser->selectionModel(), &QItemSelectionModel::selectionChanged, + this, &UIExtraDataManagerWindow::sltChooserHandleSelectionChanged); + connect(m_pViewOfData->selectionModel(), &QItemSelectionModel::selectionChanged, + this, &UIExtraDataManagerWindow::sltDataHandleSelectionChanged); + connect(m_pModelSourceOfData, &QStandardItemModel::itemChanged, + this, &UIExtraDataManagerWindow::sltDataHandleItemChanged); /* Make sure chooser have current-index if possible: */ makeSureChooserHaveCurrentIndexIfPossible(); @@ -1539,6 +1542,6 @@ /* Configure chooser-filter: */ m_pFilterOfChooser->setPlaceholderText("Search.."); - connect(m_pFilterOfChooser, SIGNAL(textChanged(const QString&)), - this, SLOT(sltChooserApplyFilter(const QString&))); + connect(m_pFilterOfChooser, &QLineEdit::textChanged, + this, &UIExtraDataManagerWindow::sltChooserApplyFilter); /* Add chooser-filter into layout: */ pLayout->addWidget(m_pFilterOfChooser); @@ -1604,6 +1607,6 @@ /* Configure data-filter: */ m_pFilterOfData->setPlaceholderText("Search.."); - connect(m_pFilterOfData, SIGNAL(textChanged(const QString&)), - this, SLOT(sltDataApplyFilter(const QString&))); + connect(m_pFilterOfData, &QLineEdit::textChanged, + this, &UIExtraDataManagerWindow::sltDataApplyFilter); /* Add data-filter into layout: */ pLayout->addWidget(m_pFilterOfData); @@ -1636,6 +1639,6 @@ m_pViewOfData->setSelectionMode(QAbstractItemView::ExtendedSelection); m_pViewOfData->setSelectionBehavior(QAbstractItemView::SelectRows); - connect(m_pViewOfData, SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(sltDataHandleCustomContextMenuRequested(const QPoint&))); + connect(m_pViewOfData, &QTableView::customContextMenuRequested, + this, &UIExtraDataManagerWindow::sltDataHandleCustomContextMenuRequested); QHeaderView *pVHeader = m_pViewOfData->verticalHeader(); QHeaderView *pHHeader = m_pViewOfData->horizontalHeader(); @@ -1662,6 +1665,6 @@ m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Close); m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape); - connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog())); - connect(m_pButtonBox, SIGNAL(rejected()), this, SLOT(close())); + connect(m_pButtonBox, &QIDialogButtonBox::helpRequested, &msgCenter(), &UIMessageCenter::sltShowHelpHelpDialog); + connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIExtraDataManagerWindow::close); /* Add button-box into main layout: */ m_pMainLayout->addWidget(m_pButtonBox); @@ -4340,6 +4343,6 @@ { /* Create queued (async) connections for signals of event proxy object: */ - connect(m_pHandler, SIGNAL(sigExtraDataChange(QString, QString, QString)), - this, SLOT(sltExtraDataChange(QString, QString, QString)), + connect(m_pHandler, &UIExtraDataEventHandler::sigExtraDataChange, + this, &UIExtraDataManager::sltExtraDataChange, Qt::QueuedConnection); } @@ -4379,8 +4382,8 @@ m_pWindow = new UIExtraDataManagerWindow; /* Configure window connections: */ - connect(this, SIGNAL(sigExtraDataMapAcknowledging(QString)), - m_pWindow, SLOT(sltExtraDataMapAcknowledging(QString))); - connect(this, SIGNAL(sigExtraDataChange(QString, QString, QString)), - m_pWindow, SLOT(sltExtraDataChange(QString, QString, QString))); + connect(this, &UIExtraDataManager::sigExtraDataMapAcknowledging, + m_pWindow, &UIExtraDataManagerWindow::sltExtraDataMapAcknowledging); + connect(this, &UIExtraDataManager::sigExtraDataChange, + m_pWindow, &UIExtraDataManagerWindow::sltExtraDataChange); } /* Show and raise window: */