[glom] C++11: Use =default for simple move opertions.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] C++11: Use =default for simple move opertions.
- Date: Tue, 8 Nov 2016 13:44:54 +0000 (UTC)
commit 77ba7dcd37c0aa4d57f40f0d7e9151df39b2990c
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Nov 7 22:59:07 2016 +0100
C++11: Use =default for simple move opertions.
glom/libglom/data_structure/foundset.cc | 18 -----------------
glom/libglom/data_structure/foundset.h | 4 +-
glom/libglom/data_structure/groupinfo.cc | 17 ----------------
glom/libglom/data_structure/groupinfo.h | 4 +-
glom/libglom/data_structure/privileges.cc | 18 -----------------
glom/libglom/data_structure/privileges.h | 4 +-
glom/libglom/data_structure/system_prefs.cc | 28 ---------------------------
glom/libglom/data_structure/system_prefs.h | 5 +--
8 files changed, 8 insertions(+), 90 deletions(-)
---
diff --git a/glom/libglom/data_structure/foundset.cc b/glom/libglom/data_structure/foundset.cc
index 37fa39e..d2760a6 100644
--- a/glom/libglom/data_structure/foundset.cc
+++ b/glom/libglom/data_structure/foundset.cc
@@ -27,22 +27,4 @@ FoundSet::FoundSet() noexcept
{
}
-FoundSet::FoundSet(FoundSet&& src) noexcept
-: m_table_name(std::move(src.m_table_name)),
- m_extra_join(std::move(src.m_extra_join)),
- m_where_clause(std::move(src.m_where_clause)),
- m_sort_clause(std::move(src.m_sort_clause))
-{
-}
-
-FoundSet& FoundSet::operator=(FoundSet&& src) noexcept
-{
- m_table_name = std::move(src.m_table_name);
- m_extra_join = std::move(src.m_extra_join);
- m_where_clause = std::move(src.m_where_clause);
- m_sort_clause = std::move(src.m_sort_clause);
-
- return *this;
-}
-
} //namespace Glom
diff --git a/glom/libglom/data_structure/foundset.h b/glom/libglom/data_structure/foundset.h
index a226722..0c0c73c 100644
--- a/glom/libglom/data_structure/foundset.h
+++ b/glom/libglom/data_structure/foundset.h
@@ -39,9 +39,9 @@ class FoundSet
public:
FoundSet() noexcept;
FoundSet(const FoundSet& src) = default;
- FoundSet(FoundSet&& src) noexcept;
+ FoundSet(FoundSet&& src) = default;
FoundSet& operator=(const FoundSet& src) = default;
- FoundSet& operator=(FoundSet&& src) noexcept;
+ FoundSet& operator=(FoundSet&& src) = default;
private:
//We cannot implement this without a way to compare GdaSqlExpr instances,
diff --git a/glom/libglom/data_structure/groupinfo.cc b/glom/libglom/data_structure/groupinfo.cc
index 7933253..faa7ded 100644
--- a/glom/libglom/data_structure/groupinfo.cc
+++ b/glom/libglom/data_structure/groupinfo.cc
@@ -28,23 +28,6 @@ GroupInfo::GroupInfo()
{
}
-GroupInfo::GroupInfo(GroupInfo&& src)
-: TranslatableItem(src),
- m_developer(std::move(src.m_developer)),
- m_map_privileges(std::move(src.m_map_privileges))
-{
-}
-
-GroupInfo& GroupInfo::operator=(GroupInfo&& src)
-{
- TranslatableItem::operator=(src);
-
- m_developer = std::move(src.m_developer);
- m_map_privileges = std::move(src.m_map_privileges);
-
- return *this;
-}
-
bool GroupInfo::operator==(const GroupInfo& src) const
{
return TranslatableItem::operator==(src) &&
diff --git a/glom/libglom/data_structure/groupinfo.h b/glom/libglom/data_structure/groupinfo.h
index e603cf1..7356a56 100644
--- a/glom/libglom/data_structure/groupinfo.h
+++ b/glom/libglom/data_structure/groupinfo.h
@@ -33,10 +33,10 @@ class GroupInfo : public TranslatableItem
public:
GroupInfo();
GroupInfo(const GroupInfo& src) = default;
- GroupInfo(GroupInfo&& src);
+ GroupInfo(GroupInfo&& src) = default;
GroupInfo& operator=(const GroupInfo& src) = default;
- GroupInfo& operator=(GroupInfo&& src);
+ GroupInfo& operator=(GroupInfo&& src) = default;
bool operator==(const GroupInfo& src) const;
bool operator!=(const GroupInfo& src) const;
diff --git a/glom/libglom/data_structure/privileges.cc b/glom/libglom/data_structure/privileges.cc
index b03864c..7c0bd4c 100644
--- a/glom/libglom/data_structure/privileges.cc
+++ b/glom/libglom/data_structure/privileges.cc
@@ -31,24 +31,6 @@ Privileges::Privileges()
{
}
-Privileges::Privileges(Privileges&& src)
-: m_view(std::move(src.m_view)),
- m_edit(std::move(src.m_edit)),
- m_create(std::move(src.m_create)),
- m_delete(std::move(src.m_delete))
-{
-}
-
-Privileges& Privileges::operator=(Privileges&& src)
-{
- m_view = std::move(src.m_view);
- m_edit = std::move(src.m_edit);
- m_create = std::move(src.m_create);
- m_delete = std::move(src.m_delete);
-
- return *this;
-}
-
bool Privileges::operator==(const Privileges& src) const
{
return (m_view == src.m_view)
diff --git a/glom/libglom/data_structure/privileges.h b/glom/libglom/data_structure/privileges.h
index dccf9df..5248b26 100644
--- a/glom/libglom/data_structure/privileges.h
+++ b/glom/libglom/data_structure/privileges.h
@@ -34,10 +34,10 @@ class Privileges
public:
Privileges();
Privileges(const Privileges& src) = default;
- Privileges(Privileges&& src);
+ Privileges(Privileges&& src) = default;
Privileges& operator=(const Privileges& src) = default;
- Privileges& operator=(Privileges&& src);
+ Privileges& operator=(Privileges&& src) = default;
bool operator==(const Privileges& src) const;
diff --git a/glom/libglom/data_structure/system_prefs.cc b/glom/libglom/data_structure/system_prefs.cc
index 51133d2..dda49a6 100644
--- a/glom/libglom/data_structure/system_prefs.cc
+++ b/glom/libglom/data_structure/system_prefs.cc
@@ -27,34 +27,6 @@ SystemPrefs::SystemPrefs()
{
}
-SystemPrefs::SystemPrefs(SystemPrefs&& src)
-: m_name(std::move(src.m_name)),
- m_org_name(std::move(src.m_org_name)),
- m_org_address_street(std::move(src.m_org_address_street)),
- m_org_address_street2(std::move(src.m_org_address_street2)),
- m_org_address_town(std::move(src.m_org_address_town)),
- m_org_address_county(std::move(src.m_org_address_county)),
- m_org_address_country(std::move(src.m_org_address_country)),
- m_org_address_postcode(std::move(src.m_org_address_postcode)),
- m_org_logo(std::move(src.m_org_logo))
-{
-}
-
-SystemPrefs& SystemPrefs::operator=(SystemPrefs&& src)
-{
- m_name = std::move(src.m_name);
- m_org_name = std::move(src.m_org_name);
- m_org_address_street = std::move(src.m_org_address_street);
- m_org_address_street2 = std::move(src.m_org_address_street2);
- m_org_address_town = std::move(src.m_org_address_town);
- m_org_address_county = std::move(src.m_org_address_county);
- m_org_address_country = std::move(src.m_org_address_country);
- m_org_address_postcode = std::move(src.m_org_address_postcode);
- m_org_logo = std::move(src.m_org_logo);
-
- return *this;
-}
-
bool SystemPrefs::operator==(const SystemPrefs& src) const
{
return (m_name == src.m_name) &&
diff --git a/glom/libglom/data_structure/system_prefs.h b/glom/libglom/data_structure/system_prefs.h
index ae75c49..c0299f2 100644
--- a/glom/libglom/data_structure/system_prefs.h
+++ b/glom/libglom/data_structure/system_prefs.h
@@ -32,15 +32,14 @@ class SystemPrefs
public:
SystemPrefs();
SystemPrefs(const SystemPrefs& src) = default;
- SystemPrefs(SystemPrefs&& src);
+ SystemPrefs(SystemPrefs&& src) = default;
SystemPrefs& operator=(const SystemPrefs& src) = default;
- SystemPrefs& operator=(SystemPrefs&& src);
+ SystemPrefs& operator=(SystemPrefs&& src) = default;
bool operator==(const SystemPrefs& src) const;
bool operator!=(const SystemPrefs& src) const;
-
//TODO: Add getters and setters:
Glib::ustring m_name, m_org_name,
m_org_address_street, m_org_address_street2, m_org_address_town,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]