Skip to content

Commit 182dd8a

Browse files
committed
Constification
1 parent 4180c1e commit 182dd8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+88
-88
lines changed

src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ QgsEditorWidgetWrapper::QgsEditorWidgetWrapper( QgsVectorLayer* vl, int fieldIdx
2626
{
2727
}
2828

29-
int QgsEditorWidgetWrapper::fieldIdx()
29+
int QgsEditorWidgetWrapper::fieldIdx() const
3030
{
3131
return mFieldIdx;
3232
}
3333

34-
QgsField QgsEditorWidgetWrapper::field()
34+
QgsField QgsEditorWidgetWrapper::field() const
3535
{
3636
if ( mFieldIdx < layer()->fields().count() )
3737
return layer()->fields().at( mFieldIdx );
3838
else
3939
return QgsField();
4040
}
4141

42-
QVariant QgsEditorWidgetWrapper::defaultValue()
42+
QVariant QgsEditorWidgetWrapper::defaultValue() const
4343
{
4444
return layer()->dataProvider()->defaultValue( mFieldIdx );
4545
}

src/gui/editorwidgets/core/qgseditorwidgetwrapper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
6161
*
6262
* @return The current value the widget represents
6363
*/
64-
virtual QVariant value() = 0;
64+
virtual QVariant value() const = 0;
6565

6666
/**
6767
* Access the field index.
@@ -70,7 +70,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
7070
*
7171
* @see layer()
7272
*/
73-
int fieldIdx();
73+
int fieldIdx() const;
7474

7575
/**
7676
* Access the field.
@@ -79,7 +79,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
7979
*
8080
* @see layer()
8181
*/
82-
QgsField field();
82+
QgsField field() const;
8383

8484
/**
8585
* Access the default value of the field.
@@ -88,7 +88,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
8888
*
8989
* @see layer()
9090
*/
91-
QVariant defaultValue();
91+
QVariant defaultValue() const;
9292

9393
/**
9494
* Will return a wrapper for a given widget

src/gui/editorwidgets/core/qgswidgetwrapper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void QgsWidgetWrapper::setContext( const QgsAttributeEditorContext &context )
5252
mContext = context;
5353
}
5454

55-
const QVariant QgsWidgetWrapper::config( const QString& key, const QVariant& defaultVal )
55+
QVariant QgsWidgetWrapper::config( const QString& key, const QVariant& defaultVal ) const
5656
{
5757
if ( mConfig.contains( key ) )
5858
{
@@ -61,17 +61,17 @@ const QVariant QgsWidgetWrapper::config( const QString& key, const QVariant& def
6161
return defaultVal;
6262
}
6363

64-
const QgsEditorWidgetConfig QgsWidgetWrapper::config()
64+
QgsEditorWidgetConfig QgsWidgetWrapper::config() const
6565
{
6666
return mConfig;
6767
}
6868

69-
const QgsAttributeEditorContext& QgsWidgetWrapper::context()
69+
const QgsAttributeEditorContext& QgsWidgetWrapper::context() const
7070
{
7171
return mContext;
7272
}
7373

74-
QgsVectorLayer* QgsWidgetWrapper::layer()
74+
QgsVectorLayer* QgsWidgetWrapper::layer() const
7575
{
7676
return mLayer;
7777
}

src/gui/editorwidgets/core/qgswidgetwrapper.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject
8787
*
8888
* @return the value assigned to this configuration option
8989
*/
90-
const QVariant config( const QString& key, const QVariant& defaultVal = QVariant() );
90+
QVariant config( const QString& key, const QVariant& defaultVal = QVariant() ) const;
9191

9292
/**
9393
* Returns the whole config
9494
*
9595
* @return The configuration
9696
*/
97-
const QgsEditorWidgetConfig config();
97+
QgsEditorWidgetConfig config() const;
9898

9999
/**
100100
* Returns information about the context in which this widget is shown
101101
*
102102
* @return context information
103103
*/
104-
const QgsAttributeEditorContext& context();
104+
const QgsAttributeEditorContext& context() const;
105105

106106
/**
107107
* Access the QgsVectorLayer, you are working on
@@ -110,7 +110,7 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject
110110
*
111111
* @see field()
112112
*/
113-
QgsVectorLayer* layer();
113+
QgsVectorLayer* layer() const;
114114

115115
/**
116116
* Will return a wrapper for a given widget
@@ -130,7 +130,7 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject
130130
*
131131
* @note Added in 2.12
132132
*/
133-
virtual bool valid() = 0;
133+
virtual bool valid() const = 0;
134134

135135
protected:
136136
/**

src/gui/editorwidgets/qgscheckboxwidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QgsCheckboxWidgetWrapper::QgsCheckboxWidgetWrapper( QgsVectorLayer* vl, int fiel
2323
}
2424

2525

26-
QVariant QgsCheckboxWidgetWrapper::value()
26+
QVariant QgsCheckboxWidgetWrapper::value() const
2727
{
2828
QVariant v;
2929

@@ -53,7 +53,7 @@ void QgsCheckboxWidgetWrapper::initWidget( QWidget* editor )
5353
connect( mGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( valueChanged( bool ) ) );
5454
}
5555

56-
bool QgsCheckboxWidgetWrapper::valid()
56+
bool QgsCheckboxWidgetWrapper::valid() const
5757
{
5858
return mCheckBox || mGroupBox;
5959
}

src/gui/editorwidgets/qgscheckboxwidgetwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class GUI_EXPORT QgsCheckboxWidgetWrapper : public QgsEditorWidgetWrapper
4141

4242
// QgsEditorWidgetWrapper interface
4343
public:
44-
QVariant value() override;
44+
QVariant value() const override;
4545

4646
protected:
4747
QWidget* createWidget( QWidget* parent ) override;
4848
void initWidget( QWidget* editor ) override;
49-
bool valid() override;
49+
bool valid() const override;
5050

5151
public slots:
5252
void setValue( const QVariant& value ) override;

src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ QgsClassificationWidgetWrapper::QgsClassificationWidgetWrapper( QgsVectorLayer*
2424
{
2525
}
2626

27-
QVariant QgsClassificationWidgetWrapper::value()
27+
QVariant QgsClassificationWidgetWrapper::value() const
2828
{
2929
return mComboBox->itemData( mComboBox->currentIndex() );
3030
}
@@ -59,7 +59,7 @@ void QgsClassificationWidgetWrapper::initWidget( QWidget* editor )
5959
}
6060
}
6161

62-
bool QgsClassificationWidgetWrapper::valid()
62+
bool QgsClassificationWidgetWrapper::valid() const
6363
{
6464
return mComboBox;
6565
}

src/gui/editorwidgets/qgsclassificationwidgetwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ class GUI_EXPORT QgsClassificationWidgetWrapper : public QgsEditorWidgetWrapper
3232

3333
// QgsEditorWidgetWrapper interface
3434
public:
35-
QVariant value() override;
35+
QVariant value() const override;
3636

3737
protected:
3838
QWidget*createWidget( QWidget* parent ) override;
3939
void initWidget( QWidget* editor ) override;
40-
bool valid() override;
40+
bool valid() const override;
4141

4242
public slots:
4343
void setValue( const QVariant& value ) override;

src/gui/editorwidgets/qgscolorwidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ QgsColorWidgetWrapper::QgsColorWidgetWrapper( QgsVectorLayer* vl, int fieldIdx,
2222
}
2323

2424

25-
QVariant QgsColorWidgetWrapper::value()
25+
QVariant QgsColorWidgetWrapper::value() const
2626
{
2727
QVariant v;
2828

@@ -46,7 +46,7 @@ void QgsColorWidgetWrapper::initWidget( QWidget* editor )
4646
connect( mColorButton, SIGNAL( colorChanged( QColor ) ), this, SLOT( valueChanged() ) );
4747
}
4848

49-
bool QgsColorWidgetWrapper::valid()
49+
bool QgsColorWidgetWrapper::valid() const
5050
{
5151
return mColorButton;
5252
}

src/gui/editorwidgets/qgscolorwidgetwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class GUI_EXPORT QgsColorWidgetWrapper : public QgsEditorWidgetWrapper
3434

3535
// QgsEditorWidgetWrapper interface
3636
public:
37-
QVariant value() override;
37+
QVariant value() const override;
3838

3939
protected:
4040
QWidget* createWidget( QWidget* parent ) override;
4141
void initWidget( QWidget* editor ) override;
42-
bool valid() override;
42+
bool valid() const override;
4343

4444
public slots:
4545
void setValue( const QVariant& value ) override;

src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void QgsDateTimeEditWrapper::initWidget( QWidget *editor )
9090
}
9191
}
9292

93-
bool QgsDateTimeEditWrapper::valid()
93+
bool QgsDateTimeEditWrapper::valid() const
9494
{
9595
return mQgsDateTimeEdit || mQDateTimeEdit;
9696
}
@@ -101,7 +101,7 @@ void QgsDateTimeEditWrapper::dateTimeChanged( const QDateTime& dateTime )
101101
emit valueChanged( dateTime.toString( fieldFormat ) );
102102
}
103103

104-
QVariant QgsDateTimeEditWrapper::value()
104+
QVariant QgsDateTimeEditWrapper::value() const
105105
{
106106
if ( !mQDateTimeEdit )
107107
return QVariant( field().type() );

src/gui/editorwidgets/qgsdatetimeeditwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ class GUI_EXPORT QgsDateTimeEditWrapper : public QgsEditorWidgetWrapper
5151

5252
// QgsEditorWidgetWrapper interface
5353
public:
54-
QVariant value() override;
54+
QVariant value() const override;
5555
QWidget *createWidget( QWidget *parent ) override;
5656
void initWidget( QWidget *editor ) override;
57-
bool valid() override;
57+
bool valid() const override;
5858

5959
public slots:
6060
void setValue( const QVariant &value ) override;

src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* widget )
101101
mCaseString = "ILIKE";
102102
}
103103

104-
bool QgsDefaultSearchWidgetWrapper::valid()
104+
bool QgsDefaultSearchWidgetWrapper::valid() const
105105
{
106106
return true;
107107
}

src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class GUI_EXPORT QgsDefaultSearchWidgetWrapper : public QgsSearchWidgetWrapper
4747
protected:
4848
QWidget* createWidget( QWidget* parent ) override;
4949
void initWidget( QWidget* editor ) override;
50-
bool valid() override;
50+
bool valid() const override;
5151

5252
private:
5353
QgsFilterLineEdit* mLineEdit;

src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ QgsEnumerationWidgetWrapper::QgsEnumerationWidgetWrapper( QgsVectorLayer* vl, in
2525
}
2626

2727

28-
QVariant QgsEnumerationWidgetWrapper::value()
28+
QVariant QgsEnumerationWidgetWrapper::value() const
2929
{
3030
QVariant value;
3131

@@ -57,7 +57,7 @@ void QgsEnumerationWidgetWrapper::initWidget( QWidget* editor )
5757
}
5858
}
5959

60-
bool QgsEnumerationWidgetWrapper::valid()
60+
bool QgsEnumerationWidgetWrapper::valid() const
6161
{
6262
return mComboBox;
6363
}

src/gui/editorwidgets/qgsenumerationwidgetwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ class GUI_EXPORT QgsEnumerationWidgetWrapper : public QgsEditorWidgetWrapper
3232

3333
// QgsEditorWidgetWrapper interface
3434
public:
35-
QVariant value() override;
35+
QVariant value() const override;
3636

3737
protected:
3838
QWidget* createWidget( QWidget* parent ) override;
3939
void initWidget( QWidget* editor ) override;
40-
bool valid() override;
40+
bool valid() const override;
4141

4242
public slots:
4343
void setValue( const QVariant& value ) override;

src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ QgsFileNameWidgetWrapper::QgsFileNameWidgetWrapper( QgsVectorLayer* vl, int fiel
3030
{
3131
}
3232

33-
QVariant QgsFileNameWidgetWrapper::value()
33+
QVariant QgsFileNameWidgetWrapper::value() const
3434
{
3535
QVariant value;
3636

@@ -48,7 +48,7 @@ QVariant QgsFileNameWidgetWrapper::value()
4848
return value;
4949
}
5050

51-
bool QgsFileNameWidgetWrapper::valid()
51+
bool QgsFileNameWidgetWrapper::valid() const
5252
{
5353
return mLineEdit || mLabel;
5454
}

src/gui/editorwidgets/qgsfilenamewidgetwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class GUI_EXPORT QgsFileNameWidgetWrapper : public QgsEditorWidgetWrapper
3939

4040
// QgsEditorWidgetWrapper interface
4141
public:
42-
QVariant value() override;
43-
bool valid() override;
42+
QVariant value() const override;
43+
bool valid() const override;
4444

4545
protected:
4646
QWidget* createWidget( QWidget* parent ) override;

src/gui/editorwidgets/qgshiddenwidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QgsHiddenWidgetWrapper::QgsHiddenWidgetWrapper( QgsVectorLayer* vl, int fieldIdx
2323
}
2424

2525

26-
QVariant QgsHiddenWidgetWrapper::value()
26+
QVariant QgsHiddenWidgetWrapper::value() const
2727
{
2828
return mValue;
2929
}
@@ -40,7 +40,7 @@ void QgsHiddenWidgetWrapper::initWidget( QWidget* editor )
4040
editor->setVisible( false );
4141
}
4242

43-
bool QgsHiddenWidgetWrapper::valid()
43+
bool QgsHiddenWidgetWrapper::valid() const
4444
{
4545
return true;
4646
}

src/gui/editorwidgets/qgshiddenwidgetwrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class GUI_EXPORT QgsHiddenWidgetWrapper : public QgsEditorWidgetWrapper
3131

3232
// QgsEditorWidgetWrapper interface
3333
public:
34-
QVariant value() override;
34+
QVariant value() const override;
3535

3636
protected:
3737
QWidget* createWidget( QWidget* parent ) override;
3838
void initWidget( QWidget* editor ) override;
39-
bool valid() override;
39+
bool valid() const override;
4040

4141
public slots:
4242
void setValue( const QVariant& value ) override;

src/gui/editorwidgets/qgsphotowidgetwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void QgsPhotoWidgetWrapper::loadPixmap( const QString& fileName )
100100
}
101101
}
102102

103-
QVariant QgsPhotoWidgetWrapper::value()
103+
QVariant QgsPhotoWidgetWrapper::value() const
104104
{
105105
QVariant v;
106106

@@ -186,7 +186,7 @@ void QgsPhotoWidgetWrapper::initWidget( QWidget* editor )
186186
}
187187
}
188188

189-
bool QgsPhotoWidgetWrapper::valid()
189+
bool QgsPhotoWidgetWrapper::valid() const
190190
{
191191
#ifdef WITH_QTWEBKIT
192192
return mPhotoLabel || mLineEdit || mButton || mWebView;

0 commit comments

Comments
 (0)