Complete refactor of qgsdlgvectorlayerproperties to qgsvectorlayerproperties

timlinux · timlinux · commit 103bee1cebe9 · 2005-12-31T01:20:35.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4431 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/qgscontinuouscolrenderer.h b/src/qgscontinuouscolrenderer.h
@@ -24,7 +24,6 @@
 #include "qgspoint.h"
 #include "qgsfeature.h"
 #include <iostream>
-#include "qgsdlgvectorlayerproperties.h"
 
 class QgsSymbol;
 
diff --git a/src/qgssinglesymrenderer.h b/src/qgssinglesymrenderer.h
@@ -25,7 +25,6 @@
 #include "qgspoint.h"
 #include <qpainter.h>
 #include "qgsmaptopixel.h"
-#include "qgsdlgvectorlayerproperties.h"
 class QgsFeature;
 
 /**Render class to display all the features with a single QgsSymbol*/
diff --git a/src/qgsvectorlayer.h b/src/qgsvectorlayer.h
@@ -33,7 +33,6 @@ class QgsMapToPixel;
 class QgsData;
 class QgsRenderer;
 class QgsLegendItem;
-class QgsDlgVectorLayerProperties;
 class QgsGeometry;
 class QgsIdentifyResults;
 class QgsLabel;
@@ -49,7 +48,7 @@ class QgsLabel;
 #include "qgsgeometry.h"
 #include "qgsgeometryvertexindex.h"
 #include "qgsvectordataprovider.h"
-
+#include "qgsvectorlayerproperties.h"
 class QgsAttributeTableDisplay;
 
 /*! \class QgsVectorLayer
@@ -182,11 +181,11 @@ public slots:
   /**Sets the renderer. If a renderer is already present, it is deleted*/
   void setRenderer(QgsRenderer * r);
   /**Sets m_propertiesDialog*/
-  void setLayerProperties(QgsDlgVectorLayerProperties * properties);
+  void setLayerProperties(QgsVectorLayerProperties * properties);
   /**Returns point, line or polygon*/
   QGis::VectorType vectorType() const;
   /**Returns a pointer to the properties dialog*/
-  QgsDlgVectorLayerProperties *propertiesDialog();
+  QgsVectorLayerProperties *propertiesDialog();
   /**Returns the bounding box of the selected features. If there is no selection, QgsRect(0,0,0,0) is returned*/
   virtual QgsRect bBoxOfSelected();
   //! Return the provider type for this layer
@@ -445,7 +444,7 @@ public slots:
   /**Display labels */
   bool mLabelOn;
   /**Dialog to set the properties*/
-  QgsDlgVectorLayerProperties *m_propertiesDialog;
+  QgsVectorLayerProperties *m_propertiesDialog;
   /**Goes through all features and finds a free id (e.g. to give it temporarily to a not-commited feature)*/
   int findFreeId();
   /**Writes the changes to disk*/
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
@@ -25,7 +25,7 @@ qgis_ui_UIC =	\
 		qgsbookmarksbase.ui		\
 		qgscontcoldialogbase.ui			\
 		qgsdelattrdialogbase.ui			\
-		qgsdlgvectorlayerpropertiesbase.ui	\
+		qgsvectorlayerpropertiesbase.ui	\
 		qgsgeomtypedialogbase.ui		\
 		qgsgrasydialogbase.ui			\
 		qgshelpviewerbase.ui			\
@@ -93,7 +93,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
 		ui_qgsbookmarksbase.h		\
 		ui_qgscontcoldialogbase.h			\
 		ui_qgsdelattrdialogbase.h			\
-		ui_qgsdlgvectorlayerpropertiesbase.h	\
+		ui_qgsvectorlayerpropertiesbase.h	\
 		ui_qgsgeomtypedialogbase.h		\
 		ui_qgsgrasydialogbase.h			\
 		ui_qgshelpviewerbase.h			\
