@@ -216,7 +216,7 @@ void QgsPythonUtilsImpl::initPython( QgisInterface *interface, const bool instal
216
216
if ( interface )
217
217
{
218
218
// initialize 'iface' object
219
- runString ( " qgis.utils.initInterface(" + QString::number ( ( quint64 ) interface ) + ' ) ' );
219
+ runString ( QStringLiteral ( " qgis.utils.initInterface(%1) " ). arg ( reinterpret_cast < quint64 >( interface ) ) );
220
220
}
221
221
222
222
if ( !checkQgisUser () )
@@ -250,7 +250,7 @@ void QgsPythonUtilsImpl::initServerPython( QgsServerInterface *interface )
250
250
}
251
251
252
252
// This is the other main difference with initInterface() for desktop plugins
253
- runString ( " qgis.utils.initServerInterface(" + QString::number ( ( quint64 ) interface ) + ' ) ' );
253
+ runString ( QStringLiteral ( " qgis.utils.initServerInterface(%1) " ). arg ( reinterpret_cast < quint64 >( interface ) ) );
254
254
255
255
doCustomImports ();
256
256
finish ();
@@ -371,37 +371,37 @@ QString QgsPythonUtilsImpl::getTraceback()
371
371
372
372
modStringIO = PyImport_ImportModule ( iomod );
373
373
if ( !modStringIO )
374
- TRACEBACK_FETCH_ERROR ( QString ( " can't import %1" ).arg ( iomod ) );
374
+ TRACEBACK_FETCH_ERROR ( QStringLiteral ( " can't import %1" ).arg ( iomod ) );
375
375
376
- obStringIO = PyObject_CallMethod ( modStringIO, ( char * ) " StringIO" , nullptr );
376
+ obStringIO = PyObject_CallMethod ( modStringIO, reinterpret_cast < const char * >( " StringIO" ) , nullptr );
377
377
378
378
/* Construct a cStringIO object */
379
379
if ( !obStringIO )
380
- TRACEBACK_FETCH_ERROR ( " cStringIO.StringIO() failed" );
380
+ TRACEBACK_FETCH_ERROR ( QStringLiteral ( " cStringIO.StringIO() failed" ) );
381
381
382
382
modTB = PyImport_ImportModule ( " traceback" );
383
383
if ( !modTB )
384
- TRACEBACK_FETCH_ERROR ( " can't import traceback" );
384
+ TRACEBACK_FETCH_ERROR ( QStringLiteral ( " can't import traceback" ) );
385
385
386
- obResult = PyObject_CallMethod ( modTB, ( char * ) " print_exception" ,
387
- ( char * ) " OOOOO" ,
386
+ obResult = PyObject_CallMethod ( modTB, reinterpret_cast < const char * >( " print_exception" ) ,
387
+ reinterpret_cast < const char * >( " OOOOO" ) ,
388
388
type, value ? value : Py_None,
389
389
traceback ? traceback : Py_None,
390
390
Py_None,
391
391
obStringIO );
392
392
393
393
if ( !obResult )
394
- TRACEBACK_FETCH_ERROR ( " traceback.print_exception() failed" );
394
+ TRACEBACK_FETCH_ERROR ( QStringLiteral ( " traceback.print_exception() failed" ) );
395
395
396
396
Py_DECREF ( obResult );
397
397
398
- obResult = PyObject_CallMethod ( obStringIO, ( char * ) " getvalue" , nullptr );
398
+ obResult = PyObject_CallMethod ( obStringIO, reinterpret_cast < const char * >( " getvalue" ) , nullptr );
399
399
if ( !obResult )
400
- TRACEBACK_FETCH_ERROR ( " getvalue() failed." );
400
+ TRACEBACK_FETCH_ERROR ( QStringLiteral ( " getvalue() failed." ) );
401
401
402
402
/* And it should be a string all ready to go - duplicate it. */
403
403
if ( !PyUnicode_Check ( obResult ) )
404
- TRACEBACK_FETCH_ERROR ( " getvalue() did not return a string" );
404
+ TRACEBACK_FETCH_ERROR ( QStringLiteral ( " getvalue() did not return a string" ) );
405
405
406
406
result = QString::fromUtf8 ( PyUnicode_AsUTF8 ( obResult ) );
407
407
0 commit comments