X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.h;h=7569119a35109d6d46c6b94501b70bc7eabd9472;hb=394e5c9969a30b604bfaf78fc05a8c2d5c98ab5b;hp=1fd030d03438674510ac66e7cb6c49e13cfca5df;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git

diff --git a/source/resources.h b/source/resources.h
index 1fd030d..7569119 100644
--- a/source/resources.h
+++ b/source/resources.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GLTK_RESOURCES_H_
 #define MSP_GLTK_RESOURCES_H_
 
+#include <memory>
 #include <msp/gl/font.h>
 #include <msp/gl/module.h>
 #include <msp/gl/program.h>
@@ -17,8 +18,8 @@ namespace Msp {
 namespace GLtk {
 
 /**
-Stores resources such as styles and graphics.  All widgets require a Resources
-instance in constructor.
+Stores resources such as styles and graphics.  The Root widget requires a
+Resources instance as constructor parameter.
 */
 class MSPGLTK_API Resources: public DataFile::Collection
 {
@@ -30,6 +31,7 @@ public:
 
 	public:
 		Loader(Resources &);
+
 	private:
 		void default_font(const std::string &);
 		void font(const std::string &);
@@ -37,13 +39,12 @@ public:
 
 private:
 	FS::Path path;
-	GL::Font *default_font = 0;
-	DataFile::DirectorySource *dir_src = 0;
+	GL::Font *default_font = nullptr;
+	std::unique_ptr<DataFile::DirectorySource> dir_src;
 
 public:
 	Resources();
 	Resources(const FS::Path &);
-	~Resources();
 
 	const GL::Font &get_default_font() const;
 	const GL::Sampler &get_default_sampler() const;