Skip to content

Commit 840022d

Browse files
committed
fix indentation and some typos
1 parent 5fd69fd commit 840022d

16 files changed

+117
-118
lines changed

python/core/qgsaction.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class QgsAction
9090
//! Whether to capture output for display when this action is run
9191
bool capture() const;
9292

93-
//! Wheter this action should be shown on the attribute table
93+
//! Whether this action should be shown on the attribute table
9494
bool showInAttributeTable() const;
9595

9696
//! Whether the action is runable on the current platform

python/core/qgssqlstatement.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsSQLStatement
1818

1919
/** Performs basic validity checks. Basically checking that columns referencing
2020
* a table, references a specified table. Returns true if the validation is
21-
* succesful */
21+
* successful */
2222
bool doBasicValidationChecks( QString& errorMsgOut /Out/ ) const;
2323

2424
//! Returns root node of the statement. Root node is null is parsing has failed

python/gui/raster/qgsrasterhistogramwidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QgsRasterHistogramWidget : QWidget
2727

2828
signals:
2929
/**
30-
* Emmited when something on the widget has changed.
30+
* Emitted when something on the widget has changed.
3131
* All widgets will fire this event to notify of an internal change.
3232
*/
3333
void widgetChanged();

python/gui/raster/qgsrasterrendererwidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class QgsRasterRendererWidget: QWidget
3030

3131
signals:
3232
/**
33-
* Emmited when something on the widget has changed.
33+
* Emitted when something on the widget has changed.
3434
* All widgets will fire this event to notify of an internal change.
3535
*/
3636
void widgetChanged();

python/gui/raster/qgsrastertransparencywidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class QgsRasterTransparencyWidget: QWidget
1515

1616
signals:
1717
/**
18-
* Emmited when something on the widget has changed.
18+
* Emitted when something on the widget has changed.
1919
* All widgets will fire this event to notify of an internal change.
2020
*/
2121
void widgetChanged();

python/gui/raster/qgsrendererrasterpropertieswidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsRendererRasterPropertiesWidget : QWidget
2323
signals:
2424

2525
/**
26-
* Emmited when something on the widget has changed.
26+
* Emitted when something on the widget has changed.
2727
* All widgets will fire this event to notify of an internal change.
2828
*/
2929
void widgetChanged();

python/gui/symbology-ng/qgsrendererv2propertiesdialog.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class QgsRendererV2PropertiesDialog : QDialog
2424
void layerVariablesChanged();
2525

2626
/**
27-
* Emmited when something on the widget has changed.
27+
* Emitted when something on the widget has changed.
2828
* All widgets will fire this event to notify of an internal change.
2929
*/
3030
void widgetChanged();

python/gui/symbology-ng/qgsrendererv2widget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class QgsRendererV2Widget : QWidget
4848
void layerVariablesChanged();
4949

5050
/**
51-
* Emmited when something on the widget has changed.
51+
* Emitted when something on the widget has changed.
5252
* All widgets will fire this event to notify of an internal change.
5353
*/
5454
void widgetChanged();

scripts/chkspelling.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717

1818

1919
RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
20-
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build*|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs"
20+
EX="\.(svn-base|tmp|xpm|ts|o)|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|qgisstyle|LexerR.py|debian/build*|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-|debian/tmp|src/plugins/dxf2shp_converter/dxflib|python/ext-libs|i18n/"
2121

2222
egrep --exclude=*.{png,svg,db,bz2,pdf,qgs,qml,api,pyc} --exclude-dir=.git --exclude-dir=debian/build* --color=always "$RE" -ir . | egrep -iv "$EX"

src/app/qgisapp.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5711,11 +5711,10 @@ void QgisApp::setMapStyleDockLayer( QgsMapLayer* layer )
57115711
// We don't set the layer if the dock isn't open mainly to save
57125712
// the extra work if it's not needed
57135713
if ( mMapStylingDock->isVisible() )
5714-
{
5714+
{
57155715
mMapStyleWidget->setPageFactories( mMapStylePanelFactories );
57165716
mMapStyleWidget->setLayer( layer );
5717-
5718-
}
5717+
}
57195718
}
57205719

57215720
void QgisApp::mapStyleDock( bool enabled )
@@ -8952,12 +8951,12 @@ void QgisApp::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory*
89528951
mMapLayerPropertiesFactories.removeAll( factory );
89538952
}
89548953

8955-
void QgisApp::registerMapStylePanelFactory(QgsMapStylePanelFactory *factory)
8954+
void QgisApp::registerMapStylePanelFactory( QgsMapStylePanelFactory *factory )
89568955
{
89578956
mMapStylePanelFactories << factory;
89588957
}
89598958

8960-
void QgisApp::unregisterMapStylePanelFactory(QgsMapStylePanelFactory *factory)
8959+
void QgisApp::unregisterMapStylePanelFactory( QgsMapStylePanelFactory *factory )
89618960
{
89628961
mMapStylePanelFactories.removeAll( factory );
89638962
}

src/app/qgisappinterface.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,14 +485,14 @@ void QgisAppInterface::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertie
485485
qgis->unregisterMapLayerPropertiesFactory( factory );
486486
}
487487

