From fcfb2b12b77b5298c29380036fbf976a11574fcd Mon Sep 17 00:00:00 2001
From: Zach H <zahalpern+github@gmail.com>
Date: Tue, 6 Feb 2018 05:06:51 -0500
Subject: [PATCH] remove extra copies (#3081)

---
 cockatrice/src/settings/carddatabasesettings.h | 5 +----
 cockatrice/src/settings/gamefilterssettings.h  | 5 +----
 cockatrice/src/settings/layoutssettings.h      | 5 +----
 cockatrice/src/settings/messagesettings.h      | 5 +----
 cockatrice/src/settings/serverssettings.h      | 5 +----
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/cockatrice/src/settings/carddatabasesettings.h b/cockatrice/src/settings/carddatabasesettings.h
index 0f00d7dd..38b95be7 100644
--- a/cockatrice/src/settings/carddatabasesettings.h
+++ b/cockatrice/src/settings/carddatabasesettings.h
@@ -24,11 +24,8 @@ signals:
 public slots:
 
 private:
-    CardDatabaseSettings(QString settingPath, QObject *parent = 0);
+    explicit CardDatabaseSettings(QString settingPath, QObject *parent = nullptr);
     CardDatabaseSettings( const CardDatabaseSettings& /*other*/ );
-    CardDatabaseSettings( CardDatabaseSettings& /*other*/ );
-    CardDatabaseSettings( volatile const CardDatabaseSettings& /*other*/ );
-    CardDatabaseSettings( volatile CardDatabaseSettings& /*other*/ );    
 };
 
 #endif // CARDDATABASESETTINGS_H
diff --git a/cockatrice/src/settings/gamefilterssettings.h b/cockatrice/src/settings/gamefilterssettings.h
index f8e3fac9..01e7228b 100644
--- a/cockatrice/src/settings/gamefilterssettings.h
+++ b/cockatrice/src/settings/gamefilterssettings.h
@@ -29,11 +29,8 @@ signals:
 public slots:
 
 private:
-    GameFiltersSettings(QString settingPath,QObject *parent = 0);
+    explicit GameFiltersSettings(QString settingPath,QObject *parent = nullptr);
     GameFiltersSettings( const GameFiltersSettings& /*other*/ );
-    GameFiltersSettings( GameFiltersSettings& /*other*/ );
-    GameFiltersSettings( volatile const GameFiltersSettings& /*other*/ );
-    GameFiltersSettings( volatile GameFiltersSettings& /*other*/ );
 
     QString hashGameType(const QString &gameType) const;
 };
diff --git a/cockatrice/src/settings/layoutssettings.h b/cockatrice/src/settings/layoutssettings.h
index 1617d7c3..21d27e04 100644
--- a/cockatrice/src/settings/layoutssettings.h
+++ b/cockatrice/src/settings/layoutssettings.h
@@ -53,11 +53,8 @@ signals:
 public slots:
 
 private:
-    LayoutsSettings(QString settingPath,QObject *parent = 0);
+    explicit LayoutsSettings(QString settingPath,QObject *parent = nullptr);
     LayoutsSettings( const LayoutsSettings& /*other*/ );
-    LayoutsSettings( LayoutsSettings& /*other*/ );
-    LayoutsSettings( volatile const LayoutsSettings& /*other*/ );
-    LayoutsSettings( volatile LayoutsSettings& /*other*/ );
 };
 
 #endif // LAYOUTSSETTINGS_H
diff --git a/cockatrice/src/settings/messagesettings.h b/cockatrice/src/settings/messagesettings.h
index 4ac4592e..f7de5f23 100644
--- a/cockatrice/src/settings/messagesettings.h
+++ b/cockatrice/src/settings/messagesettings.h
@@ -19,11 +19,8 @@ signals:
 public slots:
 
 private:
-    MessageSettings(QString settingPath, QObject *parent = 0);
+    explicit MessageSettings(QString settingPath, QObject *parent = nullptr);
     MessageSettings( const MessageSettings& /*other*/ );
-    MessageSettings( MessageSettings& /*other*/ );
-    MessageSettings( volatile const MessageSettings& /*other*/ );
-    MessageSettings( volatile MessageSettings& /*other*/ );
 };
 
 #endif // MESSAGESETTINGS_H
diff --git a/cockatrice/src/settings/serverssettings.h b/cockatrice/src/settings/serverssettings.h
index d2748118..4a2fee9d 100644
--- a/cockatrice/src/settings/serverssettings.h
+++ b/cockatrice/src/settings/serverssettings.h
@@ -47,11 +47,8 @@ signals:
 public slots:
 
 private:
-    ServersSettings(QString settingPath,QObject *parent = 0);
+    explicit ServersSettings(QString settingPath,QObject *parent = nullptr);
     ServersSettings( const ServersSettings& /*other*/ );
-    ServersSettings( ServersSettings& /*other*/ );
-    ServersSettings( volatile const ServersSettings& /*other*/ );
-    ServersSettings( volatile ServersSettings& /*other*/ );       
 };
 
 #endif // SERVERSSETTINGS_H