mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-13 10:04:13 +02:00
Remaining signal/slot migration and clean-up after the latest merge.
This commit is contained in:
@@ -123,10 +123,8 @@ void AutoNumberingDockWidget::setProject(QETProject *project,
|
|||||||
disconnect(m_project, &QETProject::elementAutoNumAdded, this, &AutoNumberingDockWidget::elementAutoNumChanged);
|
disconnect(m_project, &QETProject::elementAutoNumAdded, this, &AutoNumberingDockWidget::elementAutoNumChanged);
|
||||||
|
|
||||||
//Folio Signals
|
//Folio Signals
|
||||||
disconnect (m_project,SIGNAL(folioAutoNumRemoved()),
|
disconnect(m_project, &QETProject::folioAutoNumRemoved, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged));
|
||||||
this,SLOT(folioAutoNumChanged()));
|
disconnect(m_project, &QETProject::folioAutoNumAdded, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged));
|
||||||
disconnect (m_project,SIGNAL(folioAutoNumAdded()),
|
|
||||||
this,SLOT(folioAutoNumChanged()));
|
|
||||||
disconnect(m_project, &QETProject::defaultTitleBlockPropertiesChanged, this, &AutoNumberingDockWidget::setActive);
|
disconnect(m_project, &QETProject::defaultTitleBlockPropertiesChanged, this, &AutoNumberingDockWidget::setActive);
|
||||||
|
|
||||||
//Conductor, Element and Folio Signals
|
//Conductor, Element and Folio Signals
|
||||||
@@ -150,10 +148,8 @@ void AutoNumberingDockWidget::setProject(QETProject *project,
|
|||||||
connect(m_project, &QETProject::elementAutoNumAdded, this, &AutoNumberingDockWidget::elementAutoNumChanged);
|
connect(m_project, &QETProject::elementAutoNumAdded, this, &AutoNumberingDockWidget::elementAutoNumChanged);
|
||||||
|
|
||||||
//Folio Signals
|
//Folio Signals
|
||||||
connect (m_project,SIGNAL(folioAutoNumRemoved()),
|
connect(m_project, &QETProject::folioAutoNumRemoved, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged));
|
||||||
this,SLOT(folioAutoNumChanged()));
|
connect(m_project, &QETProject::folioAutoNumAdded, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged));
|
||||||
connect (m_project,SIGNAL(folioAutoNumAdded()),
|
|
||||||
this,SLOT(folioAutoNumChanged()));
|
|
||||||
connect(m_project, &QETProject::defaultTitleBlockPropertiesChanged, this, &AutoNumberingDockWidget::setActive);
|
connect(m_project, &QETProject::defaultTitleBlockPropertiesChanged, this, &AutoNumberingDockWidget::setActive);
|
||||||
|
|
||||||
//Conductor, Element and Folio Signals
|
//Conductor, Element and Folio Signals
|
||||||
@@ -358,7 +354,6 @@ void AutoNumberingDockWidget::on_m_folio_cb_activated(int) {
|
|||||||
if (new_properties != old_properties)
|
if (new_properties != old_properties)
|
||||||
diagram->undoStack().push(new ChangeTitleBlockCommand(diagram, old_properties, new_properties));
|
diagram->undoStack().push(new ChangeTitleBlockCommand(diagram, old_properties, new_properties));
|
||||||
}
|
}
|
||||||
emit(folioAutoNumChanged(current_autonum));
|
|
||||||
refreshRow(AutoNumCategory::Folio);
|
refreshRow(AutoNumCategory::Folio);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ ElementsPanel::ElementsPanel(QWidget *parent) :
|
|||||||
|
|
||||||
// we handle double click on items ourselves
|
// we handle double click on items ourselves
|
||||||
connect(this, &ElementsPanel::itemDoubleClicked, this, &ElementsPanel::slot_doubleClick);
|
connect(this, &ElementsPanel::itemDoubleClicked, this, &ElementsPanel::slot_doubleClick);
|
||||||
connect(this, &GenericPanel::firstActivated, [this]() {QTimer::singleShot(250, this, SLOT(reload()));});
|
connect(this, &GenericPanel::firstActivated, [this]() {QTimer::singleShot(250, this, &ElementsPanel::reload);});
|
||||||
connect(this, &ElementsPanel::panelContentChanged, this, &ElementsPanel::panelContentChange);
|
connect(this, &ElementsPanel::panelContentChanged, this, &ElementsPanel::panelContentChange);
|
||||||
|
|
||||||
// manage signal itemClicked
|
// manage signal itemClicked
|
||||||
|
|||||||
+1
-1
@@ -1796,7 +1796,7 @@ void QETApp::checkRemainingWindows()
|
|||||||
*/
|
*/
|
||||||
static bool sleep = true;
|
static bool sleep = true;
|
||||||
if (sleep) {
|
if (sleep) {
|
||||||
QTimer::singleShot(500, this, SLOT(checkRemainingWindows()));
|
QTimer::singleShot(500, this, &QETApp::checkRemainingWindows);
|
||||||
} else {
|
} else {
|
||||||
if (!diagramEditors().count() && !elementEditors().count()) {
|
if (!diagramEditors().count() && !elementEditors().count()) {
|
||||||
qApp->quit();
|
qApp->quit();
|
||||||
|
|||||||
Reference in New Issue
Block a user