renamed QgsUValDialog to QgsUniqueValueDialog

git-svn-id: http://svn.osgeo.org/qgis/trunk@4878 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/gui/Makefile.am

@@ -122,7 +122,7 @@ libqgis_guiHEADERS =							\
 		qgssinglesymbolrenderer.h			\
 		qgsspatialrefsys.h					\
 		qgsuniquevaluerenderer.h				\
-		qgsuvaldialog.h					\
+		qgsuniquevaluedialog.h					\
 		qgsvectorfilewriter.h				\
 		qgsvectorlayerproperties.h			
 
@@ -172,7 +172,7 @@ libqgis_gui_la_MOC =							\
 		qgsrunprocess.moc.cpp				\
 		qgsserversourceselect.moc.cpp		\
 		qgssinglesymboldialog.moc.cpp			\
-		qgsuvaldialog.moc.cpp			\
+		qgsuniquevaluedialog.moc.cpp			\
 		qgsvectorlayer.moc.cpp \
 		qgsvectorlayerproperties.moc.cpp	
 
@@ -233,7 +233,7 @@ libqgis_gui_la_SOURCES =						\
 		qgssinglesymbolrenderer.cpp			\
 		qgsspatialrefsys.cpp				\
 		qgsuniquevaluerenderer.cpp			\
-		qgsuvaldialog.cpp		\
+		qgsuniquevaluedialog.cpp		\
 		qgsvectorfilewriter.cpp				\
 		qgsvectorlayer.cpp \
 		qgsvectorlayerproperties.cpp	

src/gui/qgsuniquevaluedialog.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgsuvaldialog.cpp  -  description
+                         qgsuniquevaluedialog.cpp  -  description
                              -------------------
     begin                : July 2004
     copyright            : (C) 2004 by Marco Hugentobler
@@ -16,7 +16,7 @@
  ***************************************************************************/
 /* $Id$ */
 
-#include "qgsuvaldialog.h"
+#include "qgsuniquevaluedialog.h"
 #include "qgsfeature.h"
 #include "qgsfeatureattribute.h"
 #include "qgssymbol.h"
@@ -25,7 +25,7 @@
 #include "qgsvectorlayer.h"
 
 
-QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), sydialog(vl)
+QgsUniqueValueDialog::QgsUniqueValueDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), sydialog(vl)
 {
     setupUi(this);
     setSizeGripEnabled(true); 
@@ -48,7 +48,7 @@ QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), s
     } 
     else
     {
-	qWarning("Warning, data provider is null in QgsUValDialog::QgsUValDialog");
+	qWarning("Warning, data provider is null in QgsUniqueValueDialog::QgsUniqueValueDialog");
 	return;
     }
 
@@ -95,7 +95,7 @@ QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), s
     mClassBreakBox->setCurrentItem(0);
 }
 
-QgsUValDialog::~QgsUValDialog()
+QgsUniqueValueDialog::~QgsUniqueValueDialog()
 {
     std::map<QString, QgsSymbol *>::iterator myValueIterator = mValues.begin();
     while ( myValueIterator != mValues.end() )
@@ -110,7 +110,7 @@ QgsUValDialog::~QgsUValDialog()
     mClassBreakBox->setCurrentItem(0);
 }
 
-void QgsUValDialog::apply()
+void QgsUniqueValueDialog::apply()
 {
     QgsUniqueValueRenderer *renderer = new QgsUniqueValueRenderer(mVectorLayer->vectorType());
 
@@ -134,7 +134,7 @@ void QgsUValDialog::apply()
     mVectorLayer->refreshLegend();
 }
 
-void QgsUValDialog::changeClassificationAttribute(int nr)
+void QgsUniqueValueDialog::changeClassificationAttribute(int nr)
 {
     //delete old entries
     for(std::map<QString,QgsSymbol*>::iterator it=mValues.begin();it!=mValues.end();++it)
@@ -206,7 +206,7 @@ void QgsUValDialog::changeClassificationAttribute(int nr)
     mClassBreakBox->setCurrentItem(0);
 }
 
-void QgsUValDialog::changeCurrentValue()
+void QgsUniqueValueDialog::changeCurrentValue()
 {
     sydialog.blockSignals(true);//block signal to prevent sydialog from changing the current QgsRenderItem
     Q3ListBoxItem* item=mClassBreakBox->selectedItem();
@@ -224,7 +224,7 @@ void QgsUValDialog::changeCurrentValue()
     sydialog.blockSignals(false);
 }
 
