Skip to content
Permalink
Browse files
call static
  • Loading branch information
Koyaani authored and nyalldawson committed Dec 30, 2021
1 parent 8b1d08d commit aa730d6a44deffd376784ec4b6893696df519746
Showing with 125 additions and 129 deletions.
  1. +2 −2 src/3d/materials/qgsgoochmaterialsettings.cpp
  2. +2 −2 src/3d/materials/qgsphongmaterialsettings.cpp
  3. +3 −3 src/3d/mesh/qgsmesh3dmaterial_p.cpp
  4. +1 −1 src/analysis/mesh/qgsmeshtriangulation.cpp
  5. +1 −2 src/analysis/processing/qgsalgorithmlayoutatlastoimage.cpp
  6. +6 −2 src/analysis/processing/qgsalgorithmlayoutatlastopdf.cpp
  7. +2 −2 src/app/browser/qgsinbuiltdataitemproviders.cpp
  8. +9 −9 src/app/main.cpp
  9. +1 −1 src/app/options/qgsoptions.cpp
  10. +1 −1 src/app/qgisapp.cpp
  11. +6 −6 src/app/qgsappcoordinateoperationhandlers.cpp
  12. +1 −3 src/core/geometry/qgsgeometry.cpp
  13. +3 −3 src/core/labeling/qgspallabeling.cpp
  14. +1 −1 src/core/layertree/qgslayertreemodellegendnode.cpp
  15. +2 −1 src/core/layout/qgslayoututils.cpp
  16. +3 −3 src/core/mesh/qgsmesheditor.cpp
  17. +1 −1 src/core/network/qgsnetworkaccessmanager.cpp
  18. +3 −3 src/core/pointcloud/qgspointcloudlayer.cpp
  19. +3 −4 src/core/project/qgsproject.cpp
  20. +2 −2 src/core/project/qgsprojectbadlayerhandler.cpp
  21. +1 −1 src/core/project/qgsprojectfiletransform.cpp
  22. +1 −1 src/core/qgsapplication.cpp
  23. +3 −3 src/core/qgsauxiliarystorage.cpp
  24. +1 −1 src/core/qgsdiagramrenderer.cpp
  25. +1 −1 src/core/qgsrunprocess.cpp
  26. +2 −2 src/core/qgstiledownloadmanager.cpp
  27. +0 −1 src/core/symbology/qgslinesymbollayer.cpp
  28. +2 −2 src/crashhandler/main.cpp
  29. +1 −1 src/gui/attributeformconfig/qgsattributewidgetedit.cpp
  30. +2 −2 src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
  31. +3 −3 src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
  32. +1 −1 src/gui/labeling/qgslabelinggui.cpp
  33. +1 −1 src/gui/processing/models/qgsmodeldesignerdialog.cpp
  34. +1 −1 src/gui/processing/models/qgsmodelgraphicsscene.cpp
  35. +1 −2 src/gui/qgsrichtexteditor.cpp
  36. +1 −1 src/gui/qgsstatusbar.cpp
  37. +1 −1 src/gui/symbology/qgscptcitycolorrampdialog.cpp
  38. +1 −1 src/gui/symbology/qgssymbolselectordialog.cpp
  39. +1 −1 src/process/main.cpp
  40. +1 −1 src/server/qgis_map_serv.cpp
  41. +7 −7 src/server/qgis_mapserver.cpp
  42. +1 −2 src/server/services/wfs/qgswfsdescribefeaturetype.cpp
  43. +1 −2 src/server/services/wfs/qgswfsgetfeature.cpp
  44. +2 −2 src/server/services/wms/qgswmsrenderer.cpp
  45. +1 −1 tests/src/3d/sandbox/qgis_3d_sandbox.cpp
  46. +1 −2 tests/src/core/testqgscalloutregistry.cpp
  47. +15 −15 tests/src/core/testqgsmesheditor.cpp
  48. +2 −2 tests/src/core/testqgspainteffectregistry.cpp
  49. +14 −14 tests/src/core/testqgsprovidermetadata.cpp
  50. +1 −1 tests/src/gui/testqgsmessagebar.cpp
  51. +1 −1 tests/src/quickgui/app/main.cpp
