mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Cleanup: consistently use qPrintable()
Replace constructs of the kind s.toUtf8().data(), s.toUtf8().constData(), s.toLocal8Bit().data(), s.toLocal8Bit.constData() or qUtf8Printable(s) by qPrintable(s). This is concise, consistent and - in principle - more performant than the .data() versions. Sadly, owing to a suboptimal implementation, qPrintable(s) currently is a pessimization compared to s.toUtf8().data(). A fix is scheduled for new Qt versions: https://codereview.qt-project.org/#/c/221331/ Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
		
							parent
							
								
									4e44fe7598
								
							
						
					
					
						commit
						b72cc1f317
					
				
					 33 changed files with 166 additions and 162 deletions
				
			
		|  | @ -910,9 +910,9 @@ void ConfigureDiveComputerDialog::getDeviceData() | |||
| #else | ||||
| 	QString device = ui.device->currentText(); | ||||
| #endif | ||||
| 	device_data.devname = strdup(device.toUtf8().data()); | ||||
| 	device_data.vendor = strdup(selected_vendor.toUtf8().data()); | ||||
| 	device_data.product = strdup(selected_product.toUtf8().data()); | ||||
| 	device_data.devname = strdup(qPrintable(device)); | ||||
| 	device_data.vendor = strdup(qPrintable(selected_vendor)); | ||||
| 	device_data.product = strdup(qPrintable(selected_product)); | ||||
| 
 | ||||
| 	device_data.descriptor = descriptorLookup.value(selected_vendor + selected_product); | ||||
| 	device_data.deviceid = device_data.diveid = 0; | ||||
|  | @ -1479,7 +1479,7 @@ void ConfigureDiveComputerDialog::pickLogFile() | |||
| 					       filename, tr("Log files") + " (*.log)"); | ||||
| 	if (!logFile.isEmpty()) { | ||||
| 		free(logfile_name); | ||||
| 		logfile_name = strdup(logFile.toUtf8().data()); | ||||
| 		logfile_name = strdup(qPrintable(logFile)); | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue