#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,17 +1,17 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- 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.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,6 @@
#include <utility>
#include <vector>
#include "cvfObject.h"
#include <QString>
@@ -36,33 +35,33 @@ class RifElementPropertyMetadata;
class RifElementPropertyTableReader : cvf::Object
{
public:
static RifElementPropertyMetadata readMetadata(const QString& filePath);
static void readData(const RifElementPropertyMetadata *metadata, RifElementPropertyTable *table);
static RifElementPropertyMetadata readMetadata( const QString& filePath );
static void readData( const RifElementPropertyMetadata* metadata, RifElementPropertyTable* table );
};
//==================================================================================================
///
//==================================================================================================
class RifElementPropertyMetadata
{
public:
QString fileName;
std::vector<QString> dataColumns;
QString fileName;
std::vector<QString> dataColumns;
};
//==================================================================================================
///
//==================================================================================================
class RifElementPropertyTable
{
public:
RifElementPropertyTable() : hasData(false) {}
RifElementPropertyTable()
: hasData( false )
{
}
RifElementPropertyMetadata metadata;
bool hasData;
std::vector<int> elementIds;
std::vector<std::vector<float>> data;
};