COMP: Rename ctkAbstractJob "generateCopy()" to "clone()"

commontk · Jan 17, 2024 · 40f093e · 40f093e
1 parent 6848c92
commit 40f093e
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/Libs/Core/ctkAbstractJob.h b/Libs/Core/ctkAbstractJob.h
@@ -119,8 +119,8 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   /// Generate worker for job
   Q_INVOKABLE virtual ctkAbstractWorker* createWorker() = 0;
 
-  /// Create a copy of this object
-  Q_INVOKABLE virtual ctkAbstractJob* generateCopy() const = 0;
+  /// Create a copy of this job
+  Q_INVOKABLE virtual ctkAbstractJob* clone() const = 0;
 
   /// Logger report string formatting for specific job
   Q_INVOKABLE virtual QString loggerReport(const QString& status) const = 0;

diff --git a/Libs/DICOM/Core/ctkDICOMInserterJob.cpp b/Libs/DICOM/Core/ctkDICOMInserterJob.cpp
@@ -128,7 +128,7 @@ QStringList ctkDICOMInserterJob::tagsToExcludeFromStorage() const
 }
 
 //------------------------------------------------------------------------------
-ctkAbstractJob* ctkDICOMInserterJob::generateCopy() const
+ctkAbstractJob* ctkDICOMInserterJob::clone() const
 {
   ctkDICOMInserterJob* newInserterJob = new ctkDICOMInserterJob;
   newInserterJob->setDICOMLevel(this->dicomLevel());

diff --git a/Libs/DICOM/Core/ctkDICOMInserterJob.h b/Libs/DICOM/Core/ctkDICOMInserterJob.h
@@ -69,8 +69,8 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMInserterJob : public ctkDICOMJob
   QStringList tagsToExcludeFromStorage() const;
   ///}@
 
-  /// Create a copy of this object
-  Q_INVOKABLE ctkAbstractJob* generateCopy() const override;
+  /// \see ctkAbstractJob::clone()
+  Q_INVOKABLE ctkAbstractJob* clone() const override;
 
   /// Generate worker for job
   Q_INVOKABLE ctkDICOMWorker* createWorker() override;

diff --git a/Libs/DICOM/Core/ctkDICOMQueryJob.cpp b/Libs/DICOM/Core/ctkDICOMQueryJob.cpp
@@ -176,7 +176,7 @@ QString ctkDICOMQueryJob::loggerReport(const QString &status) const
     }
 }
 //------------------------------------------------------------------------------
-ctkAbstractJob* ctkDICOMQueryJob::generateCopy() const
+ctkAbstractJob* ctkDICOMQueryJob::clone() const
 {
   ctkDICOMQueryJob* newQueryJob = new ctkDICOMQueryJob;
   newQueryJob->setMaximumPatientsQuery(this->maximumConcurrentJobsPerType());

diff --git a/Libs/DICOM/Core/ctkDICOMQueryJob.h b/Libs/DICOM/Core/ctkDICOMQueryJob.h
@@ -87,8 +87,8 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMQueryJob : public ctkDICOMJob
   /// Logger report string formatting for specific task
   Q_INVOKABLE QString loggerReport(const QString& status) const override;
 
-  /// Create a copy of the object
-  Q_INVOKABLE ctkAbstractJob* generateCopy() const override;
+  /// \see ctkAbstractJob::clone()
+  Q_INVOKABLE ctkAbstractJob* clone() const override;
 
   /// Generate worker for job
   Q_INVOKABLE ctkDICOMWorker* createWorker() override;

diff --git a/Libs/DICOM/Core/ctkDICOMRetrieveJob.cpp b/Libs/DICOM/Core/ctkDICOMRetrieveJob.cpp
@@ -155,7 +155,7 @@ QString ctkDICOMRetrieveJob::loggerReport(const QString &status) const
     }
 }
 //------------------------------------------------------------------------------
-ctkAbstractJob* ctkDICOMRetrieveJob::generateCopy() const
+ctkAbstractJob* ctkDICOMRetrieveJob::clone() const
 {
   ctkDICOMRetrieveJob* newRetrieveJob = new ctkDICOMRetrieveJob;
   newRetrieveJob->setServer(this->serverShared());

diff --git a/Libs/DICOM/Core/ctkDICOMRetrieveJob.h b/Libs/DICOM/Core/ctkDICOMRetrieveJob.h
@@ -56,8 +56,8 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMRetrieveJob : public ctkDICOMJob
   /// Logger report string formatting for specific task
   Q_INVOKABLE QString loggerReport(const QString& status) const override;
 
-  /// Create a copy of the object
-  Q_INVOKABLE ctkAbstractJob* generateCopy() const override;
+  /// \see ctkAbstractJob::clone()
+  Q_INVOKABLE ctkAbstractJob* clone() const override;
 
   /// Generate worker for job
   Q_INVOKABLE ctkDICOMWorker* createWorker() override;

diff --git a/Libs/DICOM/Core/ctkDICOMRetrieveWorker.cpp b/Libs/DICOM/Core/ctkDICOMRetrieveWorker.cpp
@@ -266,7 +266,7 @@ void ctkDICOMRetrieveWorker::run()
   ctkDICOMServer* proxyServer = server->proxyServer();
   if (proxyServer && proxyServer->queryRetrieveEnabled())
     {
-    ctkDICOMRetrieveJob* newJob = qobject_cast<ctkDICOMRetrieveJob*>(retrieveJob->generateCopy());
+    ctkDICOMRetrieveJob* newJob = qobject_cast<ctkDICOMRetrieveJob*>(retrieveJob->clone());
     newJob->setRetryCounter(0);
     newJob->setServer(*proxyServer);
     scheduler->addJob(newJob);

diff --git a/Libs/DICOM/Core/ctkDICOMStorageListenerJob.cpp b/Libs/DICOM/Core/ctkDICOMStorageListenerJob.cpp
@@ -113,7 +113,7 @@ QString ctkDICOMStorageListenerJob::loggerReport(const QString &status) const
                  .arg(this->jobUID());
 }
 //------------------------------------------------------------------------------
-ctkAbstractJob* ctkDICOMStorageListenerJob::generateCopy() const
+ctkAbstractJob* ctkDICOMStorageListenerJob::clone() const
 {
   ctkDICOMStorageListenerJob* newListenerJob = new ctkDICOMStorageListenerJob;
   newListenerJob->setAETitle(this->AETitle());

diff --git a/Libs/DICOM/Core/ctkDICOMStorageListenerJob.h b/Libs/DICOM/Core/ctkDICOMStorageListenerJob.h
@@ -68,8 +68,8 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMStorageListenerJob : public ctkDICOMJob
   /// Logger report string formatting for specific task
   Q_INVOKABLE QString loggerReport(const QString& status) const override;
 
-  /// Create a copy of the object
-  Q_INVOKABLE ctkAbstractJob* generateCopy() const override;
+  /// \see ctkAbstractJob::clone()
+  Q_INVOKABLE ctkAbstractJob* clone() const override;
 
   /// Generate worker for job
   Q_INVOKABLE ctkDICOMWorker* createWorker() override;

diff --git a/Libs/DICOM/Core/ctkDICOMWorker.cpp b/Libs/DICOM/Core/ctkDICOMWorker.cpp
@@ -48,7 +48,7 @@ void ctkDICOMWorker::startNextJob()
     return;
     }
 
-  ctkDICOMJob* newJob = job->generateCopy();
+  ctkDICOMJob* newJob = job->clone();
   newJob->setRetryCounter(newJob->retryCounter() + 1);
   scheduler->addJob(newJob);
 }