OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4683 clang-format on all files in ApplicationCode

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.h
View File

@@ -1,17 +1,17 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2018 equinor 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.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -20,7 +20,6 @@
#include "RimPolylinesAnnotation.h"
class RimPolylinesFromFileAnnotation : public RimPolylinesAnnotation
{
friend class RimPolylinesFromFileAnnotationInView;
@@ -31,18 +30,20 @@ public:
RimPolylinesFromFileAnnotation();
~RimPolylinesFromFileAnnotation() override;
void setFileName(const QString& fileName);
QString fileName() const;
void readPolyLinesFile(QString * errorMessage);
void setFileName( const QString& fileName );
QString fileName() const;
void readPolyLinesFile( QString* errorMessage );
cvf::ref<RigPolyLinesData> polyLinesData() override;
bool isEmpty() override;
cvf::ref<RigPolyLinesData> polyLinesData() override;
bool isEmpty() override;
void setDescriptionFromFileName();
void setDescriptionFromFileName();
protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
private:
caf::PdmFieldHandle* userDescriptionField() override;
@@ -51,6 +52,3 @@ private:
caf::PdmField<caf::FilePath> m_polyLinesFileName;
cvf::ref<RigPolyLinesData> m_polyLinesData;
};