sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

indentation update [ci skip]

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-11-30 10:26:17 +01:00
parent 4d4fa44605
commit e48a6f642f
19 changed files with 74 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/symbology-ng/qgsheatmaprenderer.sip
View File

@ -37,7 +37,7 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
* @see colorRamp * @see colorRamp
*/ */
void setColorRamp( QgsVectorColorRampV2* ramp /Transfer/ ); void setColorRamp( QgsVectorColorRampV2* ramp /Transfer/ );
/**Returns whether the ramp is inverted /**Returns whether the ramp is inverted
* @returns true if color ramp is inverted * @returns true if color ramp is inverted
* @see setInvertRamp * @see setInvertRamp
@ -121,7 +121,7 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
* @see renderQuality * @see renderQuality
*/ */
void setRenderQuality( const int quality ); void setRenderQuality( const int quality );
/**Returns the expression used for weighting points when generating the heatmap. /**Returns the expression used for weighting points when generating the heatmap.
* @returns point weight expression. If empty, all points are equally weighted. * @returns point weight expression. If empty, all points are equally weighted.
* @see setWeightExpression * @see setWeightExpression

2
python/core/symbology-ng/qgssymbolv2.sip
View File

@ -54,7 +54,7 @@ class QgsSymbolV2
SymbolType type() const; SymbolType type() const;
// symbol layers handling // symbol layers handling
/**Returns list of symbol layers contained in the symbol. /**Returns list of symbol layers contained in the symbol.
* @returns symbol layers list * @returns symbol layers list
* @note added in QGIS 2.7 * @note added in QGIS 2.7

2
python/gui/symbology-ng/qgsheatmaprendererwidget.sip
View File

@ -17,7 +17,7 @@ class QgsHeatmapRendererWidget : QgsRendererV2Widget
* @param renderer the mask renderer (will take ownership) * @param renderer the mask renderer (will take ownership)
*/ */
QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
/** @returns the current feature renderer */ /** @returns the current feature renderer */
virtual QgsFeatureRendererV2* renderer(); virtual QgsFeatureRendererV2* renderer();
}; };

2
python/plugins/processing/algs/gdal/buildvrt.py
View File

@ -42,7 +42,7 @@ class buildvrt(GdalAlgorithm):
RESOLUTION = 'RESOLUTION' RESOLUTION = 'RESOLUTION'
SEPARATE = 'SEPARATE' SEPARATE = 'SEPARATE'
PROJ_DIFFERENCE = 'PROJ_DIFFERENCE' PROJ_DIFFERENCE = 'PROJ_DIFFERENCE'
RESOLUTION_OPTIONS = ['average', 'highest', 'lowest'] RESOLUTION_OPTIONS = ['average', 'highest', 'lowest']
def defineCharacteristics(self): def defineCharacteristics(self):

36
python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
View File

@ -73,9 +73,9 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
ADDFIELDS = 'ADDFIELDS' ADDFIELDS = 'ADDFIELDS'
LAUNDER = 'LAUNDER' LAUNDER = 'LAUNDER'
INDEX = 'INDEX' INDEX = 'INDEX'
SKIPFAILURES = 'SKIPFAILURES' SKIPFAILURES = 'SKIPFAILURES'
OPTIONS = 'OPTIONS' OPTIONS = 'OPTIONS'
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Import Vector into PostGIS database (new connection)' self.name = 'Import Vector into PostGIS database (new connection)'
self.group = '[OGR] Miscellaneous' self.group = '[OGR] Miscellaneous'
@ -89,7 +89,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
self.addParameter(ParameterString(self.HOST, 'Host', self.addParameter(ParameterString(self.HOST, 'Host',
'localhost', optional=False)) 'localhost', optional=False))
self.addParameter(ParameterString(self.PORT, 'Port', self.addParameter(ParameterString(self.PORT, 'Port',
'5432', optional=False)) '5432', optional=False))
self.addParameter(ParameterString(self.USER, 'Username', self.addParameter(ParameterString(self.USER, 'Username',
'', optional=False)) '', optional=False))
self.addParameter(ParameterString(self.DBNAME, 'Database Name', self.addParameter(ParameterString(self.DBNAME, 'Database Name',
@ -114,15 +114,15 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
self.addParameter(ParameterBoolean(self.CLIP, self.addParameter(ParameterBoolean(self.CLIP,
'Clip the input layer using the above (rectangle) extent', False)) 'Clip the input layer using the above (rectangle) extent', False))
self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")', self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")',
'', optional=True)) '', optional=True))
self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)', self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)',
'', optional=True)) '', optional=True))
self.addParameter(ParameterBoolean(self.OVERWRITE, self.addParameter(ParameterBoolean(self.OVERWRITE,
'Overwrite existing table?', True)) 'Overwrite existing table?', True))
self.addParameter(ParameterBoolean(self.APPEND, self.addParameter(ParameterBoolean(self.APPEND,
'Append to existing table?', False)) 'Append to existing table?', False))
self.addParameter(ParameterBoolean(self.ADDFIELDS, self.addParameter(ParameterBoolean(self.ADDFIELDS,
'Append and add new fields to existing table?', False)) 'Append and add new fields to existing table?', False))
self.addParameter(ParameterBoolean(self.LAUNDER, self.addParameter(ParameterBoolean(self.LAUNDER,
'Do not launder columns/table name/s?', False)) 'Do not launder columns/table name/s?', False))
self.addParameter(ParameterBoolean(self.INDEX, self.addParameter(ParameterBoolean(self.INDEX,
@ -142,9 +142,9 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
user = unicode(self.getParameterValue(self.USER)) user = unicode(self.getParameterValue(self.USER))
dbname = unicode(self.getParameterValue(self.DBNAME)) dbname = unicode(self.getParameterValue(self.DBNAME))
password = unicode(self.getParameterValue(self.PASSWORD)) password = unicode(self.getParameterValue(self.PASSWORD))
schema = unicode(self.getParameterValue(self.SCHEMA)) schema = unicode(self.getParameterValue(self.SCHEMA))
schemastring = "-lco SCHEMA="+schema schemastring = "-lco SCHEMA="+schema
table = unicode(self.getParameterValue(self.TABLE)) table = unicode(self.getParameterValue(self.TABLE))
pk = unicode(self.getParameterValue(self.PK)) pk = unicode(self.getParameterValue(self.PK))
pkstring = "-lco FID="+pk pkstring = "-lco FID="+pk
geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN)) geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN))
@ -152,13 +152,13 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
dim = self.DIMLIST[self.getParameterValue(self.DIM)] dim = self.DIMLIST[self.getParameterValue(self.DIM)]
dimstring = "-lco DIM="+dim dimstring = "-lco DIM="+dim
simplify = unicode(self.getParameterValue(self.SIMPLIFY)) simplify = unicode(self.getParameterValue(self.SIMPLIFY))
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
spat = self.getParameterValue(self.SPAT) spat = self.getParameterValue(self.SPAT)
ogrspat = self.ogrConnectionString(spat) ogrspat = self.ogrConnectionString(spat)
clip = self.getParameterValue(self.CLIP) clip = self.getParameterValue(self.CLIP)
where = unicode(self.getParameterValue(self.WHERE)) where = unicode(self.getParameterValue(self.WHERE))
wherestring = "-where '"+where+"'" wherestring = "-where '"+where+"'"
gt = unicode(self.getParameterValue(self.GT)) gt = unicode(self.getParameterValue(self.GT))
overwrite = self.getParameterValue(self.OVERWRITE) overwrite = self.getParameterValue(self.OVERWRITE)
append = self.getParameterValue(self.APPEND) append = self.getParameterValue(self.APPEND)
addfields = self.getParameterValue(self.ADDFIELDS) addfields = self.getParameterValue(self.ADDFIELDS)
@ -171,7 +171,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
arguments = [] arguments = []
arguments.append('-progress') arguments.append('-progress')
arguments.append('--config PG_USE_COPY YES') arguments.append('--config PG_USE_COPY YES')
arguments.append('-f') arguments.append('-f')
arguments.append('PostgreSQL') arguments.append('PostgreSQL')
arguments.append('PG:"host=') arguments.append('PG:"host=')
@ -185,7 +185,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
arguments.append('password=') arguments.append('password=')
arguments.append(password) arguments.append(password)
arguments.append('"') arguments.append('"')
arguments.append(dimstring) arguments.append(dimstring)
arguments.append(ogrLayer) arguments.append(ogrLayer)
if index: if index:
arguments.append(indexstring) arguments.append(indexstring)
@ -208,13 +208,13 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
arguments.append(pkstring) arguments.append(pkstring)
if len(table) > 0: if len(table) > 0:
arguments.append('-nln') arguments.append('-nln')
arguments.append(table) arguments.append(table)
if len(ssrs) > 0: if len(ssrs) > 0:
arguments.append('-s_srs') arguments.append('-s_srs')
arguments.append(ssrs) arguments.append(ssrs)
if len(tsrs) > 0: if len(tsrs) > 0:
arguments.append('-t_srs') arguments.append('-t_srs')
arguments.append(tsrs) arguments.append(tsrs)
if len(spat) > 0: if len(spat) > 0:
regionCoords = ogrspat.split(',') regionCoords = ogrspat.split(',')
arguments.append('-spat') arguments.append('-spat')
@ -227,7 +227,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
if skipfailures: if skipfailures:
arguments.append('-skipfailures') arguments.append('-skipfailures')
if where: if where:
arguments.append(wherestring) arguments.append(wherestring)
if len(simplify) > 0: if len(simplify) > 0:
arguments.append('-simplify') arguments.append('-simplify')
arguments.append(simplify) arguments.append(simplify)

34
python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
View File

@ -76,14 +76,14 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
ADDFIELDS = 'ADDFIELDS' ADDFIELDS = 'ADDFIELDS'
LAUNDER = 'LAUNDER' LAUNDER = 'LAUNDER'
INDEX = 'INDEX' INDEX = 'INDEX'
SKIPFAILURES = 'SKIPFAILURES' SKIPFAILURES = 'SKIPFAILURES'
OPTIONS = 'OPTIONS' OPTIONS = 'OPTIONS'
def dbConnectionNames(self): def dbConnectionNames(self):
settings = QSettings() settings = QSettings()
settings.beginGroup('/PostgreSQL/connections/') settings.beginGroup('/PostgreSQL/connections/')
return settings.childGroups() return settings.childGroups()
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Import Vector into PostGIS database (available connections)' self.name = 'Import Vector into PostGIS database (available connections)'
self.group = '[OGR] Miscellaneous' self.group = '[OGR] Miscellaneous'
@ -115,15 +115,15 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
self.addParameter(ParameterBoolean(self.CLIP, self.addParameter(ParameterBoolean(self.CLIP,
'Clip the input layer using the above (rectangle) extent', False)) 'Clip the input layer using the above (rectangle) extent', False))
self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")', self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")',
'', optional=True)) '', optional=True))
self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)', self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)',
'', optional=True)) '', optional=True))
self.addParameter(ParameterBoolean(self.OVERWRITE, self.addParameter(ParameterBoolean(self.OVERWRITE,
'Overwrite existing table?', True)) 'Overwrite existing table?', True))
self.addParameter(ParameterBoolean(self.APPEND, self.addParameter(ParameterBoolean(self.APPEND,
'Append to existing table?', False)) 'Append to existing table?', False))
self.addParameter(ParameterBoolean(self.ADDFIELDS, self.addParameter(ParameterBoolean(self.ADDFIELDS,
'Append and add new fields to existing table?', False)) 'Append and add new fields to existing table?', False))
self.addParameter(ParameterBoolean(self.LAUNDER, self.addParameter(ParameterBoolean(self.LAUNDER,
'Do not launder columns/table name/s?', False)) 'Do not launder columns/table name/s?', False))
self.addParameter(ParameterBoolean(self.INDEX, self.addParameter(ParameterBoolean(self.INDEX,
@ -146,9 +146,9 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
ogrLayer = self.ogrConnectionString(inLayer) ogrLayer = self.ogrConnectionString(inLayer)
ssrs = unicode(self.getParameterValue(self.S_SRS)) ssrs = unicode(self.getParameterValue(self.S_SRS))
tsrs = unicode(self.getParameterValue(self.T_SRS)) tsrs = unicode(self.getParameterValue(self.T_SRS))
schema = unicode(self.getParameterValue(self.SCHEMA)) schema = unicode(self.getParameterValue(self.SCHEMA))
schemastring = "-lco SCHEMA="+schema schemastring = "-lco SCHEMA="+schema
table = unicode(self.getParameterValue(self.TABLE)) table = unicode(self.getParameterValue(self.TABLE))
pk = unicode(self.getParameterValue(self.PK)) pk = unicode(self.getParameterValue(self.PK))
pkstring = "-lco FID="+pk pkstring = "-lco FID="+pk
geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN)) geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN))
@ -156,13 +156,13 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
dim = self.DIMLIST[self.getParameterValue(self.DIM)] dim = self.DIMLIST[self.getParameterValue(self.DIM)]
dimstring = "-lco DIM="+dim dimstring = "-lco DIM="+dim
simplify = unicode(self.getParameterValue(self.SIMPLIFY)) simplify = unicode(self.getParameterValue(self.SIMPLIFY))
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
spat = self.getParameterValue(self.SPAT) spat = self.getParameterValue(self.SPAT)
ogrspat = self.ogrConnectionString(spat) ogrspat = self.ogrConnectionString(spat)
clip = self.getParameterValue(self.CLIP) clip = self.getParameterValue(self.CLIP)
where = unicode(self.getParameterValue(self.WHERE)) where = unicode(self.getParameterValue(self.WHERE))
wherestring = "-where '"+where+"'" wherestring = "-where '"+where+"'"
gt = unicode(self.getParameterValue(self.GT)) gt = unicode(self.getParameterValue(self.GT))
overwrite = self.getParameterValue(self.OVERWRITE) overwrite = self.getParameterValue(self.OVERWRITE)
append = self.getParameterValue(self.APPEND) append = self.getParameterValue(self.APPEND)
addfields = self.getParameterValue(self.ADDFIELDS) addfields = self.getParameterValue(self.ADDFIELDS)
@ -175,7 +175,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
arguments = [] arguments = []
arguments.append('-progress') arguments.append('-progress')
arguments.append('--config PG_USE_COPY YES') arguments.append('--config PG_USE_COPY YES')
arguments.append('-f') arguments.append('-f')
arguments.append('PostgreSQL') arguments.append('PostgreSQL')
arguments.append('PG:"host=') arguments.append('PG:"host=')
@ -189,7 +189,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
arguments.append('password=') arguments.append('password=')
arguments.append(password) arguments.append(password)
arguments.append('"') arguments.append('"')
arguments.append(dimstring) arguments.append(dimstring)
arguments.append(ogrLayer) arguments.append(ogrLayer)
if index: if index:
arguments.append(indexstring) arguments.append(indexstring)
@ -212,13 +212,13 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
arguments.append(pkstring) arguments.append(pkstring)
if len(table) > 0: if len(table) > 0:
arguments.append('-nln') arguments.append('-nln')
arguments.append(table) arguments.append(table)
if len(ssrs) > 0: if len(ssrs) > 0:
arguments.append('-s_srs') arguments.append('-s_srs')
arguments.append(ssrs) arguments.append(ssrs)
if len(tsrs) > 0: if len(tsrs) > 0:
arguments.append('-t_srs') arguments.append('-t_srs')
arguments.append(tsrs) arguments.append(tsrs)
if len(spat) > 0: if len(spat) > 0:
regionCoords = ogrspat.split(',') regionCoords = ogrspat.split(',')
arguments.append('-spat') arguments.append('-spat')
@ -231,7 +231,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
if skipfailures: if skipfailures:
arguments.append('-skipfailures') arguments.append('-skipfailures')
if where: if where:
arguments.append(wherestring) arguments.append(wherestring)
if len(simplify) > 0: if len(simplify) > 0:
arguments.append('-simplify') arguments.append('-simplify')
arguments.append(simplify) arguments.append(simplify)

