From d19444c911c292105e15f66182decbf6907c7876 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Thu, 23 Jul 2020 08:22:35 -0700
Subject: [PATCH] deleted unused copy constructors in peers

---
 src/cbmpeer.cpp     | 18 ------------------
 src/cbmpeer.h       | 11 ++++-------
 src/cdextrapeer.cpp | 18 ------------------
 src/cdextrapeer.h   | 11 ++++-------
 src/cpeer.cpp       | 11 -----------
 src/cpeer.h         |  2 +-
 src/cxlxpeer.cpp    | 17 -----------------
 src/cxlxpeer.h      | 11 ++++-------
 src/main.h          |  1 +
 9 files changed, 14 insertions(+), 86 deletions(-)

diff --git a/src/cbmpeer.cpp b/src/cbmpeer.cpp
index b6c336d..36a3e4d 100644
--- a/src/cbmpeer.cpp
+++ b/src/cbmpeer.cpp
@@ -50,24 +50,6 @@ CBmPeer::CBmPeer(const CCallsign &callsign, const CIp &ip, const char *modules,
     }
 }
 
-CBmPeer::CBmPeer(const CBmPeer &peer)
-: CPeer(peer)
-{
-    for ( auto it=peer.cbegin(); it!=peer.cend(); it++ )
-    {
-        std::shared_ptr<CBmClient> client(new CBmClient((const CBmClient &)*(*it)));
-        m_Clients.push_back(client);
-
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-// destructors
-
-CBmPeer::~CBmPeer()
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // status
 
diff --git a/src/cbmpeer.h b/src/cbmpeer.h
index ee90a9b..2e78e07 100644
--- a/src/cbmpeer.h
+++ b/src/cbmpeer.h
@@ -42,18 +42,15 @@ public:
     // constructors
     CBmPeer();
     CBmPeer(const CCallsign &, const CIp &, const char *, const CVersion &);
-    CBmPeer(const CBmPeer &);
-    
-    // destructor
-    ~CBmPeer();
-    
+    CBmPeer(const CBmPeer &) = delete;
+
     // status
     bool IsAlive(void) const;
-    
+
     // identity
     int GetProtocol(void) const                 { return PROTOCOL_XLX; }
     const char *GetProtocolName(void) const     { return "XLX"; }
-    
+
     // revision helper
     static int GetProtocolRevision(const CVersion &);
 };
diff --git a/src/cdextrapeer.cpp b/src/cdextrapeer.cpp
index 8be01d9..4631357 100644
--- a/src/cdextrapeer.cpp
+++ b/src/cdextrapeer.cpp
@@ -51,24 +51,6 @@ CDextraPeer::CDextraPeer(const CCallsign &callsign, const CIp &ip, const char *m
     }
 }
 
-CDextraPeer::CDextraPeer(const CDextraPeer &peer)
-: CPeer(peer)
-{
-    for ( auto it=peer.cbegin(); it!=peer.cend(); it++ )
-    {
-        std::shared_ptr<CDextraClient> client(new CDextraClient((const CDextraClient &)*(*it)));
-        m_Clients.push_back(client);
-
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-// destructors
-
-CDextraPeer::~CDextraPeer()
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // status
 
diff --git a/src/cdextrapeer.h b/src/cdextrapeer.h
index ff3b24e..ecf0ce4 100644
--- a/src/cdextrapeer.h
+++ b/src/cdextrapeer.h
@@ -41,18 +41,15 @@ public:
     // constructors
     CDextraPeer();
     CDextraPeer(const CCallsign &, const CIp &, const char *, const CVersion &);
-    CDextraPeer(const CDextraPeer &);
-    
-    // destructor
-    ~CDextraPeer();
-    
+    CDextraPeer(const CDextraPeer &) = delete;
+
     // status
     bool IsAlive(void) const;
-    
+
     // identity
     int GetProtocol(void) const                 { return PROTOCOL_DEXTRA; }
     const char *GetProtocolName(void) const     { return "DExtra"; }
-    
+
     // revision helper
     static int GetProtocolRevision(const CVersion &);
 };
diff --git a/src/cpeer.cpp b/src/cpeer.cpp
index b31dbba..20c28de 100644
--- a/src/cpeer.cpp
+++ b/src/cpeer.cpp
@@ -52,17 +52,6 @@ CPeer::CPeer(const CCallsign &callsign, const CIp &ip, const char *modules, cons
     m_LastHeardTime = std::time(nullptr);
 }
 
-CPeer::CPeer(const CPeer &peer)
-{
-    m_Callsign = peer.m_Callsign;
-    m_Ip = peer.m_Ip;
-    ::memcpy(m_ReflectorModules, peer.m_ReflectorModules, sizeof(m_ReflectorModules));
-    m_Version = peer.m_Version;
-    m_LastKeepaliveTime = peer.m_LastKeepaliveTime;
-    m_ConnectTime = peer.m_ConnectTime;
-    m_LastHeardTime = peer.m_LastHeardTime;
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // destructors
 
diff --git a/src/cpeer.h b/src/cpeer.h
index dbfcb7f..0ce1004 100644
--- a/src/cpeer.h
+++ b/src/cpeer.h
@@ -44,7 +44,7 @@ public:
     // constructors
     CPeer();
     CPeer(const CCallsign &, const CIp &, const char *, const CVersion &);
-    CPeer(const CPeer &);
+    CPeer(const CPeer &) = delete;
 
     // destructor
     virtual ~CPeer();
diff --git a/src/cxlxpeer.cpp b/src/cxlxpeer.cpp
index 7e85630..c5b2b73 100644
--- a/src/cxlxpeer.cpp
+++ b/src/cxlxpeer.cpp
@@ -53,23 +53,6 @@ CXlxPeer::CXlxPeer(const CCallsign &callsign, const CIp &ip, const char *modules
     }
 }
 
-CXlxPeer::CXlxPeer(const CXlxPeer &peer)
-: CPeer(peer)
-{
-    for ( auto it=peer.cbegin(); it!=peer.cend(); it++ )
-    {
-        std::shared_ptr<CXlxClient> client(new CXlxClient((const CXlxClient &)*(*it)));
-        m_Clients.push_back(client);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-// destructors
-
-CXlxPeer::~CXlxPeer()
-{
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 // status
 
diff --git a/src/cxlxpeer.h b/src/cxlxpeer.h
index 497d7f2..8447302 100644
--- a/src/cxlxpeer.h
+++ b/src/cxlxpeer.h
@@ -41,18 +41,15 @@ public:
     // constructors
     CXlxPeer();
     CXlxPeer(const CCallsign &, const CIp &, const char *, const CVersion &);
-    CXlxPeer(const CXlxPeer &);
-    
-    // destructor
-    ~CXlxPeer();
-    
+    CXlxPeer(const CXlxPeer &) = delete;
+
     // status
     bool IsAlive(void) const;
-    
+
     // identity
     int GetProtocol(void) const                 { return PROTOCOL_XLX; }
     const char *GetProtocolName(void) const     { return "XLX"; }
-    
+
     // revision helper
     static int GetProtocolRevision(const CVersion &);
 };
diff --git a/src/main.h b/src/main.h
index 26b25d0..8baf9ec 100644
--- a/src/main.h
+++ b/src/main.h
@@ -4,6 +4,7 @@
 //
 //  Created by Jean-Luc Deltombe (LX3JL) on 31/10/2015.
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
+//  Copyright © 2020 Thomas A. Eary, N7TAE
 //
 // ----------------------------------------------------------------------------
 //    This file is part of xlxd.