use a pointer otherwise Python is creating a copy

3nids · 3nids · commit 4e2eb0eb9c85 · 2018-02-28T13:43:11.000-04:00
diff --git a/python/core/__init__.py b/python/core/__init__.py
@@ -210,6 +210,8 @@ def __exit__(self, ex_type, ex_value, traceback):
             self.layer.rollBack()
             return False
 
+# Python class to mimic QgsReadWriteContextCategoryPopper C++ class
+
 
 class ReadWriteContextEnterCategory():
     def __init__(self, context, category_name, details=None):
@@ -227,6 +229,7 @@ def __exit__(self, ex_type, ex_value, traceback):
         return True
 
 
+# Inject the context manager into QgsReadWriteContext class as a member
 QgsReadWriteContext.enterCategory = ReadWriteContextEnterCategory
 
 
diff --git a/python/core/qgsreadwritecontext.sip.in b/python/core/qgsreadwritecontext.sip.in
@@ -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
diff --git a/src/core/qgsreadwritecontext.cpp b/src/core/qgsreadwritecontext.cpp
@@ -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()
diff --git a/src/core/qgsreadwritecontext.h b/src/core/qgsreadwritecontext.h
@@ -122,10 +122,14 @@ class CORE_EXPORT QgsReadWriteContextCategoryPopper
 {
   public:
     //! Creates a popper
-    QgsReadWriteContextCategoryPopper( QgsReadWriteContext &context ) : mContext( context ) {}
-    ~QgsReadWriteContextCategoryPopper() {mContext.leaveCategory();}
+    QgsReadWriteContextCategoryPopper( QgsReadWriteContext *context ) : mContext( context ) {}
+    ~QgsReadWriteContextCategoryPopper()
+    {
+      if ( mContext )
+        mContext->leaveCategory();
+    }
   private:
-    QgsReadWriteContext mContext;
+    QgsReadWriteContext *mContext;
 };
 
 #endif // QGSREADWRITECONTEXT_H

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ QgsReadWriteContextCategoryPopper QgsReadWriteContext::enterCategory( const QStr`
`41`	`41`	`if ( !details.isEmpty() )`
`42`	`42`	`message.append( QString( " :: %1" ).arg( details ) );`
`43`	`43`	`mCategories.push_back( message );`
`44`		`- return QgsReadWriteContextCategoryPopper( *this );`
	`44`	`+ return QgsReadWriteContextCategoryPopper( this );`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`void QgsReadWriteContext::leaveCategory()`