6
python/plugins/processing/core/Processing.py
View File

@ -151,10 +151,10 @@ class Processing:
ProcessingConfig.readSettings() ProcessingConfig.readSettings()
RenderingStyles.loadStyles() RenderingStyles.loadStyles()
Processing.loadFromProviders() Processing.loadFromProviders()
# Inform registered listeners that all providers' algorithms have been loaded # Inform registered listeners that all providers' algorithms have been loaded
Processing.fireAlgsListHasChanged() Processing.fireAlgsListHasChanged()
@staticmethod @staticmethod
def updateAlgsList(): def updateAlgsList():
"""Call this method when there has been any change that """Call this method when there has been any change that
@ -185,7 +185,7 @@ class Processing:
called for all registered listeners. called for all registered listeners.
""" """
Processing.listeners.append(listener) Processing.listeners.append(listener)
@staticmethod @staticmethod
def removeAlgListListener(listener): def removeAlgListListener(listener):
try: try:

4
python/plugins/processing/script/snippets.py
View File

@ -1,4 +1,4 @@
##Iterate over the features of a layer. ##Iterate over the features of a layer.
feats = processing.features(layer) feats = processing.features(layer)
n = len(feats) n = len(feats)
for i, feat in enumerate(feats): for i, feat in enumerate(feats):
@ -9,7 +9,7 @@ for i, feat in enumerate(feats):
fields = processing.fields(layer) fields = processing.fields(layer)
# int, float and bool can be used as well as types # int, float and bool can be used as well as types
fields.append(('NEW_FIELD', str)) fields.append(('NEW_FIELD', str))
writer = processing.VectorWriter(output_file, None, fields, writer = processing.VectorWriter(output_file, None, fields,
processing.geomtype(layer), layer.crs()) processing.geomtype(layer), layer.crs())
##Create a new table ##Create a new table

