sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

run astyle

Browse Source
This commit is contained in:
Denis Rouzaud 2018-01-22 21:31:27 -04:00
parent 834a945c5f
commit 50e1e78113
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/layout/qgslayoutapputils.cpp
View File

@ -292,7 +292,7 @@ void QgsLayoutAppUtils::registerGuiForKnownItemTypes()
{
return new QgsLayoutHtmlWidget( qobject_cast< QgsLayoutFrame * >( item ) );
}, createRubberBand );
htmlItemMetadata->setItemCreationFunction( [ = ]( QgsLayout * layout )->QgsLayoutItem*
htmlItemMetadata->setItemCreationFunction( [ = ]( QgsLayout * layout )->QgsLayoutItem *
{
std::unique_ptr< QgsLayoutItemHtml > htmlMultiFrame = qgis::make_unique< QgsLayoutItemHtml >( layout );
QgsLayoutItemHtml *html = htmlMultiFrame.get();
@ -311,7 +311,7 @@ void QgsLayoutAppUtils::registerGuiForKnownItemTypes()
{
return new QgsLayoutAttributeTableWidget( qobject_cast< QgsLayoutFrame * >( item ) );
}, createRubberBand );
attributeTableItemMetadata->setItemCreationFunction( [ = ]( QgsLayout * layout )->QgsLayoutItem*
attributeTableItemMetadata->setItemCreationFunction( [ = ]( QgsLayout * layout )->QgsLayoutItem *
{
std::unique_ptr< QgsLayoutItemAttributeTable > tableMultiFrame = qgis::make_unique< QgsLayoutItemAttributeTable >( layout );
QgsLayoutItemAttributeTable *table = tableMultiFrame.get();

4
src/core/gps/qgsgpsdetector.cpp
View File

@ -45,8 +45,8 @@ QList< QPair<QString, QString> > QgsGpsDetector::availablePorts()
#ifdef Q_OS_LINUX
// look for linux serial devices
const QStringList devices { QStringLiteral( "/dev/ttyS%1" ),
QStringLiteral( "/dev/ttyUSB%1" ),
QStringLiteral( "/dev/rfcomm%1" ), QStringLiteral( "/dev/ttyACM%1" ) };
QStringLiteral( "/dev/ttyUSB%1" ),
QStringLiteral( "/dev/rfcomm%1" ), QStringLiteral( "/dev/ttyACM%1" ) };
for ( const QString &linuxDev : devices )
{
for ( int i = 0; i < 10; ++i )

2
src/core/layout/qgslayoutitemregistry.cpp
View File

@ -51,7 +51,7 @@ bool QgsLayoutItemRegistry::populate()
#if 0
// add temporary item to register
auto createTemporaryItem = []( QgsLayout * layout )->QgsLayoutItem*
auto createTemporaryItem = []( QgsLayout * layout )->QgsLayoutItem *
{
return new TestLayoutItem( layout );
};