quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete copy constructors and assignment operators explicitly

Browse Source
This commit is contained in:
Garux
2021-03-24 15:48:29 +03:00
parent 6aa8e432f7
commit dc5dea6d21
10 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/entity/modelskinkey.h
View File

@@ -40,9 +40,6 @@ class ModelSkinKey : public ModuleObserver
ModelSkin* m_skin;
Callback m_skinChangedCallback;
ModelSkinKey( const ModelSkinKey& );
ModelSkinKey operator=( const ModelSkinKey& );
void construct(){
m_skin = &GlobalModelSkinCache().capture( m_name.c_str() );
m_skin->attach( *this );
@@ -53,6 +50,9 @@ class ModelSkinKey : public ModuleObserver
}
public:
ModelSkinKey( const ModelSkinKey& ) = delete; // not copyable
ModelSkinKey operator=( const ModelSkinKey& ) = delete; // not assignable
ModelSkinKey( const Callback& skinChangedCallback ) : m_skinChangedCallback( skinChangedCallback ){
construct();
}

5
plugins/entity/namekeys.h
View File

@@ -55,8 +55,6 @@ class NameKeys : public Entity::Observer, public Namespaced
Namespace* m_namespace;
EntityKeyValues& m_entity;
KeyIsNameFunc m_keyIsName;
NameKeys( const NameKeys& other );
NameKeys& operator=( const NameKeys& other );
typedef std::map<CopiedString, EntityKeyValue*> KeyValues;
KeyValues m_keyValues;
@@ -86,6 +84,9 @@ class NameKeys : public Entity::Observer, public Namespaced
}
}
public:
NameKeys( const NameKeys& other ) = delete; // not copyable
NameKeys& operator=( const NameKeys& other ) = delete; // not assignable
NameKeys( EntityKeyValues& entity ) : m_namespace( 0 ), m_entity( entity ), m_keyIsName( Static<KeyIsName>::instance().m_keyIsName ){
m_entity.attach( *this );
}

6
plugins/model/model.cpp
View File

@@ -453,9 +453,6 @@ class PicoModelInstance :
};
typedef Array<Remap> SurfaceRemaps;
SurfaceRemaps m_skins;
PicoModelInstance( const PicoModelInstance& );
PicoModelInstance operator=( const PicoModelInstance& );
public:
typedef LazyStatic<TypeCasts> StaticTypeCasts;
@@ -508,6 +505,9 @@ public:
constructRemaps();
}
PicoModelInstance( const PicoModelInstance& ) = delete; // not copyable
PicoModelInstance operator=( const PicoModelInstance& ) = delete; // not assignable
PicoModelInstance( const scene::Path& path, scene::Instance* parent, PicoModel& picomodel ) :
Instance( path, parent, this, StaticTypeCasts::instance().get() ),
m_picomodel( picomodel ),