scoped_connection: Remaining minor fixes

kjellahl · kjellahl · commit 4a94afa0cff5 · 2023-07-23T15:55:12.000+02:00
diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
@@ -16,6 +16,7 @@
 
 set (SOURCE_FILES
 	connection.cc
+	scoped_connection.cc
 	signal_base.cc
 	trackable.cc
 	functors/slot_base.cc
diff --git a/sigc++/connection.h b/sigc++/connection.h
@@ -44,7 +44,7 @@ namespace sigc
  * sigc::connection doesnʼt disconnect the slot automatically upon destruction.
  * You do not need to keep the sigc::connection object to retain the connection
  * of the slot to the signal. See also @ref sigc::scoped_connection, which does
- * diconnect automatically when the connection object is destroyed or replaced.
+ * disconnect automatically when the connection object is destroyed or replaced.
  *
  * @ingroup signal
  */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
@@ -24,7 +24,7 @@ sigc_public_h =				\
 	member_method_trait.h \
 	reference_wrapper.h		\
 	retype_return.h			\
-        scoped_connection.h             \
+	scoped_connection.h \
 	signal.h \
 	signal_base.h			\
 	slot.h			\
@@ -59,6 +59,7 @@ sigc_public_h =				\
 	functors/slot_base.h
 
 sigc_sources_cc =			\
+	scoped_connection.cc \
 	signal_base.cc			\
 	trackable.cc			\
 	connection.cc			\
diff --git a/sigc++/scoped_connection.cc b/sigc++/scoped_connection.cc
@@ -102,7 +102,7 @@ scoped_connection::operator bool() const noexcept
 // Swapping can be noexcept, as it does not need to disconnect either connection
 // because they will still stay alive, just in opposite instances post-swapping.
 void
-swap(scoped_connection &sca, scoped_connection &scb) noexcept
+swap(scoped_connection& sca, scoped_connection& scb) noexcept
 {
   using std::swap;
   swap(sca.conn_, scb.conn_);
diff --git a/sigc++/scoped_connection.h b/sigc++/scoped_connection.h
@@ -118,7 +118,7 @@ struct SIGC_API scoped_connection final
   scoped_connection& operator=(scoped_connection&& sc);
 
   /// Swap two scoped connections.
-  friend void swap(scoped_connection &sca, scoped_connection &scb) noexcept;
+  friend void swap(scoped_connection& sca, scoped_connection& scb) noexcept;
 
   /// scoped_connection disconnects the referred slot, if any, upon destruction.
   ~scoped_connection();
@@ -168,7 +168,7 @@ struct SIGC_API scoped_connection final
   sigc::connection conn_;
 };
 
-void swap(scoped_connection &sca, scoped_connection &scb) noexcept;
+void swap(scoped_connection& sca, scoped_connection& scb) noexcept;
 
 } /* namespace sigc */
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -40,6 +40,7 @@ set (TEST_SOURCE_FILES
   test_retype.cc
   test_retype_return.cc
   test_rvalue_ref.cc
+  test_scoped_connection.cc
   test_signal.cc
   test_signal_move.cc
   test_size.cc
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -93,6 +93,7 @@ test_ptr_fun_SOURCES         = test_ptr_fun.cc $(sigc_test_util)
 test_retype_SOURCES          = test_retype.cc $(sigc_test_util)
 test_retype_return_SOURCES   = test_retype_return.cc $(sigc_test_util)
 test_rvalue_ref_SOURCES      = test_rvalue_ref.cc $(sigc_test_util)
+test_scoped_connection_SOURCES = test_scoped_connection.cc $(sigc_test_util)
 test_signal_SOURCES          = test_signal.cc $(sigc_test_util)
 test_signal_move_SOURCES     = test_signal_move.cc $(sigc_test_util)
 test_size_SOURCES            = test_size.cc $(sigc_test_util)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace sigc`
`44`	`44`	`* sigc::connection doesnʼt disconnect the slot automatically upon destruction.`
`45`	`45`	`* You do not need to keep the sigc::connection object to retain the connection`
`46`	`46`	`* of the slot to the signal. See also @ref sigc::scoped_connection, which does`
`47`		`- * diconnect automatically when the connection object is destroyed or replaced.`
	`47`	`+ * disconnect automatically when the connection object is destroyed or replaced.`
`48`	`48`	`*`
`49`	`49`	`* @ingroup signal`
`50`	`50`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ scoped_connection::operator bool() const noexcept`
`102`	`102`	`// Swapping can be noexcept, as it does not need to disconnect either connection`
`103`	`103`	`// because they will still stay alive, just in opposite instances post-swapping.`
`104`	`104`	`void`
`105`		`-swap(scoped_connection &sca, scoped_connection &scb) noexcept`
	`105`	`+swap(scoped_connection& sca, scoped_connection& scb) noexcept`
`106`	`106`	`{`
`107`	`107`	`using std::swap;`
`108`	`108`	`swap(sca.conn_, scb.conn_);`