mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	core: replace divesite_table_t by a vector of std::unique_ptr<>s
This is a long commit, because it introduces a new abstraction: a general std::vector<> of std::unique_ptrs<>. Moreover, it replaces a number of pointers by C++ references, when the callee does not suppoert null objects. This simplifies memory management and makes ownership more explicit. It is a proof-of-concept and a test-bed for the other core data structrures. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
		
							parent
							
								
									411188728d
								
							
						
					
					
						commit
						e39dea3d68
					
				
					 41 changed files with 451 additions and 426 deletions
				
			
		| 
						 | 
				
			
			@ -1409,12 +1409,12 @@ void MainWindow::on_actionImportDiveSites_triggered()
 | 
			
		|||
		parse_file(fileNamePtr.data(), &log);
 | 
			
		||||
	}
 | 
			
		||||
	// The imported dive sites still have pointers to imported dives - remove them
 | 
			
		||||
	for (int i = 0; i < log.sites->nr; ++i)
 | 
			
		||||
		log.sites->dive_sites[i]->dives.clear();
 | 
			
		||||
	for (const auto &ds: *log.sites)
 | 
			
		||||
		ds->dives.clear();
 | 
			
		||||
 | 
			
		||||
	QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files");
 | 
			
		||||
 | 
			
		||||
	DivesiteImportDialog divesiteImport(*log.sites, source, this);
 | 
			
		||||
	DivesiteImportDialog divesiteImport(std::move(*log.sites), source, this);
 | 
			
		||||
	divesiteImport.exec();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue