Skip to content
Permalink
Browse files

correctly use reference for context in QgsReadWriteContextCategoryPopper

  • Loading branch information
3nids committed Mar 1, 2018
1 parent 3c78fb5 commit a483ef817aba799c02a444fe5cf21857f47b6246
Showing with 5 additions and 9 deletions.
  1. +1 −1 python/core/qgsreadwritecontext.sip.in
  2. +1 −1 src/core/qgsreadwritecontext.cpp
  3. +3 −7 src/core/qgsreadwritecontext.h
@@ -116,7 +116,7 @@ This would happen when it gets out of scope.
#include "qgsreadwritecontext.h"
%End
public:
QgsReadWriteContextCategoryPopper( QgsReadWriteContext *context );
QgsReadWriteContextCategoryPopper( QgsReadWriteContext &context );
%Docstring
Creates a popper
%End
@@ -41,7 +41,7 @@ QgsReadWriteContextCategoryPopper QgsReadWriteContext::enterCategory( const QStr
if ( !details.isEmpty() )
message.append( QString( " :: %1" ).arg( details ) );
mCategories.push_back( message );
return QgsReadWriteContextCategoryPopper( this );
return QgsReadWriteContextCategoryPopper( *this );
}

void QgsReadWriteContext::leaveCategory()
@@ -124,14 +124,10 @@ class CORE_EXPORT QgsReadWriteContextCategoryPopper
{
public:
//! Creates a popper
QgsReadWriteContextCategoryPopper( QgsReadWriteContext *context ) : mContext( context ) {}
~QgsReadWriteContextCategoryPopper()
{
if ( mContext )
mContext->leaveCategory();
}
QgsReadWriteContextCategoryPopper( QgsReadWriteContext &context ) : mContext( context ) {}
~QgsReadWriteContextCategoryPopper() {mContext.leaveCategory();}
private:
QgsReadWriteContext *mContext;
QgsReadWriteContext &mContext;
};

#endif // QGSREADWRITECONTEXT_H

0 comments on commit a483ef8

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