Skip to content
Permalink
Browse files

Merge pull request #5444 from m-kuhn/shhhht

Shhhht
  • Loading branch information
m-kuhn committed Oct 25, 2017
2 parents ceb31fa + 4567e80 commit 8f8e806b737b60dd18266e7d6310f75197fb4a2d
@@ -1117,17 +1117,14 @@ void QgsPluginManager::setCurrentTab( int idx )
{
if ( idx == PLUGMAN_TAB_SETTINGS )
{
QgsDebugMsg( "Switching current tab to Settings" );
mOptionsStackedWidget->setCurrentIndex( 2 );
}
else if ( idx == PLUGMAN_TAB_INSTALL_FROM_ZIP )
{
QgsDebugMsg( "Switching current tab to Install from ZIP" );
mOptionsStackedWidget->setCurrentIndex( 1 );
}
else
{
QgsDebugMsg( "Switching current tab to Plugins" );
mOptionsStackedWidget->setCurrentIndex( 0 );

QStringList acceptedStatuses;
@@ -616,7 +616,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat

tblResults->setRowCount( j + 1 );

QgsDebugMsg( QString( "adding item #%1 / %2 / %3 / %4" ).arg( j ).arg( vlayer->name(), vlayer->attributeDisplayName( i ), value2 ) );
QgsDebugMsgLevel( QStringLiteral( "adding item #%1 / %2 / %3 / %4" ).arg( j ).arg( vlayer->name(), vlayer->attributeDisplayName( i ), value2 ), 4 );

QTableWidgetItem *item = new QTableWidgetItem( vlayer->name() );
item->setData( Qt::UserRole, QVariant::fromValue( qobject_cast<QObject *>( vlayer ) ) );
@@ -38,7 +38,7 @@
* See details in QEP #17
****************************************************************************/

class CORE_EXPORT QgsFieldsPrivate : public QSharedData
class QgsFieldsPrivate : public QSharedData
{
public:

@@ -1066,7 +1066,7 @@ bool QgsPostgresConn::openCursor( const QString &cursorName, const QString &sql
{
if ( mOpenCursors++ == 0 && !mTransaction )
{
QgsDebugMsg( QString( "Starting read-only transaction: %1" ).arg( mPostgresqlVersion ) );
QgsDebugMsgLevel( QString( "Starting read-only transaction: %1" ).arg( mPostgresqlVersion ), 4 );
if ( mPostgresqlVersion >= 80000 )
PQexecNR( QStringLiteral( "BEGIN READ ONLY" ) );
else
@@ -1084,7 +1084,7 @@ bool QgsPostgresConn::closeCursor( const QString &cursorName )

if ( --mOpenCursors == 0 && !mTransaction )
{
QgsDebugMsg( "Committing read-only transaction" );
QgsDebugMsgLevel( "Committing read-only transaction", 4 );
PQexecNR( QStringLiteral( "COMMIT" ) );
}

@@ -611,7 +611,10 @@ static void _drawDebugRect( QPainter &p, const QRectF &rect, const QColor &color

QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, int pixelHeight, QgsRasterBlockFeedback *feedback )
{
QgsDebugMsg( "Entering." );
if ( QgsApplication::instance()->thread() != QThread::currentThread() )
{
QgsDebugMsg( "Trying to draw a WMS image on the main thread. Stop it!" );
}

// compose the URL query string for the WMS server.

0 comments on commit 8f8e806

Please sign in to comment.
You can’t perform that action at this time.