restore QgsVectorLayer::setReadOnly (followup 4cd1e38)

qgis · Nov 20, 2015 · 79640ef · 79640ef
1 parent bbbf8a5
commit 79640ef
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -1006,7 +1006,7 @@ class QgsVectorLayer : QgsMapLayer
     /** Make layer read-only (editing disabled) or not
      *  @return false if the layer is in editing yet
      */
-    bool setFieldEditable( bool editable = true );
+    bool setReadOnly( bool readonly = true );
 
     /**
      * Make layer editable.

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2719,7 +2719,7 @@ bool QgsVectorLayer::isReadOnly() const
   return mReadOnly;
 }
 
-bool QgsVectorLayer::setFieldEditable( bool readonly )
+bool QgsVectorLayer::setReadOnly( bool readonly )
 {
   // exit if the layer is in editing mode
   if ( readonly && mEditBuffer )

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1126,7 +1126,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Make layer read-only (editing disabled) or not
      *  @return false if the layer is in editing yet
      */
-    bool setFieldEditable( bool editable = true );
+    bool setReadOnly( bool readonly = true );
 
     /**
      * Make layer editable.

diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
@@ -78,7 +78,7 @@ QgsGeometryCheckerResultTab::QgsGeometryCheckerResultTab( QgisInterface* iface,
 QgsGeometryCheckerResultTab::~QgsGeometryCheckerResultTab()
 {
   if ( mFeaturePool->getLayer() )
-    mFeaturePool->getLayer()->setFieldEditable( false );
+    mFeaturePool->getLayer()->setReadOnly( false );
   delete mChecker;
   delete mFeaturePool;
   qDeleteAll( mCurrentRubberBands );

diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
@@ -286,7 +286,7 @@ void QgsGeometryCheckerSetupTab::runChecks()
   emit checkerStarted( checker, featurePool );
 
   /** Add result layer (do this after checkerStarted, otherwise warning about removing of result layer may appear) **/
-  layer->setFieldEditable( true );
+  layer->setReadOnly( true );
   if ( ui.radioButtonOutputNew->isChecked() )
   {
     QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << layer );

diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapperdialog.cpp
@@ -261,7 +261,7 @@ void QgsGeometrySnapperDialog::run()
     }
   }
 
-  layer->setFieldEditable( true );
+  layer->setReadOnly( true );
   if ( ui.radioButtonOutputNew->isChecked() )
   {
     QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << layer );
@@ -294,7 +294,7 @@ void QgsGeometrySnapperDialog::run()
   ui.progressBar->hide();
   ui.widgetInputs->setEnabled( true );
 
-  layer->setFieldEditable( false );
+  layer->setReadOnly( false );
 
   /** Refresh canvas **/
   mIface->mapCanvas()->refresh();