Skip to content

Commit f2c3fb0

Browse files
3nids3nids
committed
renamed QgsSymbolLevelsV2Dialog to QgsSymbolLevelsDialog
1 parent 275736d commit f2c3fb0

11 files changed

+39
-38
lines changed

‎doc/api_break.dox

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
3030
<tr><td>QgsSymbolLayerV2Registry <td>QgsSymbolLayerRegistry
3131
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
3232
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
33+
<tr><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
3334
<tr><th>QgsSymbolV2 <th>QgsSymbol
3435
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
3536
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem

‎python/gui/gui.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
%Include symbology-ng/qgsstylev2managerdialog.sip
245245
%Include symbology-ng/qgssvgselectorwidget.sip
246246
%Include symbology-ng/qgssymbollayerwidget.sip
247-
%Include symbology-ng/qgssymbollevelsv2dialog.sip
247+
%Include symbology-ng/qgssymbollevelsdialog.sip
248248
%Include symbology-ng/qgssymbolslistwidget.sip
249249
%Include symbology-ng/qgssymbolselectordialog.sip
250250
%Include symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip

‎python/gui/symbology-ng/qgssymbollevelsv2dialog.sip renamed to ‎python/gui/symbology-ng/qgssymbollevelsdialog.sip

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
class QgsSymbolLevelsV2Dialog : QDialog
1+
class QgsSymbolLevelsDialog : QDialog
22
{
33
%TypeHeaderCode
4-
#include <qgssymbollevelsv2dialog.h>
4+
#include <qgssymbollevelsdialog.h>
55
%End
66

77
public:
88
//! @note not available in python bindings
9-
// QgsSymbolLevelsV2Dialog( const QList< QPair<QString, QgsSymbol*> >& list, bool usingSymbolLevels, QWidget* parent = NULL );
9+
// QgsSymbolLevelsDialog( const QList< QPair<QString, QgsSymbol*> >& list, bool usingSymbolLevels, QWidget* parent = NULL );
1010

1111
bool usingLevels() const;
1212

@@ -25,5 +25,5 @@ class QgsSymbolLevelsV2Dialog : QDialog
2525
//void setDefaultLevels();
2626

2727
private:
28-
QgsSymbolLevelsV2Dialog();
28+
QgsSymbolLevelsDialog();
2929
};

‎resources/customization.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
<widget objectName="QgsTileScaleWidget" class="QWidget" label="">
397397
<widget objectName="mSlider" class="QSlider" label=""/>
398398
</widget>
399-
<widget objectName="QgsSymbolLevelsV2DialogBase" class="QDialog" label="">
399+
<widget objectName="QgsSymbolLevelsDialogBase" class="QDialog" label="">
400400
<widget objectName="chkEnable" class="QCheckBox" label="Enable symbol levels"/>
401401
<widget objectName="label" class="QLabel" label="Define the order in which the symbol layers are rendered. The numbers in the cells define in which rendering pass the layer will be drawn."/>
402402
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>

‎src/gui/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SET(QGIS_GUI_SRCS
3939
symbology-ng/qgsstylev2managerdialog.cpp
4040
symbology-ng/qgssvgselectorwidget.cpp
4141
symbology-ng/qgssymbollayerwidget.cpp
42-
symbology-ng/qgssymbollevelsv2dialog.cpp
42+
symbology-ng/qgssymbollevelsdialog.cpp
4343
symbology-ng/qgssymbolslistwidget.cpp
4444
symbology-ng/qgssymbolselectordialog.cpp
4545
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
@@ -488,7 +488,7 @@ SET(QGIS_GUI_MOC_HDRS
488488
symbology-ng/qgsstylev2managerdialog.h
489489
symbology-ng/qgssvgselectorwidget.h
490490
symbology-ng/qgssymbollayerwidget.h
491-
symbology-ng/qgssymbollevelsv2dialog.h
491+
symbology-ng/qgssymbollevelsdialog.h
492492
symbology-ng/qgssymbolslistwidget.h
493493
symbology-ng/qgssymbolselectordialog.h
494494
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h

‎src/gui/symbology-ng/qgsrendererv2widget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "qgssymbol.h"
1717
#include "qgsvectorlayer.h"
1818
#include "qgscolordialog.h"
19-
#include "qgssymbollevelsv2dialog.h"
19+
#include "qgssymbollevelsdialog.h"
2020
#include "qgsexpressionbuilderdialog.h"
2121
#include "qgsmapcanvas.h"
2222
#include "qgspanelwidget.h"
@@ -250,7 +250,7 @@ void QgsRendererV2Widget::showSymbolLevelsDialog( QgsFeatureRendererV2* r )
250250
{
251251
QgsLegendSymbolList symbols = r->legendSymbolItems();
252252

253-
QgsSymbolLevelsV2Dialog dlg( symbols, r->usingSymbolLevels(), this );
253+
QgsSymbolLevelsDialog dlg( symbols, r->usingSymbolLevels(), this );
254254

255255
if ( dlg.exec() )
256256
{

‎src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,13 @@ void QgsRuleBasedRendererV2Widget::keyPressEvent( QKeyEvent* event )
392392
}
393393
}
394394

395-
#include "qgssymbollevelsv2dialog.h"
395+
#include "qgssymbollevelsdialog.h"
396396

397397
void QgsRuleBasedRendererV2Widget::setRenderingOrder()
398398
{
399399
QgsLegendSymbolList lst = mRenderer->legendSymbolItems();
400400

401-
QgsSymbolLevelsV2Dialog dlg( lst, true, this );
401+
QgsSymbolLevelsDialog dlg( lst, true, this );
402402
dlg.setForceOrderingEnabled( true );
403403

404404
dlg.exec();

‎src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp renamed to ‎src/gui/symbology-ng/qgssymbollevelsdialog.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgssymbollevelsv2dialog.cpp
2+
qgssymbollevelsdialog.cpp
33
---------------------
44
begin : November 2009
55
copyright : (C) 2009 by Martin Dobias
@@ -13,7 +13,7 @@
1313
* *
1414
***************************************************************************/
1515

16-
#include "qgssymbollevelsv2dialog.h"
16+
#include "qgssymbollevelsdialog.h"
1717

1818
#include "qgssymbollayerutils.h"
1919
#include "qgssymbollayer.h"
@@ -27,7 +27,7 @@
2727

2828
////////////////
2929

30-
QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent )
30+
QgsSymbolLevelsDialog::QgsSymbolLevelsDialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent )
3131
: QDialog( parent )
3232
, mList( list )
3333
, mForceOrderingEnabled( false )
@@ -85,13 +85,13 @@ QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& lis
8585
connect( tableLevels, SIGNAL( cellChanged( int, int ) ), this, SLOT( renderingPassChanged( int, int ) ) );
8686
}
8787

88-
QgsSymbolLevelsV2Dialog::~QgsSymbolLevelsV2Dialog()
88+
QgsSymbolLevelsDialog::~QgsSymbolLevelsDialog()
8989
{
9090
QSettings settings;
9191
settings.setValue( "/Windows/symbolLevelsDlg/geometry", saveGeometry() );
9292
}
9393

