From eb4f44d4d28e0ef5f2a24554d20f5b2a24f87910 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 5 Sep 2019 15:56:15 +0200 Subject: [PATCH] #4657 Remove unused functions --- .../ProjectDataModel/RimScriptCollection.cpp | 51 ++----------------- .../ProjectDataModel/RimScriptCollection.h | 4 +- 2 files changed, 4 insertions(+), 51 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp index 108e3dc95d..1e0de2b898 100644 --- a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp @@ -131,54 +131,9 @@ void RimScriptCollection::readContentFromDisc() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimScriptCollection::pathsAndSubPaths( QStringList& pathList ) -{ - if ( !this->directory().isEmpty() ) - { - QDir myDir( this->directory() ); - if ( myDir.isReadable() ) - { - pathList.append( this->directory() ); - } - } - - for ( size_t i = 0; i < this->subDirectories.size(); ++i ) - { - if ( this->subDirectories[i] ) - { - this->subDirectories[i]->pathsAndSubPaths( pathList ); - } - } -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimScriptCollection* RimScriptCollection::findScriptCollection( const QString& path ) -{ - if ( !this->directory().isEmpty() ) - { - QFileInfo otherPath( path ); - QFileInfo thisPath( directory() ); - if ( otherPath == thisPath ) return this; - } - - for ( size_t i = 0; i < this->subDirectories.size(); ++i ) - { - RimScriptCollection* foundColl = nullptr; - if ( this->subDirectories[i] ) foundColl = this->subDirectories[i]->findScriptCollection( path ); - if ( foundColl ) return foundColl; - } - - return nullptr; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimScriptCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, - const QVariant& oldValue, - const QVariant& newValue ) +void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, + const QVariant& oldValue, + const QVariant& newValue) { if ( &directory == changedField ) { diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.h b/ApplicationCode/ProjectDataModel/RimScriptCollection.h index f02dcb2f2f..6cd2e9ae7e 100644 --- a/ApplicationCode/ProjectDataModel/RimScriptCollection.h +++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.h @@ -50,9 +50,7 @@ public: // Pdm Fields caf::PdmChildArrayField subDirectories; public: // Methods - void readContentFromDisc(); - void pathsAndSubPaths( QStringList& pathList ); - RimScriptCollection* findScriptCollection( const QString& path ); + void readContentFromDisc(); // Overrides from PdmObject void fieldChangedByUi( const caf::PdmFieldHandle* changedField,