#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.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -20,31 +20,32 @@
#include "RimCellFilter.h"
//==================================================================================================
///
///
///
///
//==================================================================================================
class RimPropertyFilter : public RimCellFilter
{
CAF_PDM_HEADER_INIT;
public:
RimPropertyFilter();
~RimPropertyFilter() override;
std::vector<int> selectedCategoryValues() const;
std::vector<int> selectedCategoryValues() const;
protected:
void setCategoryValues(const std::vector<int>& categoryValues);
void setCategoryNames(const std::vector<QString>& categoryNames);
void setCategoryNamesAndValues(const std::vector<std::pair<QString, int>>& categoryNamesAndValues);
void clearCategories();
void setCategoryValues( const std::vector<int>& categoryValues );
void setCategoryNames( const std::vector<QString>& categoryNames );
void setCategoryNamesAndValues( const std::vector<std::pair<QString, int>>& categoryNamesAndValues );
void clearCategories();
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
protected:
caf::PdmField< std::vector<int> > m_selectedCategoryValues;
std::vector<int> m_categoryValues;
std::vector<QString> m_categoryNames;
caf::PdmField<std::vector<int>> m_selectedCategoryValues;
std::vector<int> m_categoryValues;
std::vector<QString> m_categoryNames;
};