From 0f779c7f76ebb7e61bcb2319a448a8bf6fb1de89 Mon Sep 17 00:00:00 2001
From: Ignacio Rodriguez <ignacio@fastmicroservices.com>
Date: Tue, 3 Nov 2020 20:24:44 +0700
Subject: [PATCH] improved takes

---
 src/gui/src/ServerConfig.h   | 34 ++++------------------------------
 src/lib/synergy/ServerArgs.h | 12 ++++--------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h
index ce0f384a5..53d6165c9 100644
--- a/src/gui/src/ServerConfig.h
+++ b/src/gui/src/ServerConfig.h
@@ -43,37 +43,11 @@ class ServerConfig : public BaseConfig, public GUI::Config::ConfigBase
     public:
         ServerConfig(int numColumns, int numRows,
             QString serverName, MainWindow* mainWindow);
-        ServerConfig(const ServerConfig &src) {
-            *this = src;
-        }
-        ServerConfig(ServerConfig &&) =delete;
-        ~ServerConfig();
 
-        ServerConfig& operator=(const ServerConfig &src) {
-            m_Screens = src.m_Screens;
-            m_NumColumns = src.m_NumColumns;
-            m_NumRows = src.m_NumRows;
-            m_HasHeartbeat = src.m_HasHeartbeat;
-            m_Heartbeat = src.m_Heartbeat;
-            m_RelativeMouseMoves = src.m_RelativeMouseMoves;
-            m_ScreenSaverSync = src.m_ScreenSaverSync;
-            m_Win32KeepForeground = src.m_Win32KeepForeground;
-            m_HasSwitchDelay = src.m_HasSwitchDelay;
-            m_SwitchDelay = src.m_SwitchDelay;
-            m_HasSwitchDoubleTap = src.m_HasSwitchDoubleTap;
-            m_SwitchDoubleTap = src.m_SwitchDoubleTap;
-            m_SwitchCornerSize = src.m_SwitchCornerSize;
-            m_SwitchCorners = src.m_SwitchCorners;
-            m_Hotkeys = src.m_Hotkeys;
-            m_ServerName = src.m_ServerName;
-            m_IgnoreAutoConfigClient = src.m_IgnoreAutoConfigClient;
-            m_EnableDragAndDrop = src.m_EnableDragAndDrop;
-            m_DisableLockToScreen = src.m_DisableLockToScreen;
-            m_ClipboardSharing = src.m_ClipboardSharing;
-            m_ClipboardSharingSize = src.m_ClipboardSharingSize;
-            m_pMainWindow = src.m_pMainWindow;
-            return *this;
-        };
+        ServerConfig(const ServerConfig &src) =default;
+        ServerConfig(ServerConfig &&) =default;
+        ~ServerConfig();
+        ServerConfig& operator=(const ServerConfig &src) =default;
         ServerConfig& operator=(ServerConfig &&) =delete;
 
     public:
diff --git a/src/lib/synergy/ServerArgs.h b/src/lib/synergy/ServerArgs.h
index eac35c0bf..310483bc7 100644
--- a/src/lib/synergy/ServerArgs.h
+++ b/src/lib/synergy/ServerArgs.h
@@ -29,16 +29,12 @@ namespace lib {
             /// Public Functions
         public:
             ServerArgs();
-            ServerArgs(ServerArgs const &src) {
-                m_configFile = src.m_configFile;
-                m_serial = src.m_serial;
-                m_config = src.m_config;
-            }
-            ServerArgs(ServerArgs &&) =delete;
+            ServerArgs(ServerArgs const &src) =default;
+            ServerArgs(ServerArgs &&) =default;
             ~ServerArgs() override;
 
-            ServerArgs& operator=(ServerArgs const &) =delete;
-            ServerArgs& operator=(ServerArgs &&) =delete;
+            ServerArgs& operator=(ServerArgs const &) =default;
+            ServerArgs& operator=(ServerArgs &&) =default;
 
             /// Public variables
         public: