diff --git a/src/app/tape/dialogs/configpages/tapepathpage.cpp b/src/app/tape/dialogs/configpages/tapepathpage.cpp index 0aff9cf42..659e03ec6 100644 --- a/src/app/tape/dialogs/configpages/tapepathpage.cpp +++ b/src/app/tape/dialogs/configpages/tapepathpage.cpp @@ -54,7 +54,7 @@ TapePathPage::TapePathPage(QWidget *parent) pathGroup(nullptr) { QGroupBox *pathGroup = PathGroup(); - SCASSERT(pathGroup != nullptr); + SCASSERT(pathGroup != nullptr) QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(pathGroup); @@ -76,7 +76,7 @@ void TapePathPage::DefaultPath() { const int row = pathTable->currentRow(); QTableWidgetItem *item = pathTable->item(row, 1); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) switch (row) { @@ -102,7 +102,7 @@ void TapePathPage::EditPath() { const int row = pathTable->currentRow(); QTableWidgetItem *item = pathTable->item(row, 1); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) QString path; switch (row) diff --git a/src/app/tape/dialogs/dialogabouttape.cpp b/src/app/tape/dialogs/dialogabouttape.cpp index 808c6a338..6bcc8e0b9 100644 --- a/src/app/tape/dialogs/dialogabouttape.cpp +++ b/src/app/tape/dialogs/dialogabouttape.cpp @@ -112,7 +112,7 @@ void DialogAboutTape::showEvent(QShowEvent *event) //--------------------------------------------------------------------------------------------------------------------- void DialogAboutTape::FontPointSize(QWidget *w, int pointSize) { - SCASSERT(w != nullptr); + SCASSERT(w != nullptr) QFont font = w->font(); font.setPointSize(pointSize); diff --git a/src/app/tape/dialogs/dialogexporttocsv.cpp b/src/app/tape/dialogs/dialogexporttocsv.cpp index b00b67bf1..e0e2024b0 100644 --- a/src/app/tape/dialogs/dialogexporttocsv.cpp +++ b/src/app/tape/dialogs/dialogexporttocsv.cpp @@ -56,7 +56,7 @@ DialogExportToCSV::DialogExportToCSV(QWidget *parent) SetSeparator(qApp->TapeSettings()->GetCSVSeparator()); QPushButton *bDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults); - SCASSERT(bDefaults != nullptr); + SCASSERT(bDefaults != nullptr) connect(bDefaults, &QPushButton::clicked, [this]() { ui->checkBoxWithHeader->setChecked(qApp->TapeSettings()->GetDefCSVWithHeader()); diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index cad65dc98..78ec2335b 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -479,7 +479,7 @@ void MApplication::OpenSettings() //--------------------------------------------------------------------------------------------------------------------- VTapeSettings *MApplication::TapeSettings() { - SCASSERT(settings != nullptr); + SCASSERT(settings != nullptr) return qobject_cast(settings); } diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 57f57c10e..5d1b11cd9 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1446,8 +1446,8 @@ void TMainWindow::ShowMDiagram(const QString &name) //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::DeployFormula() { - SCASSERT(ui->plainTextEditFormula != nullptr); - SCASSERT(ui->pushButtonGrow != nullptr); + SCASSERT(ui->plainTextEditFormula != nullptr) + SCASSERT(ui->pushButtonGrow != nullptr) const QTextCursor cursor = ui->plainTextEditFormula->textCursor(); @@ -1844,7 +1844,7 @@ void TMainWindow::SetupMenu() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::InitWindow() { - SCASSERT(m != nullptr); + SCASSERT(m != nullptr) ui->labelToolTip->setVisible(false); ui->tabWidget->setVisible(true); ui->dockWidgetDiagram->setVisible(dockDiagramVisible); @@ -2052,7 +2052,7 @@ void TMainWindow::ShowUnits() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::ShowHeaderUnits(QTableWidget *table, int column, const QString &unit) { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) QString header = table->horizontalHeaderItem(column)->text(); const int index = header.indexOf(QLatin1String("(")); @@ -2819,7 +2819,7 @@ void TMainWindow::UpdateRecentFileActions() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::CreateWindowMenu(QMenu *menu) { - SCASSERT(menu != nullptr); + SCASSERT(menu != nullptr) QAction *action = menu->addAction(tr("&New Window")); connect(action, &QAction::triggered, [this]() @@ -2990,7 +2990,7 @@ void TMainWindow::InitUnits() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::InitComboBoxUnits() { - SCASSERT(comboBoxUnits != nullptr); + SCASSERT(comboBoxUnits != nullptr) comboBoxUnits->addItem(VDomDocument::UnitsToStr(Unit::Cm, true), QVariant(static_cast(Unit::Cm))); comboBoxUnits->addItem(VDomDocument::UnitsToStr(Unit::Mm, true), QVariant(static_cast(Unit::Mm))); comboBoxUnits->addItem(VDomDocument::UnitsToStr(Unit::Inch, true), QVariant(static_cast(Unit::Inch))); @@ -2999,7 +2999,7 @@ void TMainWindow::InitComboBoxUnits() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::InitGender(QComboBox *gender) { - SCASSERT(gender != nullptr); + SCASSERT(gender != nullptr) gender->addItem(tr("unknown", "gender"), QVariant(static_cast(GenderType::Unknown))); gender->addItem(tr("male", "gender"), QVariant(static_cast(GenderType::Male))); gender->addItem(tr("female", "gender"), QVariant(static_cast(GenderType::Female))); diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index 8c9130e04..31e54bbf2 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -683,7 +683,7 @@ void VApplication::OpenSettings() //--------------------------------------------------------------------------------------------------------------------- VSettings *VApplication::ValentinaSettings() { - SCASSERT(settings != nullptr); + SCASSERT(settings != nullptr) return qobject_cast(settings); } diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp index e32df2705..0d1f90cfc 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp +++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp @@ -873,7 +873,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolEndLine(VProperty *property) const QString id = propertyToId[property]; VToolEndLine *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -906,7 +906,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolAlongLine(VProperty *property) const QString id = propertyToId[property]; VToolAlongLine *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -936,7 +936,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolArc(VProperty *property) const QString id = propertyToId[property]; VToolArc *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 8: // AttrRadius @@ -966,7 +966,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolArcWithLength(VProperty *propert const QString id = propertyToId[property]; VToolArcWithLength *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 8: // AttrRadius @@ -996,7 +996,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolBisector(VProperty *property) const QString id = propertyToId[property]; VToolBisector *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1048,7 +1048,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCutArc(VProperty *property) const QString id = propertyToId[property]; VToolCutArc *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1072,7 +1072,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCutSpline(VProperty *property) const QString id = propertyToId[property]; VToolCutSpline *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1096,7 +1096,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCutSplinePath(VProperty *propert const QString id = propertyToId[property]; VToolCutSplinePath *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1120,7 +1120,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolHeight(VProperty *property) const QString id = propertyToId[property]; VToolHeight *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1147,7 +1147,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolLine(VProperty *property) const QString id = propertyToId[property]; VToolLine *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 3: // AttrTypeLine @@ -1190,7 +1190,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolNormal(VProperty *property) const QString id = propertyToId[property]; VToolNormal *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 4: // AttrLength @@ -1223,7 +1223,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfContact(VProperty *proper const QString id = propertyToId[property]; VToolPointOfContact *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 8: // AttrRadius @@ -1291,7 +1291,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCircles(VProp const QString id = propertyToId[property]; VToolPointOfIntersectionCircles *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1355,7 +1355,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointFromCircleAndTangent(VPrope const QString id = propertyToId[property]; VToolPointFromCircleAndTangent *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1410,7 +1410,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolShoulderPoint(VProperty *propert const QString id = propertyToId[property]; VToolShoulderPoint *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 4: // AttrLength @@ -1440,7 +1440,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSpline(VProperty *property) const QString id = propertyToId[property]; auto i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) VSpline spl = i->getSpline(); const VFormula f = value.value(); @@ -1496,7 +1496,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezier(VProperty *property) const QString id = propertyToId[property]; auto i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { @@ -1521,7 +1521,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSplinePath(VProperty *property) const QString id = propertyToId[property]; VToolSplinePath *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1545,7 +1545,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezierPath(VProperty *prope const QString id = propertyToId[property]; VToolCubicBezierPath *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1588,7 +1588,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersectAxis(VProperty *pro const QString id = propertyToId[property]; VToolLineIntersectAxis *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1618,7 +1618,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCurveIntersectAxis(VProperty *pr const QString id = propertyToId[property]; VToolCurveIntersectAxis *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 0: // AttrName @@ -1648,7 +1648,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolRotation(VProperty *property) const QString id = propertyToId[property]; VToolRotation *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 38: // AttrSuffix @@ -1672,7 +1672,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolMove(VProperty *property) const QString id = propertyToId[property]; VToolMove *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 38: // AttrSuffix @@ -1743,7 +1743,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolEllipticalArc(VProperty *propert const QString id = propertyToId[property]; VToolEllipticalArc *i = qgraphicsitem_cast(currentItem); - SCASSERT(i != nullptr); + SCASSERT(i != nullptr) switch (PropertiesList().indexOf(id)) { case 40://AttrRadius1 diff --git a/src/app/valentina/dialogs/configpages/configurationpage.cpp b/src/app/valentina/dialogs/configpages/configurationpage.cpp index e0d2428b8..306c2262c 100644 --- a/src/app/valentina/dialogs/configpages/configurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/configurationpage.cpp @@ -106,7 +106,7 @@ void ConfigurationPage::Apply() settings->SetAutosaveTime(autoTime->value()); QTimer *autoSaveTimer = qApp->getAutoSaveTimer(); - SCASSERT(autoSaveTimer); + SCASSERT(autoSaveTimer) autoSaveCheck->isChecked() ? autoSaveTimer->start(autoTime->value()*60000) : autoSaveTimer->stop(); diff --git a/src/app/valentina/dialogs/configpages/pathpage.cpp b/src/app/valentina/dialogs/configpages/pathpage.cpp index 97128b929..9c9dd34e1 100644 --- a/src/app/valentina/dialogs/configpages/pathpage.cpp +++ b/src/app/valentina/dialogs/configpages/pathpage.cpp @@ -51,7 +51,7 @@ PathPage::PathPage(QWidget *parent) : QWidget(parent), defaultButton(nullptr), editButton(nullptr), pathTable(nullptr), pathGroup(nullptr) { QGroupBox *pathGroup = PathGroup(); - SCASSERT(pathGroup != nullptr); + SCASSERT(pathGroup != nullptr) QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(pathGroup); @@ -75,7 +75,7 @@ void PathPage::DefaultPath() { const int row = pathTable->currentRow(); QTableWidgetItem *item = pathTable->item(row, 1); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) switch (row) { @@ -103,7 +103,7 @@ void PathPage::EditPath() { const int row = pathTable->currentRow(); QTableWidgetItem *item = pathTable->item(row, 1); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) QString path; switch (row) diff --git a/src/app/valentina/dialogs/dialogaboutapp.cpp b/src/app/valentina/dialogs/dialogaboutapp.cpp index 1e5c3683d..987065a9b 100644 --- a/src/app/valentina/dialogs/dialogaboutapp.cpp +++ b/src/app/valentina/dialogs/dialogaboutapp.cpp @@ -110,7 +110,7 @@ void DialogAboutApp::showEvent(QShowEvent *event) //--------------------------------------------------------------------------------------------------------------------- void DialogAboutApp::FontPointSize(QWidget *w, int pointSize) { - SCASSERT(w != nullptr); + SCASSERT(w != nullptr) QFont font = w->font(); font.setPointSize(pointSize); diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index 34a779bdb..f2ff02db3 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -190,7 +190,7 @@ void DialogHistory::FillTable() { cursorRow = CursorRow(); QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setIcon(QIcon("://icon/32x32/put_after.png")); } ui->tableWidget->resizeColumnsToContents(); @@ -270,25 +270,25 @@ QString DialogHistory::Record(const VToolRecord &tool) case Tool::Spline: { const QSharedPointer spl = data->GeometricObject(tool.getId()); - SCASSERT(not spl.isNull()); + SCASSERT(not spl.isNull()) return spl->NameForHistory(tr("Curve")); } case Tool::CubicBezier: { const QSharedPointer spl = data->GeometricObject(tool.getId()); - SCASSERT(not spl.isNull()); + SCASSERT(not spl.isNull()) return spl->NameForHistory(tr("Cubic bezier curve")); } case Tool::Arc: { const QSharedPointer arc = data->GeometricObject(tool.getId()); - SCASSERT(not arc.isNull()); + SCASSERT(not arc.isNull()) return arc->NameForHistory(tr("Arc")); } case Tool::ArcWithLength: { const QSharedPointer arc = data->GeometricObject(tool.getId()); - SCASSERT(not arc.isNull()); + SCASSERT(not arc.isNull()) return tr("%1 with length %2") .arg(arc->NameForHistory(tr("Arc"))) .arg(arc->GetLength()); @@ -296,13 +296,13 @@ QString DialogHistory::Record(const VToolRecord &tool) case Tool::SplinePath: { const QSharedPointer splPath = data->GeometricObject(tool.getId()); - SCASSERT(not splPath.isNull()); + SCASSERT(not splPath.isNull()) return splPath->NameForHistory(tr("Spline path")); } case Tool::CubicBezierPath: { const QSharedPointer splPath = data->GeometricObject(tool.getId()); - SCASSERT(not splPath.isNull()); + SCASSERT(not splPath.isNull()) return splPath->NameForHistory(tr("Cubic bezier curve path")); } case Tool::PointOfContact: @@ -330,7 +330,7 @@ QString DialogHistory::Record(const VToolRecord &tool) case Tool::CutArc: { const QSharedPointer arc = data->GeometricObject(AttrUInt(domElem, AttrArc)); - SCASSERT(not arc.isNull()); + SCASSERT(not arc.isNull()) return tr("%1 - cut %2") .arg(PointName(tool.getId())) .arg(arc->NameForHistory(tr("arc"))); @@ -339,7 +339,7 @@ QString DialogHistory::Record(const VToolRecord &tool) { const quint32 splineId = AttrUInt(domElem, VToolCutSpline::AttrSpline); const QSharedPointer spl = data->GeometricObject(splineId); - SCASSERT(not spl.isNull()); + SCASSERT(not spl.isNull()) return tr("%1 - cut %2") .arg(PointName(tool.getId())) .arg(spl->NameForHistory(tr("curve"))); @@ -349,7 +349,7 @@ QString DialogHistory::Record(const VToolRecord &tool) const quint32 splinePathId = AttrUInt(domElem, VToolCutSplinePath::AttrSplinePath); const QSharedPointer splPath = data->GeometricObject(splinePathId); - SCASSERT(not splPath.isNull()); + SCASSERT(not splPath.isNull()) return tr("%1 - cut %2") .arg(PointName(tool.getId())) .arg(splPath->NameForHistory(tr("curve path"))); @@ -382,7 +382,7 @@ QString DialogHistory::Record(const VToolRecord &tool) case Tool::EllipticalArc: { const QSharedPointer elArc = data->GeometricObject(tool.getId()); - SCASSERT(not elArc.isNull()); + SCASSERT(not elArc.isNull()) return tr("%1 with length %2") .arg(elArc->NameForHistory(tr("Elliptical arc"))) .arg(elArc->GetLength()); @@ -497,7 +497,7 @@ void DialogHistory::RetranslateUi() UpdateHistory(); QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setIcon(QIcon("")); cursorRow = currentRow; diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 93ba69a91..7bebdfb62 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -184,7 +184,7 @@ void DialogIncrements::FillIncrements() template void DialogIncrements::FillTable(const QMap &varTable, QTableWidget *table) { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) qint32 currentRow = -1; QMapIterator i(varTable); @@ -270,7 +270,7 @@ void DialogIncrements::ShowUnits() //--------------------------------------------------------------------------------------------------------------------- void DialogIncrements::ShowHeaderUnits(QTableWidget *table, int column, const QString &unit) { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) const QString header = table->horizontalHeaderItem(column)->text(); const QString unitHeader = QString("%1 (%2)").arg(header).arg(unit); @@ -280,7 +280,7 @@ void DialogIncrements::ShowHeaderUnits(QTableWidget *table, int column, const QS //--------------------------------------------------------------------------------------------------------------------- void DialogIncrements::AddCell(QTableWidget *table, const QString &text, int row, int column, int aligment, bool ok) { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) QTableWidgetItem *item = new QTableWidgetItem(text); item->setTextAlignment(aligment); @@ -664,8 +664,8 @@ void DialogIncrements::SaveIncrFormula() //--------------------------------------------------------------------------------------------------------------------- void DialogIncrements::DeployFormula() { - SCASSERT(ui->plainTextEditFormula != nullptr); - SCASSERT(ui->pushButtonGrow != nullptr); + SCASSERT(ui->plainTextEditFormula != nullptr) + SCASSERT(ui->pushButtonGrow != nullptr) const QTextCursor cursor = ui->plainTextEditFormula->textCursor(); diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.cpp b/src/app/valentina/dialogs/dialoglayoutprogress.cpp index 2419403f5..b22d0b0de 100644 --- a/src/app/valentina/dialogs/dialoglayoutprogress.cpp +++ b/src/app/valentina/dialogs/dialoglayoutprogress.cpp @@ -54,7 +54,7 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) movie->start (); QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); - SCASSERT(bCancel != nullptr); + SCASSERT(bCancel != nullptr) connect(bCancel, &QPushButton::clicked, [this](){emit Abort();}); setModal(true); diff --git a/src/app/valentina/dialogs/dialognewpattern.cpp b/src/app/valentina/dialogs/dialognewpattern.cpp index fa7e4882a..e71185f69 100644 --- a/src/app/valentina/dialogs/dialognewpattern.cpp +++ b/src/app/valentina/dialogs/dialognewpattern.cpp @@ -85,7 +85,7 @@ void DialogNewPattern::CheckState() } QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagName); } diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index c406548cf..995e039da 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -69,7 +69,7 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte ui->lineEditAuthor->setClearButtonEnabled(true); #endif - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); @@ -108,7 +108,7 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte &DialogPatternProperties::Apply); QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); - SCASSERT(bCancel != nullptr); + SCASSERT(bCancel != nullptr) connect(bCancel, &QPushButton::clicked, this, &DialogPatternProperties::close); ui->tabWidget->setCurrentIndex(0); @@ -689,7 +689,7 @@ void DialogPatternProperties::SetOptions(const QMap &option) template void DialogPatternProperties::InitComboBox(QComboBox *box, const QMap &option) { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->clear(); diff --git a/src/app/valentina/dialogs/dialogpatternxmledit.cpp b/src/app/valentina/dialogs/dialogpatternxmledit.cpp index d2509f6e1..5defcf7ec 100644 --- a/src/app/valentina/dialogs/dialogpatternxmledit.cpp +++ b/src/app/valentina/dialogs/dialogpatternxmledit.cpp @@ -130,7 +130,7 @@ bool DialogPatternXmlEdit::ApplyNodeChange(QDomNode domElement, QString name, QS bool DialogPatternXmlEdit::ApplyNodeAdd(QDomNode domElement, VXMLTreeElement* treeElement, QString name, QString value) { QDomElement newnode = domElement.ownerDocument().createElement(name); - //SCASSERT(newnode != nullptr); + //SCASSERT(newnode != nullptr) newnode.setNodeValue(value); domElement.appendChild(newnode); treeElement->SetDocNode(newnode); @@ -285,7 +285,7 @@ bool DialogPatternXmlEdit::DeleteNodeAndSons(VXMLTreeElement * currentNode, bool } if (index < 0) { - SCASSERT(index==0); + SCASSERT(index==0) return false; } parent->removeRow(index); @@ -321,7 +321,7 @@ DialogPatternXmlEdit::ChangesStackElement* DialogPatternXmlEdit::CreateStackElem //--------------------------------------------------------------------------------------------------------------------- bool DialogPatternXmlEdit::UndoChange(DialogPatternXmlEdit::ChangesStackElement* current) { - SCASSERT(current != nullptr); + SCASSERT(current != nullptr) VXMLTreeElement * currentNode = current->element; @@ -374,7 +374,7 @@ bool DialogPatternXmlEdit::UndoChange(DialogPatternXmlEdit::ChangesStackElement* } if (index < 0) { - SCASSERT(index==0); + SCASSERT(index==0) return false; } parent->removeRow(index); @@ -612,7 +612,7 @@ void DialogPatternXmlEdit::RemoveChangeStackElement(ChangesStackElement* elmt) } if (index->next == nullptr) { - SCASSERT(index->next != nullptr); + SCASSERT(index->next != nullptr) return; } delete index->next->newText; @@ -813,7 +813,7 @@ void DialogPatternXmlEdit::ButtonSetClicked() { // If node was created or edited previously, rewrite if (this->currentNodeEditedStatus == DialogPatternXmlEdit::ChangeTypeDelete) { // You shouldn't be able to edit a deleted node... - SCASSERT(this->currentNodeEditedStatus != DialogPatternXmlEdit::ChangeTypeDelete); + SCASSERT(this->currentNodeEditedStatus != DialogPatternXmlEdit::ChangeTypeDelete) ClearEditData(); return; } @@ -933,7 +933,7 @@ void DialogPatternXmlEdit::BaseSelectionChanged(int value) ui->pushButton_Apply_Changes->setEnabled(false); index = ui->comboBox_Base_Selection->itemData(value).toInt(); //.convert(QVariant::Int); - SCASSERT(value < rootBasesNum); + SCASSERT(value < rootBasesNum) // QMessageBox::information(this, "test", QString("%1:%2").arg(value).arg(index)); // Clear all tree info and nodes diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index c6300a2f3..ab9a2505d 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -59,7 +59,7 @@ DialogSaveLayout::DialogSaveLayout(int count, const QString &fileName, QWidget * qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(false); #if QT_VERSION > QT_VERSION_CHECK(5, 1, 0) @@ -229,7 +229,7 @@ void DialogSaveLayout::Save() void DialogSaveLayout::PathChanged(const QString &text) { QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) QPalette palette = ui->lineEditPath->palette(); diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 2aca6bd2c..488977290 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -550,7 +550,7 @@ void MainWindow::SetToolButton(bool checked, Tool t, const QString &cursor, cons dialogTool = new Dialog(pattern, 0, this); VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) connect(scene, &VMainGraphicsScene::ChoosedObject, dialogTool.data(), &DialogTool::ChosenObject); connect(scene, &VMainGraphicsScene::SelectedObject, dialogTool.data(), &DialogTool::SelectedObject); @@ -609,7 +609,7 @@ void MainWindow::SetToolButtonWithApply(bool checked, Tool t, const QString &cur } VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) connect(scene, &VMainGraphicsScene::ChoosedObject, dialogTool.data(), &DialogTool::ChosenObject); connect(scene, &VMainGraphicsScene::SelectedObject, dialogTool.data(), &DialogTool::SelectedObject); @@ -635,11 +635,11 @@ void MainWindow::SetToolButtonWithApply(bool checked, Tool t, const QString &cur template void MainWindow::ClosedDialog(int result) { - SCASSERT(not dialogTool.isNull()); + SCASSERT(not dialogTool.isNull()) if (result == QDialog::Accepted) { VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) QGraphicsItem *tool = dynamic_cast(DrawTool::Create(dialogTool, scene, doc, pattern)); ui->view->itemClicked(tool); @@ -655,14 +655,14 @@ void MainWindow::ClosedDialog(int result) template void MainWindow::ClosedDialogWithApply(int result) { - SCASSERT(not dialogTool.isNull()); + SCASSERT(not dialogTool.isNull()) if (result == QDialog::Accepted) { // Only create tool if not already created with apply if (dialogTool->GetAssociatedTool() == nullptr) { VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) dialogTool->SetAssociatedTool( dynamic_cast (DrawTool::Create(dialogTool, scene, doc, pattern))); @@ -673,7 +673,7 @@ void MainWindow::ClosedDialogWithApply(int result) vtool->FullUpdateFromGuiApply(); } } - SCASSERT(not dialogTool.isNull()); + SCASSERT(not dialogTool.isNull()) QGraphicsItem *tool = dynamic_cast(dialogTool->GetAssociatedTool()); ui->view->itemClicked(tool); if (dialogTool->GetAssociatedTool() != nullptr) @@ -701,13 +701,13 @@ void MainWindow::ClosedDialogWithApply(int result) template void MainWindow::ApplyDialog() { - SCASSERT(not dialogTool.isNull()); + SCASSERT(not dialogTool.isNull()) // Only create tool if not already created with apply if (dialogTool->GetAssociatedTool() == nullptr) { VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) dialogTool->SetAssociatedTool( static_cast (DrawTool::Create(dialogTool, scene, doc, pattern))); @@ -715,7 +715,7 @@ void MainWindow::ApplyDialog() else { // Or update associated tool with data VDrawTool * vtool= static_cast(dialogTool->GetAssociatedTool()); - SCASSERT(vtool != nullptr); + SCASSERT(vtool != nullptr) vtool->FullUpdateFromGuiApply(); } } @@ -1091,11 +1091,11 @@ void MainWindow::ToolMove(bool checked) //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ClosedDialogGroup(int result) { - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) if (result == QDialog::Accepted) { DialogGroup *dialog = qobject_cast(dialogTool); - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) const QDomElement group = doc->CreateGroup(pattern->getNextId(), dialog->GetName(), dialog->GetGroup()); if (not group.isNull()) { @@ -2039,7 +2039,7 @@ void MainWindow::SaveCurrentScene() if (mode == Draw::Calculation || mode == Draw::Modeling) { VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) /*Save transform*/ scene->setTransform(ui->view->transform()); @@ -2058,7 +2058,7 @@ void MainWindow::SaveCurrentScene() void MainWindow::RestoreCurrentScene() { VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) /*Set transform for current scene*/ ui->view->setTransform(scene->transform()); diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index 8bcdbe851..cd6d7c46d 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -1153,7 +1153,7 @@ bool MainWindowsNoGUI::IsPagesFit(const QSizeF &printPaper) const // On previous stage already was checked if pages have uniform size // Enough will be to check only one page QGraphicsRectItem *p = qgraphicsitem_cast(papers.at(0)); - SCASSERT(p != nullptr); + SCASSERT(p != nullptr) const QSizeF pSize = p->rect().size(); if (pSize.height() <= printPaper.height() && pSize.width() <= printPaper.width()) { @@ -1182,7 +1182,7 @@ int MainWindowsNoGUI::ContinueIfLayoutStale() msgBox.setDefaultButton(QMessageBox::No); QSpacerItem* horizontalSpacer = new QSpacerItem(500, 0, QSizePolicy::Minimum, QSizePolicy::Expanding); QGridLayout* layout = static_cast(msgBox.layout()); - SCASSERT(layout != nullptr); + SCASSERT(layout != nullptr) layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount()); msgBox.exec(); return msgBox.result(); diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index c5f2fb433..fe2bc9d8d 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -67,8 +67,8 @@ VPattern::VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, QObject *parent) : VAbstractPattern(parent), data(data), mode(mode), sceneDraw(sceneDraw), sceneDetail(sceneDetail) { - SCASSERT(sceneDraw != nullptr); - SCASSERT(sceneDetail != nullptr); + SCASSERT(sceneDraw != nullptr) + SCASSERT(sceneDetail != nullptr) } //--------------------------------------------------------------------------------------------------------------------- @@ -134,8 +134,8 @@ void VPattern::Parse(const Document &parse) break; } - SCASSERT(sceneDraw != nullptr); - SCASSERT(sceneDetail != nullptr); + SCASSERT(sceneDraw != nullptr) + SCASSERT(sceneDetail != nullptr) QStringList tags = QStringList() << TagDraw << TagIncrements << TagAuthor << TagDescription << TagNotes << TagMeasurements << TagVersion << TagGradation << TagImage << TagUnit << TagPatternName << TagPatternNum << TagCompanyName << TagCustomerName @@ -314,10 +314,10 @@ void VPattern::setCurrentData() void VPattern::UpdateToolData(const quint32 &id, VContainer *data) { Q_ASSERT_X(id != 0, Q_FUNC_INFO, "id == 0"); //-V712 //-V654 - SCASSERT(data != nullptr); + SCASSERT(data != nullptr) ToolExists(id); VDataTool *tool = tools.value(id); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) tool->VDataTool::setData(data); } @@ -548,8 +548,8 @@ void VPattern::ParseDrawElement(const QDomNode &node, const Document &parse) */ void VPattern::ParseDrawMode(const QDomNode &node, const Document &parse, const Draw &mode) { - SCASSERT(sceneDraw != nullptr); - SCASSERT(sceneDetail != nullptr); + SCASSERT(sceneDraw != nullptr) + SCASSERT(sceneDetail != nullptr) VMainGraphicsScene *scene = nullptr; if (mode == Draw::Calculation) { @@ -820,7 +820,7 @@ void VPattern::PointsCommonAttributes(const QDomElement &domElement, quint32 &id void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse, const QString &type) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(not type.isEmpty(), Q_FUNC_INFO, "type of point is empty"); @@ -934,7 +934,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try { @@ -1053,7 +1053,7 @@ QString VPattern::GetLabelBase(quint32 index) const //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolBasePoint(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); VToolBasePoint *spoint = nullptr; @@ -1084,7 +1084,7 @@ void VPattern::ParseToolBasePoint(VMainGraphicsScene *scene, const QDomElement & //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolEndLine(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1134,7 +1134,7 @@ void VPattern::ParseToolEndLine(VMainGraphicsScene *scene, QDomElement &domEleme //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolAlongLine(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1179,7 +1179,7 @@ void VPattern::ParseToolAlongLine(VMainGraphicsScene *scene, QDomElement &domEle //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolShoulderPoint(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1225,7 +1225,7 @@ void VPattern::ParseToolShoulderPoint(VMainGraphicsScene *scene, QDomElement &do //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolNormal(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1271,7 +1271,7 @@ void VPattern::ParseToolNormal(VMainGraphicsScene *scene, QDomElement &domElemen //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolBisector(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1317,7 +1317,7 @@ void VPattern::ParseToolBisector(VMainGraphicsScene *scene, QDomElement &domElem //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolLineIntersect(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1347,7 +1347,7 @@ void VPattern::ParseToolLineIntersect(VMainGraphicsScene *scene, const QDomEleme //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolPointOfContact(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1426,7 +1426,7 @@ void VPattern::ParseNodePoint(const QDomElement &domElement, const Document &par //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolHeight(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1457,7 +1457,7 @@ void VPattern::ParseToolHeight(VMainGraphicsScene *scene, const QDomElement &dom //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolTriangle(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1488,7 +1488,7 @@ void VPattern::ParseToolTriangle(VMainGraphicsScene *scene, const QDomElement &d void VPattern::ParseToolPointOfIntersection(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1516,7 +1516,7 @@ void VPattern::ParseToolPointOfIntersection(VMainGraphicsScene *scene, const QDo //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolCutSpline(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1557,7 +1557,7 @@ void VPattern::ParseToolCutSpline(VMainGraphicsScene *scene, QDomElement &domEle //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolCutSplinePath(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1599,7 +1599,7 @@ void VPattern::ParseToolCutSplinePath(VMainGraphicsScene *scene, QDomElement &do //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolCutArc(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1641,7 +1641,7 @@ void VPattern::ParseToolCutArc(VMainGraphicsScene *scene, QDomElement &domElemen void VPattern::ParseToolLineIntersectAxis(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1692,7 +1692,7 @@ void VPattern::ParseToolLineIntersectAxis(VMainGraphicsScene *scene, QDomElement void VPattern::ParseToolCurveIntersectAxis(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1741,7 +1741,7 @@ void VPattern::ParseToolCurveIntersectAxis(VMainGraphicsScene *scene, QDomElemen void VPattern::ParseToolPointOfIntersectionArcs(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1773,7 +1773,7 @@ void VPattern::ParseToolPointOfIntersectionArcs(VMainGraphicsScene *scene, const void VPattern::ParseToolPointOfIntersectionCircles(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1816,7 +1816,7 @@ void VPattern::ParseToolPointOfIntersectionCircles(VMainGraphicsScene *scene, QD void VPattern::ParseToolPointOfIntersectionCurves(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1847,7 +1847,7 @@ void VPattern::ParseToolPointOfIntersectionCurves(VMainGraphicsScene *scene, QDo void VPattern::ParseToolPointFromCircleAndTangent(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1888,7 +1888,7 @@ void VPattern::ParseToolPointFromCircleAndTangent(VMainGraphicsScene *scene, QDo void VPattern::ParseToolPointFromArcAndTangent(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1919,7 +1919,7 @@ void VPattern::ParseToolPointFromArcAndTangent(VMainGraphicsScene *scene, const //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolTrueDarts(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -1962,7 +1962,7 @@ void VPattern::ParseToolTrueDarts(VMainGraphicsScene *scene, const QDomElement & // TODO. Delete if minimal supported version is 0.2.7 void VPattern::ParseOldToolSpline(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -2002,7 +2002,7 @@ void VPattern::ParseOldToolSpline(VMainGraphicsScene *scene, const QDomElement & //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolSpline(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -2034,7 +2034,7 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, QDomElement &domElemen if (spl != nullptr) { VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(spl, &VToolSpline::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } @@ -2066,7 +2066,7 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, QDomElement &domElemen //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolCubicBezier(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -2106,7 +2106,7 @@ void VPattern::ParseToolCubicBezier(VMainGraphicsScene *scene, const QDomElement //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseOldToolSplinePath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -2167,7 +2167,7 @@ void VPattern::ParseOldToolSplinePath(VMainGraphicsScene *scene, const QDomEleme //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -2223,7 +2223,7 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement if (spl != nullptr) { VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(spl, &VToolSplinePath::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } @@ -2265,7 +2265,7 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolCubicBezierPath(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try @@ -2408,7 +2408,7 @@ void VPattern::ParseNodeSplinePath(const QDomElement &domElement, const Document //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolArc(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2453,7 +2453,7 @@ void VPattern::ParseToolArc(VMainGraphicsScene *scene, QDomElement &domElement, //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolEllipticalArc(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2575,7 +2575,7 @@ void VPattern::ParseNodeArc(const QDomElement &domElement, const Document &parse //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2621,7 +2621,7 @@ void VPattern::ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &do //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolRotation(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2664,7 +2664,7 @@ void VPattern::ParseToolRotation(VMainGraphicsScene *scene, QDomElement &domElem //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolFlippingByLine(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2694,7 +2694,7 @@ void VPattern::ParseToolFlippingByLine(VMainGraphicsScene *scene, QDomElement &d //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolFlippingByAxis(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2724,7 +2724,7 @@ void VPattern::ParseToolFlippingByAxis(VMainGraphicsScene *scene, QDomElement &d //--------------------------------------------------------------------------------------------------------------------- void VPattern::ParseToolMove(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); try @@ -2876,7 +2876,7 @@ void VPattern::GarbageCollector() void VPattern::ParseSplineElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse, const QString &type) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); @@ -2939,7 +2939,7 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, QDomElement &domEle void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse, const QString &type) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(not type.isEmpty(), Q_FUNC_INFO, "type of arc is empty"); @@ -2975,7 +2975,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen void VPattern::ParseEllipticalArcElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse, const QString &type) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(not type.isEmpty(), Q_FUNC_INFO, "type of elliptical arc is empty"); @@ -3007,7 +3007,7 @@ void VPattern::ParseEllipticalArcElement(VMainGraphicsScene *scene, QDomElement void VPattern::ParseToolsElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document &parse, const QString &type) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); @@ -3044,7 +3044,7 @@ void VPattern::ParseToolsElement(VMainGraphicsScene *scene, const QDomElement &d void VPattern::ParseOperationElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse, const QString &type) { - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Q_ASSERT_X(not domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(not type.isEmpty(), Q_FUNC_INFO, "type of operation is empty"); @@ -3527,8 +3527,8 @@ void VPattern::SetReadOnly(bool rOnly) //--------------------------------------------------------------------------------------------------------------------- void VPattern::PrepareForParse(const Document &parse) { - SCASSERT(sceneDraw != nullptr); - SCASSERT(sceneDetail != nullptr); + SCASSERT(sceneDraw != nullptr) + SCASSERT(sceneDetail != nullptr) if (parse == Document::FullParse) { TestUniqueId(); @@ -3723,7 +3723,7 @@ QRectF VPattern::ToolBoundingRect(const QRectF &rec, const quint32 &id) const if (tools.contains(id)) { const T *vTool = qobject_cast(tools.value(id)); - SCASSERT(vTool != nullptr); + SCASSERT(vTool != nullptr) QRectF childrenRect = vTool->childrenBoundingRect(); //map to scene coordinate. @@ -3749,7 +3749,7 @@ void VPattern::IncrementReferens(quint32 id) const Q_ASSERT_X(id != 0, Q_FUNC_INFO, "id == 0"); ToolExists(id); VDataTool *tool = tools.value(id); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) tool->incrementReferens(); } @@ -3763,6 +3763,6 @@ void VPattern::DecrementReferens(quint32 id) const Q_ASSERT_X(id != 0, Q_FUNC_INFO, "id == 0"); ToolExists(id); VDataTool *tool = tools.value(id); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) tool->decrementReferens(); } diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 787cfbbd8..169abd868 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -535,14 +535,14 @@ VDataTool *VAbstractPattern::getTool(const quint32 &id) void VAbstractPattern::AddTool(const quint32 &id, VDataTool *tool) { Q_ASSERT_X(id != 0, Q_FUNC_INFO, "id == 0"); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) tools.insert(id, tool); } //--------------------------------------------------------------------------------------------------------------------- void VAbstractPattern::AddToolOnRemove(VDataTool *tool) { - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) toolsOnRemove.append(tool); } diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index a7c4857ec..62ead1f98 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -101,7 +101,7 @@ VMeasurements::VMeasurements(Unit unit, VContainer *data) data(data), type(MeasurementsType::Individual) { - SCASSERT(data != nullptr); + SCASSERT(data != nullptr) CreateEmptyIndividualFile(unit); } @@ -112,7 +112,7 @@ VMeasurements::VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer data(data), type(MeasurementsType::Standard) { - SCASSERT(data != nullptr); + SCASSERT(data != nullptr) CreateEmptyStandardFile(unit, baseSize, baseHeight); } diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp index 79f5d2fbf..a59e16898 100644 --- a/src/libs/vlayout/vposter.cpp +++ b/src/libs/vlayout/vposter.cpp @@ -249,8 +249,8 @@ PosterData VPoster::Cut(int i, int j, const QRect &imageRect) const const int x = j*PageRect().width() - j*static_cast(allowence); const int y = i*PageRect().height() - i*static_cast(allowence); - SCASSERT(x <= imageRect.width()); - SCASSERT(y <= imageRect.height()); + SCASSERT(x <= imageRect.width()) + SCASSERT(y <= imageRect.height()) PosterData data; data.row = static_cast(i); diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index a21e9e2eb..14ee3f3b1 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -1071,7 +1071,7 @@ void InitPMSystems(QComboBox *systemCombo) // * The default option (blank field or 'None') should appear at the top of the list. // * The list should be sorted alphabetically so users can find their system easily. - SCASSERT(systemCombo != nullptr); + SCASSERT(systemCombo != nullptr) systemCombo->addItem(qApp->TrVars()->PMSystemName(listSystems.at(listSystems.size()-1)), listSystems.at(listSystems.size()-1)); @@ -1150,7 +1150,7 @@ QStringList ListPMSystems() //--------------------------------------------------------------------------------------------------------------------- QStringList ListNumbers(const VTranslateMeasurements *trM, const QStringList &listMeasurements) { - SCASSERT(trM != nullptr); + SCASSERT(trM != nullptr) QStringList numbers; for (int i=0; i < listMeasurements.size(); ++i) diff --git a/src/libs/vmisc/vabstractapplication.cpp b/src/libs/vmisc/vabstractapplication.cpp index 2acf0a9f3..b2a43ad27 100644 --- a/src/libs/vmisc/vabstractapplication.cpp +++ b/src/libs/vmisc/vabstractapplication.cpp @@ -283,7 +283,7 @@ void VAbstractApplication::setPatternUnit(const Unit &patternUnit) */ VCommonSettings *VAbstractApplication::Settings() { - SCASSERT(settings != nullptr); + SCASSERT(settings != nullptr) return settings; } diff --git a/src/libs/vmisc/vtablesearch.cpp b/src/libs/vmisc/vtablesearch.cpp index b03cc4f83..976ffa719 100644 --- a/src/libs/vmisc/vtablesearch.cpp +++ b/src/libs/vmisc/vtablesearch.cpp @@ -48,7 +48,7 @@ VTableSearch::VTableSearch(QTableWidget *table, QObject *parent) //--------------------------------------------------------------------------------------------------------------------- void VTableSearch::Clear() { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) for(int i = 0; i < table->rowCount(); ++i) { @@ -96,7 +96,7 @@ void VTableSearch::ShowNext(int newIndex) //--------------------------------------------------------------------------------------------------------------------- void VTableSearch::Find(const QString &term) { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) Clear(); @@ -194,7 +194,7 @@ void VTableSearch::AddRow(int row) //--------------------------------------------------------------------------------------------------------------------- void VTableSearch::RefreshList(const QString &term) { - SCASSERT(table != nullptr); + SCASSERT(table != nullptr) if (term.isEmpty()) { diff --git a/src/libs/vpatterndb/variables/varcradius.cpp b/src/libs/vpatterndb/variables/varcradius.cpp index ca023d2c3..2366552a1 100644 --- a/src/libs/vpatterndb/variables/varcradius.cpp +++ b/src/libs/vpatterndb/variables/varcradius.cpp @@ -46,7 +46,7 @@ VArcRadius::VArcRadius() VArcRadius::VArcRadius(const quint32 &id, const quint32 &parentId, const VArc *arc, Unit patternUnit) :VCurveVariable(id, parentId) { - SCASSERT(arc != nullptr); + SCASSERT(arc != nullptr) SetType(VarType::ArcRadius); SetName(QString(radius_V+"%1").arg(arc->name())); diff --git a/src/libs/vpatterndb/variables/vcurveangle.cpp b/src/libs/vpatterndb/variables/vcurveangle.cpp index 576d49543..f36ae42cc 100644 --- a/src/libs/vpatterndb/variables/vcurveangle.cpp +++ b/src/libs/vpatterndb/variables/vcurveangle.cpp @@ -49,7 +49,7 @@ VCurveAngle::VCurveAngle(const quint32 &id, const quint32 &parentId, const VAbst :VCurveVariable(id, parentId) { SetType(VarType::CurveAngle); - SCASSERT(curve != nullptr); + SCASSERT(curve != nullptr) if (angle == CurveAngle::StartAngle) { SetValue(curve->GetStartAngle()); diff --git a/src/libs/vpatterndb/variables/vcurveclength.cpp b/src/libs/vpatterndb/variables/vcurveclength.cpp index 1262cd832..ca4f09880 100644 --- a/src/libs/vpatterndb/variables/vcurveclength.cpp +++ b/src/libs/vpatterndb/variables/vcurveclength.cpp @@ -50,7 +50,7 @@ VCurveCLength::VCurveCLength(const quint32 &id, const quint32 &parentId, const V : VCurveVariable(id, parentId) { SetType(VarType::CurveCLength); - SCASSERT(curve != nullptr); + SCASSERT(curve != nullptr) if (cType == CurveCLength::C1) { SetValue(FromPixel(curve->GetC1Length(), patternUnit)); diff --git a/src/libs/vpatterndb/variables/vcurvelength.cpp b/src/libs/vpatterndb/variables/vcurvelength.cpp index 6fbab9ee9..2809c9e4d 100644 --- a/src/libs/vpatterndb/variables/vcurvelength.cpp +++ b/src/libs/vpatterndb/variables/vcurvelength.cpp @@ -48,7 +48,7 @@ VCurveLength::VCurveLength(const quint32 &id, const quint32 &parentId, const VAb :VCurveVariable(id, parentId) { SetType(VarType::CurveLength); - SCASSERT(curve != nullptr); + SCASSERT(curve != nullptr) SetName(curve->name()); SetValue(FromPixel(curve->GetLength(), patternUnit)); } diff --git a/src/libs/vpatterndb/variables/vellipticalarcradius.cpp b/src/libs/vpatterndb/variables/vellipticalarcradius.cpp index aa900362f..0503ee75c 100644 --- a/src/libs/vpatterndb/variables/vellipticalarcradius.cpp +++ b/src/libs/vpatterndb/variables/vellipticalarcradius.cpp @@ -45,7 +45,7 @@ VEllipticalArcRadius::VEllipticalArcRadius() VEllipticalArcRadius::VEllipticalArcRadius(const quint32 &id, const quint32 &parentId, const VEllipticalArc *elArc, const int numberRadius, Unit patternUnit) : VCurveVariable(id, parentId) { - SCASSERT(elArc != nullptr); + SCASSERT(elArc != nullptr) SetType(VarType::ArcRadius); SetName(QString(radius_V+"%1"+"%2").arg(numberRadius).arg(elArc->name())); diff --git a/src/libs/vpatterndb/variables/vlineangle.cpp b/src/libs/vpatterndb/variables/vlineangle.cpp index 9f92841e8..bbb7f1e26 100644 --- a/src/libs/vpatterndb/variables/vlineangle.cpp +++ b/src/libs/vpatterndb/variables/vlineangle.cpp @@ -53,8 +53,8 @@ VLineAngle::VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2 { SetType(VarType::LineAngle); - SCASSERT(p1 != nullptr); - SCASSERT(p2 != nullptr); + SCASSERT(p1 != nullptr) + SCASSERT(p2 != nullptr) SetName(QString(angleLine_+"%1_%2").arg(p1->name(), p2->name())); SetValue(p1, p2); @@ -90,8 +90,8 @@ bool VLineAngle::Filter(quint32 id) //--------------------------------------------------------------------------------------------------------------------- void VLineAngle::SetValue(const VPointF *p1, const VPointF *p2) { - SCASSERT(p1 != nullptr); - SCASSERT(p2 != nullptr); + SCASSERT(p1 != nullptr) + SCASSERT(p2 != nullptr) //Correct angle. Try avoid results like 6,7563e-15. const qreal angle = qFloor(QLineF(*p1, *p2).angle() * 100000.) / 100000.; VInternalVariable::SetValue(angle); diff --git a/src/libs/vpatterndb/variables/vlinelength.cpp b/src/libs/vpatterndb/variables/vlinelength.cpp index bd014f65e..8fe836157 100644 --- a/src/libs/vpatterndb/variables/vlinelength.cpp +++ b/src/libs/vpatterndb/variables/vlinelength.cpp @@ -50,8 +50,8 @@ VLengthLine::VLengthLine(const VPointF *p1, const quint32 &p1Id, const VPointF * Unit patternUnit) :VInternalVariable(), d(new VLengthLineData(p1Id, p2Id, patternUnit)) { - SCASSERT(p1 != nullptr); - SCASSERT(p2 != nullptr); + SCASSERT(p1 != nullptr) + SCASSERT(p2 != nullptr) SetType(VarType::LineLength); SetName(QString(line_+"%1_%2").arg(p1->name(), p2->name())); @@ -88,8 +88,8 @@ bool VLengthLine::Filter(quint32 id) //--------------------------------------------------------------------------------------------------------------------- void VLengthLine::SetValue(const VPointF *p1, const VPointF *p2) { - SCASSERT(p1 != nullptr); - SCASSERT(p2 != nullptr); + SCASSERT(p1 != nullptr) + SCASSERT(p2 != nullptr) VInternalVariable::SetValue(FromPixel(QLineF(*p1, *p2).length(), d->patternUnit)); } diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index 0daeac738..12e070407 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -176,7 +176,7 @@ const VDetail VContainer::GetDetail(quint32 id) const */ quint32 VContainer::AddGObject(VGObject *obj) { - SCASSERT(obj != nullptr); + SCASSERT(obj != nullptr) QSharedPointer pointer(obj); uniqueNames.insert(obj->name()); return AddObject(d->gObjects, pointer); @@ -243,7 +243,7 @@ template void VContainer::UpdateObject(QHash &obj, const quint32 &id, val point) { Q_ASSERT_X(id != NULL_ID, Q_FUNC_INFO, "id == 0"); //-V654 //-V712 - SCASSERT(point.isNull() == false); + SCASSERT(point.isNull() == false) point->setId(id); if (d->gObjects.contains(id)) { @@ -483,7 +483,7 @@ void VContainer::RemoveVariable(const QString &name) template quint32 VContainer::AddObject(QHash &obj, val value) { - SCASSERT(value != nullptr); + SCASSERT(value != nullptr) const quint32 id = getNextId(); value->setId(id); obj[id] = value; @@ -498,7 +498,7 @@ quint32 VContainer::AddObject(QHash &obj, val value) */ void VContainer::UpdateGObject(quint32 id, VGObject* obj) { - SCASSERT(obj != nullptr); + SCASSERT(obj != nullptr) QSharedPointer pointer(obj); UpdateObject(d->gObjects, id, pointer); uniqueNames.insert(obj->name()); diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h index d181677fa..845808ac1 100644 --- a/src/libs/vpatterndb/vcontainer.h +++ b/src/libs/vpatterndb/vcontainer.h @@ -251,7 +251,7 @@ const QSharedPointer VContainer::GeometricObject(const quint32 &id) const try { QSharedPointer obj = qSharedPointerDynamicCast(gObj); - SCASSERT(obj.isNull() == false); + SCASSERT(obj.isNull() == false) return obj; } catch (const std::bad_alloc &) @@ -270,13 +270,13 @@ const QSharedPointer VContainer::GeometricObject(const quint32 &id) const template QSharedPointer VContainer::GetVariable(QString name) const { - SCASSERT(name.isEmpty()==false); + SCASSERT(name.isEmpty()==false) if (d->variables.contains(name)) { try { QSharedPointer value = qSharedPointerDynamicCast(d->variables.value(name)); - SCASSERT(value.isNull() == false); + SCASSERT(value.isNull() == false) return value; } catch (const std::bad_alloc &) diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index 1b0057949..f00a16936 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -154,8 +154,8 @@ void DialogEditWrongFormula::DeployFormulaTextEdit() //--------------------------------------------------------------------------------------------------------------------- void DialogEditWrongFormula::EvalFormula() { - SCASSERT(plainTextEditFormula != nullptr); - SCASSERT(labelResultCalculation != nullptr); + SCASSERT(plainTextEditFormula != nullptr) + SCASSERT(labelResultCalculation != nullptr) Eval(plainTextEditFormula->toPlainText(), flagFormula, labelResultCalculation, postfix, checkZero); } @@ -252,7 +252,7 @@ void DialogEditWrongFormula::PutHere() */ void DialogEditWrongFormula::PutVal(QTableWidgetItem *item) { - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) QTextCursor cursor = ui->plainTextEditFormula->textCursor(); cursor.insertText(ui->tableWidget->item(item->row(), ColumnName)->text()); ui->plainTextEditFormula->setTextCursor(cursor); @@ -339,7 +339,7 @@ void DialogEditWrongFormula::Functions() //--------------------------------------------------------------------------------------------------------------------- void DialogEditWrongFormula::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagFormula); } diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index 93909f136..be87b34b4 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -180,7 +180,7 @@ void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolAlongLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) const QString toolTip = tr("Select second point of line"); switch (number) @@ -229,7 +229,7 @@ void DialogAlongLine::SaveData() formula.replace("\n", " "); VisToolAlongLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPointId()); line->setObject2Id(GetSecondPointId()); @@ -269,7 +269,7 @@ void DialogAlongLine::SetSecondPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolAlongLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject2Id(value); } @@ -292,7 +292,7 @@ void DialogAlongLine::SetFirstPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolAlongLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -312,7 +312,7 @@ void DialogAlongLine::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolAlongLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp index 435cbccbc..172f19098 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp @@ -155,7 +155,7 @@ void DialogArc::SetF2(const QString &value) ui->plainTextEditF2->setPlainText(f2); VisToolArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setF2(f2); MoveCursorToEnd(ui->plainTextEditF2); @@ -189,7 +189,7 @@ void DialogArc::SetF1(const QString &value) ui->plainTextEditF1->setPlainText(f1); VisToolArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setF1(f1); MoveCursorToEnd(ui->plainTextEditF1); @@ -211,7 +211,7 @@ void DialogArc::SetRadius(const QString &value) ui->plainTextEditFormula->setPlainText(radius); VisToolArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setRadius(radius); MoveCursorToEnd(ui->plainTextEditFormula); @@ -257,7 +257,7 @@ void DialogArc::SaveData() f2.replace("\n", " "); VisToolArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(GetCenter()); path->setRadius(radius); @@ -357,9 +357,9 @@ void DialogArc::FXF2() */ void DialogArc::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagRadius && flagF1 && flagF2); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) bApply->setEnabled(flagRadius && flagF1 && flagF2); } diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp index d283430ad..abf6bafca 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp @@ -136,7 +136,7 @@ void DialogArcWithLength::SetRadius(const QString &value) ui->plainTextEditRadius->setPlainText(radius); VisToolArcWithLength *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setRadius(radius); MoveCursorToEnd(ui->plainTextEditRadius); @@ -159,7 +159,7 @@ void DialogArcWithLength::SetF1(const QString &value) ui->plainTextEditF1->setPlainText(f1); VisToolArcWithLength *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setF1(f1); MoveCursorToEnd(ui->plainTextEditF1); @@ -183,7 +183,7 @@ void DialogArcWithLength::SetLength(const QString &value) ui->plainTextEditLength->setPlainText(length); VisToolArcWithLength *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setLength(radius); MoveCursorToEnd(ui->plainTextEditLength); @@ -308,7 +308,7 @@ void DialogArcWithLength::FXLength() //--------------------------------------------------------------------------------------------------------------------- void DialogArcWithLength::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagRadius && flagF1 && flagLength); // In case dialog hasn't apply button if ( bApply != nullptr) @@ -336,7 +336,7 @@ void DialogArcWithLength::SaveData() length.replace("\n", " "); VisToolArcWithLength *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(GetCenter()); path->setRadius(radius); diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index 76e617c6d..1b9615a25 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -175,7 +175,7 @@ void DialogBisector::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolBisector *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -262,7 +262,7 @@ void DialogBisector::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolBisector *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); @@ -278,7 +278,7 @@ void DialogBisector::SetFirstPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolBisector *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -292,7 +292,7 @@ void DialogBisector::SetSecondPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolBisector *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject2Id(value); } @@ -306,7 +306,7 @@ void DialogBisector::SetThirdPointId(const quint32 &value) setCurrentPointId(ui->comboBoxThirdPoint, value); VisToolBisector *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject3Id(value); } @@ -331,7 +331,7 @@ void DialogBisector::SaveData() formula.replace("\n", " "); VisToolBisector *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPointId()); line->setObject2Id(GetSecondPointId()); diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index 0558c91e4..0665f0e30 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -99,7 +99,7 @@ void DialogCubicBezier::SetSpline(const VCubicBezier &spline) ui->lineEditSplineName->setText(spl.name()); auto path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(spl.GetP1().id()); path->setObject2Id(spl.GetP2().id()); @@ -127,7 +127,7 @@ void DialogCubicBezier::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { auto *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) switch (number) { @@ -239,7 +239,7 @@ void DialogCubicBezier::SaveData() newDuplicate <= -1 ? spl.SetDuplicate(d) : spl.SetDuplicate(static_cast(newDuplicate)); auto path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(p1->id()); path->setObject2Id(p2->id()); diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index cf8a1f340..678658224 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -104,7 +104,7 @@ void DialogCubicBezierPath::SetPath(const VCubicBezierPath &value) ui->lineEditSplPathName->setText(path.name()); auto visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); + SCASSERT(visPath != nullptr) visPath->setPath(path); ui->listWidget->blockSignals(false); @@ -142,14 +142,14 @@ void DialogCubicBezierPath::ChosenObject(quint32 id, const SceneObject &type) SavePath(); auto visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); + SCASSERT(visPath != nullptr) visPath->setPath(path); if (path.CountPoints() == 1) { visPath->VisualMode(NULL_ID); VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(visPath, &VisToolCubicBezierPath::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } else @@ -196,7 +196,7 @@ void DialogCubicBezierPath::SaveData() newDuplicate <= -1 ? path.SetDuplicate(d) : path.SetDuplicate(static_cast(newDuplicate)); auto visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); + SCASSERT(visPath != nullptr) visPath->setPath(path); visPath->SetMode(Mode::Show); visPath->RefreshGeometry(); diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index 272dae97c..0e9346659 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -137,7 +137,7 @@ void DialogCurveIntersectAxis::SetAngle(const QString &value) ui->plainTextEditFormula->setPlainText(formulaAngle); VisToolCurveIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->SetAngle(formulaAngle); MoveCursorToEnd(ui->plainTextEditFormula); @@ -155,7 +155,7 @@ void DialogCurveIntersectAxis::SetBasePointId(const quint32 &value) setCurrentPointId(ui->comboBoxAxisPoint, value); VisToolCurveIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setAxisPointId(value); } @@ -171,7 +171,7 @@ void DialogCurveIntersectAxis::setCurveId(const quint32 &value) setCurrentCurveId(ui->comboBoxCurve, value); VisToolCurveIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -196,7 +196,7 @@ void DialogCurveIntersectAxis::ShowDialog(bool click) { /*We will ignore click if poinet is in point circle*/ VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) const QSharedPointer point = data->GeometricObject(GetBasePointId()); QLineF line = QLineF(*point, scene->getScenePos()); @@ -209,7 +209,7 @@ void DialogCurveIntersectAxis::ShowDialog(bool click) } VisToolCurveIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) this->SetAngle(line->Angle());//Show in dialog angle what user choose emit ToolTip(""); @@ -224,7 +224,7 @@ void DialogCurveIntersectAxis::ChosenObject(quint32 id, const SceneObject &type) if (prepare == false)// After first choose we ignore all objects { VisToolCurveIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -239,7 +239,7 @@ void DialogCurveIntersectAxis::ChosenObject(quint32 id, const SceneObject &type) number++; line->VisualMode(id); VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(line, &VisToolCurveIntersectAxis::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } @@ -309,7 +309,7 @@ void DialogCurveIntersectAxis::SaveData() formulaAngle.replace("\n", " "); VisToolCurveIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(getCurveId()); line->setAxisPointId(GetBasePointId()); diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index 46f9846f4..000e74512 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -153,7 +153,7 @@ void DialogCutArc::SaveData() formula.replace("\n", " "); VisToolCutArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(getArcId()); path->setLength(formula); @@ -177,7 +177,7 @@ void DialogCutArc::setArcId(const quint32 &value) setCurrentArcId(ui->comboBoxArc, value); VisToolCutArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(value); } @@ -197,7 +197,7 @@ void DialogCutArc::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolCutArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index c7ea264af..75b28b483 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -118,7 +118,7 @@ void DialogCutSpline::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolCutSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); @@ -134,7 +134,7 @@ void DialogCutSpline::setSplineId(const quint32 &value) setCurrentSplineId(ui->comboBoxSpline, value); VisToolCutSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(value); } @@ -169,7 +169,7 @@ void DialogCutSpline::SaveData() formula.replace("\n", " "); VisToolCutSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(getSplineId()); path->setLength(formula); diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index d0f0b5729..33d4d96ad 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -118,7 +118,7 @@ void DialogCutSplinePath::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolCutSplinePath *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); @@ -134,7 +134,7 @@ void DialogCutSplinePath::setSplinePathId(const quint32 &value) setCurrentSplinePathId(ui->comboBoxSplinePath, value); VisToolCutSplinePath *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(value); } @@ -169,7 +169,7 @@ void DialogCutSplinePath::SaveData() formula.replace("\n", " "); VisToolCutSplinePath *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(getSplinePathId()); path->setLength(formula); diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 1475c6f29..2a6667ddb 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -104,10 +104,10 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge ui.doubleSpinBoxSeams->setValue(UnitConvertor(1, Unit::Cm, qApp->patternUnit())); bOk = ui.buttonBox->button(QDialogButtonBox::Ok); - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) connect(bOk, &QPushButton::clicked, this, &DialogTool::DialogAccepted); QPushButton *bCancel = ui.buttonBox->button(QDialogButtonBox::Cancel); - SCASSERT(bCancel != nullptr); + SCASSERT(bCancel != nullptr) connect(bCancel, &QPushButton::clicked, this, &DialogTool::DialogRejected); flagName = true;//We have default name of detail. @@ -235,7 +235,7 @@ void DialogDetail::SaveData() //--------------------------------------------------------------------------------------------------------------------- void DialogDetail::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagFormula && flagName && flagError && flagWidth); // In case dialog hasn't apply button if ( bApply != nullptr) @@ -321,7 +321,7 @@ void DialogDetail::AddUpdate() else { int iR = ui.listWidgetMCP->currentRow(); - SCASSERT(iR >= 0); + SCASSERT(iR >= 0) m_conMCP[iR] = mcp; SetAddMode(); } @@ -340,7 +340,7 @@ void DialogDetail::Cancel() void DialogDetail::Remove() { int iR = ui.listWidgetMCP->currentRow(); - SCASSERT(iR >= 0); + SCASSERT(iR >= 0) m_conMCP.removeAt(iR); UpdateList(); ClearFields(); @@ -350,7 +350,7 @@ void DialogDetail::Remove() //--------------------------------------------------------------------------------------------------------------------- void DialogDetail::NameDetailChanged() { - SCASSERT(labelEditNamePoint != nullptr); + SCASSERT(labelEditNamePoint != nullptr) QLineEdit* edit = qobject_cast(sender()); if (edit) { @@ -391,7 +391,7 @@ void DialogDetail::MaterialChanged() void DialogDetail::NewItem(quint32 id, const Tool &typeTool, const NodeDetail &typeNode, qreal mx, qreal my, bool reverse) { - SCASSERT(id > NULL_ID); + SCASSERT(id > NULL_ID) QString name; switch (typeTool) { @@ -524,7 +524,7 @@ void DialogDetail::EnableObjectGUI(bool value) quint32 DialogDetail::RowId(int i) const { const QListWidgetItem *rowItem = ui.listWidget->item(i); - SCASSERT(rowItem != nullptr); + SCASSERT(rowItem != nullptr) const VNodeDetail rowNode = qvariant_cast(rowItem->data(Qt::UserRole)); return rowNode.getId(); } @@ -589,7 +589,7 @@ void DialogDetail::BiasXChanged(qreal d) { qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setMx(qApp->toPixel(d)); item->setData(Qt::UserRole, QVariant::fromValue(node)); @@ -604,7 +604,7 @@ void DialogDetail::BiasYChanged(qreal d) { qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setMy(qApp->toPixel(d)); item->setData(Qt::UserRole, QVariant::fromValue(node)); @@ -668,7 +668,7 @@ void DialogDetail::ClickedReverse(bool checked) { qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setReverse(checked); item->setData(Qt::UserRole, QVariant::fromValue(node)); @@ -687,7 +687,7 @@ void DialogDetail::ObjectChanged(int row) return; } const QListWidgetItem *item = ui.listWidget->item( row ); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) const VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); ui.doubleSpinBoxBiasX->setValue(qApp->fromPixel(node.getMx())); ui.doubleSpinBoxBiasY->setValue(qApp->fromPixel(node.getMy())); diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp index 841768ca2..88bb8ed78 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp @@ -196,7 +196,7 @@ void DialogEllipticalArc::SetRadius1(const QString &value) ui->plainTextEditRadius1->setPlainText(radius1); VisToolEllipticalArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setRadius1(radius1); MoveCursorToEnd(ui->plainTextEditRadius1); @@ -228,7 +228,7 @@ void DialogEllipticalArc::SetRadius2(const QString &value) ui->plainTextEditRadius2->setPlainText(radius2); VisToolEllipticalArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setRadius2(radius2); MoveCursorToEnd(ui->plainTextEditRadius2); @@ -260,7 +260,7 @@ void DialogEllipticalArc::SetF1(const QString &value) ui->plainTextEditF1->setPlainText(f1); VisToolEllipticalArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setF1(f1); MoveCursorToEnd(ui->plainTextEditF1); @@ -292,7 +292,7 @@ void DialogEllipticalArc::SetF2(const QString &value) ui->plainTextEditF2->setPlainText(f2); VisToolEllipticalArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setF2(f2); MoveCursorToEnd(ui->plainTextEditF2); @@ -324,7 +324,7 @@ void DialogEllipticalArc::SetRotationAngle(const QString &value) ui->plainTextEditRotationAngle->setPlainText(rotationAngle); VisToolEllipticalArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setRotationAngle(rotationAngle); MoveCursorToEnd(ui->plainTextEditRotationAngle); @@ -612,9 +612,9 @@ void DialogEllipticalArc::ChosenObject(quint32 id, const SceneObject &type) */ void DialogEllipticalArc::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagRadius1 && flagRadius2 && flagF1 && flagF2 && flagRotationAngle); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) bApply->setEnabled(flagRadius1 && flagRadius2 && flagF1 && flagF2 && flagRotationAngle); } @@ -639,7 +639,7 @@ void DialogEllipticalArc::SaveData() rotationAngle.replace("\n", " "); VisToolEllipticalArc *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(GetCenter()); path->setRadius1(radius1); diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 73a098eed..d95a190af 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -188,7 +188,7 @@ void DialogEndLine::ChosenObject(quint32 id, const SceneObject &type) { vis->VisualMode(id); VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(vis.data(), &Visualization::ToolTip, window, &VAbstractMainWindow::ShowToolTip); prepare = true; } @@ -235,7 +235,7 @@ void DialogEndLine::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formulaLength); VisToolEndLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLength(formulaLength); MoveCursorToEnd(ui->plainTextEditFormula); @@ -258,7 +258,7 @@ void DialogEndLine::SetAngle(const QString &value) ui->plainTextEditAngle->setPlainText(formulaAngle); VisToolEndLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->SetAngle(formulaAngle); MoveCursorToEnd(ui->plainTextEditAngle); @@ -274,7 +274,7 @@ void DialogEndLine::SetBasePointId(const quint32 &value) setCurrentPointId(ui->comboBoxBasePoint, value); VisToolEndLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -303,7 +303,7 @@ void DialogEndLine::ShowDialog(bool click) { /*We will ignore click if pointer is in point circle*/ VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) const QSharedPointer point = data->GeometricObject(GetBasePointId()); QLineF line = QLineF(*point, scene->getScenePos()); @@ -317,7 +317,7 @@ void DialogEndLine::ShowDialog(bool click) this->setModal(true); VisToolEndLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) this->SetAngle(line->Angle());//Show in dialog angle what user choose this->SetFormula(line->Length()); @@ -345,7 +345,7 @@ void DialogEndLine::SaveData() formulaAngle.replace("\n", " "); VisToolEndLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetBasePointId()); line->setLength(formulaLength); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp index 2939be0ad..66928d72a 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp @@ -101,7 +101,7 @@ void DialogFlippingByAxis::SetOriginPointId(quint32 value) { ChangeCurrentData(ui->comboBoxOriginPoint, value); VisToolFlippingByAxis *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetOriginPointId(value); } @@ -120,7 +120,7 @@ void DialogFlippingByAxis::SetAxisType(AxisType type) ui->comboBoxAxisType->setCurrentIndex(index); auto operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetAxisType(type); } } @@ -157,11 +157,11 @@ void DialogFlippingByAxis::ShowDialog(bool click) stage1 = false; VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) scene->clearSelection(); VisToolFlippingByAxis *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->VisualMode(); @@ -201,7 +201,7 @@ void DialogFlippingByAxis::ChosenObject(quint32 id, const SceneObject &type) if (SetObject(id, ui->comboBoxOriginPoint, "")) { VisToolFlippingByAxis *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetOriginPointId(id); operation->RefreshGeometry(); @@ -274,9 +274,9 @@ void DialogFlippingByAxis::SuffixChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByAxis::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagError && flagName); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) bApply->setEnabled(bOk->isEnabled()); } @@ -292,7 +292,7 @@ void DialogFlippingByAxis::SaveData() m_suffix = ui->lineEditSuffix->text(); VisToolFlippingByAxis *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->SetOriginPointId(GetOriginPointId()); @@ -321,7 +321,7 @@ void DialogFlippingByAxis::PointChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByAxis::FillComboBoxAxisType(QComboBox *box) { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->addItem(tr("Vertical axis"), QVariant(static_cast(AxisType::VerticalAxis))); box->addItem(tr("Horizontal axis"), QVariant(static_cast(AxisType::HorizontalAxis))); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index 3565eea83..79eb1fb0b 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -105,7 +105,7 @@ void DialogFlippingByLine::SetFirstLinePointId(quint32 value) { ChangeCurrentData(ui->comboBoxFirstLinePoint, value); VisToolFlippingByLine *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetFirstLinePointId(value); } @@ -156,11 +156,11 @@ void DialogFlippingByLine::ShowDialog(bool click) stage1 = false; VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) scene->clearSelection(); VisToolFlippingByLine *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->VisualMode(); @@ -204,7 +204,7 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type) { number++; VisToolFlippingByLine *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetFirstLinePointId(id); operation->RefreshGeometry(); } @@ -226,7 +226,7 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type) prepare = true; VisToolFlippingByLine *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetSecondLinePointId(id); operation->RefreshGeometry(); } @@ -303,9 +303,9 @@ void DialogFlippingByLine::SuffixChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogFlippingByLine::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagError && flagName); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) bApply->setEnabled(bOk->isEnabled()); } @@ -321,7 +321,7 @@ void DialogFlippingByLine::SaveData() m_suffix = ui->lineEditSuffix->text(); VisToolFlippingByLine *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->SetFirstLinePointId(GetFirstLinePointId()); diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index cd710a1dd..1e3127cf8 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -129,7 +129,7 @@ void DialogHeight::SetBasePointId(const quint32 &value) setCurrentPointId(ui->comboBoxBasePoint, value); VisToolHeight *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -143,7 +143,7 @@ void DialogHeight::SetP1LineId(const quint32 &value) setCurrentPointId(ui->comboBoxP1Line, value); VisToolHeight *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLineP1Id(value); } @@ -157,7 +157,7 @@ void DialogHeight::SetP2LineId(const quint32 &value) setCurrentPointId(ui->comboBoxP2Line, value); VisToolHeight *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLineP2Id(value); } @@ -186,7 +186,7 @@ void DialogHeight::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolHeight *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -240,7 +240,7 @@ void DialogHeight::SaveData() pointName = ui->lineEditNamePoint->text(); VisToolHeight *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetBasePointId()); line->setLineP1Id(GetP1LineId()); diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 69801ed13..923091334 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -92,7 +92,7 @@ void DialogLine::SetSecondPoint(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setPoint2Id(value); } @@ -129,7 +129,7 @@ void DialogLine::SetFirstPoint(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -162,7 +162,7 @@ void DialogLine::ShowVisualization() void DialogLine::SaveData() { VisToolLine *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPoint()); line->setPoint2Id(GetSecondPoint()); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 0cc166f31..3e82cd601 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -109,7 +109,7 @@ void DialogLineIntersect::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolLineIntersect *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -194,7 +194,7 @@ void DialogLineIntersect::SaveData() pointName = ui->lineEditNamePoint->text(); VisToolLineIntersect *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetP1Line1()); line->setLine1P2Id(GetP2Line1()); @@ -267,7 +267,7 @@ void DialogLineIntersect::ShowVisualization() */ void DialogLineIntersect::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagName && flagPoint); } @@ -307,7 +307,7 @@ void DialogLineIntersect::SetP2Line2(const quint32 &value) setCurrentPointId(ui->comboBoxP2Line2, value); VisToolLineIntersect *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLine2P2Id(value); } @@ -321,7 +321,7 @@ void DialogLineIntersect::SetP1Line2(const quint32 &value) setCurrentPointId(ui->comboBoxP1Line2, value); VisToolLineIntersect *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLine2P1Id(value); } @@ -335,7 +335,7 @@ void DialogLineIntersect::SetP2Line1(const quint32 &value) setCurrentPointId(ui->comboBoxP2Line1, value); VisToolLineIntersect *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLine1P2Id(value); } @@ -349,7 +349,7 @@ void DialogLineIntersect::SetP1Line1(const quint32 &value) setCurrentPointId(ui->comboBoxP1Line1, value); VisToolLineIntersect *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index 698403ef7..4fae732a5 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -150,7 +150,7 @@ void DialogLineIntersectAxis::SetAngle(const QString &value) ui->plainTextEditFormula->setPlainText(formulaAngle); VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->SetAngle(formulaAngle); MoveCursorToEnd(ui->plainTextEditFormula); @@ -168,7 +168,7 @@ void DialogLineIntersectAxis::SetBasePointId(const quint32 &value) setCurrentPointId(ui->comboBoxAxisPoint, value); VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setAxisPointId(value); } @@ -184,7 +184,7 @@ void DialogLineIntersectAxis::SetFirstPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstLinePoint, value); VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -200,7 +200,7 @@ void DialogLineIntersectAxis::SetSecondPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondLinePoint, value); VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setPoint2Id(value); } @@ -225,7 +225,7 @@ void DialogLineIntersectAxis::ShowDialog(bool click) { /*We will ignore click if poinet is in point circle*/ VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) const QSharedPointer point = data->GeometricObject(GetBasePointId()); QLineF line = QLineF(*point, scene->getScenePos()); @@ -238,7 +238,7 @@ void DialogLineIntersectAxis::ShowDialog(bool click) } VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) this->SetAngle(line->Angle());//Show in dialog angle what user choose emit ToolTip(""); @@ -255,7 +255,7 @@ void DialogLineIntersectAxis::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -265,7 +265,7 @@ void DialogLineIntersectAxis::ChosenObject(quint32 id, const SceneObject &type) number++; line->VisualMode(id); VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(line, &VisToolLineIntersectAxis::ToolTip, window, &VAbstractMainWindow::ShowToolTip); } break; @@ -377,7 +377,7 @@ void DialogLineIntersectAxis::SaveData() formulaAngle.replace("\n", " "); VisToolLineIntersectAxis *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPointId()); line->setPoint2Id(GetSecondPointId()); diff --git a/src/libs/vtools/dialogs/tools/dialogmove.cpp b/src/libs/vtools/dialogs/tools/dialogmove.cpp index 9ed45b505..a2f3ba643 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.cpp +++ b/src/libs/vtools/dialogs/tools/dialogmove.cpp @@ -137,7 +137,7 @@ void DialogMove::SetAngle(const QString &value) ui->plainTextEditAngle->setPlainText(formulaAngle); VisToolMove *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetAngle(formulaAngle); MoveCursorToEnd(ui->plainTextEditAngle); @@ -161,7 +161,7 @@ void DialogMove::SetLength(const QString &value) ui->plainTextEditLength->setPlainText(formulaLength); VisToolMove *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetLength(formulaLength); MoveCursorToEnd(ui->plainTextEditLength); @@ -200,16 +200,16 @@ void DialogMove::ShowDialog(bool click) prepare = true; VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) scene->clearSelection(); VisToolMove *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->VisualMode(); VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(operation, &VisToolMove::ToolTip, window, &VAbstractMainWindow::ShowToolTip); scene->ToggleArcSelection(false); @@ -225,7 +225,7 @@ void DialogMove::ShowDialog(bool click) else if (not stage1 && prepare && click) { VisToolMove *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) if (operation->LengthValue() > 0) { @@ -367,9 +367,9 @@ void DialogMove::SuffixChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogMove::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagAngle && flagLength && flagName); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) bApply->setEnabled(bOk->isEnabled()); } @@ -391,7 +391,7 @@ void DialogMove::SaveData() formulaLength.replace("\n", " "); VisToolMove *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->SetAngle(formulaAngle); diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 992f25314..cc4f9c9a9 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -168,7 +168,7 @@ void DialogNormal::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolNormal *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -208,7 +208,7 @@ void DialogNormal::SaveData() angle = ui->doubleSpinBoxAngle->value(); VisToolNormal *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPointId()); line->setObject2Id(GetSecondPointId()); @@ -235,7 +235,7 @@ void DialogNormal::SetSecondPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolNormal *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject2Id(value); } @@ -261,7 +261,7 @@ void DialogNormal::SetFirstPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolNormal *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -276,7 +276,7 @@ void DialogNormal::SetAngle(const qreal &value) ui->doubleSpinBoxAngle->setValue(angle); VisToolNormal *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->SetAngle(angle); } @@ -296,7 +296,7 @@ void DialogNormal::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolNormal *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 3872c8465..7e6dc55c4 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -92,7 +92,7 @@ void DialogPointFromArcAndTangent::SetArcId(const quint32 &value) setCurrentArcId(ui->comboBoxArc, value); VisToolPointFromArcAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setArcId(value); } @@ -108,7 +108,7 @@ void DialogPointFromArcAndTangent::SetTangentPointId(const quint32 &value) setCurrentPointId(ui->comboBoxTangentPoint, value); VisToolPointFromArcAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(value); } @@ -127,7 +127,7 @@ void DialogPointFromArcAndTangent::SetCrossCirclesPoint(const CrossCirclesPoint ui->comboBoxResult->setCurrentIndex(index); VisToolPointFromArcAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setCrossPoint(p); } } @@ -140,7 +140,7 @@ void DialogPointFromArcAndTangent::ChosenObject(quint32 id, const SceneObject &t if (type == SceneObject::Point || type == SceneObject::Arc) { VisToolPointFromArcAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) switch (number) { @@ -186,7 +186,7 @@ void DialogPointFromArcAndTangent::SaveData() pointName = ui->lineEditNamePoint->text(); VisToolPointFromArcAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(GetTangentPointId()); point->setArcId(GetArcId()); diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index 05a14d45f..605571dfd 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -126,7 +126,7 @@ void DialogPointFromCircleAndTangent::SetCircleCenterId(const quint32 &value) setCurrentPointId(ui->comboBoxCircleCenter, value); VisToolPointFromCircleAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject2Id(value); } @@ -149,7 +149,7 @@ void DialogPointFromCircleAndTangent::SetCircleRadius(const QString &value) ui->plainTextEditRadius->setPlainText(formula); VisToolPointFromCircleAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setCRadius(formula); MoveCursorToEnd(ui->plainTextEditRadius); @@ -167,7 +167,7 @@ void DialogPointFromCircleAndTangent::SetTangentPointId(const quint32 &value) setCurrentPointId(ui->comboBoxTangentPoint, value); VisToolPointFromCircleAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(value); } @@ -186,7 +186,7 @@ void DialogPointFromCircleAndTangent::SetCrossCirclesPoint(const CrossCirclesPoi ui->comboBoxResult->setCurrentIndex(index); VisToolPointFromCircleAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setCrossPoint(p); } } @@ -199,7 +199,7 @@ void DialogPointFromCircleAndTangent::ChosenObject(quint32 id, const SceneObject if (type == SceneObject::Point) { VisToolPointFromCircleAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) switch (number) { @@ -313,7 +313,7 @@ void DialogPointFromCircleAndTangent::SaveData() radius.replace("\n", " "); VisToolPointFromCircleAndTangent *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(GetTangentPointId()); point->setObject2Id(GetCircleCenterId()); @@ -332,7 +332,7 @@ void DialogPointFromCircleAndTangent::closeEvent(QCloseEvent *event) //--------------------------------------------------------------------------------------------------------------------- void DialogPointFromCircleAndTangent::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagFormula && flagName && flagError && flagCircleRadius); // In case dialog hasn't apply button if ( bApply != nullptr) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index 633c7f966..9d684c2be 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -172,7 +172,7 @@ void DialogPointOfContact::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolPointOfContact *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -229,7 +229,7 @@ void DialogPointOfContact::SaveData() radius.replace("\n", " "); VisToolPointOfContact *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPoint()); line->setLineP2Id(GetSecondPoint()); @@ -255,7 +255,7 @@ void DialogPointOfContact::SetSecondPoint(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolPointOfContact *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLineP2Id(value); } @@ -269,7 +269,7 @@ void DialogPointOfContact::SetFirstPoint(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolPointOfContact *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -283,7 +283,7 @@ void DialogPointOfContact::setCenter(const quint32 &value) setCurrentPointId(ui->comboBoxCenter, value); VisToolPointOfContact *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setRadiusId(value); } @@ -303,7 +303,7 @@ void DialogPointOfContact::setRadius(const QString &value) ui->plainTextEditFormula->setPlainText(radius); VisToolPointOfContact *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setRadius(radius); MoveCursorToEnd(ui->plainTextEditFormula); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 60c4da141..f9a2936ca 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -95,7 +95,7 @@ void DialogPointOfIntersection::SetSecondPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolPointOfIntersection *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setPoint2Id(value); } @@ -112,7 +112,7 @@ void DialogPointOfIntersection::ChosenObject(quint32 id, const SceneObject &type if (type == SceneObject::Point) { VisToolPointOfIntersection *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -149,7 +149,7 @@ void DialogPointOfIntersection::SaveData() pointName = ui->lineEditNamePoint->text(); VisToolPointOfIntersection *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetFirstPointId()); line->setPoint2Id(GetSecondPointId()); @@ -191,7 +191,7 @@ void DialogPointOfIntersection::SetFirstPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolPointOfIntersection *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 298d922d7..7ca16810b 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -98,7 +98,7 @@ void DialogPointOfIntersectionArcs::SetFirstArcId(const quint32 &value) setCurrentArcId(ui->comboBoxArc1, value); VisToolPointOfIntersectionArcs *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setArc1Id(value); } @@ -114,7 +114,7 @@ void DialogPointOfIntersectionArcs::SetSecondArcId(const quint32 &value) setCurrentArcId(ui->comboBoxArc2, value); VisToolPointOfIntersectionArcs *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setArc2Id(value); } @@ -133,7 +133,7 @@ void DialogPointOfIntersectionArcs::SetCrossArcPoint(const CrossCirclesPoint &p) ui->comboBoxResult->setCurrentIndex(index); VisToolPointOfIntersectionArcs *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setCrossPoint(p); } } @@ -146,7 +146,7 @@ void DialogPointOfIntersectionArcs::ChosenObject(quint32 id, const SceneObject & if (type == SceneObject::Arc) { VisToolPointOfIntersectionArcs *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) switch (number) { @@ -208,7 +208,7 @@ void DialogPointOfIntersectionArcs::SaveData() pointName = ui->lineEditNamePoint->text(); VisToolPointOfIntersectionArcs *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setArc1Id(GetFirstArcId()); point->setArc2Id(GetSecondArcId()); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index c50f45957..fc4c56d79 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -142,7 +142,7 @@ void DialogPointOfIntersectionCircles::SetFirstCircleCenterId(const quint32 &val setCurrentPointId(ui->comboBoxCircle1Center, value); VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(value); } @@ -158,7 +158,7 @@ void DialogPointOfIntersectionCircles::SetSecondCircleCenterId(const quint32 &va setCurrentPointId(ui->comboBoxCircle2Center, value); VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject2Id(value); } @@ -181,7 +181,7 @@ void DialogPointOfIntersectionCircles::SetFirstCircleRadius(const QString &value ui->plainTextEditCircle1Radius->setPlainText(formula); VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setC1Radius(formula); MoveCursorToEnd(ui->plainTextEditCircle1Radius); @@ -206,7 +206,7 @@ void DialogPointOfIntersectionCircles::SetSecondCircleRadius(const QString &valu ui->plainTextEditCircle2Radius->setPlainText(formula); VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setC2Radius(formula); MoveCursorToEnd(ui->plainTextEditCircle2Radius); @@ -227,7 +227,7 @@ void DialogPointOfIntersectionCircles::SetCrossCirclesPoint(const CrossCirclesPo ui->comboBoxResult->setCurrentIndex(index); VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setCrossPoint(p); } } @@ -240,7 +240,7 @@ void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObjec if (type == SceneObject::Point) { VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) switch (number) { @@ -405,7 +405,7 @@ void DialogPointOfIntersectionCircles::SaveData() c2Radius.replace("\n", " "); VisToolPointOfIntersectionCircles *point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(GetFirstCircleCenterId()); point->setObject2Id(GetSecondCircleCenterId()); @@ -426,7 +426,7 @@ void DialogPointOfIntersectionCircles::closeEvent(QCloseEvent *event) //--------------------------------------------------------------------------------------------------------------------- void DialogPointOfIntersectionCircles::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagFormula && flagName && flagError && flagCircle1Radius && flagCircle2Radius); // In case dialog hasn't apply button if ( bApply != nullptr) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp index 9d26ad3b2..1beca4ce3 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp @@ -101,7 +101,7 @@ void DialogPointOfIntersectionCurves::SetFirstCurveId(const quint32 &value) setCurrentCurveId(ui->comboBoxCurve1, value); auto point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(value); } @@ -117,7 +117,7 @@ void DialogPointOfIntersectionCurves::SetSecondCurveId(const quint32 &value) setCurrentCurveId(ui->comboBoxCurve2, value); auto point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject2Id(value); } @@ -136,7 +136,7 @@ void DialogPointOfIntersectionCurves::SetVCrossPoint(const VCrossCurvesPoint &vP ui->comboBoxVCorrection->setCurrentIndex(index); auto point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setVCrossPoint(vP); } } @@ -156,7 +156,7 @@ void DialogPointOfIntersectionCurves::SetHCrossPoint(const HCrossCurvesPoint &hP ui->comboBoxHCorrection->setCurrentIndex(index); auto point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setHCrossPoint(hP); } } @@ -172,7 +172,7 @@ void DialogPointOfIntersectionCurves::ChosenObject(quint32 id, const SceneObject || type == SceneObject::SplinePath) { auto point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) switch (number) { @@ -215,7 +215,7 @@ void DialogPointOfIntersectionCurves::SaveData() pointName = ui->lineEditNamePoint->text(); auto point = qobject_cast(vis); - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) point->setObject1Id(GetFirstCurveId()); point->setObject2Id(GetSecondCurveId()); @@ -227,7 +227,7 @@ void DialogPointOfIntersectionCurves::SaveData() //--------------------------------------------------------------------------------------------------------------------- void DialogPointOfIntersectionCurves::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagName && flagError); // In case dialog hasn't apply button if ( bApply != nullptr) diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index 4e7a6bb2f..f130e6371 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -121,7 +121,7 @@ void DialogRotation::SetOrigPointId(const quint32 &value) { ChangeCurrentData(ui->comboBoxOriginPoint, value); VisToolRotation *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetOriginPointId(value); } @@ -143,7 +143,7 @@ void DialogRotation::SetAngle(const QString &value) ui->plainTextEditFormula->setPlainText(formulaAngle); VisToolRotation *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetAngle(formulaAngle); MoveCursorToEnd(ui->plainTextEditFormula); @@ -181,11 +181,11 @@ void DialogRotation::ShowDialog(bool click) stage1 = false; VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) scene->clearSelection(); VisToolRotation *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->VisualMode(); @@ -205,7 +205,7 @@ void DialogRotation::ShowDialog(bool click) { /*We will ignore click if pointer is in point circle*/ VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) const QSharedPointer point = data->GeometricObject(GetOrigPointId()); const QLineF line = QLineF(*point, scene->getScenePos()); @@ -217,7 +217,7 @@ void DialogRotation::ShowDialog(bool click) } VisToolRotation *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) SetAngle(operation->Angle());//Show in dialog angle that a user choose setModal(true); @@ -243,9 +243,9 @@ void DialogRotation::ChosenObject(quint32 id, const SceneObject &type) if (SetObject(id, ui->comboBoxOriginPoint, "")) { VisToolRotation *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(operation, &Visualization::ToolTip, window, &VAbstractMainWindow::ShowToolTip); operation->SetOriginPointId(id); @@ -348,9 +348,9 @@ void DialogRotation::SuffixChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogRotation::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagAngle && flagName && flagError); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) bApply->setEnabled(bOk->isEnabled()); } @@ -369,7 +369,7 @@ void DialogRotation::SaveData() formulaAngle.replace("\n", " "); VisToolRotation *operation = qobject_cast(vis); - SCASSERT(operation != nullptr); + SCASSERT(operation != nullptr) operation->SetObjects(objects.toVector()); operation->SetOriginPointId(GetOrigPointId()); diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index b25739dd8..0b4d9ed11 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -176,7 +176,7 @@ void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolShoulderPoint *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -233,7 +233,7 @@ void DialogShoulderPoint::SaveData() formula.replace("\n", " "); VisToolShoulderPoint *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetP3()); line->setLineP1Id(GetP1Line()); @@ -260,7 +260,7 @@ void DialogShoulderPoint::SetP3(const quint32 &value) setCurrentPointId(ui->comboBoxP3, value); VisToolShoulderPoint *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } @@ -286,7 +286,7 @@ void DialogShoulderPoint::SetP2Line(const quint32 &value) setCurrentPointId(ui->comboBoxP2Line, value); VisToolShoulderPoint *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLineP2Id(value); } @@ -300,7 +300,7 @@ void DialogShoulderPoint::SetP1Line(const quint32 &value) setCurrentPointId(ui->comboBoxP1Line, value); VisToolShoulderPoint *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLineP1Id(value); } @@ -320,7 +320,7 @@ void DialogShoulderPoint::SetFormula(const QString &value) ui->plainTextEditFormula->setPlainText(formula); VisToolShoulderPoint *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setLength(formula); MoveCursorToEnd(ui->plainTextEditFormula); } diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index f1075487b..e89d1db5b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -132,10 +132,10 @@ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidge vis = new VisToolSpline(data); auto path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) auto scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) connect(scene, &VMainGraphicsScene::MouseLeftPressed, path, &VisToolSpline::MouseLeftPressed); connect(scene, &VMainGraphicsScene::MouseLeftReleased, path, &VisToolSpline::MouseLeftReleased); } @@ -159,7 +159,7 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { auto *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) switch (number) { @@ -201,7 +201,7 @@ void DialogSpline::SaveData() newDuplicate <= -1 ? spl.SetDuplicate(d) : spl.SetDuplicate(static_cast(newDuplicate)); auto path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(GetP1()->id()); path->setObject4Id(GetP4()->id()); @@ -523,7 +523,7 @@ void DialogSpline::ShowDialog(bool click) if (prepare && click) { auto *path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) spl = VSpline(*GetP1(), path->GetP2(), path->GetP3(), *GetP4()); @@ -553,7 +553,7 @@ void DialogSpline::ShowDialog(bool click) //--------------------------------------------------------------------------------------------------------------------- void DialogSpline::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagAngle1 && flagAngle2 && flagLength1 && flagLength2 && flagError); // In case dialog hasn't apply button if ( bApply != nullptr) @@ -600,7 +600,7 @@ void DialogSpline::SetSpline(const VSpline &spline) ui->lineEditSplineName->setText(spl.name()); auto path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) path->setObject1Id(spl.GetP1().id()); path->setObject4Id(spl.GetP4().id()); diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 5d1aad667..ac35e9874 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -127,10 +127,10 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId vis = new VisToolSplinePath(data); auto path = qobject_cast(vis); - SCASSERT(path != nullptr); + SCASSERT(path != nullptr) auto scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) connect(scene, &VMainGraphicsScene::MouseLeftPressed, path, &VisToolSplinePath::MouseLeftPressed); connect(scene, &VMainGraphicsScene::MouseLeftReleased, path, &VisToolSplinePath::MouseLeftReleased); } @@ -164,7 +164,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value) ui->lineEditSplPathName->setText(path.name()); auto visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); + SCASSERT(visPath != nullptr) visPath->setPath(path); ui->listWidget->blockSignals(false); } @@ -205,14 +205,14 @@ void DialogSplinePath::ChosenObject(quint32 id, const SceneObject &type) SavePath(); auto visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); + SCASSERT(visPath != nullptr) visPath->setPath(path); if (path.CountPoints() == 1) { visPath->VisualMode(NULL_ID); VAbstractMainWindow *window = qobject_cast(qApp->getMainWindow()); - SCASSERT(window != nullptr); + SCASSERT(window != nullptr) connect(visPath, &VisToolSplinePath::ToolTip, window, &VAbstractMainWindow::ShowToolTip); connect(visPath, &VisToolSplinePath::PathChanged, this, &DialogSplinePath::PathUpdated); @@ -235,7 +235,7 @@ void DialogSplinePath::SaveData() newDuplicate <= -1 ? path.SetDuplicate(d) : path.SetDuplicate(static_cast(newDuplicate)); auto visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); + SCASSERT(visPath != nullptr) visPath->setPath(path); visPath->SetMode(Mode::Show); visPath->RefreshGeometry(); @@ -244,7 +244,7 @@ void DialogSplinePath::SaveData() //--------------------------------------------------------------------------------------------------------------------- void DialogSplinePath::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bool fAngle1 = true, fAngle2 = true, fLength1 = true, fLength2 = true; @@ -310,7 +310,7 @@ void DialogSplinePath::Angle1Changed() if (row != 0) { QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); const QString angle1F = ui->plainTextEditAngle1F->toPlainText().replace("\n", " "); @@ -353,7 +353,7 @@ void DialogSplinePath::Angle2Changed() if (row != ui->listWidget->count()-1) { QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); const QString angle2F = ui->plainTextEditAngle2F->toPlainText().replace("\n", " "); @@ -396,7 +396,7 @@ void DialogSplinePath::Length1Changed() if (row != 0) { QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); const QString length1F = ui->plainTextEditLength1F->toPlainText().replace("\n", " "); @@ -430,7 +430,7 @@ void DialogSplinePath::Length2Changed() if (row != ui->listWidget->count()-1) { QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); const QString length2F = ui->plainTextEditLength2F->toPlainText().replace("\n", " "); @@ -565,7 +565,7 @@ void DialogSplinePath::EvalAngle1() Eval(ui->plainTextEditAngle1F->toPlainText(), flagAngle1[row], ui->labelResultAngle1, degreeSymbol, false); QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); ShowPointIssue(p.P().name()); @@ -584,7 +584,7 @@ void DialogSplinePath::EvalAngle2() Eval(ui->plainTextEditAngle2F->toPlainText(), flagAngle2[row], ui->labelResultAngle2, degreeSymbol, false); QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); ShowPointIssue(p.P().name()); @@ -615,7 +615,7 @@ void DialogSplinePath::EvalLength1() } QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); ShowPointIssue(p.P().name()); @@ -646,7 +646,7 @@ void DialogSplinePath::EvalLength2() } QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); ShowPointIssue(p.P().name()); @@ -959,7 +959,7 @@ void DialogSplinePath::ShowPointIssue(const QString &pName) } QListWidgetItem *item = ui->listWidget->item(row); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) if (flagAngle1.at(row) && flagAngle2.at(row) && flagLength1.at(row) && flagLength2.at(row)) { diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index c2146dc8b..3b577fe76 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -93,7 +93,7 @@ DialogTool::DialogTool(const VContainer *data, const quint32 &toolId, QWidget *p okColor(QColor(76, 76, 76)), errorColor(Qt::red), associatedTool(nullptr), toolId(toolId), prepare(false), pointName(QString()), number(0), vis(nullptr) { - SCASSERT(data != nullptr); + SCASSERT(data != nullptr) timerFormula = new QTimer(this); connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); } @@ -165,7 +165,7 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, FillComboBox rule, const quint //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxSplines(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->blockSignals(true); const auto objs = data->DataGObjects(); @@ -189,7 +189,7 @@ void DialogTool::FillComboBoxSplines(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxSplinesPath(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->blockSignals(true); const auto objs = data->DataGObjects(); @@ -213,7 +213,7 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxCurves(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) const auto objs = data->DataGObjects(); QMap list; QHash >::const_iterator i; @@ -243,7 +243,7 @@ void DialogTool::FillComboBoxCurves(QComboBox *box) const */ void DialogTool::FillComboBoxTypeLine(QComboBox *box, const QMap &stylesPics) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) QMap::const_iterator i = stylesPics.constBegin(); while (i != stylesPics.constEnd()) { @@ -257,7 +257,7 @@ void DialogTool::FillComboBoxTypeLine(QComboBox *box, const QMap //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxLineColors(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->clear(); int size = box->iconSize().height(); @@ -280,7 +280,7 @@ void DialogTool::FillComboBoxLineColors(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxCrossCirclesPoints(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->addItem(tr("First point"), QVariant(static_cast(CrossCirclesPoint::FirstPoint))); box->addItem(tr("Second point"), QVariant(static_cast(CrossCirclesPoint::SecondPoint))); @@ -289,7 +289,7 @@ void DialogTool::FillComboBoxCrossCirclesPoints(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxVCrossCurvesPoint(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->addItem(tr("Highest point"), QVariant(static_cast(VCrossCurvesPoint::HighestPoint))); box->addItem(tr("Lowest point"), QVariant(static_cast(VCrossCurvesPoint::LowestPoint))); @@ -298,7 +298,7 @@ void DialogTool::FillComboBoxVCrossCurvesPoint(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::FillComboBoxHCrossCurvesPoint(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->addItem(tr("Leftmost point"), QVariant(static_cast(HCrossCurvesPoint::LeftmostPoint))); box->addItem(tr("Rightmost point"), QVariant(static_cast(HCrossCurvesPoint::RightmostPoint))); @@ -340,7 +340,7 @@ void DialogTool::ChangeCurrentData(QComboBox *box, const QVariant &value) const //--------------------------------------------------------------------------------------------------------------------- void DialogTool::MoveCursorToEnd(QPlainTextEdit *plainTextEdit) { - SCASSERT(plainTextEdit != nullptr); + SCASSERT(plainTextEdit != nullptr) QTextCursor cursor = plainTextEdit->textCursor(); cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor); plainTextEdit->setTextCursor(cursor); @@ -411,10 +411,10 @@ bool DialogTool::IsSplinePath(const QSharedPointer &obj) const */ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer, const QString& postfix) { - SCASSERT(edit != nullptr); - SCASSERT(timer != nullptr); - SCASSERT(labelEditFormula != nullptr); - SCASSERT(labelResultCalculation != nullptr); + SCASSERT(edit != nullptr) + SCASSERT(timer != nullptr) + SCASSERT(labelEditFormula != nullptr) + SCASSERT(labelResultCalculation != nullptr) if (edit->text().isEmpty()) { flag = false; @@ -436,10 +436,10 @@ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer, c //--------------------------------------------------------------------------------------------------------------------- void DialogTool::ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer *timer, const QString& postfix) { - SCASSERT(edit != nullptr); - SCASSERT(timer != nullptr); - SCASSERT(labelEditFormula != nullptr); - SCASSERT(labelResultCalculation != nullptr); + SCASSERT(edit != nullptr) + SCASSERT(timer != nullptr) + SCASSERT(labelEditFormula != nullptr) + SCASSERT(labelResultCalculation != nullptr) if (edit->toPlainText().isEmpty()) { flag = false; @@ -473,9 +473,9 @@ void DialogTool::ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer *tim qreal DialogTool::Eval(const QString &text, bool &flag, QLabel *label, const QString& postfix, bool checkZero) { qDebug() << "Eval started"; - SCASSERT(label != nullptr); + SCASSERT(label != nullptr) qDebug() << "Label ok"; - SCASSERT(labelEditFormula != nullptr); + SCASSERT(labelEditFormula != nullptr) qDebug() << "lef ok"; qreal result = INT_MIN;//Value can be 0, so use max imposible value @@ -548,7 +548,7 @@ qreal DialogTool::Eval(const QString &text, bool &flag, QLabel *label, const QSt void DialogTool::setCurrentPointId(QComboBox *box, const quint32 &value, FillComboBox rule, const quint32 &ch1, const quint32 &ch2) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->blockSignals(true); @@ -564,7 +564,7 @@ void DialogTool::setCurrentPointId(QComboBox *box, const quint32 &value, FillCom */ void DialogTool::setCurrentSplineId(QComboBox *box, const quint32 &value) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) FillComboBoxSplines(box); ChangeCurrentData(box, value); } @@ -576,7 +576,7 @@ void DialogTool::setCurrentSplineId(QComboBox *box, const quint32 &value) const void DialogTool::setCurrentArcId(QComboBox *box, const quint32 &value, FillComboBox rule, const quint32 &ch1, const quint32 &ch2) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) FillComboBoxArcs(box, rule, ch1, ch2); ChangeCurrentData(box, value); } @@ -589,7 +589,7 @@ void DialogTool::setCurrentArcId(QComboBox *box, const quint32 &value, FillCombo */ void DialogTool::setCurrentSplinePathId(QComboBox *box, const quint32 &value) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) FillComboBoxSplinesPath(box); ChangeCurrentData(box, value); } @@ -597,7 +597,7 @@ void DialogTool::setCurrentSplinePathId(QComboBox *box, const quint32 &value) co //--------------------------------------------------------------------------------------------------------------------- void DialogTool::setCurrentCurveId(QComboBox *box, const quint32 &value) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) FillComboBoxCurves(box); ChangeCurrentData(box, value); } @@ -610,7 +610,7 @@ void DialogTool::setCurrentCurveId(QComboBox *box, const quint32 &value) const */ quint32 DialogTool::getCurrentObjectId(QComboBox *box) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) qint32 index = box->currentIndex(); if (index != -1) { @@ -625,7 +625,7 @@ quint32 DialogTool::getCurrentObjectId(QComboBox *box) const //--------------------------------------------------------------------------------------------------------------------- bool DialogTool::SetObject(const quint32 &id, QComboBox *box, const QString &toolTip) { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) const qint32 index = box->findData(id); if ( index != -1 ) { // -1 for not found @@ -643,8 +643,8 @@ bool DialogTool::SetObject(const quint32 &id, QComboBox *box, const QString &too //--------------------------------------------------------------------------------------------------------------------- void DialogTool::DeployFormula(QPlainTextEdit *formula, QPushButton *buttonGrowLength, int formulaBaseHeight) { - SCASSERT(formula != nullptr); - SCASSERT(buttonGrowLength != nullptr); + SCASSERT(formula != nullptr) + SCASSERT(buttonGrowLength != nullptr) const QTextCursor cursor = formula->textCursor(); @@ -687,7 +687,7 @@ void DialogTool::DeployFormula(QPlainTextEdit *formula, QPushButton *buttonGrowL */ void DialogTool::FillList(QComboBox *box, const QMap &list) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->clear(); QMapIterator iter(list); @@ -703,7 +703,7 @@ template void DialogTool::PrepareList(QMap &list, quint32 id) const { const auto obj = data->GeometricObject(id); - SCASSERT(obj != nullptr); + SCASSERT(obj != nullptr) QString newName = obj->name(); int bias = 0; @@ -730,7 +730,7 @@ bool DialogTool::IsSpline(const QSharedPointer &obj) const */ void DialogTool::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagFormula && flagName && flagError); // In case dialog hasn't apply button if ( bApply != nullptr) @@ -765,7 +765,7 @@ void DialogTool::SelectedObject(bool selected, quint32 object, quint32 tool) */ void DialogTool::NamePointChanged() { - SCASSERT(labelEditNamePoint != nullptr); + SCASSERT(labelEditNamePoint != nullptr) QLineEdit* edit = qobject_cast(sender()); if (edit) { @@ -789,7 +789,7 @@ void DialogTool::NamePointChanged() //--------------------------------------------------------------------------------------------------------------------- void DialogTool::ChangeColor(QWidget *widget, const QColor &color) { - SCASSERT(widget != nullptr); + SCASSERT(widget != nullptr) QPalette palette = widget->palette(); palette.setColor(widget->foregroundRole(), color); widget->setPalette(palette); @@ -849,7 +849,7 @@ void DialogTool::FormulaChangedPlainText() //-V524 */ void DialogTool::ArrowUp() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(90); } @@ -859,7 +859,7 @@ void DialogTool::ArrowUp() */ void DialogTool::ArrowDown() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(270); } @@ -869,7 +869,7 @@ void DialogTool::ArrowDown() */ void DialogTool::ArrowLeft() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(180); } @@ -879,7 +879,7 @@ void DialogTool::ArrowLeft() */ void DialogTool::ArrowRight() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(0); } @@ -889,7 +889,7 @@ void DialogTool::ArrowRight() */ void DialogTool::ArrowLeftUp() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(135); } @@ -899,7 +899,7 @@ void DialogTool::ArrowLeftUp() */ void DialogTool::ArrowLeftDown() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(225); } @@ -909,7 +909,7 @@ void DialogTool::ArrowLeftDown() */ void DialogTool::ArrowRightUp() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(45); } @@ -919,7 +919,7 @@ void DialogTool::ArrowRightUp() */ void DialogTool::ArrowRightDown() { - SCASSERT(spinBoxAngle != nullptr); + SCASSERT(spinBoxAngle != nullptr) spinBoxAngle->setValue(315); } @@ -929,8 +929,8 @@ void DialogTool::ArrowRightDown() */ void DialogTool::EvalFormula() { - SCASSERT(plainTextEditFormula != nullptr); - SCASSERT(labelResultCalculation != nullptr); + SCASSERT(plainTextEditFormula != nullptr) + SCASSERT(labelResultCalculation != nullptr) const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit());//Show unit in dialog lable (cm, mm or inch) Eval(plainTextEditFormula->toPlainText(), flagFormula, labelResultCalculation, postfix, false); } @@ -986,7 +986,7 @@ template void DialogTool::FillCombo(QComboBox *box, GOType gType, FillComboBox rule, const quint32 &ch1, const quint32 &ch2) const { - SCASSERT(box != nullptr); + SCASSERT(box != nullptr) box->blockSignals(true); const QHash > *objs = data->DataGObjects(); diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index cc5d29af8..388832a0d 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -300,7 +300,7 @@ inline VAbstractTool *DialogTool::GetAssociatedTool() template inline void DialogTool::InitArrow(T *ui) { - SCASSERT(ui != nullptr); + SCASSERT(ui != nullptr) spinBoxAngle = ui->doubleSpinBoxAngle; connect(ui->toolButtonArrowDown, &QPushButton::clicked, this, &DialogTool::ArrowDown); connect(ui->toolButtonArrowUp, &QPushButton::clicked, this, &DialogTool::ArrowUp); @@ -322,7 +322,7 @@ inline void DialogTool::InitOkCancelApply(T *ui) { InitOkCancel(ui); bApply = ui->buttonBox->button(QDialogButtonBox::Apply); - SCASSERT(bApply != nullptr); + SCASSERT(bApply != nullptr) connect(bApply, &QPushButton::clicked, this, &DialogTool::DialogApply); } @@ -335,11 +335,11 @@ template inline void DialogTool::InitOkCancel(T *ui) { bOk = ui->buttonBox->button(QDialogButtonBox::Ok); - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) connect(bOk, &QPushButton::clicked, this, &DialogTool::DialogAccepted); QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel); - SCASSERT(bCancel != nullptr); + SCASSERT(bCancel != nullptr) connect(bCancel, &QPushButton::clicked, this, &DialogTool::DialogRejected); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c()); @@ -365,10 +365,10 @@ inline void DialogTool::AddVisualization() if (prepare == false) { VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) T *toolVis = qobject_cast(vis); - SCASSERT(toolVis != nullptr); + SCASSERT(toolVis != nullptr) if (not scene->items().contains(toolVis)) { diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index f8e52f700..d9c4be59f 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -103,7 +103,7 @@ void DialogTriangle::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolTriangle *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) switch (number) { @@ -176,7 +176,7 @@ void DialogTriangle::SaveData() pointName = ui->lineEditNamePoint->text(); VisToolTriangle *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(GetAxisP1Id()); line->setObject2Id(GetAxisP2Id()); @@ -239,7 +239,7 @@ void DialogTriangle::SetSecondPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondPoint, value); VisToolTriangle *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setHypotenuseP2Id(value); } @@ -253,7 +253,7 @@ void DialogTriangle::SetFirstPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstPoint, value); VisToolTriangle *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setHypotenuseP1Id(value); } @@ -267,7 +267,7 @@ void DialogTriangle::SetAxisP2Id(const quint32 &value) setCurrentPointId(ui->comboBoxAxisP2, value); VisToolTriangle *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject2Id(value); } @@ -281,7 +281,7 @@ void DialogTriangle::SetAxisP1Id(const quint32 &value) setCurrentPointId(ui->comboBoxAxisP1, value); VisToolTriangle *line = qobject_cast(vis); - SCASSERT(line != nullptr); + SCASSERT(line != nullptr) line->setObject1Id(value); } diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index dd4152eab..a0d4ba69f 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -145,7 +145,7 @@ void DialogTrueDarts::SetFirstBasePointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstBasePoint, value, FillComboBox::NoChildren, ch1, ch2); VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) points->setObject1Id(value); } @@ -161,7 +161,7 @@ void DialogTrueDarts::SetSecondBasePointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondBasePoint, value, FillComboBox::NoChildren, ch1, ch2); VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) points->setObject2Id(value); } @@ -177,7 +177,7 @@ void DialogTrueDarts::SetFirstDartPointId(const quint32 &value) setCurrentPointId(ui->comboBoxFirstDartPoint, value, FillComboBox::NoChildren, ch1, ch2); VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) points->setD1PointId(value); } @@ -193,7 +193,7 @@ void DialogTrueDarts::SetSecondDartPointId(const quint32 &value) setCurrentPointId(ui->comboBoxSecondDartPoint, value, FillComboBox::NoChildren, ch1, ch2); VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) points->setD2PointId(value); } @@ -209,7 +209,7 @@ void DialogTrueDarts::SetThirdDartPointId(const quint32 &value) setCurrentPointId(ui->comboBoxThirdDartPoint, value, FillComboBox::NoChildren, ch1, ch2); VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) points->setD3PointId(value); } @@ -229,7 +229,7 @@ void DialogTrueDarts::ChosenObject(quint32 id, const SceneObject &type) if (type == SceneObject::Point) { VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) switch (number) { @@ -370,7 +370,7 @@ void DialogTrueDarts::SaveData() d2PointName = ui->lineEditSecondNewDartPoint->text(); VisToolTrueDarts *points = qobject_cast(vis); - SCASSERT(points != nullptr); + SCASSERT(points != nullptr) points->setObject1Id(GetFirstBasePointId()); points->setObject2Id(GetSecondBasePointId()); @@ -383,7 +383,7 @@ void DialogTrueDarts::SaveData() //--------------------------------------------------------------------------------------------------------------------- void DialogTrueDarts::CheckState() { - SCASSERT(bOk != nullptr); + SCASSERT(bOk != nullptr) bOk->setEnabled(flagName1 && flagName2 && flagError); // In case dialog hasn't apply button if ( bApply != nullptr) @@ -396,8 +396,8 @@ void DialogTrueDarts::CheckState() void DialogTrueDarts::NameChanged(QLabel *labelEditNamePoint, const QString &pointD1Name, const QString &pointD2Name, QLineEdit* secondPointName, bool &flagName) { - SCASSERT(labelEditNamePoint != nullptr); - SCASSERT(secondPointName != nullptr); + SCASSERT(labelEditNamePoint != nullptr) + SCASSERT(secondPointName != nullptr) QLineEdit* edit = qobject_cast(sender()); if (edit) { @@ -420,9 +420,9 @@ void DialogTrueDarts::FillComboBoxs(const quint32 &ch1, const quint32 &ch2) void DialogTrueDarts::CheckName(QLineEdit *edit, QLabel *labelEditNamePoint, const QString &pointD1Name, const QString &pointD2Name, QLineEdit *secondPointName, bool &flagName) { - SCASSERT(labelEditNamePoint != nullptr); - SCASSERT(secondPointName != nullptr); - SCASSERT(edit != nullptr); + SCASSERT(labelEditNamePoint != nullptr) + SCASSERT(secondPointName != nullptr) + SCASSERT(edit != nullptr) const QString name = edit->text(); const QString secondName = secondPointName->text(); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index efebbbfa4..f160fb284 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp @@ -79,9 +79,9 @@ VToolFlippingByAxis::~VToolFlippingByAxis() //--------------------------------------------------------------------------------------------------------------------- void VToolFlippingByAxis::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogFlippingByAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) dialogTool->SetOriginPointId(m_originPointId); dialogTool->SetAxisType(m_axisType); dialogTool->SetSuffix(suffix); @@ -91,9 +91,9 @@ void VToolFlippingByAxis::setDialog() VToolFlippingByAxis *VToolFlippingByAxis::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogFlippingByAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 originPointId = dialogTool->GetOriginPointId(); const AxisType axisType = dialogTool->GetAxisType(); const QString suffix = dialogTool->GetSuffix(); @@ -177,7 +177,7 @@ void VToolFlippingByAxis::SetVisualization() if (not vis.isNull()) { VisToolFlippingByAxis *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->SetObjects(source); visual->SetOriginPointId(m_originPointId); @@ -189,9 +189,9 @@ void VToolFlippingByAxis::SetVisualization() //--------------------------------------------------------------------------------------------------------------------- void VToolFlippingByAxis::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogFlippingByAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetOriginPointId())); doc->SetAttribute(domElement, AttrAxisType, QString().setNum(static_cast(dialogTool->GetAxisType()))); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index 3d0a9c443..fc35a2836 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp @@ -79,9 +79,9 @@ VToolFlippingByLine::~VToolFlippingByLine() //--------------------------------------------------------------------------------------------------------------------- void VToolFlippingByLine::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogFlippingByLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) dialogTool->SetFirstLinePointId(m_firstLinePointId); dialogTool->SetSecondLinePointId(m_secondLinePointId); dialogTool->SetSuffix(suffix); @@ -91,9 +91,9 @@ void VToolFlippingByLine::setDialog() VToolFlippingByLine *VToolFlippingByLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogFlippingByLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 firstLinePointId = dialogTool->GetFirstLinePointId(); const quint32 secondLinePointId = dialogTool->GetSecondLinePointId(); const QString suffix = dialogTool->GetSuffix(); @@ -157,7 +157,7 @@ void VToolFlippingByLine::SetVisualization() if (not vis.isNull()) { VisToolFlippingByLine *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->SetObjects(source); visual->SetFirstLinePointId(m_firstLinePointId); @@ -169,9 +169,9 @@ void VToolFlippingByLine::SetVisualization() //--------------------------------------------------------------------------------------------------------------------- void VToolFlippingByLine::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogFlippingByLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrP1Line, QString().setNum(dialogTool->GetFirstLinePointId())); doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetSecondLinePointId())); diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp index 8949b583e..3c38954f1 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp @@ -75,13 +75,13 @@ void VAbstractOperation::GroupVisibility(quint32 object, bool visible) if (obj->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(obj); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setVisible(visible); } else { VSimpleCurve *item = qobject_cast(obj); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setVisible(visible); } } @@ -149,13 +149,13 @@ void VAbstractOperation::FullUpdateFromFile() if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->RefreshGeometry(*VAbstractTool::data.GeometricObject(i.key())); } else { VSimpleCurve *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->RefreshGeometry(VAbstractTool::data.GeometricObject(i.key())); } } @@ -173,13 +173,13 @@ void VAbstractOperation::SetFactor(qreal factor) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->RefreshGeometry(*VAbstractTool::data.GeometricObject(i.key())); } else { VSimpleCurve *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->RefreshGeometry(VAbstractTool::data.GeometricObject(i.key())); } } @@ -195,13 +195,13 @@ void VAbstractOperation::AllowHover(bool enabled) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setAcceptHoverEvents(enabled); } else { VSimpleCurve *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setAcceptHoverEvents(enabled); } } @@ -217,13 +217,13 @@ void VAbstractOperation::AllowSelecting(bool enabled) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setFlag(QGraphicsItem::ItemIsSelectable, enabled); } else { VSimpleCurve *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setFlag(QGraphicsItem::ItemIsSelectable, enabled); } } @@ -239,7 +239,7 @@ void VAbstractOperation::AllowPointHover(bool enabled) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setAcceptHoverEvents(enabled); } } @@ -255,7 +255,7 @@ void VAbstractOperation::AllowPointSelecting(bool enabled) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->setFlag(QGraphicsItem::ItemIsSelectable, enabled); } } @@ -271,7 +271,7 @@ void VAbstractOperation::AllowPointLabelHover(bool enabled) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->AllowLabelHover(enabled); } } @@ -287,7 +287,7 @@ void VAbstractOperation::AllowPointLabelSelecting(bool enabled) if (i.value()->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->AllowLabelSelecting(enabled); } } @@ -384,7 +384,7 @@ void VAbstractOperation::LabelChangePosition(const QPointF &pos, quint32 labelId if (obj->GetType() == GOType::Point) { VSimplePoint *item = qobject_cast(obj); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) ChangePosition(item, labelId, pos); } } @@ -496,7 +496,7 @@ void VAbstractOperation::DoChangePosition(quint32 id, qreal mx, qreal my) VAbstractTool::data.UpdateGObject(id, point); VSimplePoint *item = qobject_cast(operatedObjects.value(id)); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) item->RefreshGeometry(*point); } @@ -512,7 +512,7 @@ void VAbstractOperation::AllowCurveHover(bool enabled, GOType type) if (i.value()->GetType() != GOType::Point) { VSimpleCurve *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) if (item->GetType() == type) { item->setAcceptHoverEvents(enabled); @@ -531,7 +531,7 @@ void VAbstractOperation::AllowCurveSelecting(bool enabled, GOType type) if (i.value()->GetType() != GOType::Point) { VSimpleCurve *item = qobject_cast(i.value()); - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) if (item->GetType() == type) { item->setFlag(QGraphicsItem::ItemIsSelectable, enabled); diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h index 2d525f5cb..40c85247a 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h @@ -182,8 +182,8 @@ void VAbstractOperation::ShowToolVisualization(bool show) template void VAbstractOperation::InitOperationToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) InitDrawToolConnections(scene, tool); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp index 16cf893f3..931c2beba 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp @@ -87,9 +87,9 @@ VToolMove::~VToolMove() //--------------------------------------------------------------------------------------------------------------------- void VToolMove::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogMove *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) dialogTool->SetAngle(formulaAngle); dialogTool->SetLength(formulaLength); dialogTool->SetSuffix(suffix); @@ -99,9 +99,9 @@ void VToolMove::setDialog() VToolMove *VToolMove::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogMove *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) QString angle = dialogTool->GetAngle(); QString length = dialogTool->GetLength(); const QString suffix = dialogTool->GetSuffix(); @@ -300,7 +300,7 @@ void VToolMove::SetVisualization() if (not vis.isNull()) { VisToolMove *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->SetObjects(source); visual->SetAngle(qApp->TrVars()->FormulaToUser(formulaAngle, qApp->Settings()->GetOsSeparator())); @@ -312,9 +312,9 @@ void VToolMove::SetVisualization() //--------------------------------------------------------------------------------------------------------------------- void VToolMove::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogMove *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle()); QString length = dialogTool->GetLength(); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index 010d961d1..889d0b81f 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp @@ -99,9 +99,9 @@ VToolRotation::~VToolRotation() //--------------------------------------------------------------------------------------------------------------------- void VToolRotation::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogRotation *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) dialogTool->SetOrigPointId(origPointId); dialogTool->SetAngle(formulaAngle); dialogTool->SetSuffix(suffix); @@ -111,9 +111,9 @@ void VToolRotation::setDialog() VToolRotation *VToolRotation::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogRotation *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 originPointId = dialogTool->GetOrigPointId(); QString angle = dialogTool->GetAngle(); const QString suffix = dialogTool->GetSuffix(); @@ -289,7 +289,7 @@ void VToolRotation::SetVisualization() if (not vis.isNull()) { VisToolRotation *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->SetObjects(source); visual->SetOriginPointId(origPointId); @@ -301,9 +301,9 @@ void VToolRotation::SetVisualization() //--------------------------------------------------------------------------------------------------------------------- void VToolRotation::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogRotation *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetOrigPointId())); doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index b72b55fa8..2c6e7f31f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -183,8 +183,8 @@ inline void VAbstractSpline::ShowToolVisualization(bool show) template void VAbstractSpline::InitSplineToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) InitDrawToolConnections(scene, tool); QObject::connect(scene, &VMainGraphicsScene::EnableSplineItemHover, tool, &T::AllowHover); @@ -195,8 +195,8 @@ void VAbstractSpline::InitSplineToolConnections(VMainGraphicsScene *scene, T *to template void VAbstractSpline::InitSplinePathToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) InitDrawToolConnections(scene, tool); QObject::connect(scene, &VMainGraphicsScene::EnableSplinePathItemHover, tool, &T::AllowHover); @@ -207,8 +207,8 @@ void VAbstractSpline::InitSplinePathToolConnections(VMainGraphicsScene *scene, T template void VAbstractSpline::InitArcToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) InitDrawToolConnections(scene, tool); QObject::connect(scene, &VMainGraphicsScene::EnableArcItemHover, tool, &T::AllowHover); @@ -219,8 +219,8 @@ void VAbstractSpline::InitArcToolConnections(VMainGraphicsScene *scene, T *tool) template void VAbstractSpline::InitElArcToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) InitDrawToolConnections(scene, tool); QObject::connect(scene, &VMainGraphicsScene::EnableElArcItemHover, tool, &T::AllowHover); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index 39327b779..2ef780a52 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -89,9 +89,9 @@ VToolArc::VToolArc(VAbstractPattern *doc, VContainer *data, quint32 id, const So */ void VToolArc::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); dialogTool->SetCenter(arc->GetCenter().id()); dialogTool->SetF1(arc->GetFormulaF1()); @@ -110,9 +110,9 @@ void VToolArc::setDialog() */ VToolArc* VToolArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 center = dialogTool->GetCenter(); QString radius = dialogTool->GetRadius(); QString f1 = dialogTool->GetF1(); @@ -193,7 +193,7 @@ QString VToolArc::getTagName() const quint32 VToolArc::getCenter() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) return arc->GetCenter().id(); } @@ -216,7 +216,7 @@ void VToolArc::setCenter(const quint32 &value) VFormula VToolArc::GetFormulaRadius() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) VFormula radius(arc->GetFormulaRadius(), getData()); radius.setCheckZero(true); @@ -244,7 +244,7 @@ void VToolArc::SetFormulaRadius(const VFormula &value) VFormula VToolArc::GetFormulaF1() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) VFormula f1(arc->GetFormulaF1(), getData()); f1.setCheckZero(false); @@ -273,7 +273,7 @@ void VToolArc::SetFormulaF1(const VFormula &value) VFormula VToolArc::GetFormulaF2() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) VFormula f2(arc->GetFormulaF2(), getData()); f2.setCheckZero(false); @@ -337,9 +337,9 @@ void VToolArc::RemoveReferens() */ void VToolArc::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetCenter())); doc->SetAttribute(domElement, AttrRadius, dialogTool->GetRadius()); doc->SetAttribute(domElement, AttrAngle1, dialogTool->GetF1()); @@ -353,7 +353,7 @@ void VToolArc::SaveOptions(QDomElement &tag, QSharedPointer &obj) VAbstractSpline::SaveOptions(tag, obj); QSharedPointer arc = qSharedPointerDynamicCast(obj); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) doc->SetAttribute(tag, AttrType, ToolType); doc->SetAttribute(tag, AttrCenter, arc->GetCenter().id()); @@ -369,7 +369,7 @@ void VToolArc::SetVisualization() { const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); VisToolArc *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) const VTranslateVars *trVars = qApp->TrVars(); visual->setObject1Id(arc->GetCenter().id()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 03ce82bdb..ee4e4e215 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -78,9 +78,9 @@ VToolArcWithLength::VToolArcWithLength(VAbstractPattern *doc, VContainer *data, //--------------------------------------------------------------------------------------------------------------------- void VToolArcWithLength::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogArcWithLength *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); dialogTool->SetCenter(arc->GetCenter().id()); dialogTool->SetF1(arc->GetFormulaF1()); @@ -93,9 +93,9 @@ void VToolArcWithLength::setDialog() VToolArcWithLength *VToolArcWithLength::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogArcWithLength *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 center = dialogTool->GetCenter(); QString radius = dialogTool->GetRadius(); QString f1 = dialogTool->GetF1(); @@ -163,7 +163,7 @@ QString VToolArcWithLength::getTagName() const quint32 VToolArcWithLength::getCenter() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) return arc->GetCenter().id(); } @@ -186,7 +186,7 @@ void VToolArcWithLength::setCenter(const quint32 &value) VFormula VToolArcWithLength::GetFormulaRadius() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) VFormula radius(arc->GetFormulaRadius(), getData()); radius.setCheckZero(true); @@ -214,7 +214,7 @@ void VToolArcWithLength::SetFormulaRadius(const VFormula &value) VFormula VToolArcWithLength::GetFormulaF1() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) VFormula f1(arc->GetFormulaF1(), getData()); f1.setCheckZero(false); @@ -243,7 +243,7 @@ void VToolArcWithLength::SetFormulaF1(const VFormula &value) VFormula VToolArcWithLength::GetFormulaLength() const { QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) VFormula radius(arc->GetFormulaLength(), getData()); radius.setCheckZero(true); @@ -294,9 +294,9 @@ void VToolArcWithLength::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolArcWithLength::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogArcWithLength *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetCenter())); doc->SetAttribute(domElement, AttrRadius, dialogTool->GetRadius()); doc->SetAttribute(domElement, AttrAngle1, dialogTool->GetF1()); @@ -310,7 +310,7 @@ void VToolArcWithLength::SaveOptions(QDomElement &tag, QSharedPointer VAbstractSpline::SaveOptions(tag, obj); QSharedPointer arc = qSharedPointerDynamicCast(obj); - SCASSERT(arc.isNull() == false); + SCASSERT(arc.isNull() == false) doc->SetAttribute(tag, AttrType, ToolType); doc->SetAttribute(tag, AttrCenter, arc->GetCenter().id()); @@ -326,7 +326,7 @@ void VToolArcWithLength::SetVisualization() { const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); VisToolArcWithLength *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) const VTranslateVars *trVars = qApp->TrVars(); visual->setObject1Id(arc->GetCenter().id()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp index 6da275d30..46fba40c4 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp @@ -81,9 +81,9 @@ VToolCubicBezier::~VToolCubicBezier() //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezier::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const auto spl = VAbstractTool::data.GeometricObject(id); dialogTool->SetSpline(*spl); dialogTool->SetColor(spl->GetColor()); @@ -93,9 +93,9 @@ void VToolCubicBezier::setDialog() VToolCubicBezier *VToolCubicBezier::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) auto spl = Create(0, new VCubicBezier(dialogTool->GetSpline()), dialogTool->GetColor(), scene, doc, data, Document::FullParse, Source::FromGui); @@ -193,9 +193,9 @@ void VToolCubicBezier::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezier::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const VCubicBezier spl = dialogTool->GetSpline(); @@ -209,7 +209,7 @@ void VToolCubicBezier::SaveOptions(QDomElement &tag, QSharedPointer &o VAbstractSpline::SaveOptions(tag, obj); auto spl = qSharedPointerDynamicCast(obj); - SCASSERT(spl.isNull() == false); + SCASSERT(spl.isNull() == false) SetSplineAttributes(tag, *spl); } @@ -219,7 +219,7 @@ void VToolCubicBezier::SetVisualization() if (not vis.isNull()) { auto visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); visual->setObject1Id(spl->GetP1().id()); @@ -252,7 +252,7 @@ void VToolCubicBezier::RefreshGeometry() //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezier::SetSplineAttributes(QDomElement &domElement, const VCubicBezier &spl) { - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) doc->SetAttribute(domElement, AttrType, ToolType); doc->SetAttribute(domElement, AttrPoint1, spl.GetP1().id()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp index 89b5dafac..df6976627 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp @@ -83,9 +83,9 @@ VToolCubicBezierPath::~VToolCubicBezierPath() //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezierPath::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); dialogTool->SetPath(*splPath); dialogTool->SetColor(splPath->GetColor()); @@ -95,9 +95,9 @@ void VToolCubicBezierPath::setDialog() VToolCubicBezierPath *VToolCubicBezierPath::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) auto path = new VCubicBezierPath(dialogTool->GetPath()); const QString color = dialogTool->GetColor(); for (qint32 i = 0; i < path->CountPoints(); ++i) @@ -204,9 +204,9 @@ void VToolCubicBezierPath::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezierPath::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) const auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor()); SetSplinePathAttributes(domElement, dialogTool->GetPath()); @@ -218,7 +218,7 @@ void VToolCubicBezierPath::SaveOptions(QDomElement &tag, QSharedPointer splPath = qSharedPointerDynamicCast(obj); - SCASSERT(splPath.isNull() == false); + SCASSERT(splPath.isNull() == false) SetSplinePathAttributes(tag, *splPath); } @@ -229,7 +229,7 @@ void VToolCubicBezierPath::SetVisualization() if (not vis.isNull()) { auto visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); visual->setPath(*splPath.data()); @@ -253,7 +253,7 @@ void VToolCubicBezierPath::RefreshGeometry() //--------------------------------------------------------------------------------------------------------------------- void VToolCubicBezierPath::AddPathPoint(VAbstractPattern *doc, QDomElement &domElement, const VPointF &splPoint) { - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) QDomElement pathPoint = doc->createElement(AttrPathPoint); doc->SetAttribute(pathPoint, AttrPSpline, splPoint.id()); domElement.appendChild(pathPoint); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp index defc9bc0e..ec2a03131 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp @@ -89,9 +89,9 @@ VToolEllipticalArc::VToolEllipticalArc(VAbstractPattern *doc, VContainer *data, */ void VToolEllipticalArc::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogEllipticalArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); dialogTool->SetCenter(elArc->GetCenter().id()); dialogTool->SetF1(elArc->GetFormulaF1()); @@ -114,9 +114,9 @@ void VToolEllipticalArc::setDialog() VToolEllipticalArc* VToolEllipticalArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogEllipticalArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 center = dialogTool->GetCenter(); QString radius1 = dialogTool->GetRadius1(); @@ -208,7 +208,7 @@ QString VToolEllipticalArc::getTagName() const quint32 VToolEllipticalArc::getCenter() const { QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) return elArc->GetCenter().id(); } @@ -231,7 +231,7 @@ void VToolEllipticalArc::setCenter(const quint32 &value) VFormula VToolEllipticalArc::GetFormulaRadius1() const { QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) VFormula radius1(elArc->GetFormulaRadius1(), getData()); radius1.setCheckZero(true); @@ -259,7 +259,7 @@ void VToolEllipticalArc::SetFormulaRadius1(const VFormula &value) VFormula VToolEllipticalArc::GetFormulaRadius2() const { QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) VFormula radius2(elArc->GetFormulaRadius2(), getData()); radius2.setCheckZero(true); @@ -287,7 +287,7 @@ void VToolEllipticalArc::SetFormulaRadius2(const VFormula &value) VFormula VToolEllipticalArc::GetFormulaF1() const { QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) VFormula f1(elArc->GetFormulaF1(), getData()); f1.setCheckZero(false); @@ -316,7 +316,7 @@ void VToolEllipticalArc::SetFormulaF1(const VFormula &value) VFormula VToolEllipticalArc::GetFormulaF2() const { QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) VFormula f2(elArc->GetFormulaF2(), getData()); f2.setCheckZero(false); @@ -344,7 +344,7 @@ void VToolEllipticalArc::SetFormulaF2(const VFormula &value) VFormula VToolEllipticalArc::GetFormulaRotationAngle() const { QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) VFormula rotationAngle(elArc->GetFormulaRotationAngle(), getData()); rotationAngle.setCheckZero(false); @@ -405,9 +405,9 @@ void VToolEllipticalArc::RemoveReferens() */ void VToolEllipticalArc::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogEllipticalArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetCenter())); doc->SetAttribute(domElement, AttrRadius1, dialogTool->GetRadius1()); doc->SetAttribute(domElement, AttrRadius2, dialogTool->GetRadius2()); @@ -423,7 +423,7 @@ void VToolEllipticalArc::SaveOptions(QDomElement &tag, QSharedPointer VAbstractSpline::SaveOptions(tag, obj); QSharedPointer elArc = qSharedPointerDynamicCast(obj); - SCASSERT(elArc.isNull() == false); + SCASSERT(elArc.isNull() == false) doc->SetAttribute(tag, AttrType, ToolType); doc->SetAttribute(tag, AttrCenter, elArc->GetCenter().id()); @@ -441,7 +441,7 @@ void VToolEllipticalArc::SetVisualization() { const QSharedPointer elArc = VAbstractTool::data.GeometricObject(id); VisToolEllipticalArc *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) const VTranslateVars *trVars = qApp->TrVars(); visual->setObject1Id(elArc->GetCenter().id()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 1ae884da6..ed60820d5 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -141,9 +141,9 @@ VToolSpline::~VToolSpline() */ void VToolSpline::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogSpline *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const auto spl = VAbstractTool::data.GeometricObject(id); dialogTool->SetSpline(*spl); dialogTool->SetColor(spl->GetColor()); @@ -160,9 +160,9 @@ void VToolSpline::setDialog() */ VToolSpline* VToolSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) VSpline *spline = new VSpline(dialogTool->GetSpline()); @@ -327,9 +327,9 @@ void VToolSpline::RemoveReferens() */ void VToolSpline::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const VSpline spl = dialogTool->GetSpline(); @@ -352,7 +352,7 @@ void VToolSpline::SaveOptions(QDomElement &tag, QSharedPointer &obj) VAbstractSpline::SaveOptions(tag, obj); auto spl = qSharedPointerDynamicCast(obj); - SCASSERT(spl.isNull() == false); + SCASSERT(spl.isNull() == false) SetSplineAttributes(tag, *spl); } @@ -458,7 +458,7 @@ void VToolSpline::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (QGraphicsView *view = viewList.at(0)) { VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) const QPointF cursorPosition = currentScene->getScenePos(); view->ensureVisible(QRectF(cursorPosition.x()-5, cursorPosition.y()-5, 10, 10)); } @@ -503,7 +503,7 @@ void VToolSpline::SetVisualization() if (not vis.isNull()) { VisToolSpline *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); visual->setObject1Id(spl->GetP1().id()); @@ -589,7 +589,7 @@ void VToolSpline::RefreshGeometry() //--------------------------------------------------------------------------------------------------------------------- void VToolSpline::SetSplineAttributes(QDomElement &domElement, const VSpline &spl) { - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) doc->SetAttribute(domElement, AttrType, ToolType); doc->SetAttribute(domElement, AttrPoint1, spl.GetP1().id()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 0da7aa71f..270ffa1c4 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -151,9 +151,9 @@ VToolSplinePath::~VToolSplinePath() */ void VToolSplinePath::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogSplinePath *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); dialogTool->SetPath(*splPath); dialogTool->SetColor(splPath->GetColor()); @@ -170,9 +170,9 @@ void VToolSplinePath::setDialog() VToolSplinePath* VToolSplinePath::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogSplinePath *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) VSplinePath *path = new VSplinePath(dialogTool->GetPath()); for (qint32 i = 0; i < path->CountPoints(); ++i) { @@ -390,7 +390,7 @@ void VToolSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolSplinePath::AddPathPoint(VAbstractPattern *doc, QDomElement &domElement, const VSplinePoint &splPoint) { - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) QDomElement pathPoint = doc->createElement(AttrPathPoint); doc->SetAttribute(pathPoint, AttrPSpline, splPoint.P().id()); @@ -436,9 +436,9 @@ void VToolSplinePath::RemoveReferens() */ void VToolSplinePath::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogSplinePath *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const VSplinePath splPath = dialogTool->GetPath(); for (qint32 i = 1; i <= splPath.CountSubSpl(); ++i) @@ -466,7 +466,7 @@ void VToolSplinePath::SaveOptions(QDomElement &tag, QSharedPointer &ob VAbstractSpline::SaveOptions(tag, obj); QSharedPointer splPath = qSharedPointerDynamicCast(obj); - SCASSERT(splPath.isNull() == false); + SCASSERT(splPath.isNull() == false) SetSplinePathAttributes(tag, *splPath); } @@ -578,7 +578,7 @@ void VToolSplinePath::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (QGraphicsView *view = viewList.at(0)) { VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) const QPointF cursorPosition = currentScene->getScenePos(); view->ensureVisible(QRectF(cursorPosition.x()-5, cursorPosition.y()-5, 10, 10)); } @@ -624,7 +624,7 @@ void VToolSplinePath::SetVisualization() if (not vis.isNull()) { VisToolSplinePath *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); visual->setPath(*splPath.data()); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index 1bb4f61be..d530583f8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -354,7 +354,7 @@ void VToolDoublePoint::SaveOptions(QDomElement &tag, QSharedPointer &o if (obj->id() == p1id) { QSharedPointer point = qSharedPointerDynamicCast(obj); - SCASSERT(point.isNull() == false); + SCASSERT(point.isNull() == false) doc->SetAttribute(tag, AttrName1, point->name()); doc->SetAttribute(tag, AttrMx1, qApp->fromPixel(point->mx())); @@ -363,7 +363,7 @@ void VToolDoublePoint::SaveOptions(QDomElement &tag, QSharedPointer &o else if (obj->id() == p2id) { QSharedPointer point = qSharedPointerDynamicCast(obj); - SCASSERT(point.isNull() == false); + SCASSERT(point.isNull() == false) doc->SetAttribute(tag, AttrName2, point->name()); doc->SetAttribute(tag, AttrMx2, qApp->fromPixel(point->mx())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index 8b5d9187b..e612748ef 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -107,9 +107,9 @@ void VToolTrueDarts::FindPoint(const QPointF &baseLineP1, const QPointF &baseLin //--------------------------------------------------------------------------------------------------------------------- void VToolTrueDarts::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogTrueDarts *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p1 = VAbstractTool::data.GeometricObject(p1id); const QSharedPointer p2 = VAbstractTool::data.GeometricObject(p2id); @@ -127,9 +127,9 @@ void VToolTrueDarts::setDialog() VToolTrueDarts *VToolTrueDarts::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogTrueDarts *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QString point1Name = dialogTool->GetFirstNewDartPointName(); const QString point2Name = dialogTool->GetSecondNewDartPointName(); @@ -337,9 +337,9 @@ void VToolTrueDarts::RemoveReferens() //--------------------------------------------------------------------------------------------------------------------- void VToolTrueDarts::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogTrueDarts *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName1, dialogTool->GetFirstNewDartPointName()); doc->SetAttribute(domElement, AttrName2, dialogTool->GetSecondNewDartPointName()); @@ -379,7 +379,7 @@ void VToolTrueDarts::SetVisualization() if (not vis.isNull()) { VisToolTrueDarts *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(baseLineP1Id); visual->setObject2Id(baseLineP2Id); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index b3ee69974..78e880945 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -83,9 +83,9 @@ VToolCutArc::VToolCutArc(VAbstractPattern *doc, VContainer *data, const quint32 */ void VToolCutArc::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer point = VAbstractTool::data.GeometricObject(id); dialogTool->SetFormula(formula); dialogTool->setArcId(curveCutId); @@ -102,9 +102,9 @@ void VToolCutArc::setDialog() */ VToolCutArc* VToolCutArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->GetFormula(); const quint32 arcId = dialogTool->getArcId(); @@ -213,9 +213,9 @@ void VToolCutArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolCutArc::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutArc *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrArc, QString().setNum(dialogTool->getArcId())); @@ -244,7 +244,7 @@ void VToolCutArc::SetVisualization() if (not vis.isNull()) { VisToolCutArc *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(curveCutId); visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index 2e29d3e90..1a9435b7c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -86,9 +86,9 @@ VToolCutSpline::VToolCutSpline(VAbstractPattern *doc, VContainer *data, const qu */ void VToolCutSpline::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutSpline *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer point = VAbstractTool::data.GeometricObject(id); dialogTool->SetFormula(formula); dialogTool->setSplineId(curveCutId); @@ -106,9 +106,9 @@ void VToolCutSpline::setDialog() VToolCutSpline* VToolCutSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutSpline *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->GetFormula(); const quint32 splineId = dialogTool->getSplineId(); @@ -213,9 +213,9 @@ void VToolCutSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolCutSpline::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutSpline *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrSpline, QString().setNum(dialogTool->getSplineId())); @@ -244,7 +244,7 @@ void VToolCutSpline::SetVisualization() if (not vis.isNull()) { VisToolCutSpline *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(curveCutId); visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index d300c3d02..bb044d606 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -90,9 +90,9 @@ VToolCutSplinePath::VToolCutSplinePath(VAbstractPattern *doc, VContainer *data, */ void VToolCutSplinePath::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutSplinePath *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer point = VAbstractTool::data.GeometricObject(id); dialogTool->SetFormula(formula); dialogTool->setSplinePathId(curveCutId); @@ -110,9 +110,9 @@ void VToolCutSplinePath::setDialog() VToolCutSplinePath* VToolCutSplinePath::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutSplinePath *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->GetFormula(); const quint32 splinePathId = dialogTool->getSplinePathId(); @@ -146,7 +146,7 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString VContainer *data, const Document &parse, const Source &typeCreation) { const auto splPath = data->GeometricObject(splinePathId); - SCASSERT(splPath != nullptr); + SCASSERT(splPath != nullptr) const qreal result = CheckFormula(_id, formula, data); @@ -155,9 +155,9 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString VSplinePath *splPath2 = nullptr; VPointF *p = VToolCutSplinePath::CutSplinePath(qApp->toPixel(result), splPath, pointName, &splPath1, &splPath2); - SCASSERT(splPath1 != nullptr); - SCASSERT(splPath2 != nullptr); - SCASSERT(p != nullptr); + SCASSERT(splPath1 != nullptr) + SCASSERT(splPath2 != nullptr) + SCASSERT(p != nullptr) p->setMx(mx); p->setMy(my); @@ -205,7 +205,7 @@ void VToolCutSplinePath::ShowVisualization(bool show) VPointF *VToolCutSplinePath::CutSplinePath(qreal length, const QSharedPointer &splPath, const QString &pName, VSplinePath **splPath1, VSplinePath **splPath2) { - SCASSERT(splPath != nullptr); + SCASSERT(splPath != nullptr) QPointF spl1p2, spl1p3, spl2p2, spl2p3; qint32 p1 = 0, p2 = 0; @@ -301,9 +301,9 @@ void VToolCutSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolCutSplinePath::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCutSplinePath *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrSplinePath, QString().setNum(dialogTool->getSplinePathId())); @@ -332,7 +332,7 @@ void VToolCutSplinePath::SetVisualization() if (not vis.isNull()) { VisToolCutSplinePath *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(curveCutId); visual->setLength(qApp->TrVars()->FormulaToUser(formula, qApp->Settings()->GetOsSeparator())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index 2963d28b5..adf05921a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -129,9 +129,9 @@ void VToolAlongLine::RemoveReferens() */ void VToolAlongLine::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogAlongLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -208,7 +208,7 @@ void VToolAlongLine::setDialog() { SCASSERT(dialog != nullptr); DialogAlongLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -229,9 +229,9 @@ void VToolAlongLine::setDialog() VToolAlongLine* VToolAlongLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogAlongLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) QString formula = dialogTool->GetFormula(); const quint32 firstPointId = dialogTool->GetFirstPointId(); const quint32 secondPointId = dialogTool->GetSecondPointId(); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 93eb1e5cc..1f8fee2c9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -127,9 +127,9 @@ QPointF VToolBisector::FindPoint(const QPointF &firstPoint, const QPointF &secon */ void VToolBisector::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogBisector *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -151,9 +151,9 @@ void VToolBisector::setDialog() VToolBisector* VToolBisector::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogBisector *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) QString formula = dialogTool->GetFormula(); const quint32 firstPointId = dialogTool->GetFirstPointId(); const quint32 secondPointId = dialogTool->GetSecondPointId(); @@ -282,9 +282,9 @@ void VToolBisector::RemoveReferens() */ void VToolBisector::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogBisector *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -323,7 +323,7 @@ void VToolBisector::SetVisualization() if (not vis.isNull()) { VisToolBisector *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); visual->setObject2Id(basePointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index 4ccbba610..dde7fd06b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -91,10 +91,10 @@ VToolCurveIntersectAxis::~VToolCurveIntersectAxis() //--------------------------------------------------------------------------------------------------------------------- void VToolCurveIntersectAxis::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) dialog->setModal(true); DialogCurveIntersectAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -109,9 +109,9 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(DialogTool *dialog, VMa VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCurveIntersectAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool); + SCASSERT(dialogTool) const QString pointName = dialogTool->getPointName(); const QString typeLine = dialogTool->GetTypeLine(); const QString lineColor = dialogTool->GetLineColor(); @@ -279,9 +279,9 @@ void VToolCurveIntersectAxis::contextMenuEvent(QGraphicsSceneContextMenuEvent *e //--------------------------------------------------------------------------------------------------------------------- void VToolCurveIntersectAxis::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogCurveIntersectAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -317,7 +317,7 @@ void VToolCurveIntersectAxis::SetVisualization() if (not vis.isNull()) { VisToolCurveIntersectAxis *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(curveId); visual->setAxisPointId(basePointId); @@ -446,8 +446,8 @@ void VToolCurveIntersectAxis::InitSegments(const GOType &curveType, qreal segLen delete pC; } - SCASSERT(splPath1 != nullptr); - SCASSERT(splPath2 != nullptr); + SCASSERT(splPath1 != nullptr) + SCASSERT(splPath2 != nullptr) if (not VFuzzyComparePossibleNulls(segLength, -1)) { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 75d8e0057..d4dae1598 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -91,10 +91,10 @@ VToolEndLine::~VToolEndLine() */ void VToolEndLine::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) dialog->setModal(true); DialogEndLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -116,9 +116,9 @@ void VToolEndLine::setDialog() VToolEndLine* VToolEndLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogEndLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool); + SCASSERT(dialogTool) const QString pointName = dialogTool->getPointName(); const QString typeLine = dialogTool->GetTypeLine(); const QString lineColor = dialogTool->GetLineColor(); @@ -219,9 +219,9 @@ void VToolEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolEndLine::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogEndLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -257,7 +257,7 @@ void VToolEndLine::SetVisualization() if (not vis.isNull()) { VisToolEndLine *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(basePointId); visual->setLength(qApp->TrVars()->FormulaToUser(formulaLength, qApp->Settings()->GetOsSeparator())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index dc9842c52..872cf464e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -84,9 +84,9 @@ VToolHeight::VToolHeight(VAbstractPattern *doc, VContainer *data, const quint32 */ void VToolHeight::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogHeight *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -107,9 +107,9 @@ void VToolHeight::setDialog() */ VToolHeight* VToolHeight::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogHeight *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QString pointName = dialogTool->getPointName(); const QString typeLine = dialogTool->GetTypeLine(); const QString lineColor = dialogTool->GetLineColor(); @@ -226,9 +226,9 @@ void VToolHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolHeight::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogHeight *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -264,7 +264,7 @@ void VToolHeight::SetVisualization() if (not vis.isNull()) { VisToolHeight *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(basePointId); visual->setLineP1Id(p1LineId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 507babace..21463f151 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -77,10 +77,10 @@ VToolLineIntersectAxis::~VToolLineIntersectAxis() //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersectAxis::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) dialog->setModal(true); DialogLineIntersectAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -96,9 +96,9 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(DialogTool *dialog, VMain VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLineIntersectAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool); + SCASSERT(dialogTool) const QString pointName = dialogTool->getPointName(); const QString typeLine = dialogTool->GetTypeLine(); const QString lineColor = dialogTool->GetLineColor(); @@ -275,9 +275,9 @@ void VToolLineIntersectAxis::contextMenuEvent(QGraphicsSceneContextMenuEvent *ev //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersectAxis::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLineIntersectAxis *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -316,7 +316,7 @@ void VToolLineIntersectAxis::SetVisualization() if (not vis.isNull()) { VisToolLineIntersectAxis *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); visual->setPoint2Id(secondPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 4257ffc96..8facfde80 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -90,9 +90,9 @@ VToolNormal::VToolNormal(VAbstractPattern *doc, VContainer *data, const quint32 */ void VToolNormal::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogNormal *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetFormula(formulaLength); @@ -112,9 +112,9 @@ void VToolNormal::setDialog() */ VToolNormal* VToolNormal::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogNormal *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) QString formula = dialogTool->GetFormula(); const quint32 firstPointId = dialogTool->GetFirstPointId(); const quint32 secondPointId = dialogTool->GetSecondPointId(); @@ -257,9 +257,9 @@ void VToolNormal::RemoveReferens() */ void VToolNormal::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogNormal *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -298,7 +298,7 @@ void VToolNormal::SetVisualization() if (not vis.isNull()) { VisToolNormal *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(basePointId); visual->setObject2Id(secondPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 7c73bb109..478434f82 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -92,9 +92,9 @@ VToolShoulderPoint::VToolShoulderPoint(VAbstractPattern *doc, VContainer *data, */ void VToolShoulderPoint::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogShoulderPoint *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetTypeLine(typeLine); dialogTool->SetLineColor(lineColor); @@ -154,9 +154,9 @@ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Li VToolShoulderPoint* VToolShoulderPoint::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogShoulderPoint *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool); + SCASSERT(dialogTool) QString formula = dialogTool->GetFormula(); const quint32 p1Line = dialogTool->GetP1Line(); const quint32 p2Line = dialogTool->GetP2Line(); @@ -288,9 +288,9 @@ void VToolShoulderPoint::RemoveReferens() */ void VToolShoulderPoint::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogShoulderPoint *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); @@ -329,7 +329,7 @@ void VToolShoulderPoint::SetVisualization() if (not vis.isNull()) { VisToolShoulderPoint *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(pShoulder); visual->setLineP1Id(basePointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index 80f84d56d..540f989fc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -109,9 +109,9 @@ VToolBasePoint::~VToolBasePoint() */ void VToolBasePoint::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogSinglePoint *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetData(p->name(), *p); } @@ -121,7 +121,7 @@ VToolBasePoint *VToolBasePoint::Create(quint32 _id, const QString &nameActivPP, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation) { - SCASSERT(point != nullptr); + SCASSERT(point != nullptr) quint32 id = _id; if (typeCreation == Source::FromGui) @@ -229,7 +229,7 @@ QVariant VToolBasePoint::itemChange(QGraphicsItem::GraphicsItemChange change, co { // Ensure visible only small rect around a cursor VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) const QPointF cursorPosition = currentScene->getScenePos(); view->ensureVisible(QRectF(cursorPosition.x()-5, cursorPosition.y()-5, 10, 10)); } @@ -284,9 +284,9 @@ void VToolBasePoint::DeleteTool(bool ask) */ void VToolBasePoint::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogSinglePoint *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) QPointF p = dialogTool->GetPoint(); QString name = dialogTool->getPointName(); doc->SetAttribute(domElement, AttrName, name); @@ -361,7 +361,7 @@ void VToolBasePoint::SaveOptions(QDomElement &tag, QSharedPointer &obj VToolSinglePoint::SaveOptions(tag, obj); QSharedPointer point = qSharedPointerDynamicCast(obj); - SCASSERT(point.isNull() == false); + SCASSERT(point.isNull() == false) doc->SetAttribute(tag, AttrType, ToolType); doc->SetAttribute(tag, AttrX, qApp->fromPixel(point->x())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 482f6d69e..ff97a2bfa 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -86,9 +86,9 @@ VToolLineIntersect::VToolLineIntersect(VAbstractPattern *doc, VContainer *data, */ void VToolLineIntersect::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLineIntersect *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetP1Line1(p1Line1); dialogTool->SetP2Line1(p2Line1); @@ -109,9 +109,9 @@ void VToolLineIntersect::setDialog() VToolLineIntersect* VToolLineIntersect::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLineIntersect *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 p1Line1Id = dialogTool->GetP1Line1(); const quint32 p2Line1Id = dialogTool->GetP2Line1(); const quint32 p1Line2Id = dialogTool->GetP1Line2(); @@ -252,9 +252,9 @@ void VToolLineIntersect::RemoveReferens() */ void VToolLineIntersect::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLineIntersect *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrP1Line1, QString().setNum(dialogTool->GetP1Line1())); doc->SetAttribute(domElement, AttrP2Line1, QString().setNum(dialogTool->GetP2Line1())); @@ -289,7 +289,7 @@ void VToolLineIntersect::SetVisualization() if (not vis.isNull()) { VisToolLineIntersect *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(p1Line1); visual->setLine1P2Id(p2Line1); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 91f02cb89..2c4422aab 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -70,9 +70,9 @@ VToolPointFromArcAndTangent::VToolPointFromArcAndTangent(VAbstractPattern *doc, //--------------------------------------------------------------------------------------------------------------------- void VToolPointFromArcAndTangent::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointFromArcAndTangent *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetArcId(arcId); dialogTool->SetCrossCirclesPoint(crossPoint); @@ -84,9 +84,9 @@ void VToolPointFromArcAndTangent::setDialog() VToolPointFromArcAndTangent *VToolPointFromArcAndTangent::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointFromArcAndTangent *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 arcId = dialogTool->GetArcId(); const quint32 tangentPointId = dialogTool->GetTangentPointId(); const CrossCirclesPoint pType = dialogTool->GetCrossCirclesPoint(); @@ -304,9 +304,9 @@ void VToolPointFromArcAndTangent::contextMenuEvent(QGraphicsSceneContextMenuEven //--------------------------------------------------------------------------------------------------------------------- void VToolPointFromArcAndTangent::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointFromArcAndTangent *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrArc, QString().setNum(dialogTool->GetArcId())); doc->SetAttribute(domElement, AttrTangent, QString().setNum(dialogTool->GetTangentPointId())); @@ -339,7 +339,7 @@ void VToolPointFromArcAndTangent::SetVisualization() if (not vis.isNull()) { VisToolPointFromArcAndTangent *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(tangentPointId); visual->setArcId(arcId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index 88384ff46..e33140bd9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -73,9 +73,9 @@ VToolPointFromCircleAndTangent::VToolPointFromCircleAndTangent(VAbstractPattern //--------------------------------------------------------------------------------------------------------------------- void VToolPointFromCircleAndTangent::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointFromCircleAndTangent *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetCircleCenterId(circleCenterId); dialogTool->SetCircleRadius(circleRadius); @@ -88,9 +88,9 @@ void VToolPointFromCircleAndTangent::setDialog() VToolPointFromCircleAndTangent *VToolPointFromCircleAndTangent::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointFromCircleAndTangent *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 circleCenterId = dialogTool->GetCircleCenterId(); QString circleRadius = dialogTool->GetCircleRadius(); const quint32 tangentPointId = dialogTool->GetTangentPointId(); @@ -288,9 +288,9 @@ void VToolPointFromCircleAndTangent::contextMenuEvent(QGraphicsSceneContextMenuE //--------------------------------------------------------------------------------------------------------------------- void VToolPointFromCircleAndTangent::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointFromCircleAndTangent *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrCCenter, QString().setNum(dialogTool->GetCircleCenterId())); doc->SetAttribute(domElement, AttrTangent, QString().setNum(dialogTool->GetTangentPointId())); @@ -326,7 +326,7 @@ void VToolPointFromCircleAndTangent::SetVisualization() if (not vis.isNull()) { VisToolPointFromCircleAndTangent *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(tangentPointId); visual->setObject2Id(circleCenterId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index 40d4ae4e0..a93c79f4d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -92,9 +92,9 @@ VToolPointOfContact::VToolPointOfContact(VAbstractPattern *doc, VContainer *data */ void VToolPointOfContact::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfContact *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->setRadius(arcRadius); dialogTool->setCenter(center); @@ -173,9 +173,9 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢e VToolPointOfContact* VToolPointOfContact::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfContact *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) QString radius = dialogTool->getRadius(); const quint32 center = dialogTool->getCenter(); const quint32 firstPointId = dialogTool->GetFirstPoint(); @@ -305,9 +305,9 @@ void VToolPointOfContact::RemoveReferens() */ void VToolPointOfContact::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfContact *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrRadius, dialogTool->getRadius()); doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->getCenter())); @@ -342,7 +342,7 @@ void VToolPointOfContact::SetVisualization() if (not vis.isNull()) { VisToolPointOfContact *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); visual->setLineP2Id(secondPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index b66c963e5..c113e0bda 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -80,9 +80,9 @@ VToolPointOfIntersection::VToolPointOfIntersection(VAbstractPattern *doc, VConta */ void VToolPointOfIntersection::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersection *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetFirstPointId(firstPointId); dialogTool->SetSecondPointId(secondPointId); @@ -102,9 +102,9 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(DialogTool *dialog, V VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersection *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 firstPointId = dialogTool->GetFirstPointId(); const quint32 secondPointId = dialogTool->GetSecondPointId(); const QString pointName = dialogTool->getPointName(); @@ -209,9 +209,9 @@ void VToolPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent * */ void VToolPointOfIntersection::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersection *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId())); @@ -240,7 +240,7 @@ void VToolPointOfIntersection::SetVisualization() if (not vis.isNull()) { VisToolPointOfIntersection *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); visual->setPoint2Id(secondPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index de622aa9f..d2c6f1f16 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -69,9 +69,9 @@ VToolPointOfIntersectionArcs::VToolPointOfIntersectionArcs(VAbstractPattern *doc //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionArcs::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersectionArcs *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetFirstArcId(firstArcId); dialogTool->SetSecondArcId(secondArcId); @@ -83,9 +83,9 @@ void VToolPointOfIntersectionArcs::setDialog() VToolPointOfIntersectionArcs *VToolPointOfIntersectionArcs::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersectionArcs *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 firstArcId = dialogTool->GetFirstArcId(); const quint32 secondArcId = dialogTool->GetSecondArcId(); const CrossCirclesPoint pType = dialogTool->GetCrossArcPoint(); @@ -310,9 +310,9 @@ void VToolPointOfIntersectionArcs::contextMenuEvent(QGraphicsSceneContextMenuEve //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionArcs::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersectionArcs *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrFirstArc, QString().setNum(dialogTool->GetFirstArcId())); doc->SetAttribute(domElement, AttrSecondArc, QString().setNum(dialogTool->GetSecondArcId())); @@ -344,7 +344,7 @@ void VToolPointOfIntersectionArcs::SetVisualization() if (not vis.isNull()) { VisToolPointOfIntersectionArcs *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setArc1Id(firstArcId); visual->setArc2Id(secondArcId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index c85818732..b717dccbf 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -77,9 +77,9 @@ VToolPointOfIntersectionCircles::VToolPointOfIntersectionCircles(VAbstractPatter //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionCircles::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersectionCircles *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetFirstCircleCenterId(firstCircleCenterId); dialogTool->SetSecondCircleCenterId(secondCircleCenterId); @@ -93,9 +93,9 @@ void VToolPointOfIntersectionCircles::setDialog() VToolPointOfIntersectionCircles *VToolPointOfIntersectionCircles::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersectionCircles *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 firstCircleCenterId = dialogTool->GetFirstCircleCenterId(); const quint32 secondCircleCenterId = dialogTool->GetSecondCircleCenterId(); QString firstCircleRadius = dialogTool->GetFirstCircleRadius(); @@ -324,9 +324,9 @@ void VToolPointOfIntersectionCircles::contextMenuEvent(QGraphicsSceneContextMenu //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionCircles::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogPointOfIntersectionCircles *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrC1Center, QString().setNum(dialogTool->GetFirstCircleCenterId())); doc->SetAttribute(domElement, AttrC2Center, QString().setNum(dialogTool->GetSecondCircleCenterId())); @@ -365,7 +365,7 @@ void VToolPointOfIntersectionCircles::SetVisualization() if (not vis.isNull()) { VisToolPointOfIntersectionCircles *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstCircleCenterId); visual->setObject2Id(secondCircleCenterId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp index a26745a25..a4785addd 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp @@ -75,9 +75,9 @@ VToolPointOfIntersectionCurves::VToolPointOfIntersectionCurves(VAbstractPattern //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionCurves::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) auto p = VAbstractTool::data.GeometricObject(id); dialogTool->SetFirstCurveId(firstCurveId); dialogTool->SetSecondCurveId(secondCurveId); @@ -90,9 +90,9 @@ void VToolPointOfIntersectionCurves::setDialog() VToolPointOfIntersectionCurves *VToolPointOfIntersectionCurves::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 firstCurveId = dialogTool->GetFirstCurveId(); const quint32 secondCurveId = dialogTool->GetSecondCurveId(); const VCrossCurvesPoint vCrossPoint = dialogTool->GetVCrossPoint(); @@ -370,9 +370,9 @@ void VToolPointOfIntersectionCurves::contextMenuEvent(QGraphicsSceneContextMenuE //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionCurves::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) auto dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrCurve1, QString().setNum(dialogTool->GetFirstCurveId())); doc->SetAttribute(domElement, AttrCurve2, QString().setNum(dialogTool->GetSecondCurveId())); @@ -407,7 +407,7 @@ void VToolPointOfIntersectionCurves::SetVisualization() if (not vis.isNull()) { auto visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstCurveId); visual->setObject2Id(secondCurveId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index 3ed3d2860..403fe7742 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -362,7 +362,7 @@ void VToolSinglePoint::SaveOptions(QDomElement &tag, QSharedPointer &o VDrawTool::SaveOptions(tag, obj); QSharedPointer point = qSharedPointerDynamicCast(obj); - SCASSERT(point.isNull() == false); + SCASSERT(point.isNull() == false) doc->SetAttribute(tag, AttrName, point->name()); doc->SetAttribute(tag, AttrMx, qApp->fromPixel(point->mx())); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index e0ef255f4..fd85d5e74 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -86,9 +86,9 @@ VToolTriangle::VToolTriangle(VAbstractPattern *doc, VContainer *data, const quin */ void VToolTriangle::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogTriangle *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const QSharedPointer p = VAbstractTool::data.GeometricObject(id); dialogTool->SetAxisP1Id(axisP1Id); dialogTool->SetAxisP2Id(axisP2Id); @@ -109,9 +109,9 @@ void VToolTriangle::setDialog() VToolTriangle* VToolTriangle::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogTriangle *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 axisP1Id = dialogTool->GetAxisP1Id(); const quint32 axisP2Id = dialogTool->GetAxisP2Id(); const quint32 firstPointId = dialogTool->GetFirstPointId(); @@ -273,9 +273,9 @@ void VToolTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolTriangle::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogTriangle *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrName, dialogTool->getPointName()); doc->SetAttribute(domElement, AttrAxisP1, QString().setNum(dialogTool->GetAxisP1Id())); doc->SetAttribute(domElement, AttrAxisP2, QString().setNum(dialogTool->GetAxisP2Id())); @@ -310,7 +310,7 @@ void VToolTriangle::SetVisualization() if (not vis.isNull()) { VisToolTriangle * visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(axisP1Id); visual->setObject2Id(axisP2Id); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index 226fb2db2..c59fc0334 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -143,8 +143,8 @@ void VAbstractPoint::ChangePosition(T *item, quint32 id, const QPointF &pos) template void VAbstractPoint::InitToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) InitDrawToolConnections(scene, tool); QObject::connect(scene, &VMainGraphicsScene::EnablePointItemHover, tool, &T::AllowHover); diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 4399e3807..cbb1281aa 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -154,8 +154,8 @@ template void VDrawTool::ContextMenu(Tool *tool, QGraphicsSceneContextMenuEvent *event, const RemoveOption &showRemove, const Referens &ref) { - SCASSERT(tool != nullptr); - SCASSERT(event != nullptr); + SCASSERT(tool != nullptr) + SCASSERT(event != nullptr) qCDebug(vTool, "Creating tool context menu."); QMenu menu; @@ -221,7 +221,7 @@ template */ void VDrawTool::ShowItem(Item *item, quint32 id, bool enable) { - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) if (id == item->id) { ShowVisualization(enable); @@ -253,8 +253,8 @@ QString VDrawTool::ObjectName(quint32 id) const template void VDrawTool::InitDrawToolConnections(VMainGraphicsScene *scene, T *tool) { - SCASSERT(scene != nullptr); - SCASSERT(tool != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(tool != nullptr) QObject::connect(tool, &T::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); QObject::connect(tool, &T::ChangedToolSelection, scene, &VMainGraphicsScene::SelectedItem); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index ca0a1ec36..559772cbd 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -97,9 +97,9 @@ VToolLine::VToolLine(VAbstractPattern *doc, VContainer *data, quint32 id, quint3 */ void VToolLine::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) dialogTool->SetFirstPoint(firstPoint); dialogTool->SetSecondPoint(secondPoint); dialogTool->SetTypeLine(typeLine); @@ -116,9 +116,9 @@ void VToolLine::setDialog() */ VToolLine *VToolLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const quint32 firstPoint = dialogTool->GetFirstPoint(); const quint32 secondPoint = dialogTool->GetSecondPoint(); const QString typeLine = dialogTool->GetTypeLine(); @@ -151,9 +151,9 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con VAbstractPattern *doc, VContainer *data, const Document &parse, const Source &typeCreation) { - SCASSERT(scene != nullptr); - SCASSERT(doc != nullptr); - SCASSERT(data != nullptr); + SCASSERT(scene != nullptr) + SCASSERT(doc != nullptr) + SCASSERT(data != nullptr) quint32 id = _id; if (typeCreation == Source::FromGui) { @@ -389,9 +389,9 @@ void VToolLine::keyReleaseEvent(QKeyEvent *event) */ void VToolLine::SaveDialog(QDomElement &domElement) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogLine *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPoint())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPoint())); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); @@ -424,7 +424,7 @@ void VToolLine::SetVisualization() if (not vis.isNull()) { VisToolLine *visual = qobject_cast(vis); - SCASSERT(visual != nullptr); + SCASSERT(visual != nullptr) visual->setObject1Id(firstPoint); visual->setPoint2Id(secondPoint); diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp index dba366d37..a8bce4185 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp @@ -83,7 +83,7 @@ void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint { //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) arc->setParent(tool);// Adopted by a tool } else diff --git a/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp b/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp index 482a6ce11..2b5d48027 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodeellipticalarc.cpp @@ -56,7 +56,7 @@ void VNodeEllipticalArc::Create(VAbstractPattern *doc, VContainer *data, quint32 { //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) arc->setParent(tool);// Adopted by a tool } else diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index 33a3e0fcb..27e3b9861 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp @@ -127,7 +127,7 @@ void VNodePoint::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsSc { //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) point->setParent(tool);// Adopted by a tool } else diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp index 6b607a6e6..945e4b34e 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp @@ -88,7 +88,7 @@ VNodeSpline *VNodeSpline::Create(VAbstractPattern *doc, VContainer *data, quint3 { //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) spl->setParent(tool);// Adopted by a tool } else diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp index c6ab8d453..bdff4786a 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp @@ -87,7 +87,7 @@ void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, quint32 id { //Some nodes we don't show on scene. Tool that create this nodes must free memory. VDataTool *tool = doc->getTool(idTool); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) splPath->setParent(tool);// Adopted by a tool } else diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index 98c06914a..e77c516e5 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/src/libs/vtools/tools/vabstracttool.cpp @@ -86,7 +86,7 @@ VAbstractTool::VAbstractTool(VAbstractPattern *doc, VContainer *data, quint32 id :VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), vis(), selectionType(SelectionType::ByMouseRelease) { - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) connect(this, &VAbstractTool::toolhaveChange, this->doc, &VAbstractPattern::haveLiteChange); connect(this->doc, &VAbstractPattern::FullUpdateFromFile, this, &VAbstractTool::FullUpdateFromFile); connect(this, &VAbstractTool::LiteUpdateTree, this->doc, &VAbstractPattern::LiteParseTree); @@ -402,9 +402,9 @@ void VAbstractTool::AddRecord(const quint32 id, const Tool &toolType, VAbstractP void VAbstractTool::RefreshLine(QGraphicsEllipseItem *point, VGraphicsSimpleTextItem *namePoint, QGraphicsLineItem *lineName, const qreal radius) { - SCASSERT(point != nullptr); - SCASSERT(namePoint != nullptr); - SCASSERT(lineName != nullptr); + SCASSERT(point != nullptr) + SCASSERT(namePoint != nullptr) + SCASSERT(lineName != nullptr) QRectF nRec = namePoint->sceneBoundingRect(); nRec.translate(- point->scenePos()); diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index ed3ef504e..f0345a571 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -235,9 +235,9 @@ VToolDetail::~VToolDetail() */ void VToolDetail::setDialog() { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogDetail *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) dialogTool->setDetail(VAbstractTool::data.GetDetail(id)); } @@ -251,9 +251,9 @@ void VToolDetail::setDialog() */ void VToolDetail::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogDetail *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) VDetail detail = dialogTool->getDetail(); VDetail det; qApp->getUndoStack()->beginMacro("add detail"); @@ -402,9 +402,9 @@ void VToolDetail::FullUpdateFromGuiOk(int result) { if (result == QDialog::Accepted) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogDetail *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) const VDetail newDet = dialogTool->getDetail(); const VDetail oldDet = VAbstractTool::data.GetDetail(id); @@ -651,7 +651,7 @@ QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const { // Ensure visible only small rect around a cursor VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) const QPointF cursorPosition = currentScene->getScenePos(); view->ensureVisible(QRectF(cursorPosition.x()-5, cursorPosition.y()-5, 10, 10)); } @@ -1252,9 +1252,9 @@ template Tool* VToolDetail::InitTool(VMainGraphicsScene *scene, const VNodeDetail &node) { QHash* tools = doc->getTools(); - SCASSERT(tools != nullptr); + SCASSERT(tools != nullptr) Tool *tool = qobject_cast(tools->value(node.getId())); - SCASSERT(tool != nullptr); + SCASSERT(tool != nullptr) connect(tool, &Tool::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); tool->setParentItem(this); tool->SetParentType(ParentType::Item); diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 27aa19baa..fe65a630c 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -435,7 +435,7 @@ void VToolUnionDetails::UpdatePoints(VContainer *data, const VDetail &det, const path->setMode(Draw::Modeling); const QSharedPointer splinePath = data->GeometricObject(det.at(i).getId()); - SCASSERT(splinePath != nullptr); + SCASSERT(splinePath != nullptr) for (qint32 i = 1; i <= splinePath->CountSubSpl(); ++i) { const VSpline spline = splinePath->GetSpline(i); @@ -575,9 +575,9 @@ void VToolUnionDetails::GroupVisibility(quint32 object, bool visible) VToolUnionDetails* VToolUnionDetails::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { - SCASSERT(dialog != nullptr); + SCASSERT(dialog != nullptr) DialogUnionDetails *dialogTool = qobject_cast(dialog); - SCASSERT(dialogTool != nullptr); + SCASSERT(dialogTool != nullptr) VDetail d1 = data->GetDetail(dialogTool->getD1()); VDetail d2 = data->GetDetail(dialogTool->getD2()); quint32 indexD1 = static_cast(dialogTool->getIndexD1()); @@ -619,7 +619,7 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d { id = data->getNextId(); drawName = DrawName(doc, d1id, d2id); - SCASSERT(not drawName.isEmpty()); + SCASSERT(not drawName.isEmpty()) } else { @@ -704,20 +704,20 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d newDetail.setMy(d1.getMy()); VToolDetail::Create(0, newDetail, scene, doc, data, parse, Source::FromTool, drawName); QHash* tools = doc->getTools(); - SCASSERT(tools != nullptr); + SCASSERT(tools != nullptr) if (not retainPieces) { { VToolDetail *toolDet = qobject_cast(tools->value(d1id)); - SCASSERT(toolDet != nullptr); + SCASSERT(toolDet != nullptr) bool ask = false; toolDet->Remove(ask); } { VToolDetail *toolDet = qobject_cast(tools->value(d2id)); - SCASSERT(toolDet != nullptr); + SCASSERT(toolDet != nullptr) const bool ask = false; toolDet->Remove(ask); } diff --git a/src/libs/vtools/undocommands/addpatternpiece.cpp b/src/libs/vtools/undocommands/addpatternpiece.cpp index 1e27b917c..9f9e89a55 100644 --- a/src/libs/vtools/undocommands/addpatternpiece.cpp +++ b/src/libs/vtools/undocommands/addpatternpiece.cpp @@ -41,7 +41,7 @@ AddPatternPiece::AddPatternPiece(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent) : VUndoCommand(xml, doc, parent), namePP(namePP) { - SCASSERT(namePP.isEmpty() == false); + SCASSERT(namePP.isEmpty() == false) setText(tr("add pattern piece %1").arg(namePP)); } diff --git a/src/libs/vtools/undocommands/deletedetail.cpp b/src/libs/vtools/undocommands/deletedetail.cpp index 50140d16a..a9f375b26 100644 --- a/src/libs/vtools/undocommands/deletedetail.cpp +++ b/src/libs/vtools/undocommands/deletedetail.cpp @@ -97,9 +97,9 @@ void DeleteDetail::redo() // UnionDetails delete two old details and create one new. // So when UnionDetail delete detail we can't use FullParsing. So we hide detail on scene directly. QHash* tools = doc->getTools(); - SCASSERT(tools != nullptr); + SCASSERT(tools != nullptr) VToolDetail *toolDet = qobject_cast(tools->value(nodeId)); - SCASSERT(toolDet != nullptr); + SCASSERT(toolDet != nullptr) toolDet->hide(); DecrementReferences(detail.getNodes()); diff --git a/src/libs/vtools/undocommands/label/movedoublelabel.cpp b/src/libs/vtools/undocommands/label/movedoublelabel.cpp index a782f19df..c8a35a7f9 100644 --- a/src/libs/vtools/undocommands/label/movedoublelabel.cpp +++ b/src/libs/vtools/undocommands/label/movedoublelabel.cpp @@ -91,7 +91,7 @@ MoveDoubleLabel::~MoveDoubleLabel() bool MoveDoubleLabel::mergeWith(const QUndoCommand *command) { const MoveDoubleLabel *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) if (moveCommand->GetPointId() != nodeId || moveCommand->GetPointType() != m_type || diff --git a/src/libs/vtools/undocommands/label/movelabel.cpp b/src/libs/vtools/undocommands/label/movelabel.cpp index ecef0a8bc..28a4e18b5 100644 --- a/src/libs/vtools/undocommands/label/movelabel.cpp +++ b/src/libs/vtools/undocommands/label/movelabel.cpp @@ -70,7 +70,7 @@ MoveLabel::~MoveLabel() bool MoveLabel::mergeWith(const QUndoCommand *command) { const MoveLabel *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) if (moveCommand->GetPointId() != nodeId) { diff --git a/src/libs/vtools/undocommands/label/operationmovelabel.cpp b/src/libs/vtools/undocommands/label/operationmovelabel.cpp index d83066110..1d2db9c06 100644 --- a/src/libs/vtools/undocommands/label/operationmovelabel.cpp +++ b/src/libs/vtools/undocommands/label/operationmovelabel.cpp @@ -77,7 +77,7 @@ OperationMoveLabel::~OperationMoveLabel() bool OperationMoveLabel::mergeWith(const QUndoCommand *command) { const OperationMoveLabel *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) if (moveCommand->GetToolId() != m_idTool && moveCommand->GetPointId() != nodeId) { diff --git a/src/libs/vtools/undocommands/movedetail.cpp b/src/libs/vtools/undocommands/movedetail.cpp index f06fd568d..333c331a0 100644 --- a/src/libs/vtools/undocommands/movedetail.cpp +++ b/src/libs/vtools/undocommands/movedetail.cpp @@ -49,7 +49,7 @@ MoveDetail::MoveDetail(VAbstractPattern *doc, const double &x, const double &y, setText(QObject::tr("move detail")); nodeId = id; - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { @@ -118,7 +118,7 @@ void MoveDetail::redo() bool MoveDetail::mergeWith(const QUndoCommand *command) { const MoveDetail *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) const quint32 id = moveCommand->getDetId(); if (id != nodeId) diff --git a/src/libs/vtools/undocommands/movespline.cpp b/src/libs/vtools/undocommands/movespline.cpp index a36dc6467..64de80e40 100644 --- a/src/libs/vtools/undocommands/movespline.cpp +++ b/src/libs/vtools/undocommands/movespline.cpp @@ -53,7 +53,7 @@ MoveSpline::MoveSpline(VAbstractPattern *doc, const VSpline *oldSpl, const VSpli setText(tr("move spline")); nodeId = id; - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) } //--------------------------------------------------------------------------------------------------------------------- @@ -82,7 +82,7 @@ void MoveSpline::redo() bool MoveSpline::mergeWith(const QUndoCommand *command) { const MoveSpline *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) const quint32 id = moveCommand->getSplineId(); if (id != nodeId) diff --git a/src/libs/vtools/undocommands/movesplinepath.cpp b/src/libs/vtools/undocommands/movesplinepath.cpp index 12e9188f8..0cc0626b3 100644 --- a/src/libs/vtools/undocommands/movesplinepath.cpp +++ b/src/libs/vtools/undocommands/movesplinepath.cpp @@ -52,7 +52,7 @@ MoveSplinePath::MoveSplinePath(VAbstractPattern *doc, const VSplinePath &oldSplP setText(tr("move spline path")); nodeId = id; - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) } //--------------------------------------------------------------------------------------------------------------------- @@ -81,7 +81,7 @@ void MoveSplinePath::redo() bool MoveSplinePath::mergeWith(const QUndoCommand *command) { const MoveSplinePath *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) const quint32 id = moveCommand->getSplinePathId(); if (id != nodeId) diff --git a/src/libs/vtools/undocommands/movespoint.cpp b/src/libs/vtools/undocommands/movespoint.cpp index baf9ceba5..3180715ef 100644 --- a/src/libs/vtools/undocommands/movespoint.cpp +++ b/src/libs/vtools/undocommands/movespoint.cpp @@ -51,7 +51,7 @@ MoveSPoint::MoveSPoint(VAbstractPattern *doc, const double &x, const double &y, qCDebug(vUndo, "SPoint newX %f", newX); qCDebug(vUndo, "SPoint newY %f", newY); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) QDomElement domElement = doc->elementById(id); if (domElement.isElement()) { @@ -92,7 +92,7 @@ void MoveSPoint::redo() bool MoveSPoint::mergeWith(const QUndoCommand *command) { const MoveSPoint *moveCommand = static_cast(command); - SCASSERT(moveCommand != nullptr); + SCASSERT(moveCommand != nullptr) const quint32 id = moveCommand->getSPointId(); qCDebug(vUndo, "Mergin."); diff --git a/src/libs/vtools/undocommands/renamepp.cpp b/src/libs/vtools/undocommands/renamepp.cpp index afc0025d0..d2c53c5d9 100644 --- a/src/libs/vtools/undocommands/renamepp.cpp +++ b/src/libs/vtools/undocommands/renamepp.cpp @@ -43,7 +43,7 @@ RenamePP::RenamePP(VAbstractPattern *doc, const QString &newPPname, QComboBox *c :VUndoCommand(QDomElement(), doc, parent), combo(combo), newPPname(newPPname), oldPPname(QString()) { setText(tr("rename pattern piece")); - SCASSERT(combo != nullptr); + SCASSERT(combo != nullptr) oldPPname = doc->GetNameActivPP(); } @@ -71,7 +71,7 @@ void RenamePP::redo() bool RenamePP::mergeWith(const QUndoCommand *command) { const RenamePP *renameCommand = static_cast(command); - SCASSERT(renameCommand != nullptr); + SCASSERT(renameCommand != nullptr) const QString oldName = renameCommand->getOldPPname(); if (newPPname != oldName) diff --git a/src/libs/vtools/undocommands/savedetailoptions.cpp b/src/libs/vtools/undocommands/savedetailoptions.cpp index 032db725e..fa8ae38e9 100644 --- a/src/libs/vtools/undocommands/savedetailoptions.cpp +++ b/src/libs/vtools/undocommands/savedetailoptions.cpp @@ -120,7 +120,7 @@ void SaveDetailOptions::redo() bool SaveDetailOptions::mergeWith(const QUndoCommand *command) { const SaveDetailOptions *saveCommand = static_cast(command); - SCASSERT(saveCommand != nullptr); + SCASSERT(saveCommand != nullptr) const quint32 id = saveCommand->getDetId(); if (id != nodeId || text() != command->text()) diff --git a/src/libs/vtools/undocommands/savetooloptions.cpp b/src/libs/vtools/undocommands/savetooloptions.cpp index 492de6fc5..6ec7b4fed 100644 --- a/src/libs/vtools/undocommands/savetooloptions.cpp +++ b/src/libs/vtools/undocommands/savetooloptions.cpp @@ -93,7 +93,7 @@ void SaveToolOptions::redo() bool SaveToolOptions::mergeWith(const QUndoCommand *command) { const SaveToolOptions *saveCommand = static_cast(command); - SCASSERT(saveCommand != nullptr); + SCASSERT(saveCommand != nullptr) const quint32 id = saveCommand->getToolId(); if (id != nodeId) diff --git a/src/libs/vtools/undocommands/vundocommand.cpp b/src/libs/vtools/undocommands/vundocommand.cpp index a9b56b076..2e52a502c 100644 --- a/src/libs/vtools/undocommands/vundocommand.cpp +++ b/src/libs/vtools/undocommands/vundocommand.cpp @@ -44,7 +44,7 @@ Q_LOGGING_CATEGORY(vUndo, "v.undo") VUndoCommand::VUndoCommand(const QDomElement &xml, VAbstractPattern *doc, QUndoCommand *parent) :QObject(), QUndoCommand(parent), xml(xml), doc(doc), nodeId(NULL_ID), redoFlag(false) { - SCASSERT(doc != nullptr); + SCASSERT(doc != nullptr) } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/line/operation/visoperation.cpp b/src/libs/vtools/visualization/line/operation/visoperation.cpp index c581fc91e..39877ade0 100644 --- a/src/libs/vtools/visualization/line/operation/visoperation.cpp +++ b/src/libs/vtools/visualization/line/operation/visoperation.cpp @@ -67,7 +67,7 @@ void VisOperation::VisualMode(const quint32 &pointId) { Q_UNUSED(pointId); VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) Visualization::scenePos = scene->getScenePos(); RefreshGeometry(); diff --git a/src/libs/vtools/visualization/line/visline.cpp b/src/libs/vtools/visualization/line/visline.cpp index b193352a0..1bb8e1b68 100644 --- a/src/libs/vtools/visualization/line/visline.cpp +++ b/src/libs/vtools/visualization/line/visline.cpp @@ -155,7 +155,7 @@ void VisLine::AddOnScene() void VisLine::DrawRay(QGraphicsLineItem *lineItem, const QPointF &p, const QPointF &pTangent, const QColor &color, Qt::PenStyle style) { - SCASSERT (lineItem != nullptr); + SCASSERT (lineItem != nullptr) const qreal angle = QLineF(p, pTangent).angle(); const QPointF endRay = Ray(p, angle); diff --git a/src/libs/vtools/visualization/line/vistoolline.cpp b/src/libs/vtools/visualization/line/vistoolline.cpp index 0a420e8af..032d3c74f 100644 --- a/src/libs/vtools/visualization/line/vistoolline.cpp +++ b/src/libs/vtools/visualization/line/vistoolline.cpp @@ -80,7 +80,7 @@ void VisToolLine::setPoint2Id(const quint32 &value) //--------------------------------------------------------------------------------------------------------------------- void VisToolLine::DrawLine(QGraphicsLineItem *lineItem, const QLineF &line, const QColor &color, Qt::PenStyle style) { - SCASSERT (lineItem != nullptr); + SCASSERT (lineItem != nullptr) lineItem->setPen(QPen(color, qApp->toPixel(WidthMainLine(*Visualization::data->GetPatternUnit()))/factor, style)); lineItem->setLine(line); diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp index 0a830674d..8924bbd83 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectionarcs.cpp @@ -92,7 +92,7 @@ void VisToolPointOfIntersectionArcs::RefreshGeometry() void VisToolPointOfIntersectionArcs::VisualMode(const quint32 &id) { VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) this->arc1Id = id; Visualization::scenePos = scene->getScenePos(); diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp index 7af20ea96..b70fb4393 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp @@ -96,7 +96,7 @@ void VisToolPointOfIntersectionCircles::RefreshGeometry() void VisToolPointOfIntersectionCircles::VisualMode(const quint32 &id) { VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) this->object1Id = id; Visualization::scenePos = scene->getScenePos(); diff --git a/src/libs/vtools/visualization/line/vistooltriangle.cpp b/src/libs/vtools/visualization/line/vistooltriangle.cpp index 71feb80c0..4df5c29bb 100644 --- a/src/libs/vtools/visualization/line/vistooltriangle.cpp +++ b/src/libs/vtools/visualization/line/vistooltriangle.cpp @@ -146,7 +146,7 @@ void VisToolTriangle::setHypotenuseP2Id(const quint32 &value) void VisToolTriangle::DrawAimedAxis(QGraphicsPathItem *item, const QLineF &line, const QColor &color, Qt::PenStyle style) { - SCASSERT (item != nullptr); + SCASSERT (item != nullptr) item->setPen(QPen(color, qApp->toPixel(WidthHairLine(*Visualization::data->GetPatternUnit()))/factor, style)); diff --git a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp index 93d68519c..253bdbb25 100644 --- a/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolcutsplinepath.cpp @@ -76,9 +76,9 @@ void VisToolCutSplinePath::RefreshGeometry() VSplinePath *spPath1 = nullptr; VSplinePath *spPath2 = nullptr; VPointF *p = VToolCutSplinePath::CutSplinePath(length, splPath, "X", &spPath1, &spPath2); - SCASSERT(p != nullptr); - SCASSERT(spPath1 != nullptr); - SCASSERT(spPath2 != nullptr); + SCASSERT(p != nullptr) + SCASSERT(spPath1 != nullptr) + SCASSERT(spPath2 != nullptr) DrawPoint(point, *p, mainColor); delete p; diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp index bee369c4d..345440287 100644 --- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp @@ -81,7 +81,7 @@ void VisToolPointOfIntersectionCurves::RefreshGeometry() void VisToolPointOfIntersectionCurves::VisualMode(const quint32 &id) { auto scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) this->object1Id = id; Visualization::scenePos = scene->getScenePos(); diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index fabfca5f5..d6bd123e7 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -103,7 +103,7 @@ void Visualization::setScenePos(const QPointF &value) void Visualization::VisualMode(const quint32 &pointId) { VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) this->object1Id = pointId; this->scenePos = scene->getScenePos(); @@ -207,7 +207,7 @@ qreal Visualization::FindVal(const QString &expression, const QHashsetPos(pos); point->setPen(QPen(color, qApp->toPixel(WidthMainLine(*Visualization::data->GetPatternUnit()))/factor, style)); @@ -217,7 +217,7 @@ void Visualization::DrawPoint(QGraphicsEllipseItem *point, const QPointF &pos, c //--------------------------------------------------------------------------------------------------------------------- void Visualization::DrawLine(QGraphicsLineItem *lineItem, const QLineF &line, const QColor &color, Qt::PenStyle style) { - SCASSERT (lineItem != nullptr); + SCASSERT (lineItem != nullptr) lineItem->setPen(QPen(color, qApp->toPixel(WidthHairLine(*Visualization::data->GetPatternUnit()))/factor, style)); lineItem->setLine(line); @@ -228,7 +228,7 @@ void Visualization::DrawLine(QGraphicsLineItem *lineItem, const QLineF &line, co void Visualization::DrawPath(QGraphicsPathItem *pathItem, const QPainterPath &path, const QColor &color, Qt::PenStyle style, Qt::PenCapStyle cap) { - SCASSERT (pathItem != nullptr); + SCASSERT (pathItem != nullptr) pathItem->setPen(QPen(color, qApp->toPixel(WidthMainLine(*Visualization::data->GetPatternUnit()))/factor, style, cap)); diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index d2e08ccd0..13124732b 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -105,9 +105,9 @@ private: template inline void Visualization::AddItem(Item *item) { - SCASSERT(item != nullptr); + SCASSERT(item != nullptr) VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); + SCASSERT(scene != nullptr) scene->addItem(item); connect(scene, &VMainGraphicsScene::NewFactor, item, &Visualization::SetFactor); diff --git a/src/libs/vwidgets/vabstractsimple.h b/src/libs/vwidgets/vabstractsimple.h index 8181168b6..fa1decd95 100644 --- a/src/libs/vwidgets/vabstractsimple.h +++ b/src/libs/vwidgets/vabstractsimple.h @@ -101,7 +101,7 @@ private: template void VAbstractSimple::SetPen(T *item, const QColor &color, qreal width) { - SCASSERT(item); + SCASSERT(item) item->setPen(QPen(CorrectColor(color), ToPixel(width, patternUnit)/ *factor, Qt::SolidLine, Qt::RoundCap)); } diff --git a/src/libs/vwidgets/vcontrolpointspline.cpp b/src/libs/vwidgets/vcontrolpointspline.cpp index e500b8ed4..a0b63df36 100644 --- a/src/libs/vwidgets/vcontrolpointspline.cpp +++ b/src/libs/vwidgets/vcontrolpointspline.cpp @@ -201,7 +201,7 @@ QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange chang { // Ensure visible only small rect around a cursor VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) const QPointF cursorPosition = currentScene->getScenePos(); view->ensureVisible(QRectF(cursorPosition.x()-5, cursorPosition.y()-5, 10, 10)); } diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp index 8a4c89393..2f95261ff 100644 --- a/src/libs/vwidgets/vgraphicssimpletextitem.cpp +++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp @@ -155,7 +155,7 @@ QVariant VGraphicsSimpleTextItem::itemChange(GraphicsItemChange change, const QV { // Ensure visible only small rect around a cursor VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) const QPointF cursorPosition = currentScene->getScenePos(); view->ensureVisible(QRectF(cursorPosition.x()-5, cursorPosition.y()-5, 10, 10)); } diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index eb73dae62..8e68bc497 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -213,7 +213,7 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event) else if (event->type() == QEvent::Wheel) { QWheelEvent* wheel_event = static_cast(event); - SCASSERT(wheel_event != nullptr); + SCASSERT(wheel_event != nullptr) if (QApplication::keyboardModifiers() == _modifiers) { if (wheel_event->orientation() == Qt::Vertical) @@ -243,8 +243,8 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event) //--------------------------------------------------------------------------------------------------------------------- void GraphicsViewZoom::FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view) { - SCASSERT(sc != nullptr); - SCASSERT(view != nullptr); + SCASSERT(sc != nullptr) + SCASSERT(view != nullptr) //Calculate view rect //to receive the currently visible area, map the widgets bounds to the scene @@ -273,7 +273,7 @@ void GraphicsViewZoom::FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view) //--------------------------------------------------------------------------------------------------------------------- bool GraphicsViewZoom::StartVerticalScrollings(QWheelEvent *wheel_event) { - SCASSERT(wheel_event != nullptr); + SCASSERT(wheel_event != nullptr) const QPoint numPixels = wheel_event->pixelDelta(); const QPoint numDegrees = wheel_event->angleDelta() / 8; @@ -308,7 +308,7 @@ bool GraphicsViewZoom::StartVerticalScrollings(QWheelEvent *wheel_event) //--------------------------------------------------------------------------------------------------------------------- bool GraphicsViewZoom::StartHorizontalScrollings(QWheelEvent *wheel_event) { - SCASSERT(wheel_event != nullptr); + SCASSERT(wheel_event != nullptr) const QPoint numPixels = wheel_event->pixelDelta(); const QPoint numDegrees = wheel_event->angleDelta() / 8; @@ -396,7 +396,7 @@ void VMainGraphicsView::ZoomOriginal() void VMainGraphicsView::ZoomFitBest() { VMainGraphicsScene *currentScene = qobject_cast(scene()); - SCASSERT(currentScene); + SCASSERT(currentScene) currentScene->SetOriginsVisible(false); const QRectF rect = currentScene->VisibleItemsBoundingRect(); currentScene->SetOriginsVisible(true); @@ -531,15 +531,15 @@ void VMainGraphicsView::AllowRubberBand(bool value) */ void VMainGraphicsView::NewSceneRect(QGraphicsScene *sc, QGraphicsView *view) { - SCASSERT(sc != nullptr); - SCASSERT(view != nullptr); + SCASSERT(sc != nullptr) + SCASSERT(view != nullptr) //Calculate view rect const QRectF viewRect = SceneVisibleArea(view); //Calculate scene rect VMainGraphicsScene *currentScene = qobject_cast(sc); - SCASSERT(currentScene); + SCASSERT(currentScene) const QRectF itemsRect = currentScene->VisibleItemsBoundingRect(); //Unite two rects @@ -549,7 +549,7 @@ void VMainGraphicsView::NewSceneRect(QGraphicsScene *sc, QGraphicsView *view) //--------------------------------------------------------------------------------------------------------------------- QRectF VMainGraphicsView::SceneVisibleArea(QGraphicsView *view) { - SCASSERT(view != nullptr); + SCASSERT(view != nullptr) //to receive the currently visible area, map the widgets bounds to the scene return QRectF(view->mapToScene(0, 0), view->mapToScene(view->width(), view->height())); } diff --git a/src/libs/vwidgets/vwidgetpopup.cpp b/src/libs/vwidgets/vwidgetpopup.cpp index 9d67790b3..a7357ad70 100644 --- a/src/libs/vwidgets/vwidgetpopup.cpp +++ b/src/libs/vwidgets/vwidgetpopup.cpp @@ -90,7 +90,7 @@ void VWidgetPopup::SetWidget(QWidget *widget, bool own) //--------------------------------------------------------------------------------------------------------------------- void VWidgetPopup::PopupMessage(QWidget *w, const QString &msg) { - SCASSERT(w != nullptr); + SCASSERT(w != nullptr) VWidgetPopup *popup = new VWidgetPopup(); QLabel *label = new QLabel(msg);