From 2fd3872099dfc3409f46fafbebbf9a3a40ea2925 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 24 Sep 2015 00:37:21 +0200 Subject: [PATCH] Core: Remove NonCopyable Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4 --- SDK/include/NDK/World.hpp | 8 ++++++-- include/Nazara/Audio/Music.hpp | 11 +++++++--- include/Nazara/Audio/SoundBuffer.hpp | 8 ++++++-- include/Nazara/Audio/SoundEmitter.hpp | 7 +++++-- include/Nazara/Core.hpp | 1 - include/Nazara/Core/AbstractHash.hpp | 8 ++++++-- include/Nazara/Core/CallOnExit.hpp | 8 ++++++-- include/Nazara/Core/ConditionVariable.hpp | 8 ++++++-- include/Nazara/Core/Directory.hpp | 10 +++++++--- include/Nazara/Core/DynLib.hpp | 9 +++++---- include/Nazara/Core/ErrorFlags.hpp | 8 ++++++-- include/Nazara/Core/File.hpp | 9 +++++---- include/Nazara/Core/Hash.hpp | 8 ++++++-- include/Nazara/Core/Log.hpp | 8 ++++++-- include/Nazara/Core/Mutex.hpp | 10 ++++++---- include/Nazara/Core/NonCopyable.hpp | 20 ------------------- include/Nazara/Core/Semaphore.hpp | 8 ++++++-- include/Nazara/Core/Thread.hpp | 9 +++++---- .../Nazara/Graphics/AbstractRenderQueue.hpp | 7 ++++--- .../Graphics/AbstractRenderTechnique.hpp | 7 ++++--- .../Nazara/Graphics/InstancedRenderable.hpp | 5 +++-- include/Nazara/Graphics/Renderable.hpp | 10 ++++------ include/Nazara/Lua/LuaInstance.hpp | 8 ++++++-- include/Nazara/Physics/Geom.hpp | 8 ++++++-- include/Nazara/Physics/PhysObject.hpp | 1 - include/Nazara/Physics/PhysWorld.hpp | 8 ++++++-- include/Nazara/Renderer/GpuQuery.hpp | 8 ++++++-- include/Nazara/Renderer/RenderBuffer.hpp | 8 ++++++-- include/Nazara/Renderer/RenderTexture.hpp | 8 ++++++-- include/Nazara/Renderer/Shader.hpp | 8 ++++++-- include/Nazara/Renderer/ShaderStage.hpp | 9 +++++---- include/Nazara/Renderer/Texture.hpp | 8 ++++++-- include/Nazara/Utility/Buffer.hpp | 8 ++++++-- include/Nazara/Utility/Font.hpp | 8 ++++++-- include/Nazara/Utility/Window.hpp | 8 ++++++-- src/Nazara/Core/Win32/DirectoryImpl.hpp | 8 ++++++-- src/Nazara/Core/Win32/DynLibImpl.hpp | 8 ++++++-- src/Nazara/Core/Win32/FileImpl.hpp | 8 ++++++-- src/Nazara/Utility/Win32/WindowImpl.hpp | 8 ++++++-- 39 files changed, 205 insertions(+), 112 deletions(-) delete mode 100644 include/Nazara/Core/NonCopyable.hpp diff --git a/SDK/include/NDK/World.hpp b/SDK/include/NDK/World.hpp index 794f5fb2a..2af17de1e 100644 --- a/SDK/include/NDK/World.hpp +++ b/SDK/include/NDK/World.hpp @@ -8,7 +8,6 @@ #define NDK_WORLD_HPP #include -#include #include #include #include @@ -19,7 +18,7 @@ namespace Ndk { - class NDK_API World : NzNonCopyable + class NDK_API World { friend Entity; @@ -27,6 +26,8 @@ namespace Ndk using EntityList = std::vector; inline World(bool addDefaultSystems = true); + World(const World&) = delete; + World(World&&) = delete; ///TODO ~World(); void AddDefaultSystems(); @@ -60,6 +61,9 @@ namespace Ndk void Update(); inline void Update(float elapsedTime); + World& operator=(const World&) = delete; + World& operator=(World&&) = delete; ///TODO + private: inline void Invalidate(); inline void Invalidate(EntityId id); diff --git a/include/Nazara/Audio/Music.hpp b/include/Nazara/Audio/Music.hpp index a4d990a29..0777052d3 100644 --- a/include/Nazara/Audio/Music.hpp +++ b/include/Nazara/Audio/Music.hpp @@ -27,12 +27,14 @@ using NzMusicLoader = NzResourceLoader; struct NzMusicImpl; -class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter, NzNonCopyable +class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter { friend NzMusicLoader; public: NzMusic() = default; + NzMusic(const NzMusic&) = delete; + NzMusic(NzMusic&&) = delete; ///TODO ~NzMusic(); bool Create(NzSoundStream* soundStream); @@ -43,8 +45,8 @@ class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter, NzNon nzUInt32 GetDuration() const; nzAudioFormat GetFormat() const; nzUInt32 GetPlayingOffset() const; - unsigned int GetSampleCount() const; - unsigned int GetSampleRate() const; + unsigned int GetSampleCount() const; + unsigned int GetSampleRate() const; nzSoundStatus GetStatus() const; bool IsLooping() const; @@ -60,6 +62,9 @@ class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter, NzNon void Stop(); + NzMusic& operator=(const NzMusic&) = delete; + NzMusic& operator=(NzMusic&&) = delete; ///TODO + private: NzMusicImpl* m_impl = nullptr; diff --git a/include/Nazara/Audio/SoundBuffer.hpp b/include/Nazara/Audio/SoundBuffer.hpp index 4016cf60d..8b773c5c6 100644 --- a/include/Nazara/Audio/SoundBuffer.hpp +++ b/include/Nazara/Audio/SoundBuffer.hpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -38,7 +37,7 @@ using NzSoundBufferRef = NzObjectRef; struct NzSoundBufferImpl; -class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource, NzNonCopyable +class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource { friend NzSound; friend NzSoundBufferLibrary; @@ -49,6 +48,8 @@ class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource, N public: NzSoundBuffer() = default; NzSoundBuffer(nzAudioFormat format, unsigned int sampleCount, unsigned int sampleRate, const nzInt16* samples); + NzSoundBuffer(const NzSoundBuffer&) = delete; + NzSoundBuffer(NzSoundBuffer&&) = delete; ~NzSoundBuffer(); bool Create(nzAudioFormat format, unsigned int sampleCount, unsigned int sampleRate, const nzInt16* samples); @@ -69,6 +70,9 @@ class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource, N static bool IsFormatSupported(nzAudioFormat format); template static NzSoundBufferRef New(Args&&... args); + NzSoundBuffer& operator=(const NzSoundBuffer&) = delete; + NzSoundBuffer& operator=(NzSoundBuffer&&) = delete; ///TODO + // Signals: NazaraSignal(OnSoundBufferDestroy, const NzSoundBuffer* /*soundBuffer*/); NazaraSignal(OnSoundBufferRelease, const NzSoundBuffer* /*soundBuffer*/); diff --git a/include/Nazara/Audio/SoundEmitter.hpp b/include/Nazara/Audio/SoundEmitter.hpp index e4e6cf837..043dc8439 100644 --- a/include/Nazara/Audio/SoundEmitter.hpp +++ b/include/Nazara/Audio/SoundEmitter.hpp @@ -11,7 +11,6 @@ #include #include #include -#include #include ///TODO: Faire hériter SoundEmitter de Node @@ -51,9 +50,13 @@ class NAZARA_AUDIO_API NzSoundEmitter virtual void Stop() = 0; + NzSoundEmitter& operator=(const NzSoundEmitter&) = delete; ///TODO + NzSoundEmitter& operator=(NzSoundEmitter&&) = delete; ///TODO + protected: NzSoundEmitter(); - NzSoundEmitter(const NzSoundEmitter& emitter); + NzSoundEmitter(const NzSoundEmitter& emitter); + NzSoundEmitter(NzSoundEmitter&&) = delete; ///TODO nzSoundStatus GetInternalStatus() const; diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp index 14e593ab5..6ee347b88 100644 --- a/include/Nazara/Core.hpp +++ b/include/Nazara/Core.hpp @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include diff --git a/include/Nazara/Core/AbstractHash.hpp b/include/Nazara/Core/AbstractHash.hpp index 798d3879a..eb9db66e2 100644 --- a/include/Nazara/Core/AbstractHash.hpp +++ b/include/Nazara/Core/AbstractHash.hpp @@ -8,19 +8,23 @@ #define NAZARA_ABSTRACTHASH_HPP #include -#include class NzHashDigest; -class NAZARA_CORE_API NzAbstractHash : NzNonCopyable +class NAZARA_CORE_API NzAbstractHash { public: NzAbstractHash() = default; + NzAbstractHash(const NzAbstractHash&) = delete; + NzAbstractHash(NzAbstractHash&&) = default; virtual ~NzAbstractHash(); virtual void Append(const nzUInt8* data, unsigned int len) = 0; virtual void Begin() = 0; virtual NzHashDigest End() = 0; + + NzAbstractHash& operator=(const NzAbstractHash&) = delete; + NzAbstractHash& operator=(NzAbstractHash&&) = default; }; #endif // NAZARA_ABSTRACTHASH_HPP diff --git a/include/Nazara/Core/CallOnExit.hpp b/include/Nazara/Core/CallOnExit.hpp index 9c6da1ae6..f1f633940 100644 --- a/include/Nazara/Core/CallOnExit.hpp +++ b/include/Nazara/Core/CallOnExit.hpp @@ -8,20 +8,24 @@ #define NAZARA_CALLONEXIT_HPP #include -#include #include -class NzCallOnExit : NzNonCopyable +class NzCallOnExit { using Func = std::function; public: NzCallOnExit(Func func = nullptr); + NzCallOnExit(const NzCallOnExit&) = delete; + NzCallOnExit(NzCallOnExit&&) = delete; ~NzCallOnExit(); void CallAndReset(Func func = nullptr); void Reset(Func func = nullptr); + NzCallOnExit& operator=(const NzCallOnExit&) = delete; + NzCallOnExit& operator=(NzCallOnExit&&) = default; + private: Func m_func; }; diff --git a/include/Nazara/Core/ConditionVariable.hpp b/include/Nazara/Core/ConditionVariable.hpp index f3e9bb912..3abd2d817 100644 --- a/include/Nazara/Core/ConditionVariable.hpp +++ b/include/Nazara/Core/ConditionVariable.hpp @@ -8,15 +8,16 @@ #define NAZARA_CONDITIONVARIABLE_HPP #include -#include class NzConditionVariableImpl; class NzMutex; -class NAZARA_CORE_API NzConditionVariable : NzNonCopyable +class NAZARA_CORE_API NzConditionVariable { public: NzConditionVariable(); + NzConditionVariable(const NzConditionVariable&) = delete; + NzConditionVariable(NzConditionVariable&&) = delete; ///TODO ~NzConditionVariable(); void Signal(); @@ -25,6 +26,9 @@ class NAZARA_CORE_API NzConditionVariable : NzNonCopyable void Wait(NzMutex* mutex); bool Wait(NzMutex* mutex, nzUInt32 timeout); + NzConditionVariable& operator=(const NzConditionVariable&) = delete; + NzConditionVariable& operator=(NzConditionVariable&&) = delete; ///TODO + private: NzConditionVariableImpl* m_impl; }; diff --git a/include/Nazara/Core/Directory.hpp b/include/Nazara/Core/Directory.hpp index e145a7aae..1d990f23b 100644 --- a/include/Nazara/Core/Directory.hpp +++ b/include/Nazara/Core/Directory.hpp @@ -8,7 +8,6 @@ #define NAZARA_DIRECTORY_HPP #include -#include #include #if defined(NAZARA_PLATFORM_WINDOWS) @@ -28,11 +27,13 @@ class NzDirectoryImpl; -class NAZARA_CORE_API NzDirectory : NzNonCopyable +class NAZARA_CORE_API NzDirectory { public: NzDirectory(); - NzDirectory(const NzString& dirPath); + NzDirectory(const NzString& dirPath); + NzDirectory(const NzDirectory&) = delete; + NzDirectory(NzDirectory&&) = delete; ///TODO ~NzDirectory(); void Close(); @@ -63,6 +64,9 @@ class NAZARA_CORE_API NzDirectory : NzNonCopyable static bool Remove(const NzString& dirPath, bool emptyDirectory = false); static bool SetCurrent(const NzString& dirPath); + NzDirectory& operator=(const NzDirectory&) = delete; + NzDirectory& operator=(NzDirectory&&) = delete; ///TODO + private: NazaraMutexAttrib(m_mutex, mutable) diff --git a/include/Nazara/Core/DynLib.hpp b/include/Nazara/Core/DynLib.hpp index bd9aab3a2..f98585d27 100644 --- a/include/Nazara/Core/DynLib.hpp +++ b/include/Nazara/Core/DynLib.hpp @@ -8,7 +8,6 @@ #define NAZARA_DYNLIB_HPP #include -#include #include #if defined(NAZARA_PLATFORM_WINDOWS) @@ -31,11 +30,12 @@ using NzDynLibFunc = int (*)(); // Type "générique" de pointeur sur fonction class NzDynLibImpl; -class NAZARA_CORE_API NzDynLib : NzNonCopyable +class NAZARA_CORE_API NzDynLib { public: NzDynLib(); - NzDynLib(NzDynLib&& lib); + NzDynLib(const NzDynLib&) = delete; + NzDynLib(NzDynLib&& lib); ~NzDynLib(); NzString GetLastError() const; @@ -46,7 +46,8 @@ class NAZARA_CORE_API NzDynLib : NzNonCopyable bool Load(const NzString& libraryPath); void Unload(); - NzDynLib& operator=(NzDynLib&& lib); + NzDynLib& operator=(const NzDynLib&) = delete; + NzDynLib& operator=(NzDynLib&& lib); private: NazaraMutexAttrib(m_mutex, mutable) diff --git a/include/Nazara/Core/ErrorFlags.hpp b/include/Nazara/Core/ErrorFlags.hpp index 6795db107..6e85aaa0a 100644 --- a/include/Nazara/Core/ErrorFlags.hpp +++ b/include/Nazara/Core/ErrorFlags.hpp @@ -9,18 +9,22 @@ #include #include -#include -class NAZARA_CORE_API NzErrorFlags : NzNonCopyable +class NAZARA_CORE_API NzErrorFlags { public: NzErrorFlags(nzUInt32 flags, bool replace = false); + NzErrorFlags(const NzErrorFlags&) = delete; + NzErrorFlags(NzErrorFlags&&) = delete; ~NzErrorFlags(); nzUInt32 GetPreviousFlags() const; void SetFlags(nzUInt32 flags, bool replace = false); + NzErrorFlags& operator=(const NzErrorFlags&) = delete; + NzErrorFlags& operator=(NzErrorFlags&&) = delete; + private: nzUInt32 m_previousFlags; }; diff --git a/include/Nazara/Core/File.hpp b/include/Nazara/Core/File.hpp index c41eedd0c..043b0b333 100644 --- a/include/Nazara/Core/File.hpp +++ b/include/Nazara/Core/File.hpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #if NAZARA_CORE_THREADSAFE && NAZARA_THREADSAFETY_FILE @@ -27,13 +26,14 @@ class NzFileImpl; -class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable +class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream { public: NzFile(); NzFile(const NzString& filePath); NzFile(const NzString& filePath, unsigned int openMode); - NzFile(NzFile&& file) noexcept; + NzFile(const NzFile&) = delete; + NzFile(NzFile&& file) noexcept; ~NzFile(); bool Copy(const NzString& newFilePath); @@ -76,7 +76,8 @@ class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream, NzNonCop bool Write(const NzString& string); std::size_t Write(const void* buffer, std::size_t typeSize, unsigned int count); - NzFile& operator=(const NzString& filePath); + NzFile& operator=(const NzString& filePath); + NzFile& operator=(const NzFile&) = delete; NzFile& operator=(NzFile&& file) noexcept; static NzString AbsolutePath(const NzString& filePath); diff --git a/include/Nazara/Core/Hash.hpp b/include/Nazara/Core/Hash.hpp index 7ad150231..c9abb4502 100644 --- a/include/Nazara/Core/Hash.hpp +++ b/include/Nazara/Core/Hash.hpp @@ -11,17 +11,21 @@ #include #include #include -#include -class NAZARA_CORE_API NzHash : NzNonCopyable +class NAZARA_CORE_API NzHash { public: NzHash(nzHash hash); NzHash(NzAbstractHash* hashImpl); + NzHash(const NzHash&) = delete; + NzHash(NzHash&&) = delete; ///TODO ~NzHash(); NzHashDigest Hash(const NzHashable& hashable); + NzHash& operator=(const NzHash&) = delete; + NzHash& operator=(NzHash&&) = delete; ///TODO + private: NzAbstractHash* m_impl; }; diff --git a/include/Nazara/Core/Log.hpp b/include/Nazara/Core/Log.hpp index d2d3f9ad9..3e4e73b7d 100644 --- a/include/Nazara/Core/Log.hpp +++ b/include/Nazara/Core/Log.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #if NAZARA_CORE_THREADSAFE && NAZARA_THREADSAFETY_LOG @@ -29,7 +28,7 @@ class NzFile; -class NAZARA_CORE_API NzLog : NzNonCopyable +class NAZARA_CORE_API NzLog { public: void Enable(bool enable); @@ -50,8 +49,13 @@ class NAZARA_CORE_API NzLog : NzNonCopyable private: NzLog(); + NzLog(const NzLog&) = delete; + NzLog(NzLog&&) = delete; ~NzLog(); + NzLog& operator=(const NzLog&) = delete; + NzLog& operator=(NzLog&&) = delete; + NazaraMutexAttrib(m_mutex, mutable) NzString m_filePath; diff --git a/include/Nazara/Core/Mutex.hpp b/include/Nazara/Core/Mutex.hpp index d682f2356..ca108513d 100644 --- a/include/Nazara/Core/Mutex.hpp +++ b/include/Nazara/Core/Mutex.hpp @@ -8,24 +8,26 @@ #define NAZARA_MUTEX_HPP #include -#include class NzMutexImpl; -class NAZARA_CORE_API NzMutex : NzNonCopyable +class NAZARA_CORE_API NzMutex { friend class NzConditionVariable; public: NzMutex(); + NzMutex(const NzMutex&) = delete; + NzMutex(NzMutex&&) = delete; ///TODO ~NzMutex(); void Lock(); - bool TryLock(); - void Unlock(); + NzMutex& operator=(const NzMutex&) = delete; + NzMutex& operator=(NzMutex&&) = delete; ///TODO + private: NzMutexImpl* m_impl; }; diff --git a/include/Nazara/Core/NonCopyable.hpp b/include/Nazara/Core/NonCopyable.hpp deleted file mode 100644 index e8dec1851..000000000 --- a/include/Nazara/Core/NonCopyable.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Core module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#pragma once - -#ifndef NAZARA_NONCOPYABLE_HPP -#define NAZARA_NONCOPYABLE_HPP - -#include - -class NAZARA_CORE_API NzNonCopyable -{ - protected: - NzNonCopyable() = default; - NzNonCopyable(const NzNonCopyable&) = delete; - NzNonCopyable& operator=(const NzNonCopyable&) = delete; -}; - -#endif // NAZARA_NONCOPYABLE_HPP diff --git a/include/Nazara/Core/Semaphore.hpp b/include/Nazara/Core/Semaphore.hpp index 9fd57a218..860405188 100644 --- a/include/Nazara/Core/Semaphore.hpp +++ b/include/Nazara/Core/Semaphore.hpp @@ -8,14 +8,15 @@ #define NAZARA_SEMAPHORE_HPP #include -#include class NzSemaphoreImpl; -class NAZARA_CORE_API NzSemaphore : NzNonCopyable +class NAZARA_CORE_API NzSemaphore { public: NzSemaphore(unsigned int count); + NzSemaphore(const NzSemaphore&) = delete; + NzSemaphore(NzSemaphore&&) = delete; ///TODO ~NzSemaphore(); unsigned int GetCount() const; @@ -25,6 +26,9 @@ class NAZARA_CORE_API NzSemaphore : NzNonCopyable void Wait(); bool Wait(nzUInt32 timeout); + NzSemaphore& operator=(const NzSemaphore&) = delete; + NzSemaphore& operator=(NzSemaphore&&) = delete; ///TODO + private: NzSemaphoreImpl* m_impl; }; diff --git a/include/Nazara/Core/Thread.hpp b/include/Nazara/Core/Thread.hpp index fedf6a14b..1a96a323e 100644 --- a/include/Nazara/Core/Thread.hpp +++ b/include/Nazara/Core/Thread.hpp @@ -9,12 +9,11 @@ #include #include -#include #include class NzThreadImpl; -class NAZARA_CORE_API NzThread : NzNonCopyable +class NAZARA_CORE_API NzThread { public: class Id; @@ -23,7 +22,8 @@ class NAZARA_CORE_API NzThread : NzNonCopyable template NzThread(F function); template NzThread(F function, Args&&... args); template NzThread(void (C::*function)(), C* object); - NzThread(NzThread&& other); + NzThread(const NzThread&) = delete; + NzThread(NzThread&& other); ~NzThread(); void Detach(); @@ -31,7 +31,8 @@ class NAZARA_CORE_API NzThread : NzNonCopyable bool IsJoinable() const; void Join(); - NzThread& operator=(NzThread&& thread); + NzThread& operator=(const NzThread&) = delete; + NzThread& operator=(NzThread&& thread); static unsigned int HardwareConcurrency(); static void Sleep(nzUInt32 milliseconds); diff --git a/include/Nazara/Graphics/AbstractRenderQueue.hpp b/include/Nazara/Graphics/AbstractRenderQueue.hpp index e641dcca0..1e5d282e6 100644 --- a/include/Nazara/Graphics/AbstractRenderQueue.hpp +++ b/include/Nazara/Graphics/AbstractRenderQueue.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include @@ -31,7 +30,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderQueue struct SpotLight; NzAbstractRenderQueue() = default; - NzAbstractRenderQueue(const NzAbstractRenderQueue&) = delete; + NzAbstractRenderQueue(const NzAbstractRenderQueue&) = delete; + NzAbstractRenderQueue(NzAbstractRenderQueue&&) = default; virtual ~NzAbstractRenderQueue(); // Je ne suis vraiment pas fan du nombre de surcharges pour AddBillboards, @@ -54,7 +54,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderQueue virtual void Clear(bool fully = false); - NzAbstractRenderQueue& operator=(const NzAbstractRenderQueue&) = delete; + NzAbstractRenderQueue& operator=(const NzAbstractRenderQueue&) = delete; + NzAbstractRenderQueue& operator=(NzAbstractRenderQueue&&) = default; struct DirectionalLight { diff --git a/include/Nazara/Graphics/AbstractRenderTechnique.hpp b/include/Nazara/Graphics/AbstractRenderTechnique.hpp index e6e370307..a2fa3c69c 100644 --- a/include/Nazara/Graphics/AbstractRenderTechnique.hpp +++ b/include/Nazara/Graphics/AbstractRenderTechnique.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include @@ -23,7 +22,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderTechnique { public: NzAbstractRenderTechnique(); - NzAbstractRenderTechnique(const NzAbstractRenderTechnique&) = delete; + NzAbstractRenderTechnique(const NzAbstractRenderTechnique&) = delete; + NzAbstractRenderTechnique(NzAbstractRenderTechnique&&) = default; virtual ~NzAbstractRenderTechnique(); virtual bool Draw(const NzSceneData& sceneData) const = 0; @@ -36,7 +36,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderTechnique virtual bool IsInstancingEnabled() const; - NzAbstractRenderTechnique& operator=(const NzAbstractRenderTechnique&) = delete; + NzAbstractRenderTechnique& operator=(const NzAbstractRenderTechnique&) = delete; + NzAbstractRenderTechnique& operator=(NzAbstractRenderTechnique&&) = default; protected: bool m_instancingEnabled; diff --git a/include/Nazara/Graphics/InstancedRenderable.hpp b/include/Nazara/Graphics/InstancedRenderable.hpp index 79dd50a5c..0931d36eb 100644 --- a/include/Nazara/Graphics/InstancedRenderable.hpp +++ b/include/Nazara/Graphics/InstancedRenderable.hpp @@ -7,7 +7,6 @@ #ifndef NAZARA_INSTANCEDRENDERABLE_HPP #define NAZARA_INSTANCEDRENDERABLE_HPP -#include #include #include #include @@ -31,7 +30,8 @@ class NAZARA_GRAPHICS_API NzInstancedRenderable : public NzRefCounted struct InstanceData; NzInstancedRenderable() = default; - inline NzInstancedRenderable(const NzInstancedRenderable& renderable); + inline NzInstancedRenderable(const NzInstancedRenderable& renderable); + NzInstancedRenderable(NzInstancedRenderable&& renderable) = delete; virtual ~NzInstancedRenderable(); inline void EnsureBoundingVolumeUpdated() const; @@ -44,6 +44,7 @@ class NAZARA_GRAPHICS_API NzInstancedRenderable : public NzRefCounted virtual void UpdateData(InstanceData* instanceData) const; inline NzInstancedRenderable& operator=(const NzInstancedRenderable& renderable); + NzInstancedRenderable& operator=(NzInstancedRenderable&& renderable) = delete; // Signals: NazaraSignal(OnInstancedRenderableInvalidateData, const NzInstancedRenderable* /*instancedRenderable*/, nzUInt32 /*flags*/); diff --git a/include/Nazara/Graphics/Renderable.hpp b/include/Nazara/Graphics/Renderable.hpp index 5e2794bc3..7851df0fc 100644 --- a/include/Nazara/Graphics/Renderable.hpp +++ b/include/Nazara/Graphics/Renderable.hpp @@ -7,9 +7,6 @@ #ifndef NAZARA_RENDERABLE_HPP #define NAZARA_RENDERABLE_HPP -#include -#include -#include #include #include #include @@ -22,16 +19,17 @@ class NAZARA_GRAPHICS_API NzRenderable public: NzRenderable() = default; NzRenderable(const NzRenderable& renderable) = default; + NzRenderable(NzRenderable&&) = default; virtual ~NzRenderable(); - inline void EnsureBoundingVolumeUpdated() const; - virtual void AddToRenderQueue(NzAbstractRenderQueue* renderQueue, const NzMatrix4f& transformMatrix) const = 0; virtual bool Cull(const NzFrustumf& frustum, const NzMatrix4f& transformMatrix) const; + inline void EnsureBoundingVolumeUpdated() const; virtual const NzBoundingVolumef& GetBoundingVolume() const; virtual void UpdateBoundingVolume(const NzMatrix4f& transformMatrix); - NzRenderable& operator=(const NzRenderable& renderable) = default; + NzRenderable& operator=(const NzRenderable& renderable) = default; + NzRenderable& operator=(NzRenderable&& renderable) = default; protected: virtual void MakeBoundingVolume() const = 0; diff --git a/include/Nazara/Lua/LuaInstance.hpp b/include/Nazara/Lua/LuaInstance.hpp index cdb3b05cb..9b72e421c 100644 --- a/include/Nazara/Lua/LuaInstance.hpp +++ b/include/Nazara/Lua/LuaInstance.hpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -25,10 +24,12 @@ class NzLuaInstance; using NzLuaCFunction = int (*)(lua_State* state); using NzLuaFunction = std::function; -class NAZARA_LUA_API NzLuaInstance : NzNonCopyable +class NAZARA_LUA_API NzLuaInstance { public: NzLuaInstance(); + NzLuaInstance(const NzLuaInstance&) = delete; + NzLuaInstance(NzLuaInstance&&) = delete; ///TODO ~NzLuaInstance(); void ArgCheck(bool condition, unsigned int argNum, const char* error); @@ -148,6 +149,9 @@ class NAZARA_LUA_API NzLuaInstance : NzNonCopyable void* ToUserdata(int index, const char* tname) const; void* ToUserdata(int index, const NzString& tname) const; + NzLuaInstance& operator=(const NzLuaInstance&) = delete; + NzLuaInstance& operator=(NzLuaInstance&&) = delete; ///TODO + static int GetIndexOfUpValue(int upValue); static NzLuaInstance* GetInstance(lua_State* state); diff --git a/include/Nazara/Physics/Geom.hpp b/include/Nazara/Physics/Geom.hpp index 511b7019d..c14f10ff8 100644 --- a/include/Nazara/Physics/Geom.hpp +++ b/include/Nazara/Physics/Geom.hpp @@ -8,7 +8,6 @@ #define NAZARA_GEOM_HPP #include -#include #include #include #include @@ -35,10 +34,12 @@ using NzPhysGeomConstRef = NzObjectRef; using NzPhysGeomLibrary = NzObjectLibrary; using NzPhysGeomRef = NzObjectRef; -class NAZARA_PHYSICS_API NzPhysGeom : public NzRefCounted, NzNonCopyable +class NAZARA_PHYSICS_API NzPhysGeom : public NzRefCounted { public: NzPhysGeom() = default; + NzPhysGeom(const NzPhysGeom&) = delete; + NzPhysGeom(NzPhysGeom&&) = delete; virtual ~NzPhysGeom(); NzBoxf ComputeAABB(const NzVector3f& translation, const NzQuaternionf& rotation, const NzVector3f& scale) const; @@ -49,6 +50,9 @@ class NAZARA_PHYSICS_API NzPhysGeom : public NzRefCounted, NzNonCopyable NewtonCollision* GetHandle(NzPhysWorld* world) const; virtual nzGeomType GetType() const = 0; + NzPhysGeom& operator=(const NzPhysGeom&) = delete; + NzPhysGeom& operator=(NzPhysGeom&&) = delete; + static NzPhysGeomRef Build(const NzPrimitiveList& list); // Signals: diff --git a/include/Nazara/Physics/PhysObject.hpp b/include/Nazara/Physics/PhysObject.hpp index 3ee1f2a4c..154a7cbde 100644 --- a/include/Nazara/Physics/PhysObject.hpp +++ b/include/Nazara/Physics/PhysObject.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/include/Nazara/Physics/PhysWorld.hpp b/include/Nazara/Physics/PhysWorld.hpp index ed54d5106..a48d85a86 100644 --- a/include/Nazara/Physics/PhysWorld.hpp +++ b/include/Nazara/Physics/PhysWorld.hpp @@ -8,17 +8,18 @@ #define NAZARA_PHYSWORLD_HPP #include -#include #include #include #include struct NewtonWorld; -class NAZARA_PHYSICS_API NzPhysWorld : NzNonCopyable +class NAZARA_PHYSICS_API NzPhysWorld { public: NzPhysWorld(); + NzPhysWorld(const NzPhysWorld&) = delete; + NzPhysWorld(NzPhysWorld&&) = delete; ///TODO ~NzPhysWorld(); NzVector3f GetGravity() const; @@ -31,6 +32,9 @@ class NAZARA_PHYSICS_API NzPhysWorld : NzNonCopyable void Step(float timestep); + NzPhysWorld& operator=(const NzPhysWorld&) = delete; + NzPhysWorld& operator=(NzPhysWorld&&) = delete; ///TODO + private: NzVector3f m_gravity; NewtonWorld* m_world; diff --git a/include/Nazara/Renderer/GpuQuery.hpp b/include/Nazara/Renderer/GpuQuery.hpp index 25b21eed3..334de87b9 100644 --- a/include/Nazara/Renderer/GpuQuery.hpp +++ b/include/Nazara/Renderer/GpuQuery.hpp @@ -8,14 +8,15 @@ #define NAZARA_GPUQUERY_HPP #include -#include #include #include -class NAZARA_RENDERER_API NzGpuQuery : NzNonCopyable +class NAZARA_RENDERER_API NzGpuQuery { public: NzGpuQuery(); + NzGpuQuery(const NzGpuQuery&) = delete; + NzGpuQuery(NzGpuQuery&&) = delete; ///TODO ~NzGpuQuery(); void Begin(nzGpuQueryMode mode); @@ -28,6 +29,9 @@ class NAZARA_RENDERER_API NzGpuQuery : NzNonCopyable // Fonctions OpenGL unsigned int GetOpenGLID() const; + NzGpuQuery& operator=(const NzGpuQuery&) = delete; + NzGpuQuery& operator=(NzGpuQuery&&) = delete; ///TODO + static bool IsModeSupported(nzGpuQueryMode mode); static bool IsSupported(); diff --git a/include/Nazara/Renderer/RenderBuffer.hpp b/include/Nazara/Renderer/RenderBuffer.hpp index ea99c74c1..e0ccbbb1c 100644 --- a/include/Nazara/Renderer/RenderBuffer.hpp +++ b/include/Nazara/Renderer/RenderBuffer.hpp @@ -8,7 +8,6 @@ #define NAZARA_RENDERBUFFER_HPP #include -#include #include #include #include @@ -22,13 +21,15 @@ using NzRenderBufferConstRef = NzObjectRef; using NzRenderBufferLibrary = NzObjectLibrary; using NzRenderBufferRef = NzObjectRef; -class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted, NzNonCopyable +class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted { friend NzRenderBufferLibrary; friend class NzRenderer; public: NzRenderBuffer(); + NzRenderBuffer(const NzRenderBuffer&) = delete; + NzRenderBuffer(NzRenderBuffer&&) = delete; ~NzRenderBuffer(); bool Create(nzPixelFormat format, unsigned int width, unsigned int height); @@ -43,6 +44,9 @@ class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted, NzNonCopyable bool IsValid() const; + NzRenderBuffer& operator=(const NzRenderBuffer&) = delete; + NzRenderBuffer& operator=(NzRenderBuffer&&) = delete; + static bool IsSupported(); template static NzRenderBufferRef New(Args&&... args); diff --git a/include/Nazara/Renderer/RenderTexture.hpp b/include/Nazara/Renderer/RenderTexture.hpp index 6130e4184..b7796bac2 100644 --- a/include/Nazara/Renderer/RenderTexture.hpp +++ b/include/Nazara/Renderer/RenderTexture.hpp @@ -8,7 +8,6 @@ #define NAZARA_RENDERTEXTURE_HPP #include -#include #include #include #include @@ -23,10 +22,12 @@ class NzTexture; struct NzRenderTextureImpl; -class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget, NzNonCopyable +class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget { public: inline NzRenderTexture(); + NzRenderTexture(const NzRenderTexture&) = delete; + NzRenderTexture(NzRenderTexture&&) = delete; ///TODO inline ~NzRenderTexture(); bool AttachBuffer(nzAttachmentPoint attachmentPoint, nzUInt8 index, NzRenderBuffer* buffer); @@ -59,6 +60,9 @@ class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget, NzNonCopyable unsigned int GetOpenGLID() const; bool HasContext() const override; + NzRenderTexture& operator=(const NzRenderTexture&) = delete; + NzRenderTexture& operator=(NzRenderTexture&&) = delete; ///TODO + static inline void Blit(NzRenderTexture* src, NzRenderTexture* dst, nzUInt32 buffers = nzRendererBuffer_Color | nzRendererBuffer_Depth | nzRendererBuffer_Stencil, bool bilinearFilter = false); static void Blit(NzRenderTexture* src, NzRectui srcRect, NzRenderTexture* dst, NzRectui dstRect, nzUInt32 buffers = nzRendererBuffer_Color | nzRendererBuffer_Depth | nzRendererBuffer_Stencil, bool bilinearFilter = false); static bool IsSupported(); diff --git a/include/Nazara/Renderer/Shader.hpp b/include/Nazara/Renderer/Shader.hpp index 14e747af5..7d142acac 100644 --- a/include/Nazara/Renderer/Shader.hpp +++ b/include/Nazara/Renderer/Shader.hpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -30,13 +29,15 @@ using NzShaderConstRef = NzObjectRef; using NzShaderLibrary = NzObjectLibrary; using NzShaderRef = NzObjectRef; -class NAZARA_RENDERER_API NzShader : public NzRefCounted, NzNonCopyable +class NAZARA_RENDERER_API NzShader : public NzRefCounted { friend NzShaderLibrary; friend class NzRenderer; public: NzShader(); + NzShader(const NzShader&) = delete; + NzShader(NzShader&&) = delete; ~NzShader(); void AttachStage(nzShaderStage stage, const NzShaderStage& shaderStage); @@ -98,6 +99,9 @@ class NAZARA_RENDERER_API NzShader : public NzRefCounted, NzNonCopyable // Fonctions OpenGL unsigned int GetOpenGLID() const; + NzShader& operator=(const NzShader&) = delete; + NzShader& operator=(NzShader&&) = delete; + static bool IsStageSupported(nzShaderStage stage); template static NzShaderRef New(Args&&... args); diff --git a/include/Nazara/Renderer/ShaderStage.hpp b/include/Nazara/Renderer/ShaderStage.hpp index ef3ba4053..479c1da3c 100644 --- a/include/Nazara/Renderer/ShaderStage.hpp +++ b/include/Nazara/Renderer/ShaderStage.hpp @@ -8,17 +8,17 @@ #define NAZARA_SHADERSTAGE_HPP #include -#include #include #include #include -class NAZARA_RENDERER_API NzShaderStage : NzNonCopyable +class NAZARA_RENDERER_API NzShaderStage { public: NzShaderStage(); NzShaderStage(nzShaderStage stage); - NzShaderStage(NzShaderStage&& stage); + NzShaderStage(const NzShaderStage&) = delete; + NzShaderStage(NzShaderStage&& stage); ~NzShaderStage(); bool Compile(); @@ -36,7 +36,8 @@ class NAZARA_RENDERER_API NzShaderStage : NzNonCopyable void SetSource(const NzString& source); bool SetSourceFromFile(const NzString& filePath); - NzShaderStage& operator=(NzShaderStage&& shader); + NzShaderStage& operator=(const NzShaderStage&) = delete; + NzShaderStage& operator=(NzShaderStage&& shader); // Fonctions OpenGL unsigned int GetOpenGLID() const; diff --git a/include/Nazara/Renderer/Texture.hpp b/include/Nazara/Renderer/Texture.hpp index 8ff2205c0..e3b85100b 100644 --- a/include/Nazara/Renderer/Texture.hpp +++ b/include/Nazara/Renderer/Texture.hpp @@ -8,7 +8,6 @@ #define NAZARA_TEXTURE_HPP #include -#include #include #include #include @@ -30,7 +29,7 @@ using NzTextureRef = NzObjectRef; struct NzTextureImpl; -class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource, NzNonCopyable +class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource { friend NzTextureLibrary; friend NzTextureManager; @@ -40,6 +39,8 @@ class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounte NzTexture() = default; NzTexture(nzImageType type, nzPixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, nzUInt8 levelCount = 1); explicit NzTexture(const NzImage& image); + NzTexture(const NzTexture&) = delete; + NzTexture(NzTexture&&) = delete; ~NzTexture(); bool Create(nzImageType type, nzPixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, nzUInt8 levelCount = 1); @@ -102,6 +103,9 @@ class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounte // Fonctions OpenGL unsigned int GetOpenGLID() const; + NzTexture& operator=(const NzTexture&) = delete; + NzTexture& operator=(NzTexture&&) = delete; + static unsigned int GetValidSize(unsigned int size); static bool IsFormatSupported(nzPixelFormat format); static bool IsMipmappingSupported(); diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index 3dd352307..1081905da 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -8,7 +8,6 @@ #define NAZARA_BUFFER_HPP #include -#include #include #include #include @@ -22,7 +21,7 @@ using NzBufferRef = NzObjectRef; class NzAbstractBuffer; -class NAZARA_UTILITY_API NzBuffer : public NzRefCounted, NzNonCopyable +class NAZARA_UTILITY_API NzBuffer : public NzRefCounted { friend class NzUtility; @@ -31,6 +30,8 @@ class NAZARA_UTILITY_API NzBuffer : public NzRefCounted, NzNonCopyable NzBuffer(nzBufferType type); NzBuffer(nzBufferType type, unsigned int size, nzUInt32 storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static); + NzBuffer(const NzBuffer&) = delete; + NzBuffer(NzBuffer&&) = delete; ~NzBuffer(); bool CopyContent(const NzBuffer& buffer); @@ -56,6 +57,9 @@ class NAZARA_UTILITY_API NzBuffer : public NzRefCounted, NzNonCopyable void Unmap() const; + NzBuffer& operator=(const NzBuffer&) = delete; + NzBuffer& operator=(NzBuffer&&) = delete; + static bool IsStorageSupported(nzUInt32 storage); template static NzBufferRef New(Args&&... args); static void SetBufferFactory(nzUInt32 storage, BufferFactory func); diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp index dc5544dff..e11ecf551 100644 --- a/include/Nazara/Utility/Font.hpp +++ b/include/Nazara/Utility/Font.hpp @@ -10,7 +10,6 @@ #define NAZARA_FONT_HPP #include -#include #include #include #include @@ -34,7 +33,7 @@ using NzFontLibrary = NzObjectLibrary; using NzFontLoader = NzResourceLoader; using NzFontRef = NzObjectRef; -class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource, NzNonCopyable +class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource { friend NzFontLibrary; friend NzFontLoader; @@ -45,6 +44,8 @@ class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource, NzNonC struct SizeInfo; NzFont(); + NzFont(const NzFont&) = delete; + NzFont(NzFont&&) = delete; ~NzFont(); void ClearGlyphCache(); @@ -81,6 +82,9 @@ class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource, NzNonC void SetGlyphBorder(unsigned int borderSize); void SetMinimumStepSize(unsigned int minimumStepSize); + NzFont& operator=(const NzFont&) = delete; + NzFont& operator=(NzFont&&) = delete; + static std::shared_ptr GetDefaultAtlas(); static NzFont* GetDefault(); static unsigned int GetDefaultGlyphBorder(); diff --git a/include/Nazara/Utility/Window.hpp b/include/Nazara/Utility/Window.hpp index aee4f693a..ce38e72b5 100644 --- a/include/Nazara/Utility/Window.hpp +++ b/include/Nazara/Utility/Window.hpp @@ -10,7 +10,6 @@ #define NAZARA_WINDOW_HPP #include -#include #include #include #include @@ -30,7 +29,7 @@ class NzImage; class NzIcon; class NzWindowImpl; -class NAZARA_UTILITY_API NzWindow : NzNonCopyable +class NAZARA_UTILITY_API NzWindow { friend NzWindowImpl; friend class NzMouse; @@ -40,6 +39,8 @@ class NAZARA_UTILITY_API NzWindow : NzNonCopyable NzWindow(); NzWindow(NzVideoMode mode, const NzString& title, nzUInt32 style = nzWindowStyle_Default); NzWindow(NzWindowHandle handle); + NzWindow(const NzWindow&) = delete; + NzWindow(NzWindow&&) = delete; ///TODO virtual ~NzWindow(); void Close(); @@ -89,6 +90,9 @@ class NAZARA_UTILITY_API NzWindow : NzNonCopyable bool WaitEvent(NzEvent* event); + NzWindow& operator=(const NzWindow&) = delete; + NzWindow& operator=(NzWindow&&) = delete; ///TODO + protected: virtual bool OnWindowCreated(); virtual void OnWindowDestroy(); diff --git a/src/Nazara/Core/Win32/DirectoryImpl.hpp b/src/Nazara/Core/Win32/DirectoryImpl.hpp index cb2df657d..117d04d7f 100644 --- a/src/Nazara/Core/Win32/DirectoryImpl.hpp +++ b/src/Nazara/Core/Win32/DirectoryImpl.hpp @@ -8,16 +8,17 @@ #define NAZARA_DIRECTORYIMPL_HPP #include -#include #include class NzDirectory; class NzString; -class NzDirectoryImpl : NzNonCopyable +class NzDirectoryImpl { public: NzDirectoryImpl(const NzDirectory* parent); + NzDirectoryImpl(const NzDirectoryImpl&) = delete; + NzDirectoryImpl(NzDirectoryImpl&&) = delete; ///TODO ~NzDirectoryImpl() = default; void Close(); @@ -31,6 +32,9 @@ class NzDirectoryImpl : NzNonCopyable bool Open(const NzString& dirPath); + NzDirectoryImpl& operator=(const NzDirectoryImpl&) = delete; + NzDirectoryImpl& operator=(NzDirectoryImpl&&) = delete; ///TODO + static bool Create(const NzString& dirPath); static bool Exists(const NzString& dirPath); static NzString GetCurrent(); diff --git a/src/Nazara/Core/Win32/DynLibImpl.hpp b/src/Nazara/Core/Win32/DynLibImpl.hpp index cb3f504c5..4c6a2e72f 100644 --- a/src/Nazara/Core/Win32/DynLibImpl.hpp +++ b/src/Nazara/Core/Win32/DynLibImpl.hpp @@ -9,21 +9,25 @@ #include #include -#include #include class NzString; -class NzDynLibImpl : NzNonCopyable +class NzDynLibImpl { public: NzDynLibImpl(NzDynLib* m_parent); + NzDynLibImpl(const NzDynLibImpl&) = delete; + NzDynLibImpl(NzDynLibImpl&&) = delete; ///TODO? ~NzDynLibImpl() = default; NzDynLibFunc GetSymbol(const NzString& symbol, NzString* errorMessage) const; bool Load(const NzString& libraryPath, NzString* errorMessage); void Unload(); + NzDynLibImpl& operator=(const NzDynLibImpl&) = delete; + NzDynLibImpl& operator=(NzDynLibImpl&&) = delete; ///TODO? + private: HMODULE m_handle; }; diff --git a/src/Nazara/Core/Win32/FileImpl.hpp b/src/Nazara/Core/Win32/FileImpl.hpp index b9c667595..1e1f2c854 100644 --- a/src/Nazara/Core/Win32/FileImpl.hpp +++ b/src/Nazara/Core/Win32/FileImpl.hpp @@ -9,17 +9,18 @@ #include #include -#include #include #include class NzFile; class NzString; -class NzFileImpl : NzNonCopyable +class NzFileImpl { public: NzFileImpl(const NzFile* parent); + NzFileImpl(const NzFileImpl&) = delete; + NzFileImpl(NzFileImpl&&) = delete; ///TODO ~NzFileImpl() = default; void Close(); @@ -31,6 +32,9 @@ class NzFileImpl : NzNonCopyable bool SetCursorPos(nzCursorPosition pos, nzInt64 offset); std::size_t Write(const void* buffer, std::size_t size); + NzFileImpl& operator=(const NzFileImpl&) = delete; + NzFileImpl& operator=(NzFileImpl&&) = delete; ///TODO + static bool Copy(const NzString& sourcePath, const NzString& targetPath); static bool Delete(const NzString& filePath); static bool Exists(const NzString& filePath); diff --git a/src/Nazara/Utility/Win32/WindowImpl.hpp b/src/Nazara/Utility/Win32/WindowImpl.hpp index c393fcd59..288150ad9 100644 --- a/src/Nazara/Utility/Win32/WindowImpl.hpp +++ b/src/Nazara/Utility/Win32/WindowImpl.hpp @@ -10,7 +10,6 @@ #define NAZARA_WINDOWIMPL_HPP #include -#include #include #include #include @@ -29,10 +28,12 @@ class NzWindow; #undef IsMinimized // Conflit avec la méthode du même nom -class NzWindowImpl : NzNonCopyable +class NzWindowImpl { public: NzWindowImpl(NzWindow* parent); + NzWindowImpl(const NzWindowImpl&) = delete; + NzWindowImpl(NzWindowImpl&&) = delete; ///TODO? ~NzWindowImpl() = default; bool Create(const NzVideoMode& mode, const NzString& title, nzUInt32 style); @@ -73,6 +74,9 @@ class NzWindowImpl : NzNonCopyable void SetTitle(const NzString& title); void SetVisible(bool visible); + NzWindowImpl& operator=(const NzWindowImpl&) = delete; + NzWindowImpl& operator=(NzWindowImpl&&) = delete; ///TODO? + static bool Initialize(); static void Uninitialize();