fix some attribute editor signals

qgis · Nov 7, 2012 · e15f4a8 · e15f4a8
1 parent 484f72c
commit e15f4a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -214,8 +214,8 @@ QgsFieldsProperties::QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent
   mAttributesTreeFrame->setLayout( attrTreeLayout );
   mAttributesListFrame->setLayout( attrListLayout );
 
-  connect( mAttributesTree, SIGNAL( itemSelectionChanged() ), this, SLOT( on_attributeSelectionChanged() ) );
-  connect( mAttributesList, SIGNAL( itemSelectionChanged() ), this, SLOT( on_attributeSelectionChanged() ) );
+  connect( mAttributesTree, SIGNAL( itemSelectionChanged() ), this, SLOT( onAttributeSelectionChanged() ) );
+  connect( mAttributesList, SIGNAL( itemSelectionChanged() ), this, SLOT( onAttributeSelectionChanged() ) );
 
   mAttributesTree->setHeaderLabels( QStringList() << tr( "Label" ) );
 
@@ -233,7 +233,7 @@ void QgsFieldsProperties::init()
   loadRows();
 }
 
-void QgsFieldsProperties::on_attributeSelectionChanged()
+void QgsFieldsProperties::onAttributeSelectionChanged()
 {
   bool isAddPossible = false;
   if ( mAttributesTree->selectedItems().count() == 1 && mAttributesList->selectedItems().count() > 0 )

diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
@@ -96,13 +96,13 @@ class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
     void on_mAddAttributeButton_clicked();
     void on_mDeleteAttributeButton_clicked();
     void on_mCalculateFieldButton_clicked();
-    void on_attributeSelectionChanged();
+    void onAttributeSelectionChanged();
     void on_mAttributesList_cellChanged( int row, int column );
     void on_pbnSelectEditForm_clicked();
     void on_mEditorLayoutComboBox_currentIndexChanged( int index );
+
     void addAttribute();
     void deleteAttribute();
-
     void attributeAdded( int idx );
     void attributeDeleted( int idx );
     void attributeTypeDialog();
@@ -113,19 +113,18 @@ class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
     void on_mMoveDownItem_clicked();
     void on_mMoveUpItem_clicked();
 
+  protected slots:
+    /** toggle editing of layer */
+    void toggleEditing();
 
+    /** editing of layer was toggled */
+    void editingToggled();
 
   protected:
     QgsVectorLayer* mLayer;
     QgsAttributesTree* mAttributesTree;
     QgsAttributesList* mAttributesList;
 
-    /** toggle editing of layer */
-    void toggleEditing();
-
-    /** editing of layer was toggled */
-    void editingToggled();
-
     QMap<int, QgsVectorLayer::ValueRelationData> mValueRelationData;
     QMap<int, QMap<QString, QVariant> > mValueMaps;
     QMap<int, QgsVectorLayer::RangeData> mRanges;