From f90e7afc1582e8d649319c0951c3deafc4b272f7 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 8 Dec 2013 18:29:14 +0100
Subject: Delete some unused copy constructors

---
 src/account-server/account.h         | 4 ++--
 src/account-server/character.h       | 6 ++----
 src/account-server/storage.h         | 5 ++---
 src/game-server/being.h              | 4 ++--
 src/game-server/charactercomponent.h | 4 ++--
 5 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/account-server/account.h b/src/account-server/account.h
index a359c11d..05c73c96 100644
--- a/src/account-server/account.h
+++ b/src/account-server/account.h
@@ -220,8 +220,8 @@ class Account
         void setLastLogin(time_t time);
 
     private:
-        Account(const Account &rhs);
-        Account &operator=(const Account &rhs);
+        Account(const Account &rhs) = delete;
+        Account &operator=(const Account &rhs) = delete;
 
         std::string mName;        /**< User name */
         std::string mPassword;    /**< User password (hashed with salt) */
diff --git a/src/account-server/character.h b/src/account-server/character.h
index 05fce77b..3af6c7d0 100644
--- a/src/account-server/character.h
+++ b/src/account-server/character.h
@@ -239,11 +239,9 @@ class CharacterData
         int getCorrectionPoints() const
         { return mCorrectionPoints; }
 
-
     private:
-
-        CharacterData(const CharacterData &);
-        CharacterData &operator=(const CharacterData &);
+        CharacterData(const CharacterData &) = delete;
+        CharacterData &operator=(const CharacterData &) = delete;
 
         double getAttrBase(AttributeMap::const_iterator &it) const
         { return it->second.base; }
diff --git a/src/account-server/storage.h b/src/account-server/storage.h
index 7acc78e6..d635fb9b 100644
--- a/src/account-server/storage.h
+++ b/src/account-server/storage.h
@@ -440,9 +440,8 @@ class Storage
         { return mDb; }
 
     private:
-        // Prevent copying
-        Storage(const Storage &rhs);
-        Storage &operator=(const Storage &rhs);
+        Storage(const Storage &rhs) = delete;
+        Storage &operator=(const Storage &rhs) = delete;
 
         /**
          * Gets an account from a prepared SQL statement
diff --git a/src/game-server/being.h b/src/game-server/being.h
index e27762ea..de9219a5 100644
--- a/src/game-server/being.h
+++ b/src/game-server/being.h
@@ -298,8 +298,8 @@ class BeingComponent : public Component
         BeingGender mGender;        /**< Gender of the being. */
 
     private:
-        BeingComponent(const BeingComponent &rhs);
-        BeingComponent &operator=(const BeingComponent &rhs);
+        BeingComponent(const BeingComponent &rhs) = delete;
+        BeingComponent &operator=(const BeingComponent &rhs) = delete;
 
         /**
          * Connected to signal_inserted to reset the old position.
diff --git a/src/game-server/charactercomponent.h b/src/game-server/charactercomponent.h
index d43f0fe4..13fa4f95 100644
--- a/src/game-server/charactercomponent.h
+++ b/src/game-server/charactercomponent.h
@@ -318,8 +318,8 @@ class CharacterComponent : public Component
     private:
         void deserialize(Entity &entity, MessageIn &msg);
 
-        CharacterComponent(const CharacterComponent &);
-        CharacterComponent &operator=(const CharacterComponent &);
+        CharacterComponent(const CharacterComponent &) = delete;
+        CharacterComponent &operator=(const CharacterComponent &) = delete;
 
         void abilityStatusChanged(int id);
         void abilityCooldownActivated();
-- 
cgit v1.2.3-70-g09d2