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

#1292 Fixed CppCheck Issues in AppFwk/cafProjectDataModel

Browse Source
This commit is contained in:
Magne Sjaastad
2017-03-06 15:58:24 +01:00
parent 9179ae2a14
commit 63baebc698
16 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiEditorHandle.h
View File

@@ -97,7 +97,7 @@ private:
class PdmUiProxyEditorHandle: public PdmUiEditorHandle
{
public:
PdmUiProxyEditorHandle(PdmUiEditorHandle* mainEditorHandle) : PdmUiEditorHandle() { m_mainEditorHandle = mainEditorHandle; }
explicit PdmUiProxyEditorHandle(PdmUiEditorHandle* mainEditorHandle) : PdmUiEditorHandle() { m_mainEditorHandle = mainEditorHandle; }
virtual ~PdmUiProxyEditorHandle() {};
protected: // Interface to override:

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
View File

@@ -137,7 +137,7 @@ bool PdmOptionItemInfo::findValues(const QList<PdmOptionItemInfo>& optionList, Q
for (int i = 0; i < valuesSelectedInField.size(); ++i)
{
std::list<std::pair<QVariant, unsigned int> >::iterator it;
for (it = optionVariantAndIndexPairs.begin(); it != optionVariantAndIndexPairs.end(); it++)
for (it = optionVariantAndIndexPairs.begin(); it != optionVariantAndIndexPairs.end(); ++it)
{
if (PdmUiFieldSpecialization<T>::isDataElementEqual(valuesSelectedInField[i], it->first))
{

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.cpp
View File

@@ -75,7 +75,7 @@ PdmUiGroup* PdmUiOrdering::addNewGroup(QString displayName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool PdmUiOrdering::contains(const PdmUiItem* item)
bool PdmUiOrdering::contains(const PdmUiItem* item) const
{
for (size_t i = 0; i < m_ordering.size(); ++i)
{

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.h
View File

@@ -70,7 +70,7 @@ public:
void setForgetRemainingFields(bool val) { m_forgetRemainingFields = val; }
const std::vector<PdmUiItem*>& uiItems() const { return m_ordering; }
bool contains(const PdmUiItem* item);
bool contains(const PdmUiItem* item) const;
private:
// Private copy constructor and assignment to prevent this. (The vectors below will make trouble)

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
View File

@@ -71,7 +71,7 @@ void PdmUiTreeOrdering::add(PdmFieldHandle* field, QString uiConfigName)
}
else
{
PdmUiTreeOrdering* child = new PdmUiTreeOrdering(this, field);
new PdmUiTreeOrdering(this, field);
}
}
@@ -82,7 +82,7 @@ void PdmUiTreeOrdering::add(PdmObjectHandle* object)
{
assert(object);
PdmUiTreeOrdering* child = new PdmUiTreeOrdering(this, object);
new PdmUiTreeOrdering(this, object);
}
//--------------------------------------------------------------------------------------------------

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
View File

@@ -63,8 +63,8 @@ class PdmUiTreeOrdering;
class PdmUiTreeOrdering
{
public:
PdmUiTreeOrdering(PdmObjectHandle* pdmItem );
PdmUiTreeOrdering(PdmFieldHandle* pdmField );
explicit PdmUiTreeOrdering(PdmObjectHandle* pdmItem );
explicit PdmUiTreeOrdering(PdmFieldHandle* pdmField );
PdmUiTreeOrdering(const QString & title, const QString& iconResourceName );
~PdmUiTreeOrdering();