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

#1292 Fixed CppCheck Issues in AppFwk : Removed assign/copy operators

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-07 11:14:29 +01:00
parent d3faf4ef96
commit b365834923
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Fwk/AppFwk/cafCommand/cafCmdExecCommandManager.h
View File

@ -55,6 +55,9 @@ class CmdExecCommandManager
public:
static CmdExecCommandManager* instance();
CmdExecCommandManager(const CmdExecCommandManager&) = delete;
CmdExecCommandManager& operator=(const CmdExecCommandManager&) = delete;
// When the undoFeature is enabled, execute commands are inserted in the undo stack
// The application can use the QUndoStack to display/modify execute commands wrapped in QUndoCommand objects
void enableUndoCommandSystem(bool enable);

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

@ -182,10 +182,9 @@ public:
PdmUiItem() : m_staticItemInfo(NULL) { }
virtual ~PdmUiItem();
// Copy and assignment to avoid hampering our internal pointer.
PdmUiItem(const PdmUiItem& ) : m_staticItemInfo(NULL) { }
PdmUiItem& operator=(const PdmUiItem& ) { return *this; }
PdmUiItem(const PdmUiItem&) = delete;
PdmUiItem& operator=(const PdmUiItem&) = delete;
const QString uiName(QString uiConfigName = "") const;
void setUiName(const QString& uiName, QString uiConfigName = "") { m_configItemInfos[uiConfigName].m_uiName = uiName; }

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

@ -58,8 +58,10 @@ public:
PdmUiOrdering(): m_forgetRemainingFields(false) { };
virtual ~PdmUiOrdering();
PdmUiOrdering(const PdmUiOrdering&) = delete;
PdmUiOrdering& operator=(const PdmUiOrdering&) = delete;
PdmUiGroup* addNewGroup(QString displayName);
//void add(PdmUiItem* item) { m_ordering.push_back(item); }
/// HACK constness of this class and functions must be revisited
//void add(const PdmUiItem* item) { m_ordering.push_back(const_cast<PdmUiItem*>(item)); }
@ -73,10 +75,6 @@ public:
bool contains(const PdmUiItem* item) const;
private:
// Private copy constructor and assignment to prevent this. (The vectors below will make trouble)
PdmUiOrdering(const PdmUiOrdering& other) { }
PdmUiOrdering& operator= (const PdmUiOrdering& other) { }
std::vector<PdmUiItem*> m_ordering; ///< The order of groups and fields
std::vector<PdmUiGroup*> m_createdGroups; ///< Owned PdmUiGroups, for mem management
bool m_forgetRemainingFields;

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

@ -69,6 +69,9 @@ public:
~PdmUiTreeOrdering();
PdmUiTreeOrdering(const PdmUiTreeOrdering&) = delete;
PdmUiTreeOrdering& operator=(const PdmUiTreeOrdering&) = delete;
void add(PdmFieldHandle * field, QString uiConfigName = "");
void add(PdmObjectHandle* object);
PdmUiTreeOrdering* add(const QString & title, const QString& iconResourceName );