Rename API: add_callback → push_callback

This makes it clear what is actually done.
textmate · Nov 11, 2016 · 944ad3e · 944ad3e
1 parent d05c477
commit 944ad3e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/Frameworks/DocumentWindow/src/DocumentWindowController.mm b/Frameworks/DocumentWindow/src/DocumentWindowController.mm
@@ -1362,7 +1362,7 @@ - (void)setProjectPath:(NSString*)newProjectPath
 		if(_projectSCMInfo = scm::info(to_s(_projectPath)))
 		{
 			__weak DocumentWindowController* weakSelf = self;
-			_projectSCMInfo->add_callback(^(scm::info_t const& info){
+			_projectSCMInfo->push_callback(^(scm::info_t const& info){
 				weakSelf.projectSCMVariables = info.scm_variables();
 			});
 		}
@@ -1403,7 +1403,7 @@ - (void)setDocumentPath:(NSString*)newDocumentPath
 		if(_documentSCMInfo = scm::info(docDirectory))
 		{
 			__weak DocumentWindowController* weakSelf = self;
-			_documentSCMInfo->add_callback(^(scm::info_t const& info){
+			_documentSCMInfo->push_callback(^(scm::info_t const& info){
 				weakSelf.documentSCMVariables = info.scm_variables();
 			});
 		}

diff --git a/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm b/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm
@@ -42,7 +42,7 @@ @interface FSDirectoryDataSource ()
 		_scm_info = scm::info(_path);
 		if(_scm_info)
 		{
-			_scm_info->add_callback(^(scm::info_t const& info){
+			_scm_info->push_callback(^(scm::info_t const& info){
 
 				std::set<std::string> pathsShown, pathsDeleted, pathsMissingOnDisk;
 				for(FSFileItem* item in _item.children)

diff --git a/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm b/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm
@@ -119,7 +119,7 @@ - (id)initWithURL:(NSURL*)anURL options:(NSUInteger)someOptions
 		if(_scmInfo)
 		{
 			__weak FSSCMDataSource* weakSelf = self;
-			_scmInfo->add_callback(^(scm::info_t const&){
+			_scmInfo->push_callback(^(scm::info_t const&){
 				[weakSelf postReloadNotification];
 			});
 		}

diff --git a/Frameworks/OakFilterList/src/FileChooser.mm b/Frameworks/OakFilterList/src/FileChooser.mm
@@ -445,7 +445,7 @@ - (void)reloadSCMStatus
 {
 	if(!_scmInfo && (_scmInfo = scm::info(to_s(_path))))
 	{
-		_scmInfo->add_callback(^(scm::info_t const& info){
+		_scmInfo->push_callback(^(scm::info_t const& info){
 			if(_sourceIndex == kFileChooserUncommittedChangesSourceIndex)
 				[self reloadSCMStatus];
 		});

diff --git a/Frameworks/document/src/OakDocument.mm b/Frameworks/document/src/OakDocument.mm
@@ -1571,7 +1571,7 @@ - (void)setObserveSCMStatus:(BOOL)flag
 			// is bind:toObject:withKeyPath:options: → scmStatus → setObserveSCMStatus:
 			dispatch_async(dispatch_get_main_queue(), ^{
 				__weak OakDocument* weakSelf = self;
-				_scmInfo->add_callback(^(scm::info_t const& info){
+				_scmInfo->push_callback(^(scm::info_t const& info){
 					weakSelf.scmStatus    = info.status(to_s(weakSelf.path));
 					weakSelf.scmVariables = info.scm_variables();
 				});

diff --git a/Frameworks/scm/src/scm.cc b/Frameworks/scm/src/scm.cc
@@ -113,7 +113,7 @@ namespace scm
 		return dry() ? false : _shared_info->tracks_directories();
 	}
 
-	void info_t::add_callback (void (^block)(info_t const&))
+	void info_t::push_callback (void (^block)(info_t const&))
 	{
 		_callbacks.push_back(Block_copy(block));
 		if(!dry())
@@ -401,7 +401,7 @@ namespace scm
 		__block bool shouldWait = true;
 		CFRunLoopRef runLoop = CFRunLoopGetCurrent();
 
-		info->add_callback(^(scm::info_t const& unused){
+		info->push_callback(^(scm::info_t const& unused){
 			shouldWait = false;
 			CFRunLoopStop(runLoop);
 		});

diff --git a/Frameworks/scm/src/scm.h b/Frameworks/scm/src/scm.h
@@ -29,7 +29,7 @@ namespace scm
 		scm::status::type status (std::string const& path) const;
 
 		bool tracks_directories () const;
-		void add_callback (void (^block)(info_t const&));
+		void push_callback (void (^block)(info_t const&));
 		void pop_callback ();
 
 	private: