Skip to content

Commit 0f22825

Browse files
author
mhugent
committedFeb 18, 2006
renamed QgsUValDialog to QgsUniqueValueDialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@4878 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 229c62a commit 0f22825

File tree

7 files changed

+25
-27
lines changed

7 files changed

+25
-27
lines changed
 

‎src/gui/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ libqgis_guiHEADERS = \
122122
qgssinglesymbolrenderer.h \
123123
qgsspatialrefsys.h \
124124
qgsuniquevaluerenderer.h \
125-
qgsuvaldialog.h \
125+
qgsuniquevaluedialog.h \
126126
qgsvectorfilewriter.h \
127127
qgsvectorlayerproperties.h
128128

@@ -172,7 +172,7 @@ libqgis_gui_la_MOC = \
172172
qgsrunprocess.moc.cpp \
173173
qgsserversourceselect.moc.cpp \
174174
qgssinglesymboldialog.moc.cpp \
175-
qgsuvaldialog.moc.cpp \
175+
qgsuniquevaluedialog.moc.cpp \
176176
qgsvectorlayer.moc.cpp \
177177
qgsvectorlayerproperties.moc.cpp
178178

@@ -233,7 +233,7 @@ libqgis_gui_la_SOURCES = \
233233
qgssinglesymbolrenderer.cpp \
234234
qgsspatialrefsys.cpp \
235235
qgsuniquevaluerenderer.cpp \
236-
qgsuvaldialog.cpp \
236+
qgsuniquevaluedialog.cpp \
237237
qgsvectorfilewriter.cpp \
238238
qgsvectorlayer.cpp \
239239
qgsvectorlayerproperties.cpp

‎src/gui/qgsuniquevaluedialog.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsuvaldialog.cpp - description
2+
qgsuniquevaluedialog.cpp - description
33
-------------------
44
begin : July 2004
55
copyright : (C) 2004 by Marco Hugentobler
@@ -16,7 +16,7 @@
1616
***************************************************************************/
1717
/* $Id$ */
1818

19-
#include "qgsuvaldialog.h"
19+
#include "qgsuniquevaluedialog.h"
2020
#include "qgsfeature.h"
2121
#include "qgsfeatureattribute.h"
2222
#include "qgssymbol.h"
@@ -25,7 +25,7 @@
2525
#include "qgsvectorlayer.h"
2626

2727

28-
QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), sydialog(vl)
28+
QgsUniqueValueDialog::QgsUniqueValueDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), sydialog(vl)
2929
{
3030
setupUi(this);
3131
setSizeGripEnabled(true);
@@ -48,7 +48,7 @@ QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), s
4848
}
4949
else
5050
{
51-
qWarning("Warning, data provider is null in QgsUValDialog::QgsUValDialog");
51+
qWarning("Warning, data provider is null in QgsUniqueValueDialog::QgsUniqueValueDialog");
5252
return;
5353
}
5454

@@ -95,7 +95,7 @@ QgsUValDialog::QgsUValDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), s
9595
mClassBreakBox->setCurrentItem(0);
9696
}
9797

98-
QgsUValDialog::~QgsUValDialog()
98+
QgsUniqueValueDialog::~QgsUniqueValueDialog()
9999
{
100100
std::map<QString, QgsSymbol *>::iterator myValueIterator = mValues.begin();
101101
while ( myValueIterator != mValues.end() )
@@ -110,7 +110,7 @@ QgsUValDialog::~QgsUValDialog()
110110
mClassBreakBox->setCurrentItem(0);
111111
}
112112

113-
void QgsUValDialog::apply()
113+
void QgsUniqueValueDialog::apply()
114114
{
115115
QgsUniqueValueRenderer *renderer = new QgsUniqueValueRenderer(mVectorLayer->vectorType());
116116

@@ -134,7 +134,7 @@ void QgsUValDialog::apply()
134134
mVectorLayer->refreshLegend();
135135
}
136136

137-
void QgsUValDialog::changeClassificationAttribute(int nr)
137+
void QgsUniqueValueDialog::changeClassificationAttribute(int nr)
138138
{
139139
//delete old entries
140140
for(std::map<QString,QgsSymbol*>::iterator it=mValues.begin();it!=mValues.end();++it)
@@ -206,7 +206,7 @@ void QgsUValDialog::changeClassificationAttribute(int nr)
206206
mClassBreakBox->setCurrentItem(0);
207207
}
208208

209-
void QgsUValDialog::changeCurrentValue()
209+
void QgsUniqueValueDialog::changeCurrentValue()
210210
{
211211
sydialog.blockSignals(true);//block signal to prevent sydialog from changing the current QgsRenderItem
212212
Q3ListBoxItem* item=mClassBreakBox->selectedItem();
@@ -224,7 +224,7 @@ void QgsUValDialog::changeCurrentValue()
224224
sydialog.blockSignals(false);
225225
}
226226