6
src/app/qgsattributetabledialog.cpp
View File

@ -307,13 +307,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll; bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;
QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds(); QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();
this->runFieldCalculation(mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds); this->runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );
} }
void QgsAttributeTableDialog::updateFieldFromExpressionSelected() void QgsAttributeTableDialog::updateFieldFromExpressionSelected()
{ {
QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds(); QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds();
this->runFieldCalculation(mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds); this->runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );
} }
void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds ) void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds )
@ -345,7 +345,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
{ {
if ( !filteredIds.isEmpty() && !filteredIds.contains( feature.id() ) ) if ( !filteredIds.isEmpty() && !filteredIds.contains( feature.id() ) )
{ {
continue; continue;
} }
exp.setCurrentRowNumber( rownum ); exp.setCurrentRowNumber( rownum );

2
src/app/qgsattributetabledialog.h
View File

@ -185,7 +185,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
*/ */
void columnBoxInit(); void columnBoxInit();
void runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds = QgsFeatureIds()); void runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds = QgsFeatureIds() );
void updateFieldFromExpression(); void updateFieldFromExpression();
void updateFieldFromExpressionSelected(); void updateFieldFromExpressionSelected();

2
src/app/qgsguivectorlayertools.h
View File

@ -67,7 +67,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools, public QObject
* @param layer The layer to commit * @param layer The layer to commit
* @return True if successful * @return True if successful
*/ */
bool saveEdits( QgsVectorLayer* layer) const; bool saveEdits( QgsVectorLayer* layer ) const;
private: private:
void commitError( QgsVectorLayer* vlayer ) const; void commitError( QgsVectorLayer* vlayer ) const;

