Core: Remove NonCopyable
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
This commit is contained in:
@@ -8,16 +8,17 @@
|
||||
#define NAZARA_DIRECTORYIMPL_HPP
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/NonCopyable.hpp>
|
||||
#include <windows.h>
|
||||
|
||||
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();
|
||||
|
||||
@@ -9,21 +9,25 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/DynLib.hpp>
|
||||
#include <Nazara/Core/NonCopyable.hpp>
|
||||
#include <windows.h>
|
||||
|
||||
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;
|
||||
};
|
||||
|
||||
@@ -9,17 +9,18 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/File.hpp>
|
||||
#include <Nazara/Core/NonCopyable.hpp>
|
||||
#include <ctime>
|
||||
#include <windows.h>
|
||||
|
||||
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);
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#define NAZARA_WINDOWIMPL_HPP
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/NonCopyable.hpp>
|
||||
#include <Nazara/Core/String.hpp>
|
||||
#include <Nazara/Core/Thread.hpp>
|
||||
#include <Nazara/Math/Vector2.hpp>
|
||||
@@ -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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user