Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/include/ResourceManager

Timestamp:

Mar 19, 2012, 1:59:48 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/ab_common/include/ResourceManager/ResourceManager.h (modified) (3 diffs)

trunk/ab5.0/abdev/ab_common/include/ResourceManager/ResourceManager.h

@@ -11 +11 @@
     // IDEのみで使う
     HTREEITEM hTreeItem;
+
+    ResourceItem()
+        : idName()
+        , filepath()
+        , hTreeItem() {}
+
+    ResourceItem(ResourceItem&& y)
+        : idName(std::move(y.idName))
+        , filepath(std::move(y.filepath))
+        , hTreeItem(std::move(y.hTreeItem)) {}
+
+    ResourceItem(ResourceItem const& y)
+        : idName(y.idName)
+        , filepath(y.filepath)
+        , hTreeItem(y.hTreeItem) {}
+
+    ResourceItem& operator =(ResourceItem&& y)
+    {
+        idName = std::move(y.idName);
+        filepath= std::move(y.filepath);
+        hTreeItem = std::move(y.hTreeItem);
+        return *this;
+    }
+
+    ResourceItem& operator =(ResourceItem const& y)
+    {
+        return *this = std::move(ResourceItem(y));
+    }
 };
+
 typedef std::vector<ResourceItem> ResourceItems;
 
@@ -18 +47 @@
 {
 public:
+    ResourceManager() {}
+
     void Clear();
     bool Load( const std::string &resourceFilePath );
@@ -28 +59 @@
     ResourceItems iconResources;
     std::string manifestFilePath;
+
+private:
+    ResourceManager(ResourceManager const&);
+    ResourceManager operator =(ResourceManager const&);
 };