sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Remove NonCopyable

Browse Source 
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
This commit is contained in:
Lynix
2015-09-24 00:37:21 +02:00
parent b16abf0d09
commit 2fd3872099
39 changed files with 205 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Utility/Font.hpp
View File

@@ -10,7 +10,6 @@
#define NAZARA_FONT_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/Resource.hpp>
@@ -34,7 +33,7 @@ using NzFontLibrary = NzObjectLibrary<NzFont>;
using NzFontLoader = NzResourceLoader<NzFont, NzFontParams>;
using NzFontRef = NzObjectRef<NzFont>;
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<NzAbstractAtlas> GetDefaultAtlas();
static NzFont* GetDefault();
static unsigned int GetDefaultGlyphBorder();