#4683 clang-format on all files in ApplicationCode

This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions

View File

@@ -1,24 +1,24 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cvfObject.h"
class RigFormationNames;
@@ -26,7 +26,7 @@ class RigFormationNames;
class QTextStream;
//==================================================================================================
///
///
//==================================================================================================
class RimFormationNames : public caf::PdmObject
{
@@ -36,27 +36,32 @@ public:
RimFormationNames();
~RimFormationNames() override;
void setFileName(const QString& fileName);
const QString& fileName();
QString fileNameWoPath();
void setFileName( const QString& fileName );
const QString& fileName();
QString fileNameWoPath();
RigFormationNames* formationNamesData() { return m_formationNamesData.p();}
void updateConnectedViews();
RigFormationNames* formationNamesData()
{
return m_formationNamesData.p();
}
void updateConnectedViews();
void readFormationNamesFile(QString* errorMessage);
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
void readFormationNamesFile( QString* errorMessage );
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void initAfterRead() override;
private:
void updateUiTreeName();
void readLyrFormationNameFile(QTextStream& stream, QString* errorMessage);
void readFmuFormationNameFile(QTextStream& stream, QString* errorMessage);
void updateUiTreeName();
void readLyrFormationNameFile( QTextStream& stream, QString* errorMessage );
void readFmuFormationNameFile( QTextStream& stream, QString* errorMessage );
private:
caf::PdmField<QString> m_formationNamesFileName;
caf::PdmField<QString> m_formationNamesFileName;
cvf::ref<RigFormationNames> m_formationNamesData;
};