Skip to content

Commit

Permalink
Line based exclusion doesn't seem to work with lambdas...
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Nov 20, 2019
1 parent 6ce8856 commit 1c128f9
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/core/layout/qgslayoutitemhtml.cpp
Expand Up @@ -35,6 +35,8 @@
#include <QImage>
#include <QNetworkReply>

// clazy:excludeall=lambda-in-connect

QgsLayoutItemHtml::QgsLayoutItemHtml( QgsLayout *layout )
: QgsLayoutMultiFrame( layout )
{
Expand Down Expand Up @@ -177,8 +179,8 @@ void QgsLayoutItemHtml::loadHtml( const bool useCache, const QgsExpressionContex
bool loaded = false;

QEventLoop loop;
connect( mWebPage.get(), &QWebPage::loadFinished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } ); // clazy:exclude=lambda-in-connect
connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } ); // clazy:exclude=lambda-in-connect
connect( mWebPage.get(), &QWebPage::loadFinished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } );
connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } );

//reset page size. otherwise viewport size increases but never decreases again
mWebPage->setViewportSize( QSize( maxFrameWidth() * mHtmlUnitsToLayoutUnits, 0 ) );
Expand Down Expand Up @@ -283,7 +285,7 @@ QString QgsLayoutItemHtml::fetchHtml( const QUrl &url )
//pause until HTML fetch
bool loaded = false;
QEventLoop loop;
connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } ); // clazy:exclude=lambda-in-connect
connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } );
mFetcher->fetchContent( url );

if ( !loaded )
Expand Down

0 comments on commit 1c128f9

Please sign in to comment.