Skip to content

Commit

Permalink
run astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Jan 23, 2018
1 parent 834a945 commit 50e1e78
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/app/layout/qgslayoutapputils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/core/gps/qgsgpsdetector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitemregistry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
};
Expand Down

0 comments on commit 50e1e78

Please sign in to comment.