488-
void QgisAppInterface::registerMapStylePanelFactory(QgsMapStylePanelFactory *factory)
488+
void QgisAppInterface::registerMapStylePanelFactory( QgsMapStylePanelFactory *factory )
489489
{
490-
qgis->registerMapStylePanelFactory( factory );
490+
qgis->registerMapStylePanelFactory( factory );
491491
}
492492

493-
void QgisAppInterface::unregisterMapStylePanelFactory(QgsMapStylePanelFactory *factory)
493+
void QgisAppInterface::unregisterMapStylePanelFactory( QgsMapStylePanelFactory *factory )
494494
{
495-
qgis->unregisterMapStylePanelFactory( factory );
495+
qgis->unregisterMapStylePanelFactory( factory );
496496
}
497497

498498
//! Menus

src/app/qgsfieldsproperties.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,9 +751,9 @@ void QgsFieldsProperties::attributesListCellChanged( int row, int column )
751751
{
752752
QTableWidgetItem *nameItem = mFieldsList->item( row, column );
753753
if ( !nameItem ||
754-
nameItem->text().isEmpty() ||
755-
!mLayer->fields().exists( row ) ||
756-
mLayer->fields().at( row ).name() == nameItem->text() )
754+
nameItem->text().isEmpty() ||
755+
!mLayer->fields().exists( row ) ||
756+
mLayer->fields().at( row ).name() == nameItem->text() )
757757
return;
758758

759759
mLayer->beginEditCommand( tr( "Rename attribute" ) );

