Changeset 10990 for code/branches/cpp11_v2/src/libraries/tools

Timestamp:

Dec 29, 2015, 4:47:42 PM (9 years ago)

Author:

landauf

Message:

use '= delete' to explicitly delete unimplemented copy-constructors (for non-copyable classes).
use '= default' to explicitly implement default constructors/destructors.

Location:

code/branches/cpp11_v2/src/libraries/tools

Files:

• ResourceCollection.cc (modified) (1 diff)
• ResourceCollection.h (modified) (2 diffs)
• ResourceLocation.cc (modified) (1 diff)
• ResourceLocation.h (modified) (2 diffs)
• TextureGenerator.h (modified) (1 diff)
• interfaces/TimeFactorListener.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc

@@ -48 +48 @@
     }
 
-    ResourceCollection::~ResourceCollection()
-    {
-    }
-
     void ResourceCollection::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {

code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h

@@ -42 +42 @@
     public:
         ResourceCollection(Context* context);
-        virtual ~ResourceCollection();
+        virtual ~ResourceCollection() = default;
 
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -54 +54 @@
 
     private:
-        ResourceCollection(const ResourceCollection&);
+        ResourceCollection(const ResourceCollection&) = delete;
 
         std::string resourceGroup_;

code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc

@@ -54 +54 @@
     }
 
-    ResourceLocation::~ResourceLocation()
-    {
-    }
-
     void ResourceLocation::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {

code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h

@@ -44 +44 @@
     public:
         ResourceLocation(Context* context);
-        virtual ~ResourceLocation();
+        virtual ~ResourceLocation() = default;
 
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -60 +60 @@
 
     private:
-        ResourceLocation(const ResourceLocation&);
+        ResourceLocation(const ResourceLocation&) = delete;
 
         void load(const std::string& resourceGroup);

code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h

@@ -49 +49 @@
 
     private:
-        TextureGenerator();
-        TextureGenerator(const TextureGenerator&);
-        ~TextureGenerator();
+        // static class, no instances allowed:
+        TextureGenerator() = delete;
+        TextureGenerator(const TextureGenerator&) = delete;
+        ~TextureGenerator() = delete;
 
         static std::map<std::string, std::map<ColourValue, std::string>> materials_s;

code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h

@@ -39 +39 @@
         public:
             TimeFactorListener();
-            virtual ~TimeFactorListener() {}
+            virtual ~TimeFactorListener() = default;
 
             static void setTimeFactor(float factor);