-void QgsUValDialog::applySymbologyChanges()
+void QgsUniqueValueDialog::applySymbologyChanges()
 {
   Q3ListBoxItem* item=mClassBreakBox->selectedItem();
   QString value=item->text();

src/gui/qgsuniquevaluedialog.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgsuvaldialog.h  -  description
+                         qgsuniquevaluedialog.h  -  description
                              -------------------
     begin                : July 2004
     copyright            : (C) 2004 by Marco Hugentobler
@@ -16,22 +16,22 @@
  ***************************************************************************/
 /* $Id$ */
 
-#ifndef QGSUVALDIALOG_H
-#define QGSUVALDIALOG_H
+#ifndef QGSUNIQUEVALUEDIALOG_H
+#define QGSUNIQUEVALUEDIALOG_H
 
-#include "ui_qgsuvaldialogbase.h"
+#include "ui_qgsuniquevaluedialogbase.h"
 #include "qgssinglesymboldialog.h"
 #include <map>
 
 class QgsVectorLayer;
 
 
-class QgsUValDialog: public QDialog, private Ui::QgsUValDialogBase
+class QgsUniqueValueDialog: public QDialog, private Ui::QgsUniqueValueDialogBase
 {
     Q_OBJECT
  public:
-    QgsUValDialog(QgsVectorLayer* vl);
-    ~QgsUValDialog();
+    QgsUniqueValueDialog(QgsVectorLayer* vl);
+    ~QgsUniqueValueDialog();
 
  public slots:
      void apply();

src/gui/qgsuniquevaluerenderer.cpp

@@ -16,13 +16,11 @@
  ***************************************************************************/
 /* $Id$ */
 #include "qgsuniquevaluerenderer.h"
-#include "qgsuvaldialog.h"
 #include "qgsfeatureattribute.h"
 #include "qgsfeature.h"
 #include "qgsvectorlayer.h"
 #include "qgssymbol.h"
 #include "qgssymbologyutils.h"
-#include "qgsuvaldialog.h"
 #include "qgssvgcache.h"
 #include <QDomNode>
 #include <QPainter>

src/gui/qgsvectorlayerproperties.cpp

@@ -24,7 +24,7 @@
 #include "qgslabeldialog.h"
 #include "qgslayerprojectionselector.h"
 #include "qgssinglesymboldialog.h"
-#include "qgsuvaldialog.h"
+#include "qgsuniquevaluedialog.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 #ifdef HAVE_POSTGRESQL
@@ -105,7 +105,7 @@ void QgsVectorLayerProperties::alterLayerDialog(const QString & dialogString)
     }
     else if(dialogString == tr("Unique Value"))
     {
-	mRendererDialog = new QgsUValDialog(layer);
+	mRendererDialog = new QgsUniqueValueDialog(layer);
     }
     widgetStackRenderers->addWidget(mRendererDialog);
     widgetStackRenderers->raiseWidget(mRendererDialog);  
@@ -200,7 +200,7 @@ void QgsVectorLayerProperties::reset( void )
   }
   else if(rtype == "Unique Value")
   {
-      mRendererDialog=new QgsUValDialog(layer);
+      mRendererDialog=new QgsUniqueValueDialog(layer);
       legendtypecombobox->setCurrentIndex(3);
   }
 
@@ -280,7 +280,7 @@ void QgsVectorLayerProperties::on_pbnApply_clicked()
   QgsSingleSymbolDialog *sdialog = dynamic_cast < QgsSingleSymbolDialog * >(widgetStackRenderers->visibleWidget());
   QgsGraduatedSymbolDialog *gdialog = dynamic_cast < QgsGraduatedSymbolDialog * >(widgetStackRenderers->visibleWidget());
   QgsContinuousColorDialog *cdialog = dynamic_cast < QgsContinuousColorDialog * >(widgetStackRenderers->visibleWidget());
-  QgsUValDialog* udialog = dynamic_cast< QgsUValDialog * >(widgetStackRenderers->visibleWidget()); 
+  QgsUniqueValueDialog* udialog = dynamic_cast< QgsUniqueValueDialog * >(widgetStackRenderers->visibleWidget()); 
 
   if (sdialog)
     {

src/ui/Makefile.am

@@ -144,7 +144,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
 		ui_qgspatterndialogbase.h \
 		ui_qgslinestyledialogbase.h \
 		ui_qgsmarkerdialogbase.h \
-		ui_qgsuvaldialogbase.h \
+		ui_qgsuniquevaluedialogbase.h \
 		ui_qgsnewhttpconnectionbase.h \
 		ui_qgsnewconnectionbase.h \
 		../widgets/projectionselector/ui_qgsprojectionselectorbase.h

qgsuniquevaluedialogbase.ui → src/ui/qgsuniquevaluedialogbase.ui

@@ -2,7 +2,7 @@
  <author></author>
  <comment></comment>
  <exportmacro></exportmacro>
- <class>QgsUValDialogBase</class>
+ <class>QgsUniqueValueDialogBase</class>
  <widget class="QDialog" name="QgsUValDialogBase" >
   <property name="geometry" >
    <rect>