src/app/qgsmapstylingwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class APP_EXPORT QgsMapStylingWidget : public QWidget, private Ui::QgsMapStyling
4141
{
4242
Q_OBJECT
4343
public:
44-
QgsMapStylingWidget(QgsMapCanvas *canvas, QList<QgsMapStylePanelFactory *> pages, QWidget *parent = 0 );
44+
QgsMapStylingWidget( QgsMapCanvas *canvas, QList<QgsMapStylePanelFactory *> pages, QWidget *parent = 0 );
4545
QgsMapLayer* layer() { return mCurrentLayer; }
4646

47-
void setPageFactories( QList<QgsMapStylePanelFactory*> factories) { mPageFactories = factories; }
47+
void setPageFactories( QList<QgsMapStylePanelFactory*> factories ) { mPageFactories = factories; }
4848

4949
signals:
5050
void styleChanged( QgsMapLayer* layer );

src/gui/qgsmapstylepanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "qgsmapstylepanel.h"
22

3-
QgsMapStylePanel::QgsMapStylePanel( QgsMapLayer * /*layer*/, QgsMapCanvas * /*canvas*/, QWidget *parent )
3+
QgsMapStylePanel::QgsMapStylePanel( QgsMapLayer *layer, QgsMapCanvas *canvas, QWidget *parent )
44
: QWidget( parent )
55
{
66

src/gui/qgsmapstylepanel.h

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
1-
#ifndef QGSMAPSTYLEPANEL_H
2-
#define QGSMAPSTYLEPANEL_H
3-
4-
#include <QWidget>
5-
#include <QIcon>
6-
7-
#include "qgsmaplayer.h"
8-
9-
class QgsMapCanvas;
10-
11-
/** \ingroup gui
12-
* \class A panel widget that can be shown in the map style dock
13-
* \note added in QGIS 2.16
14-
*/
15-
class GUI_EXPORT QgsMapStylePanel : public QWidget
16-
{
17-
Q_OBJECT
18-
public:
19-
20-
/**
21-
* @brief A panel widget that can be shown in the map style dock
22-
* @param layer The layer active in the dock.
23-
* @param canvas The canvas object.
24-
* @param parent The parent of the widget.
25-
* @note The widget is created each time the panel is selected in the dock.
26-
* Keep the loading light as possible for speed in the UI.
27-
*/
28-
QgsMapStylePanel( QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget *parent = 0 );
29-
30-
signals:
31-
/**
32-
* @brief Nofity the map style dock that something has changed and
33-
* we need to update the map.
34-
* You should emit this when any of the widgets are changed if live
35-
* update is enabled apply() will get called to apply the changes to the layer.
36-
*/
37-
void widgetChanged();
38-
39-
public slots:
40-
/**
41-
* @brief Called when changes to the layer need to be made.
42-
* Will be called when live update is enabled.
43-
*/
44-
virtual void apply() = 0;
45-
};
46-
47-
48-
/** \ingroup gui
49-
* \class QgsMapStylePanelFactory
50-
* \note added in QGIS 2.16
51-
*/
52-
class GUI_EXPORT QgsMapStylePanelFactory
53-
{
54-
public:
55-
/** Constructor */
56-
QgsMapStylePanelFactory();
57-
58-
/** Destructor */
59-
virtual ~QgsMapStylePanelFactory();
60-
61-
/**
62-
* @brief The icon that will be shown in the UI for the panel.
63-
* @return A QIcon for the panel icon.
64-
*/
65-
virtual QIcon icon() = 0;
66-
67-
/**
68-
* @brief The title of the panel..
69-
* @note This may or may not be shown to the user.
70-
* @return Title of the panel
71-
*/
72-
virtual QString title() = 0;
73-
74-
/**
75-
* @brief Supported layer type for the widget.
76-
* @return The layer type this widget is supported for.
77-
*/
78-
virtual QgsMapLayer::LayerType layerType() = 0;
79-
80-
/**
81-
* @brief Factory fucntion to create the widget on demand as needed by the dock.
82-
* @note This function is called each time the panel is selected. Keep it light for better UX.
83-
* @param layer The active layer in the dock.
84-
* @param canvas The map canvas.
85-
* @param parent The parent of the widget.
86-
* @return A new QgsMapStylePanel which is shown in the map style dock.
87-
*/
88-
virtual QgsMapStylePanel* createPanel( QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget* parent ) = 0;
89-
};
90-
91-
92-
#endif // QGSMAPSTYLEPANEL_H
1+
#ifndef QGSMAPSTYLEPANEL_H
2+
#define QGSMAPSTYLEPANEL_H
3+
4+
#include <QWidget>
5+
#include <QIcon>
6+
7+
#include "qgsmaplayer.h"
8+
9+
class QgsMapCanvas;
10+
11+
/** \ingroup gui
12+
* \class A panel widget that can be shown in the map style dock
13+
* \note added in QGIS 2.16
14+
*/
15+
class GUI_EXPORT QgsMapStylePanel : public QWidget
16+
{
17+
Q_OBJECT
18+
public:
19+
20+
/**
21+
* @brief A panel widget that can be shown in the map style dock
22+
* @param layer The layer active in the dock.
23+
* @param canvas The canvas object.
24+
* @param parent The parent of the widget.
25+
* @note The widget is created each time the panel is selected in the dock.
26+
* Keep the loading light as possible for speed in the UI.
27+
*/
28+
QgsMapStylePanel( QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget *parent = 0 );
29+
30+
signals:
31+
/**
32+
* @brief Nofity the map style dock that something has changed and
33+
* we need to update the map.
34+
* You should emit this when any of the widgets are changed if live
35+
* update is enabled apply() will get called to apply the changes to the layer.
36+
*/
37+
void widgetChanged();
38+
39+
public slots:
40+
/**
41+
* @brief Called when changes to the layer need to be made.
42+
* Will be called when live update is enabled.
43+
*/
44+
virtual void apply() = 0;
45+
};
46+
47+
48+
/** \ingroup gui
49+
* \class QgsMapStylePanelFactory
50+
* \note added in QGIS 2.16
51+
*/
52+
class GUI_EXPORT QgsMapStylePanelFactory
53+
{
54+
public:
55+
/** Constructor */
56+
QgsMapStylePanelFactory();
57+
58+
/** Destructor */
59+
virtual ~QgsMapStylePanelFactory();
60+
61+
/**
62+
* @brief The icon that will be shown in the UI for the panel.
63+
* @return A QIcon for the panel icon.
64+
*/
65+
virtual QIcon icon() = 0;
66+
67+
/**
68+
* @brief The title of the panel..
69+
* @note This may or may not be shown to the user.
70+
* @return Title of the panel
71+
*/
72+
virtual QString title() = 0;
73+
74+
/**
75+
* @brief Supported layer type for the widget.
76+
* @return The layer type this widget is supported for.
77+
*/
78+
virtual QgsMapLayer::LayerType layerType() = 0;
79+
80+
/**
81+
* @brief Factory fucntion to create the widget on demand as needed by the dock.
82+
* @note This function is called each time the panel is selected. Keep it light for better UX.
83+
* @param layer The active layer in the dock.
84+
* @param canvas The map canvas.
85+
* @param parent The parent of the widget.
86+
* @return A new QgsMapStylePanel which is shown in the map style dock.
87+
*/
88+
virtual QgsMapStylePanel* createPanel( QgsMapLayer* layer, QgsMapCanvas *canvas, QWidget* parent ) = 0;
89+
};
90+
91+
92+
#endif // QGSMAPSTYLEPANEL_H

src/providers/arcgisrest/qgsafsprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ bool QgsAfsProvider::getFeature( const QgsFeatureId &id, QgsFeature &f, bool fet
160160
if ( it != mCache.end() )
161161
{
162162
f = it.value();
163-
return filterRect.isNull() || f.geometry()->intersects(filterRect);
163+
return filterRect.isNull() || f.geometry()->intersects( filterRect );
164164
}
165165

166166
// Determine attributes to fetch
@@ -243,7 +243,7 @@ bool QgsAfsProvider::getFeature( const QgsFeatureId &id, QgsFeature &f, bool fet
243243
}
244244
f = mCache[id];
245245
Q_ASSERT( f.isValid() );
246-
return filterRect.isNull() || f.geometry()->intersects(filterRect);
246+
return filterRect.isNull() || f.geometry()->intersects( filterRect );
247247
}
248248

249249
void QgsAfsProvider::setDataSourceUri( const QString &uri )

0 commit comments

Comments
 (0)