Skip to content

Commit

Permalink
COMP: Fix Clazy warnings about detaching temporaries. #2844
Browse files Browse the repository at this point in the history
  • Loading branch information
Woundorf committed May 5, 2022
1 parent 298ee66 commit df962a9
Show file tree
Hide file tree
Showing 27 changed files with 53 additions and 51 deletions.
2 changes: 1 addition & 1 deletion starviewer/src/core/customwindowlevelsreader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ QList<WindowLevel*> CustomWindowLevelsReader::readFile(const QString &path)
if (reader.name() == "CustomWindowLevel")
{
WindowLevel *customWindowLevel = new WindowLevel();
QString name = reader.attributes().first().value().toString();
QString name = reader.attributes().constFirst().value().toString();
customWindowLevel->setName(name);

while (reader.readNextStartElement())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void DecayCorrectionFactorFormulaCalculator::gatherRequiredParameters(DICOMTagRe
if (!radiopharmaceuticalInfoSequence->getItems().isEmpty())
{
// TODO It could be more than one item!
DICOMSequenceItem *item = radiopharmaceuticalInfoSequence->getItems().first();
DICOMSequenceItem *item = radiopharmaceuticalInfoSequence->getItems().constFirst();
DICOMValueAttribute *radioPharmaceuticalStartDateTimeAttribute = item->getValueAttribute(DICOMRadiopharmaceuticalStartDateTime);
if (radioPharmaceuticalStartDateTimeAttribute)
{
Expand Down
4 changes: 2 additions & 2 deletions starviewer/src/core/dicomwriterdcmtk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void DICOMWriterDCMTK::addValueAttribute(DICOMValueAttribute *attribute)

if (attribute->getValueRepresentation() == DICOMValueAttribute::ByteArray)
{
dataset->putAndInsertUint8Array(tag, static_cast<Uint8*>((void*)attribute->getValueAsByteArray().data()),
dataset->putAndInsertUint8Array(tag, reinterpret_cast<const Uint8*>(attribute->getValueAsByteArray().constData()),
static_cast<unsigned long>(attribute->getValueAsByteArray().length()), true);
}
else
Expand Down Expand Up @@ -99,7 +99,7 @@ DcmSequenceOfItems* DICOMWriterDCMTK::generateDcmSequenceOfItems(DICOMSequenceAt

if (valueAttribute->getValueRepresentation() == DICOMValueAttribute::ByteArray)
{
OFCondition cond = item->putAndInsertUint8Array(itemTag, static_cast<Uint8*>((void*)valueAttribute->getValueAsByteArray().data()),
OFCondition cond = item->putAndInsertUint8Array(itemTag, reinterpret_cast<const Uint8*>(valueAttribute->getValueAsByteArray().constData()),
static_cast<unsigned long>(valueAttribute->getValueAsByteArray().length()), true);

if (cond.bad())
Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/core/nondicomfileclassifierfillerstep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ bool NonDicomFileClassifierFillerStep::fillIndividually()
// Origin correction when reading multiple files from a directory
if (series->hasImages())
{
Image *previousImage = series->getImages().last();
Image *previousImage = series->getImages().constLast();
origin.z = previousImage->getImagePositionPatient()[2] + previousImage->getSliceThickness();
}

Expand Down
10 changes: 5 additions & 5 deletions starviewer/src/core/patientbrowsermenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ void PatientBrowserMenu::setPatient(Patient *patient)
if (acquisitionPlane != AnatomicalPlane::NotAvailable)
{
int zIndex = volume->getCorrespondingOrthogonalPlane(acquisitionPlane).getZIndex();
double margin = series->getImages().first()->getSliceThickness() * 5;
double margin = series->getImages().constFirst()->getSliceThickness() * 5;

double range1[2];
range1[0] = volume->getImages().first()->getImagePositionPatient()[zIndex];
range1[1] = volume->getImages().last()->getImagePositionPatient()[zIndex];
range1[0] = volume->getImages().constFirst()->getImagePositionPatient()[zIndex];
range1[1] = volume->getImages().constLast()->getImagePositionPatient()[zIndex];

foreach (Series * secondSeries, study->getViewableSeries())
{
Expand All @@ -116,8 +116,8 @@ void PatientBrowserMenu::setPatient(Patient *patient)
if (secondVolume->getAcquisitionPlane() == acquisitionPlane)
{
double range2[2];
range2[0] = secondVolume->getImages().first()->getImagePositionPatient()[zIndex];
range2[1] = secondVolume->getImages().last()->getImagePositionPatient()[zIndex];
range2[0] = secondVolume->getImages().constFirst()->getImagePositionPatient()[zIndex];
range2[1] = secondVolume->getImages().constLast()->getImagePositionPatient()[zIndex];

if ((range1[0] + margin > range2[0] && range1[1] - margin < range2[1]) || (range2[0] + margin > range1[0] && range2[1] - margin < range1[1]))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void StandardizedUptakeValueFormulaCalculator::gatherRequiredCommonFormulaCompon
{
// TODO It could be more than one item!
// Radionuclide Total Dose is a type 3 tag
m_injectedDoseInBq = radiopharmaceuticalInfoSequence->getItems().first()->getValueAttribute(DICOMRadionuclideTotalDose)->getValueAsDouble();
m_injectedDoseInBq = radiopharmaceuticalInfoSequence->getItems().constFirst()->getValueAttribute(DICOMRadionuclideTotalDose)->getValueAsDouble();
}
}

Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/core/thumbnailcreator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ QImage ThumbnailCreator::getThumbnail(const Series *series, int resolution)
int numberOfImages = series->getImages().size();
if (numberOfImages > 0)
{
thumbnail = createImageThumbnail(series->getImages()[numberOfImages / 2]->getPath(), resolution);
thumbnail = createImageThumbnail(series->getImages().at(numberOfImages / 2)->getPath(), resolution);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions starviewer/src/core/vtkdcmtkimagereader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ QString getTagValueFromFunctionalGroupsSequence(DICOMSequenceAttribute *function
{
if (!sequence->getItems().isEmpty())
{
DICOMSequenceItem *sequenceItem = sequence->getItems().first();
DICOMSequenceItem *sequenceItem = sequence->getItems().constFirst();
DICOMValueAttribute *valueAttribute = sequenceItem->getValueAttribute(tag);

if (valueAttribute)
Expand Down Expand Up @@ -500,7 +500,7 @@ void VtkDcmtkImageReader::readOrigin(const DICOMTagReader &dicomTagReader)

if (detectorsSequence->getItems().size() == 1)
{
DICOMSequenceItem *firstDetectorItem = detectorsSequence->getItems().first();
DICOMSequenceItem *firstDetectorItem = detectorsSequence->getItems().constFirst();
QString imageOrientationString = firstDetectorItem->getValueAttribute(DICOMImageOrientationPatient)->getValueAsQString();
QString imagePositionPatientString = firstDetectorItem->getValueAttribute(DICOMImagePositionPatient)->getValueAsQString();
double spacingBetweenSlices = dicomTagReader.getValueAttributeAsQString(DICOMSpacingBetweenSlices).toDouble();
Expand Down Expand Up @@ -579,7 +579,7 @@ void VtkDcmtkImageReader::readPerFrameRescale(const DICOMTagReader &dicomTagRead
{
if (!subSequence->getItems().isEmpty())
{
DICOMSequenceItem *subSequenceItem = subSequence->getItems().first();
DICOMSequenceItem *subSequenceItem = subSequence->getItems().constFirst();
DICOMValueAttribute *interceptValue = subSequenceItem->getValueAttribute(DICOMRescaleIntercept);
DICOMValueAttribute *slopeValue = subSequenceItem->getValueAttribute(DICOMRescaleSlope);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void QDicomPrintExtension::addSelectedImagesToGroupedDICOMImagesToPrint()
selectedGroupedDICOMImagesToPrint.dicomPrintPresentationStateImage = getDICOMPrintPresentationStateImageForCurrentSelectedImages();
m_groupedDICOMImagesToPrintList.append(selectedGroupedDICOMImagesToPrint);

Image *firstSelectedImage = getSelectedImagesToAddToPrint().first();
Image *firstSelectedImage = getSelectedImagesToAddToPrint().constFirst();
m_thumbnailsPreviewWidget->append(QString::number(m_lastIDGroupedDICOMImagesToPrint), firstSelectedImage->getThumbnail(), getThumbnailPreviewDescriptionOfSelectedGroupedDICOMImagesToPrint());

updateNumberOfDicomPrintPagesToPrint();
Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/extensions/main/q2dviewer/layoutmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ StudyLayoutConfig LayoutManager::getBestLayoutCandidate(const QList<StudyLayoutC
{
// If no candidate found, we choose a default configuration.
// This default configuration is not yet configurable through settings, could be done in a future enhancement.
bestLayout = StudyLayoutConfigsLoader::getDefaultConfigForModality(study->getModalities().first());
bestLayout = StudyLayoutConfigsLoader::getDefaultConfigForModality(study->getModalities().constFirst());
}

return bestLayout;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ void Q2DViewerExtension::setPatient(Patient *patient)

if (m_patient)
{
m_currentStudyUID = m_patient->getStudies().first()->getInstanceUID();
m_currentStudyUID = m_patient->getStudies().constFirst()->getInstanceUID();
setupLayoutManager();
setupDefaultToolsForModalities(m_patient->getModalities());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ void Q3DViewerExtension::saveClut()

if (saveDialog.exec() == QDialog::Accepted)
{
QString transferFunctionFileName = saveDialog.selectedFiles().first();
QString transferFunctionFileName = saveDialog.selectedFiles().constFirst();
QTransferFunctionEditor *currentEditor = qobject_cast<QTransferFunctionEditor*>(m_editorsStackedWidget->currentWidget());
TransferFunctionIO::toFile(transferFunctionFileName, currentEditor->getTransferFunction());

Expand All @@ -470,7 +470,7 @@ void Q3DViewerExtension::applyEditorClut()

void Q3DViewerExtension::toggleClutEditor()
{
if (m_editorSplitter->sizes()[1] == 0)
if (m_editorSplitter->sizes().at(1) == 0)
{
// Show
m_editorSplitter->setSizes(QList<int>() << 1 << 1);
Expand All @@ -491,7 +491,7 @@ void Q3DViewerExtension::hideClutEditor()

void Q3DViewerExtension::setCustomStyleButtonStateBySplitter()
{
m_customStyleToolButton->setChecked(m_editorSplitter->sizes()[1] != 0);
m_customStyleToolButton->setChecked(m_editorSplitter->sizes().at(1) != 0);
}

void Q3DViewerExtension::applyRenderingStyle(const QModelIndex &index)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ void QExampleExtension::setPatient(Patient *patient)
return;
}

m_2DViewer->setInputAsynchronously(patient->getVolumesList().first());
m_3DViewer->setInput(patient->getVolumesList().first());
m_2DViewer->setInputAsynchronously(patient->getVolumesList().constFirst());
m_3DViewer->setInput(patient->getVolumesList().constFirst());
}

} // namespace udg
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ QString QExperimental3DExtension::getFileNameToSave(const QString &settingsDirKe

if (saveDialog.exec() == QDialog::Accepted)
{
fileName = saveDialog.selectedFiles().first();
fileName = saveDialog.selectedFiles().constFirst();
QFileInfo fileInfo(fileName);
settings.setValue(settingsDirKey, fileInfo.absolutePath());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,14 @@ void QPerfusionMapReconstructionExtension::computePerfusionMap()
//QVector<int> aifpos (m_seedToolData->getSeedPosition());
int index[3];
Volume* inputVolume = m_2DView->getViewer()->getMainInput();
index[0] = (int)((m_seedToolData->getSeedPosition()[0]- inputVolume->getOrigin()[0])/inputVolume->getSpacing()[0]);
index[1] = (int)((m_seedToolData->getSeedPosition()[1]- inputVolume->getOrigin()[1])/inputVolume->getSpacing()[1]);
index[2] = (int)((m_seedToolData->getSeedPosition()[2]- inputVolume->getOrigin()[2])/inputVolume->getSpacing()[2])/inputVolume->getNumberOfPhases();
index[0] = (int)((m_seedToolData->getSeedPosition().at(0) - inputVolume->getOrigin()[0]) / inputVolume->getSpacing()[0]);
index[1] = (int)((m_seedToolData->getSeedPosition().at(1) - inputVolume->getOrigin()[1]) / inputVolume->getSpacing()[1]);
index[2] = (int)((m_seedToolData->getSeedPosition().at(2) -
inputVolume->getOrigin()[2]) / inputVolume->getSpacing()[2]) / inputVolume->getNumberOfPhases();
m_mapCalculator->setAIFIndex(index[0], index[1], index[2]);
DEBUG_LOG(QString("SetAIFIndex [%1,%2,%3]").arg(index[0]).arg(index[1]).arg(index[2]));
DEBUG_LOG(QString("SetAIFPos [%1,%2,%3]").arg(m_seedToolData->getSeedPosition()[0]).arg(m_seedToolData->getSeedPosition()[1]).arg(m_seedToolData->getSeedPosition()[2]));
DEBUG_LOG(QString("SetAIFPos [%1,%2,%3]").arg(m_seedToolData->getSeedPosition().at(0)).arg(m_seedToolData->getSeedPosition().at(1))
.arg(m_seedToolData->getSeedPosition().at(2)));
}
}
m_mapCalculator->setDSCVolume(m_DSCVolume);
Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/inputoutput/converttodicomdir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Status ConvertToDicomdir::convert(const QString &dicomdirPath, CreateDicomdir::r

// \TODO Això de patient->getStudies().first s'ha de fer perquè queryPatientStudy retorna llista de Patients
// Nosaltres, en realitat només en volem un sol study.
Study *study = patient->getStudies().first();
Study *study = patient->getStudies().constFirst();
studyList.append(study);
foreach (Series *series, study->getSeries())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ QVariant LocalDatabaseEncapsulatedDocumentDAL::getDatabasePacsId(const DICOMSour
return QVariant(QVariant::LongLong);
}

return getDatabasePacsId(dicomSource.getRetrievePACS().first());
return getDatabasePacsId(dicomSource.getRetrievePACS().constFirst());
}

QVariant LocalDatabaseEncapsulatedDocumentDAL::getDatabasePacsId(const PacsDevice &pacsDevice)
Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/inputoutput/localdatabaseimagedal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ QVariant LocalDatabaseImageDAL::getDatabasePacsId(const DICOMSource &dicomSource
return QVariant(QVariant::LongLong);
}

return getDatabasePacsId(dicomSource.getRetrievePACS().first());
return getDatabasePacsId(dicomSource.getRetrievePACS().constFirst());
}

QVariant LocalDatabaseImageDAL::getDatabasePacsId(const PacsDevice &pacsDevice)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void QDICOMDIRConfigurationScreen::examinateDICOMDIRBurningApplicationPath()
{
if (!dialog->selectedFiles().empty())
{
QString burningApplicationPath = dialog->selectedFiles().takeFirst();
QString burningApplicationPath = dialog->selectedFiles().constFirst();
QFileInfo infoBurningApplicationFile(burningApplicationPath);
// Es comprova si es tracta d'una aplicació de Mac i en cas afirmatiu es modifica el path per tal d'indicar exactament on és l'executable
if (infoBurningApplicationFile.isBundle())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ void QInputOutputLocalDatabaseWidget::sendSelectedStudiesToSelectedPacs()
{
for (const PacsDevice &pacs : m_qwidgetSelectPacsToStoreDicomImage->getSelectedPacsToStoreDicomImages())
{
StudyOperationResult *result = StudyOperationsService::instance()->storeInPacs(pacs, patient->getStudies().first());
StudyOperationResult *result = StudyOperationsService::instance()->storeInPacs(pacs, patient->getStudies().constFirst());

// These connections will be deleted when result is destroyed
connect(result, &StudyOperationResult::finishedWithPartialSuccess, this, &QInputOutputLocalDatabaseWidget::onStorePartialSuccess);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ void QLocalDatabaseConfigurationScreen::examinateDataBaseRoot()
{
if (!dialog->selectedFiles().empty())
{
m_textDatabaseRoot->setText(dialog->selectedFiles().takeFirst());
m_textDatabaseRoot->setText(dialog->selectedFiles().constFirst());
// Indiquem que m_textDatabaseRoot ha modificat el seu valor
m_textDatabaseRoot->setModified(true);
}
Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/inputoutput/qrelatedstudieswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void QRelatedStudiesWidget::searchStudiesOf(Patient *patient)
// Initially check most recent study as the CurrentStudy and the second one as the PriorStudy
if (m_patient->getStudies().size() > 0)
{
Study *study = m_patient->getStudies().first();
Study *study = m_patient->getStudies().constFirst();
m_studyInstanceUIDOfCurrentStudy = study->getInstanceUID();
m_infomationPerStudy.value(m_studyInstanceUIDOfCurrentStudy)->currentRadioButton->setChecked(true);

Expand Down
2 changes: 1 addition & 1 deletion starviewer/src/inputoutput/relatedstudiesmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ RelatedStudiesManager::LoadStatus RelatedStudiesManager::loadStudy(Study *study)
if (patient && patient->getNumberOfStudies() > 0)
{
VolumeHelper::generatePatientVolumes(patient);
emit studyLoaded(patient->getStudies().first());
emit studyLoaded(patient->getStudies().constFirst());
return Loaded;
}
else
Expand Down
12 changes: 6 additions & 6 deletions starviewer/tests/auto/shared/imagetesthelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ Image* ImageTestHelper::createImageByUID(QString SOPInstanceUID)
Image *ImageTestHelper::createImageWithSexAndHeightAndWeight(QString sex, double height, int weight)
{
Patient *patient = PatientTestHelper::create(1, 1, 1);
Study *study = patient->getStudies().first();
Series *series = study->getSeries().first();
Study *study = patient->getStudies().constFirst();
Series *series = study->getSeries().constFirst();

patient->setSex(sex);
study->setHeight(height);
study->setWeight(weight);

return series->getImages().first();
return series->getImages().constFirst();
}

Image* ImageTestHelper::createImageWithHeightAndWeight(double height, int weight)
{
Patient *patient = PatientTestHelper::create(1, 1, 1);
Study *study = patient->getStudies().first();
Series *series = study->getSeries().first();
Study *study = patient->getStudies().constFirst();
Series *series = study->getSeries().constFirst();

study->setHeight(height);
study->setWeight(weight);

return series->getImages().first();
return series->getImages().constFirst();
}

void ImageTestHelper::cleanUp(Image *image)
Expand Down
6 changes: 3 additions & 3 deletions starviewer/tests/auto/shared/volumetesthelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Volume* VolumeTestHelper::createVolume(int numberOfImages, int numberOfPhases, i
testVolume->setNumberOfPhases(numberOfPhases);
testVolume->setNumberOfSlicesPerPhase(numberOfSlicesPerPhase);
Patient *patient = PatientTestHelper::create(1, 1, numberOfImages);
testVolume->setImages(patient->getStudies().first()->getSeries().first()->getImages());
testVolume->setImages(patient->getStudies().constFirst()->getSeries().constFirst()->getImages());

for (int index = 0; index < numberOfImages; index++)
{
Expand Down Expand Up @@ -51,7 +51,7 @@ Volume* VolumeTestHelper::createVolumeWithParameters(int numberOfImages, int num
testVolume->setNumberOfPhases(numberOfPhases);
testVolume->setNumberOfSlicesPerPhase(numberOfSlicesPerPhase);
Patient *patient = PatientTestHelper::create(1, 1, numberOfImages);
testVolume->setImages(patient->getStudies().first()->getSeries().first()->getImages());
testVolume->setImages(patient->getStudies().constFirst()->getSeries().constFirst()->getImages());

for (int index = 0; index < numberOfImages; index++)
{
Expand All @@ -71,7 +71,7 @@ Volume* VolumeTestHelper::createMultiframeVolume(int numberOfImages, int numberO
testVolume->setNumberOfPhases(numberOfPhases);
testVolume->setNumberOfSlicesPerPhase(numberOfSlicesPerPhase);
Patient *patient = PatientTestHelper::create(1, 1, numberOfImages);
testVolume->setImages(patient->getStudies().first()->getSeries().first()->getImages());
testVolume->setImages(patient->getStudies().constFirst()->getSeries().constFirst()->getImages());

for (int index = 0; index < numberOfImages; index++)
{
Expand Down
Loading

0 comments on commit df962a9

Please sign in to comment.