2
src/core/qgis.h
View File

@ -296,7 +296,7 @@ class CORE_EXPORT QGis
// It's assumed that this works on all systems supporting // It's assumed that this works on all systems supporting
// QLibrary // QLibrary
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#define cast_to_fptr(f) f #define cast_to_fptr(f) f
#else #else
inline void ( *cast_to_fptr( void *p ) )() inline void ( *cast_to_fptr( void *p ) )()
{ {

6
src/core/qgsmultirenderchecker.cpp
View File

@ -51,7 +51,7 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th
QVector<QgsDartMeasurement> dartMeasurements; QVector<QgsDartMeasurement> dartMeasurements;
Q_FOREACH( const QString& suffix, subDirs ) Q_FOREACH ( const QString& suffix, subDirs )
{ {
qDebug() << "Checking subdir " << suffix; qDebug() << "Checking subdir " << suffix;
bool result; bool result;
@ -83,8 +83,8 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th
if ( !successful ) if ( !successful )
{ {
Q_FOREACH( const QgsDartMeasurement& measurement, dartMeasurements ) Q_FOREACH ( const QgsDartMeasurement& measurement, dartMeasurements )
measurement.send(); measurement.send();
QgsDartMeasurement msg( "Image not accepted by test", QgsDartMeasurement::Text, "This may be caused because the test is supposed to fail or rendering inconsistencies." QgsDartMeasurement msg( "Image not accepted by test", QgsDartMeasurement::Text, "This may be caused because the test is supposed to fail or rendering inconsistencies."
"If this is a rendering inconsistency, please add another control image folder, add an anomaly image or increase the color tolerance." ); "If this is a rendering inconsistency, please add another control image folder, add an anomaly image or increase the color tolerance." );

4
src/gui/attributetable/qgsdualview.cpp
View File

@ -121,7 +121,7 @@ void QgsDualView::columnBoxInit()
// ... If there are primary key(s) defined // ... If there are primary key(s) defined
QStringList pkFields; QStringList pkFields;
Q_FOREACH( int attr, pkAttrs ) Q_FOREACH ( int attr, pkAttrs )
{ {
pkFields.append( "COALESCE(\"" + fields[attr].name() + "\", '<NULL>')" ); pkFields.append( "COALESCE(\"" + fields[attr].name() + "\", '<NULL>')" );
} }
@ -152,7 +152,7 @@ void QgsDualView::columnBoxInit()
mFeatureListPreviewButton->addAction( mActionExpressionPreview ); mFeatureListPreviewButton->addAction( mActionExpressionPreview );
mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu ); mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu );
Q_FOREACH( const QgsField& field, fields ) Q_FOREACH ( const QgsField& field, fields )
{ {
if ( mLayerCache->layer()->editorWidgetV2( mLayerCache->layer()->fieldNameIndex( field.name() ) ) != "Hidden" ) if ( mLayerCache->layer()->editorWidgetV2( mLayerCache->layer()->fieldNameIndex( field.name() ) ) != "Hidden" )
{ {

13
src/gui/qgsexpressionbuilderwidget.cpp
View File

@ -115,9 +115,9 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
txtExpressionString->setFoldingVisible( false ); txtExpressionString->setFoldingVisible( false );
customFunctionBotton->setVisible( QgsPythonRunner::isValid() ); customFunctionBotton->setVisible( QgsPythonRunner::isValid() );
txtPython->setVisible( false ); txtPython->setVisible( false );
txtPython->setText("@qgsfunction(args=-1, group='Custom')\n" txtPython->setText( "@qgsfunction(args=-1, group='Custom')\n"
"def func(values, feature, parent):\n" "def func(values, feature, parent):\n"
" return str(values)"); " return str(values)" );
} }
@ -298,9 +298,10 @@ void QgsExpressionBuilderWidget::setGeomCalculator( const QgsDistanceArea & da )
QString QgsExpressionBuilderWidget::expressionText() QString QgsExpressionBuilderWidget::expressionText()
{ {
if ( QgsPythonRunner::isValid() ) { if ( QgsPythonRunner::isValid() )
QString pythontext = txtPython->text(); {
QgsPythonRunner::run( pythontext ); QString pythontext = txtPython->text();
QgsPythonRunner::run( pythontext );
} }
return txtExpressionString->text(); return txtExpressionString->text();
} }

2
src/gui/qgsrelationeditorwidget.cpp
View File

@ -267,7 +267,7 @@ void QgsRelationEditorWidget::toggleEditing( bool state )
void QgsRelationEditorWidget::saveEdits() void QgsRelationEditorWidget::saveEdits()
{ {
mEditorContext.vectorLayerTools()->saveEdits(mRelation.referencingLayer() ); mEditorContext.vectorLayerTools()->saveEdits( mRelation.referencingLayer() );
} }
void QgsRelationEditorWidget::onCollapsedStateChanged( bool collapsed ) void QgsRelationEditorWidget::onCollapsedStateChanged( bool collapsed )

12
src/gui/qgsvectorlayertools.h
View File

@ -71,12 +71,12 @@ class GUI_EXPORT QgsVectorLayerTools
*/ */
virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0; virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0;
/** /**
* Should be called, when the features should be commited but the editing session is not ended. * Should be called, when the features should be commited but the editing session is not ended.
* *
* @param layer The layer to commit * @param layer The layer to commit
* @return True if successful * @return True if successful
*/ */
virtual bool saveEdits( QgsVectorLayer* layer ) const = 0; virtual bool saveEdits( QgsVectorLayer* layer ) const = 0;
}; };

4
src/gui/symbology-ng/qgsbrushstylecombobox.cpp
View File

@ -48,7 +48,7 @@ QgsBrushStyleComboBox::QgsBrushStyleComboBox( QWidget* parent )
{ {
Qt::BrushStyle style = styles.at( i ).first; Qt::BrushStyle style = styles.at( i ).first;
QString name = styles.at( i ).second; QString name = styles.at( i ).second;
addItem( iconForBrush( style ), name, QVariant( (int)style ) ); addItem( iconForBrush( style ), name, QVariant(( int )style ) );
} }
setCurrentIndex( 1 ); setCurrentIndex( 1 );
@ -63,7 +63,7 @@ Qt::BrushStyle QgsBrushStyleComboBox::brushStyle() const
void QgsBrushStyleComboBox::setBrushStyle( Qt::BrushStyle style ) void QgsBrushStyleComboBox::setBrushStyle( Qt::BrushStyle style )
{ {
int idx = findData( QVariant( (int)style ) ); int idx = findData( QVariant(( int )style ) );
setCurrentIndex( idx == -1 ? 0 : idx ); setCurrentIndex( idx == -1 ? 0 : idx );
} }

4
src/gui/symbology-ng/qgspenstylecombobox.cpp
View File

@ -40,7 +40,7 @@ QgsPenStyleComboBox::QgsPenStyleComboBox( QWidget* parent )
{ {
Qt::PenStyle style = styles.at( i ).first; Qt::PenStyle style = styles.at( i ).first;
QString name = styles.at( i ).second; QString name = styles.at( i ).second;
addItem( iconForPen( style ), name, QVariant( (int) style ) ); addItem( iconForPen( style ), name, QVariant(( int ) style ) );
} }
} }
@ -51,7 +51,7 @@ Qt::PenStyle QgsPenStyleComboBox::penStyle() const
void QgsPenStyleComboBox::setPenStyle( Qt::PenStyle style ) void QgsPenStyleComboBox::setPenStyle( Qt::PenStyle style )
{ {
int idx = findData( QVariant( (int) style ) ); int idx = findData( QVariant(( int ) style ) );
setCurrentIndex( idx == -1 ? 0 : idx ); setCurrentIndex( idx == -1 ? 0 : idx );
} }