@@ -243,9 +243,9 @@ Qt3DRender::QMaterial *QgsGoochMaterialSettings::dataDefinedMaterial() const

//Load shader programs
const QUrl urlVert( QStringLiteral( "qrc:/shaders/goochDataDefined.vert" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, shaderProgram->loadSource( urlVert ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, Qt3DRender::QShaderProgram::loadSource( urlVert ) );
const QUrl urlFrag( QStringLiteral( "qrc:/shaders/goochDataDefined.frag" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, shaderProgram->loadSource( urlFrag ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, Qt3DRender::QShaderProgram::loadSource( urlFrag ) );

renderPass->setShaderProgram( shaderProgram );
technique->addRenderPass( renderPass );
@@ -235,9 +235,9 @@ Qt3DRender::QMaterial *QgsPhongMaterialSettings::dataDefinedMaterial() const

//Load shader programs
const QUrl urlVert( QStringLiteral( "qrc:/shaders/phongDataDefined.vert" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, shaderProgram->loadSource( urlVert ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, Qt3DRender::QShaderProgram::loadSource( urlVert ) );
const QUrl urlFrag( QStringLiteral( "qrc:/shaders/phongDataDefined.frag" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, shaderProgram->loadSource( urlFrag ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, Qt3DRender::QShaderProgram::loadSource( urlFrag ) );

renderPass->setShaderProgram( shaderProgram );
technique->addRenderPass( renderPass );
@@ -180,11 +180,11 @@ void QgsMesh3dMaterial::configure()

//Load shader programs
const QUrl urlVert( QStringLiteral( "qrc:/shaders/mesh/mesh.vert" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, shaderProgram->loadSource( urlVert ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Vertex, Qt3DRender::QShaderProgram::loadSource( urlVert ) );
const QUrl urlGeom( QStringLiteral( "qrc:/shaders/mesh/mesh.geom" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Geometry, shaderProgram->loadSource( urlGeom ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Geometry, Qt3DRender::QShaderProgram::loadSource( urlGeom ) );
const QUrl urlFrag( QStringLiteral( "qrc:/shaders/mesh/mesh.frag" ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, shaderProgram->loadSource( urlFrag ) );
shaderProgram->setShaderCode( Qt3DRender::QShaderProgram::Fragment, Qt3DRender::QShaderProgram::loadSource( urlFrag ) );

renderPass->setShaderProgram( shaderProgram );
mTechnique->addRenderPass( renderPass );
@@ -398,7 +398,7 @@ QgsTopologicalMesh::Changes QgsMeshEditingDelaunayTriangulation::apply( QgsMeshE
while ( !facesReady && !giveUp )
{
QgsMeshEditingError error;
topologicFaces = meshEditor->topologicalMesh().createNewTopologicalFaces( destinationFaces, true, error );
topologicFaces = QgsTopologicalMesh::createNewTopologicalFaces( destinationFaces, true, error );

if ( error == QgsMeshEditingError() )
error = meshEditor->topologicalMesh().facesCanBeAdded( topologicFaces );
@@ -187,7 +187,6 @@ QVariantMap QgsLayoutAtlasToImageAlgorithm::processAlgorithm( const QVariantMap
const int idx = parameterAsEnum( parameters, QStringLiteral( "EXTENSION" ), context );
const QString extension = '.' + imageFormats.at( idx );

const QgsLayoutExporter exporter( layout.get() );
QgsLayoutExporter::ImageExportSettings settings;

if ( parameters.value( QStringLiteral( "DPI" ) ).isValid() )
@@ -224,7 +223,7 @@ QVariantMap QgsLayoutAtlasToImageAlgorithm::processAlgorithm( const QVariantMap
if ( atlas->updateFeatures() )
{
feedback->pushInfo( QObject::tr( "Exporting %n atlas feature(s)", "", atlas->count() ) );
switch ( exporter.exportToImage( atlas, fileName, extension, settings, error, feedback ) )
switch ( QgsLayoutExporter::exportToImage( atlas, fileName, extension, settings, error, feedback ) )
{
case QgsLayoutExporter::Success:
{
@@ -220,13 +220,15 @@ QgsLayoutAtlasToPdfAlgorithm *QgsLayoutAtlasToPdfAlgorithm::createInstance() con
QVariantMap QgsLayoutAtlasToPdfAlgorithm::exportAtlas( QgsLayoutAtlas *atlas, const QgsLayoutExporter &exporter, const QgsLayoutExporter::PdfExportSettings &settings,
const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
{
Q_UNUSED( exporter )

const QString dest = parameterAsFileOutput( parameters, QStringLiteral( "OUTPUT" ), context );

QString error;
if ( atlas->updateFeatures() )
{
feedback->pushInfo( QObject::tr( "Exporting %n atlas feature(s)", "", atlas->count() ) );
switch ( exporter.exportToPdf( atlas, dest, settings, error, feedback ) )
switch ( QgsLayoutExporter::exportToPdf( atlas, dest, settings, error, feedback ) )
{
case QgsLayoutExporter::Success:
{
@@ -309,6 +311,8 @@ QgsLayoutAtlasToMultiplePdfAlgorithm *QgsLayoutAtlasToMultiplePdfAlgorithm::crea
QVariantMap QgsLayoutAtlasToMultiplePdfAlgorithm::exportAtlas( QgsLayoutAtlas *atlas, const QgsLayoutExporter &exporter, const QgsLayoutExporter::PdfExportSettings &settings,
const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
{
Q_UNUSED( exporter )

QString error;

const QString filename = parameterAsString( parameters, QStringLiteral( "OUTPUT_FILENAME" ), context );
@@ -334,7 +338,7 @@ QVariantMap QgsLayoutAtlasToMultiplePdfAlgorithm::exportAtlas( QgsLayoutAtlas *a
}
}

result = exporter.exportToPdfs( atlas, dest, settings, error, feedback );
result = QgsLayoutExporter::exportToPdfs( atlas, dest, settings, error, feedback );

switch ( result )
{
@@ -361,14 +361,14 @@ void QgsAppDirectoryItemGuiProvider::changeDirectoryColor( QgsDirectoryItem *ite
return;

// store new color for directory
item->setCustomColor( item->dirPath(), color );
QgsDirectoryItem::setCustomColor( item->dirPath(), color );
// and update item's color immediately
item->setIconColor( color );
}

void QgsAppDirectoryItemGuiProvider::clearDirectoryColor( QgsDirectoryItem *item )
{
item->setCustomColor( item->dirPath(), QColor() );
QgsDirectoryItem::setCustomColor( item->dirPath(), QColor() );
// and update item's color immediately
item->setIconColor( QColor() );
}
@@ -1049,7 +1049,7 @@ int main( int argc, char *argv[] )
QgsApplication myApp( argc, argv, myUseGuiFlag, QString(), QStringLiteral( "desktop" ) );

// Set locale to emit QgsApplication's localeChanged signal
myApp.setLocale( QLocale() );
QgsApplication::setLocale( QLocale() );

//write the log messages written before creating QgsApplication
for ( const QString &preApplicationLogMessage : std::as_const( preApplicationLogMessages ) )
@@ -1098,7 +1098,7 @@ int main( int argc, char *argv[] )
QgsDebugMsgLevel( QStringLiteral( "\t - %1" ).arg( profileFolder ), 2 );
QgsDebugMsgLevel( QStringLiteral( "\t - %1" ).arg( rootProfileFolder ), 2 );

myApp.init( profileFolder );
QgsApplication::init( profileFolder );

// Redefine QgsApplication::libraryPaths as necessary.
// IMPORTANT: Do *after* QgsApplication myApp(...), but *before* Qt uses any plugins,
@@ -1190,7 +1190,7 @@ int main( int argc, char *argv[] )
// Set 1024x1024 icon for dock, app switcher, etc., rendering
myApp.setWindowIcon( QIcon( QgsApplication::iconsPath() + QStringLiteral( "qgis-icon-macos.png" ) ) );
#else
myApp.setWindowIcon( QIcon( QgsApplication::appIconPath() ) );
QgsApplication::setWindowIcon( QIcon( QgsApplication::appIconPath() ) );
#endif

// TODO: use QgsSettings
@@ -1396,7 +1396,7 @@ int main( int argc, char *argv[] )
QgisApp *qgis = new QgisApp( mypSplash, myRestorePlugins, mySkipBadLayers, mySkipVersionCheck, rootProfileFolder, profileName ); // "QgisApp" used to find canonical instance
qgis->setObjectName( QStringLiteral( "QgisApp" ) );

myApp.connect(
QgsApplication::connect(
&myApp, SIGNAL( preNotify( QObject *, QEvent *, bool * ) ),
//qgis, SLOT( preNotify( QObject *, QEvent *))
QgsCustomization::instance(), SLOT( preNotify( QObject *, QEvent *, bool * ) )
@@ -1516,11 +1516,11 @@ int main( int argc, char *argv[] )
qApp->processEvents(), grab the pixmap, save it, hide the window and exit.
*/
//qgis->show();
myApp.processEvents();
QgsApplication::processEvents();
QPixmap *myQPixmap = new QPixmap( mySnapshotWidth, mySnapshotHeight );
myQPixmap->fill();
qgis->saveMapAsImage( mySnapshotFileName, myQPixmap );
myApp.processEvents();
QgsApplication::processEvents();
qgis->hide();

return 1;
@@ -1637,7 +1637,7 @@ int main( int argc, char *argv[] )
// Continue on to interactive gui...
/////////////////////////////////////////////////////////////////////
qgis->show();
myApp.connect( &myApp, SIGNAL( lastWindowClosed() ), &myApp, SLOT( quit() ) );
QgsApplication::connect( &myApp, SIGNAL( lastWindowClosed() ), &myApp, SLOT( quit() ) );

mypSplash->finish( qgis );
delete mypSplash;
@@ -1659,7 +1659,7 @@ int main( int argc, char *argv[] )
switch ( signal )
{
case SIGINT:
myApp.exit( 1 );
QgsApplication::exit( 1 );
break;

default:
@@ -1668,7 +1668,7 @@ int main( int argc, char *argv[] )
} );
#endif

int retval = myApp.exec();
int retval = QgsApplication::exec();
delete qgis;
return retval;
}
@@ -422,7 +422,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
mAuthSettings->setDataprovider( QStringLiteral( "proxy" ) );
QString authcfg = mSettings->value( QStringLiteral( "proxy/authcfg" ) ).toString();
mAuthSettings->setConfigId( authcfg );
mAuthSettings->setWarningText( mAuthSettings->formattedWarning( QgsAuthSettingsWidget::UserSettings ) );
mAuthSettings->setWarningText( QgsAuthSettingsWidget::formattedWarning( QgsAuthSettingsWidget::UserSettings ) );

//Web proxy settings
grpProxy->setChecked( mSettings->value( QStringLiteral( "proxy/proxyEnabled" ), false ).toBool() );
@@ -2118,7 +2118,7 @@ void QgisApp::handleDropUriList( const QgsMimeDataUtils::UriList &lst )

auto showLayerLoadWarnings = [ = ]( const QString & title, const QString & shortMessage, const QString & longMessage, Qgis::MessageLevel level )
{
QgsMessageBarItem *messageWidget = visibleMessageBar()->createMessage( title, shortMessage );
QgsMessageBarItem *messageWidget = QgsMessageBar::createMessage( title, shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [ = ]
{
@@ -112,7 +112,7 @@ void QgsAppMissingGridHandler::onMissingRequiredGrid( const QgsCoordinateReferen
grid.shortName );

QgsMessageBar *bar = QgisApp::instance()->messageBar();
QgsMessageBarItem *widget = bar->createMessage( QString(), shortMessage );
QgsMessageBarItem *widget = QgsMessageBar::createMessage( QString(), shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [longMessage, downloadMessage, bar, widget, gridName]
{
@@ -180,7 +180,7 @@ void QgsAppMissingGridHandler::onMissingPreferredGrid( const QgsCoordinateRefere
+ gridMessage + accuracyMessage;

QgsMessageBar *bar = QgisApp::instance()->messageBar();
QgsMessageBarItem *widget = bar->createMessage( QString(), shortMessage );
QgsMessageBarItem *widget = QgsMessageBar::createMessage( QString(), shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [longMessage, downloadMessage, gridName, widget, bar]
{
@@ -208,7 +208,7 @@ void QgsAppMissingGridHandler::onCoordinateOperationCreationError( const QgsCoor
const QString longMessage = tr( "<p>No transform is available between <i>%1</i> and <i>%2</i>.</p><p style=\"color: red\">%3</p>" ).arg( sourceCrs.userFriendlyIdentifier(), destinationCrs.userFriendlyIdentifier(), error );

QgsMessageBar *bar = QgisApp::instance()->messageBar();
QgsMessageBarItem *widget = bar->createMessage( QString(), shortMessage );
QgsMessageBarItem *widget = QgsMessageBar::createMessage( QString(), shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [longMessage]
{
@@ -265,7 +265,7 @@ void QgsAppMissingGridHandler::onMissingGridUsedByContextHandler( const QgsCoord
+ tr( "<p>The operation specified for use in the project is:</p><p><code>%1</code></p>" ).arg( desired.proj ) ;

QgsMessageBar *bar = QgisApp::instance()->messageBar();
QgsMessageBarItem *widget = bar->createMessage( QString(), shortMessage );
QgsMessageBarItem *widget = QgsMessageBar::createMessage( QString(), shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [longMessage, gridName, downloadMessage, bar, widget]
{
@@ -293,7 +293,7 @@ void QgsAppMissingGridHandler::onFallbackOperationOccurred( const QgsCoordinateR
const QString longMessage = tr( "<p>An alternative, ballpark-only transform was used when transforming coordinates between <i>%1</i> and <i>%2</i>. The results may not match those obtained by using the preferred operation:</p><code>%3</code><p style=\"font-weight: bold\">Possibly an incorrect choice of operation was made for transformations between these reference systems. Check the Project Properties and ensure that the selected transform operations are applicable over the whole extent of the current project." ).arg( sourceCrs.userFriendlyIdentifier(), destinationCrs.userFriendlyIdentifier(), desired );

QgsMessageBar *bar = QgisApp::instance()->messageBar();
QgsMessageBarItem *widget = bar->createMessage( QString(), shortMessage );
QgsMessageBarItem *widget = QgsMessageBar::createMessage( QString(), shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [longMessage]
{
@@ -317,7 +317,7 @@ void QgsAppMissingGridHandler::onDynamicToDynamicWarning( const QgsCoordinateRef
const QString longMessage = tr( "<p>Transformation between %1 and %2 is not currently supported.</p><p><b>The results will be unpredictable and should not be used for high accuracy work.</b>" ).arg( sourceCrs.userFriendlyIdentifier(), destinationCrs.userFriendlyIdentifier() );

QgsMessageBar *bar = QgisApp::instance()->messageBar();
QgsMessageBarItem *widget = bar->createMessage( QString(), shortMessage );
QgsMessageBarItem *widget = QgsMessageBar::createMessage( QString(), shortMessage );
QPushButton *detailsButton = new QPushButton( tr( "Details" ) );
connect( detailsButton, &QPushButton::clicked, this, [longMessage]
{
@@ -3096,8 +3096,6 @@ QgsGeometry QgsGeometry::unaryUnion( const QVector<QgsGeometry> &geometries )

QgsGeometry QgsGeometry::polygonize( const QVector<QgsGeometry> &geometryList )
{
QgsGeos geos( nullptr );

QVector<const QgsAbstractGeometry *> geomV2List;
for ( const QgsGeometry &g : geometryList )
{
@@ -3108,7 +3106,7 @@ QgsGeometry QgsGeometry::polygonize( const QVector<QgsGeometry> &geometryList )
}

QString error;
QgsGeometry result = geos.polygonize( geomV2List, &error );
QgsGeometry result = QgsGeos::polygonize( geomV2List, &error );
result.mLastError = error;
return result;
}
@@ -271,7 +271,7 @@ void QgsPalLayerSettings::initPropertyDefinitions()
Q_NOWARN_DEPRECATED_PUSH // because of deprecated members
QgsPalLayerSettings::QgsPalLayerSettings()
: predefinedPositionOrder( *DEFAULT_PLACEMENT_ORDER() )
, mCallout( QgsApplication::calloutRegistry()->defaultCallout() )
, mCallout( QgsCalloutRegistry::defaultCallout() )
{
initPropertyDefinitions();

@@ -1170,12 +1170,12 @@ void QgsPalLayerSettings::readXml( const QDomElement &elem, const QgsReadWriteCo
// TODO - replace with registry when multiple callout styles exist
const QString calloutType = elem.attribute( QStringLiteral( "calloutType" ) );
if ( calloutType.isEmpty() )
mCallout.reset( QgsApplication::calloutRegistry()->defaultCallout() );
mCallout.reset( QgsCalloutRegistry::defaultCallout() );
else
{
mCallout.reset( QgsApplication::calloutRegistry()->createCallout( calloutType, elem.firstChildElement( QStringLiteral( "callout" ) ), context ) );
if ( !mCallout )
mCallout.reset( QgsApplication::calloutRegistry()->defaultCallout() );
mCallout.reset( QgsCalloutRegistry::defaultCallout() );
}
}

@@ -1541,7 +1541,7 @@ QJsonObject QgsVectorLabelLegendNode::exportSymbolToJson( const QgsLegendSetting

double textWidth, textHeight;
textWidthHeight( textWidth, textHeight, ctx, textFormat, textLines );
const QPixmap previewPixmap = mLabelSettings.labelSettingsPreviewPixmap( mLabelSettings, QSize( textWidth, textHeight ), mLabelSettings.legendString() );
const QPixmap previewPixmap = QgsPalLayerSettings::labelSettingsPreviewPixmap( mLabelSettings, QSize( textWidth, textHeight ), mLabelSettings.legendString() );

QByteArray byteArray;
QBuffer buffer( &byteArray );
@@ -416,7 +416,8 @@ double QgsLayoutUtils::scaleFactorFromItemStyle( const QStyleOptionGraphicsItem

double QgsLayoutUtils::scaleFactorFromItemStyle( const QStyleOptionGraphicsItem *style, QPainter *painter )
{
return style->levelOfDetailFromTransform( painter->worldTransform() );
Q_UNUSED( style );
return QStyleOptionGraphicsItem::levelOfDetailFromTransform( painter->worldTransform() );
}

QgsMapLayer *QgsLayoutUtils::mapLayerFromString( const QString &string, QgsProject *project )
@@ -175,7 +175,7 @@ bool QgsMeshEditor::faceCanBeAdded( const QgsMeshFace &face )
return false;

// Check if there is topological error with the mesh
QgsTopologicalMesh::TopologicalFaces topologicalFaces = mTopologicalMesh.createNewTopologicalFaces( facesToAdd, true, error );
QgsTopologicalMesh::TopologicalFaces topologicalFaces = QgsTopologicalMesh::createNewTopologicalFaces( facesToAdd, true, error );
error = mTopologicalMesh.facesCanBeAdded( topologicalFaces );

if ( error.errorType != Qgis::MeshEditingErrorType::NoError )
@@ -519,7 +519,7 @@ QVector<QgsMeshFace> QgsMeshEditor::prepareFaces( const QVector<QgsMeshFace> &fa
break;
}

error = mTopologicalMesh.counterClockwiseFaces( face, mMesh );
error = QgsTopologicalMesh::counterClockwiseFaces( face, mMesh );
if ( error.errorType != Qgis::MeshEditingErrorType::NoError )
break;
}
@@ -535,7 +535,7 @@ QgsMeshEditingError QgsMeshEditor::addFaces( const QVector<QVector<int> > &faces
if ( error.errorType != Qgis::MeshEditingErrorType::NoError )
return error;

QgsTopologicalMesh::TopologicalFaces topologicalFaces = mTopologicalMesh.createNewTopologicalFaces( facesToAdd, true, error );
QgsTopologicalMesh::TopologicalFaces topologicalFaces = QgsTopologicalMesh::createNewTopologicalFaces( facesToAdd, true, error );

error = mTopologicalMesh.facesCanBeAdded( topologicalFaces );

@@ -70,7 +70,7 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
const auto constProxyFactories = nam->proxyFactories();
for ( QNetworkProxyFactory *f : constProxyFactories )
{
QList<QNetworkProxy> systemproxies = f->systemProxyForQuery( query );
QList<QNetworkProxy> systemproxies = QNetworkProxyFactory::systemProxyForQuery( query );
if ( !systemproxies.isEmpty() )
return systemproxies;

0 comments on commit aa730d6

Please sign in to comment.