94-
void QgsSymbolLevelsV2Dialog::populateTable()
94+
void QgsSymbolLevelsDialog::populateTable()
9595
{
9696
for ( int row = 0; row < mList.count(); row++ )
9797
{
@@ -121,12 +121,12 @@ void QgsSymbolLevelsV2Dialog::populateTable()
121121

122122
}
123123

124-
void QgsSymbolLevelsV2Dialog::updateUi()
124+
void QgsSymbolLevelsDialog::updateUi()
125125
{
126126
tableLevels->setEnabled( chkEnable->isChecked() );
127127
}
128128

129-
void QgsSymbolLevelsV2Dialog::setDefaultLevels()
129+
void QgsSymbolLevelsDialog::setDefaultLevels()
130130
{
131131
for ( int i = 0; i < mList.count(); i++ )
132132
{
@@ -138,12 +138,12 @@ void QgsSymbolLevelsV2Dialog::setDefaultLevels()
138138
}
139139
}
140140

141-
bool QgsSymbolLevelsV2Dialog::usingLevels() const
141+
bool QgsSymbolLevelsDialog::usingLevels() const
142142
{
143143
return chkEnable->isChecked();
144144
}
145145

146-
void QgsSymbolLevelsV2Dialog::renderingPassChanged( int row, int column )
146+
void QgsSymbolLevelsDialog::renderingPassChanged( int row, int column )
147147
{
148148
if ( row < 0 || row >= mList.count() )
149149
return;
@@ -153,7 +153,7 @@ void QgsSymbolLevelsV2Dialog::renderingPassChanged( int row, int column )
153153
sym->symbolLayer( column - 1 )->setRenderingPass( tableLevels->item( row, column )->text().toInt() );
154154
}
155155

156-
void QgsSymbolLevelsV2Dialog::setForceOrderingEnabled( bool enabled )
156+
void QgsSymbolLevelsDialog::setForceOrderingEnabled( bool enabled )
157157
{
158158
mForceOrderingEnabled = enabled;
159159
if ( enabled )

‎src/gui/symbology-ng/qgssymbollevelsv2dialog.h renamed to ‎src/gui/symbology-ng/qgssymbollevelsdialog.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgssymbollevelsv2dialog.h
2+
qgssymbollevelsdialog.h
33
---------------------
44
begin : November 2009
55
copyright : (C) 2009 by Martin Dobias
@@ -12,28 +12,28 @@
1212
* (at your option) any later version. *
1313
* *
1414
***************************************************************************/
15-
#ifndef QGSSYMBOLLEVELSV2DIALOG_H
16-
#define QGSSYMBOLLEVELSV2DIALOG_H
15+
#ifndef QGSSYMBOLLEVELSDIALOG_H
16+
#define QGSSYMBOLLEVELSDIALOG_H
1717

1818
#include <QDialog>
1919
#include <QList>
2020
#include <QItemDelegate>
2121

2222
#include "qgsrendererv2.h"
2323

24-
#include "ui_qgssymbollevelsv2dialogbase.h"
24+
#include "ui_qgssymbollevelsdialogbase.h"
2525

2626
/** \ingroup gui
27-
* \class QgsSymbolLevelsV2Dialog
27+
* \class QgsSymbolLevelsDialog
2828
*/
29-
class GUI_EXPORT QgsSymbolLevelsV2Dialog : public QDialog, private Ui::QgsSymbolLevelsV2DialogBase
29+
class GUI_EXPORT QgsSymbolLevelsDialog : public QDialog, private Ui::QgsSymbolLevelsDialogBase
3030
{
3131
Q_OBJECT
3232
public:
3333
//! @note not available in python bindings
34-
QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent = nullptr );
34+
QgsSymbolLevelsDialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent = nullptr );
3535

36-
~QgsSymbolLevelsV2Dialog();
36+
~QgsSymbolLevelsDialog();
3737

3838
bool usingLevels() const;
3939

@@ -81,4 +81,4 @@ class SpinBoxDelegate : public QItemDelegate
8181

8282
///@endcond
8383

84-
#endif // QGSSYMBOLLEVELSV2DIALOG_H
84+
#endif // QGSSYMBOLLEVELSDIALOG_H

‎src/ui/qgssymbollevelsv2dialogbase.ui renamed to ‎src/ui/qgssymbollevelsdialogbase.ui

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>QgsSymbolLevelsV2DialogBase</class>
4-
<widget class="QDialog" name="QgsSymbolLevelsV2DialogBase">
3+
<class>QgsSymbolLevelsDialogBase</class>
4+
<widget class="QDialog" name="QgsSymbolLevelsDialogBase">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -58,7 +58,7 @@
5858
<connection>
5959
<sender>buttonBox</sender>
6060
<signal>accepted()</signal>
61-
<receiver>QgsSymbolLevelsV2DialogBase</receiver>
61+
<receiver>QgsSymbolLevelsDialogBase</receiver>
6262
<slot>accept()</slot>
6363
<hints>
6464
<hint type="sourcelabel">
@@ -74,7 +74,7 @@
7474
<connection>
7575
<sender>buttonBox</sender>
7676
<signal>rejected()</signal>
77-
<receiver>QgsSymbolLevelsV2DialogBase</receiver>
77+
<receiver>QgsSymbolLevelsDialogBase</receiver>
7878
<slot>reject()</slot>
7979
<hints>
8080
<hint type="sourcelabel">

‎tests/src/python/acceptable_missing_doc.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@
590590
"QgsMapUnitScaleDialog": ["QgsMapUnitScaleDialog(QWidget *parent=nullptr)"],
591591
"QgsFieldExpressionWidget": ["currentFieldChanged()", "setLeftHandButtonStyle(bool isLeft)", "isExpressionValid(const QString &expressionStr)"],
592592
"QgsRuleBasedRendererV2Widget": ["editRule(const QModelIndex &index)", "editRule()", "refineRuleScalesGui(const QModelIndexList &index)", "restoreSectionWidths()", "QgsRuleBasedRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "currentRuleChanged(const QModelIndex &current=QModelIndex(), const QModelIndex &previous=QModelIndex())", "clearFeatureCounts()", "refineRuleRanges()", "setRenderingOrder()", "addRule()", "create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "refineRuleCategories()", "refineRuleRangesGui(const QModelIndexList &index)", "currentRule()", "selectedRulesChanged()", "refineRuleCategoriesGui(const QModelIndexList &index)", "saveSectionWidth(int section, int oldSize, int newSize)", "refineRule(int type)", "removeRule()", "selectedRules()", "countFeatures()", "refineRuleScales()"],
593-
"QgsSymbolLevelsV2Dialog": ["renderingPassChanged(int row, int column)", "setForceOrderingEnabled(bool enabled)", "updateUi()", "usingLevels() const "],
593+
"QgsSymbolLevelsDialog": ["renderingPassChanged(int row, int column)", "setForceOrderingEnabled(bool enabled)", "updateUi()", "usingLevels() const "],
594594
"QgsAbstractGeometryV2": ["QgsAbstractGeometryV2(const QgsAbstractGeometryV2 &geom)", "ringCount(int part=0) const =0", "vertexCount(int part=0, int ring=0) const =0"],
595595
"QgsUuidWidgetWrapper": ["QgsUuidWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"],
596596
"QgsSimpleLineSymbolLayerV2Widget": ["penStyleChanged()", "penWidthChanged()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "updatePatternIcon()", "colorChanged(const QColor &color)", "QgsSimpleLineSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"],
@@ -1088,7 +1088,7 @@
10881088
"QgsNetworkDiskCache",
10891089
"QgsFillSymbolLayerV2",
10901090
"QgsRendererRulePropsDialog",
1091-
"QgsSymbolLevelsV2Dialog",
1091+
"QgsSymbolLevelsDialog",
10921092
"QWebPage",
10931093
"QgsPointLocator_VisitorNearestEdge",
10941094
"QgsStringStatisticalSummary",
@@ -1637,7 +1637,7 @@
16371637
'QgsWkbPtr',
16381638
'QgsSymbolLayer',
16391639
'QgsVectorFileWriter::StringOption',
1640-
'QgsSymbolLevelsV2Dialog',
1640+
'QgsSymbolLevelsDialog',
16411641
'QgsPenJoinStyleComboBox',
16421642
'QgsValueRelationWidgetFactory',
16431643
'QgsGlowWidget',

0 commit comments

Comments
 (0)