From 290f8d4e58121fa971ac74c3a5bda00e2d325441 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 22 Apr 2013 14:44:43 +0200 Subject: [PATCH] Removed obsolete code p4#: 21363 --- .../ProjectDataModel/RimCalcScript.cpp | 14 ------------- .../ProjectDataModel/RimCalcScript.h | 4 +--- .../ProjectDataModel/RimScriptCollection.cpp | 1 - .../ProjectDataModel/RimUiTreeView.cpp | 20 ------------------- .../ProjectDataModel/RimUiTreeView.h | 1 - 5 files changed, 1 insertion(+), 39 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimCalcScript.cpp b/ApplicationCode/ProjectDataModel/RimCalcScript.cpp index f9f44a8f46..89bc122aaa 100644 --- a/ApplicationCode/ProjectDataModel/RimCalcScript.cpp +++ b/ApplicationCode/ProjectDataModel/RimCalcScript.cpp @@ -47,17 +47,3 @@ RimCalcScript::~RimCalcScript() { } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimCalcScript::readContentFromFile() -{ - QFile file(absolutePath); - if (file.open(QIODevice::ReadOnly | QIODevice::Text)) - { - QString fileContent = file.readAll(); - - content = fileContent; - } -} - diff --git a/ApplicationCode/ProjectDataModel/RimCalcScript.h b/ApplicationCode/ProjectDataModel/RimCalcScript.h index c28a138784..77ad0f43ee 100644 --- a/ApplicationCode/ProjectDataModel/RimCalcScript.h +++ b/ApplicationCode/ProjectDataModel/RimCalcScript.h @@ -33,8 +33,6 @@ public: RimCalcScript(); virtual ~RimCalcScript(); - void readContentFromFile(); - caf::PdmField absolutePath; - caf::PdmField content; + caf::PdmField content; // TODO: Obsolete field, can be deleted on next project file revision. }; diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp index 714c6d13e0..05297be1bb 100644 --- a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp @@ -89,7 +89,6 @@ void RimScriptCollection::readContentFromDisc() RimCalcScript* calcScript = new RimCalcScript; calcScript->absolutePath = fileName; calcScript->setUiName(fi.baseName()); - calcScript->readContentFromFile(); calcScripts.push_back(calcScript); } diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp index df3140762c..45cb9bb042 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp @@ -138,7 +138,6 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event) } } menu.addAction(QString("New"), this, SLOT(slotNewScript())); - //menu.addAction(QString("ReadFromFile"), this, SLOT(slotReadScriptContentFromFile())); menu.addSeparator(); { @@ -382,25 +381,6 @@ void RimUiTreeView::slotAddSliceFilterK() } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimUiTreeView::slotReadScriptContentFromFile() -{ - QModelIndex index = currentIndex(); - RimUiTreeModelPdm* myModel = dynamic_cast(model()); - caf::PdmUiTreeItem* uiItem = myModel->getTreeItemFromIndex(currentIndex()); - if (uiItem) - { - RimCalcScript* calcScript = dynamic_cast(uiItem->dataObject().p()); - if (calcScript) - { - calcScript->readContentFromFile(); - } - } - -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.h b/ApplicationCode/ProjectDataModel/RimUiTreeView.h index 72afbbcfb6..415375e71c 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeView.h +++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.h @@ -62,7 +62,6 @@ private slots: void slotAddPropertyFilter(); void slotDeletePropertyFilter(); - void slotReadScriptContentFromFile(); void slotEditScript(); void slotNewScript(); void slotExecuteScript();