227-
void QgsUValDialog::applySymbologyChanges()
227+
void QgsUniqueValueDialog::applySymbologyChanges()
228228
{
229229
Q3ListBoxItem* item=mClassBreakBox->selectedItem();
230230
QString value=item->text();

‎src/gui/qgsuniquevaluedialog.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsuvaldialog.h - description
2+
qgsuniquevaluedialog.h - description
33
-------------------
44
begin : July 2004
55
copyright : (C) 2004 by Marco Hugentobler
@@ -16,22 +16,22 @@
1616
***************************************************************************/
1717
/* $Id$ */
1818

19-
#ifndef QGSUVALDIALOG_H
20-
#define QGSUVALDIALOG_H
19+
#ifndef QGSUNIQUEVALUEDIALOG_H
20+
#define QGSUNIQUEVALUEDIALOG_H
2121

22-
#include "ui_qgsuvaldialogbase.h"
22+
#include "ui_qgsuniquevaluedialogbase.h"
2323
#include "qgssinglesymboldialog.h"
2424
#include <map>
2525

2626
class QgsVectorLayer;
2727

2828

29-
class QgsUValDialog: public QDialog, private Ui::QgsUValDialogBase
29+
class QgsUniqueValueDialog: public QDialog, private Ui::QgsUniqueValueDialogBase
3030
{
3131
Q_OBJECT
3232
public:
33-
QgsUValDialog(QgsVectorLayer* vl);
34-
~QgsUValDialog();
33+
QgsUniqueValueDialog(QgsVectorLayer* vl);
34+
~QgsUniqueValueDialog();
3535

3636
public slots:
3737
void apply();

‎src/gui/qgsuniquevaluerenderer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
***************************************************************************/
1717
/* $Id$ */
1818
#include "qgsuniquevaluerenderer.h"
19-
#include "qgsuvaldialog.h"
2019
#include "qgsfeatureattribute.h"
2120
#include "qgsfeature.h"
2221
#include "qgsvectorlayer.h"
2322
#include "qgssymbol.h"
2423
#include "qgssymbologyutils.h"
25-
#include "qgsuvaldialog.h"
2624
#include "qgssvgcache.h"
2725
#include <QDomNode>
2826
#include <QPainter>

‎src/gui/qgsvectorlayerproperties.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "qgslabeldialog.h"
2525
#include "qgslayerprojectionselector.h"
2626
#include "qgssinglesymboldialog.h"
27-
#include "qgsuvaldialog.h"
27+
#include "qgsuniquevaluedialog.h"
2828
#include "qgsvectordataprovider.h"
2929
#include "qgsvectorlayer.h"
3030
#ifdef HAVE_POSTGRESQL
@@ -105,7 +105,7 @@ void QgsVectorLayerProperties::alterLayerDialog(const QString & dialogString)
105105
}
106106
else if(dialogString == tr("Unique Value"))
107107
{
108-
mRendererDialog = new QgsUValDialog(layer);
108+
mRendererDialog = new QgsUniqueValueDialog(layer);
109109
}
110110
widgetStackRenderers->addWidget(mRendererDialog);
111111
widgetStackRenderers->raiseWidget(mRendererDialog);
@@ -200,7 +200,7 @@ void QgsVectorLayerProperties::reset( void )
200200
}
201201
else if(rtype == "Unique Value")
202202
{
203-
mRendererDialog=new QgsUValDialog(layer);
203+
mRendererDialog=new QgsUniqueValueDialog(layer);
204204
legendtypecombobox->setCurrentIndex(3);
205205
}
206206

@@ -280,7 +280,7 @@ void QgsVectorLayerProperties::on_pbnApply_clicked()
280280
QgsSingleSymbolDialog *sdialog = dynamic_cast < QgsSingleSymbolDialog * >(widgetStackRenderers->visibleWidget());
281281
QgsGraduatedSymbolDialog *gdialog = dynamic_cast < QgsGraduatedSymbolDialog * >(widgetStackRenderers->visibleWidget());
282282
QgsContinuousColorDialog *cdialog = dynamic_cast < QgsContinuousColorDialog * >(widgetStackRenderers->visibleWidget());
283-
QgsUValDialog* udialog = dynamic_cast< QgsUValDialog * >(widgetStackRenderers->visibleWidget());
283+
QgsUniqueValueDialog* udialog = dynamic_cast< QgsUniqueValueDialog * >(widgetStackRenderers->visibleWidget());
284284

285285
if (sdialog)
286286
{

‎src/ui/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
144144
ui_qgspatterndialogbase.h \
145145
ui_qgslinestyledialogbase.h \
146146
ui_qgsmarkerdialogbase.h \
147-
ui_qgsuvaldialogbase.h \
147+
ui_qgsuniquevaluedialogbase.h \
148148
ui_qgsnewhttpconnectionbase.h \
149149
ui_qgsnewconnectionbase.h \
150150
../widgets/projectionselector/ui_qgsprojectionselectorbase.h

‎qgsuniquevaluedialogbase.ui renamed to ‎src/ui/qgsuniquevaluedialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<author></author>
33
<comment></comment>
44
<exportmacro></exportmacro>
5-
<class>QgsUValDialogBase</class>
5+
<class>QgsUniqueValueDialogBase</class>
66
<widget class="QDialog" name="QgsUValDialogBase" >
77
<property name="geometry" >
88
<rect>

0 commit comments

Comments
 (0)
Please sign in to comment.