Skip to content

Commit a3270b9

Browse files
author
mhugent
committed
Fix for typo and prepare commit script
git-svn-id: http://svn.osgeo.org/qgis/branches/table_join_branch@14025 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9d188a5 commit a3270b9

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

src/app/qgsvectorlayerproperties.cpp

+39-39
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
135135
connect( sliderTransparency, SIGNAL( valueChanged( int ) ), this, SLOT( sliderTransparency_valueChanged( int ) ) );
136136

137137
//insert existing join info
138-
QList< QgsVectorJoinInfo > joins = layer->vectorJoins();
139-
for( int i = 0; i < joins.size(); ++i )
140-
{
141-
addJoinToTreeWidget( joins[i] );
142-
}
138+
QList< QgsVectorJoinInfo > joins = layer->vectorJoins();
139+
for ( int i = 0; i < joins.size(); ++i )
140+
{
141+
addJoinToTreeWidget( joins[i] );
142+
}
143143

144144
//for each overlay plugin create a new tab
145145
int position;
@@ -803,41 +803,41 @@ QString QgsVectorLayerProperties::metadata()
803803

804804
QString xMin, yMin, xMax, yMax;
805805
double changeoverValue = 99999; // The 'largest' 5 digit number
806-
if (fabs(myExtent.xMinimum()) > changeoverValue)
807-
{
808-
xMin = QString("%1").arg(myExtent.xMinimum(), 0, 'f', 2);
809-
}
806+
if ( fabs( myExtent.xMinimum() ) > changeoverValue )
807+
{
808+
xMin = QString( "%1" ).arg( myExtent.xMinimum(), 0, 'f', 2 );
809+
}
810810
else
811-
{
812-
xMin = QString("%1").arg(myExtent.xMinimum());
813-
}
811+
{
812+
xMin = QString( "%1" ).arg( myExtent.xMinimum() );
813+
}
814814

815-
if (fabs(myExtent.yMinimum()) > changeoverValue)
816-
{
817-
yMin = QString("%1").arg(myExtent.yMinimum(), 0, 'f', 2);
818-
}
815+
if ( fabs( myExtent.yMinimum() ) > changeoverValue )
816+
{
817+
yMin = QString( "%1" ).arg( myExtent.yMinimum(), 0, 'f', 2 );
818+
}
819819
else
820-
{
821-
yMin = QString("%1").arg(myExtent.yMinimum());
822-
}
820+
{
821+
yMin = QString( "%1" ).arg( myExtent.yMinimum() );
822+
}
823823

824-
if (fabs(myExtent.xMaximum()) > changeoverValue)
825-
{
826-
xMax = QString("%1").arg(myExtent.xMaximum(), 0, 'f', 2);
827-
}
824+
if ( fabs( myExtent.xMaximum() ) > changeoverValue )
825+
{
826+
xMax = QString( "%1" ).arg( myExtent.xMaximum(), 0, 'f', 2 );
827+
}
828828
else
829-
{
830-
xMax = QString("%1").arg(myExtent.xMaximum());
831-
}
829+
{
830+
xMax = QString( "%1" ).arg( myExtent.xMaximum() );
831+
}
832832

833-
if (fabs(myExtent.yMaximum()) > changeoverValue)
834-
{
835-
yMax = QString("%1").arg(myExtent.yMaximum(), 0, 'f', 2);
836-
}
833+
if ( fabs( myExtent.yMaximum() ) > changeoverValue )
834+
{
835+
yMax = QString( "%1" ).arg( myExtent.yMaximum(), 0, 'f', 2 );
836+
}
837837
else
838-
{
839-
yMax = QString("%1").arg(myExtent.yMaximum());
840-
}
838+
{
839+
yMax = QString( "%1" ).arg( myExtent.yMaximum() );
840+
}
841841

842842
myMetadata += tr( "In layer spatial reference system units : " )
843843
+ tr( "xMin,yMin %1,%2 : xMax,yMax %3,%4" )
@@ -1172,19 +1172,19 @@ void QgsVectorLayerProperties::setUsingNewSymbology( bool useNewSymbology )
11721172
void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
11731173
{
11741174
QgsAddJoinDialog d( layer );
1175-
if( d.exec() == QDialog::QDialog::Accepted )
1175+
if ( d.exec() == QDialog::Accepted )
11761176
{
11771177
QgsVectorJoinInfo info;
11781178
info.targetField = d.targetField();
11791179
info.joinLayerId = d.joinedLayerId();
11801180
info.joinField = d.joinField();
1181-
if( layer )
1181+
if ( layer )
11821182
{
11831183
//create attribute index if possible. Todo: ask user if this should be done (e.g. in QgsAddJoinDialog)
1184-
if( d.createAttributeIndex() )
1184+
if ( d.createAttributeIndex() )
11851185
{
11861186
QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );
1187-
if( joinLayer )
1187+
if ( joinLayer )
11881188
{
11891189
joinLayer->dataProvider()->createAttributeIndex( info.joinField );
11901190
}
@@ -1202,7 +1202,7 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( QgsVectorJoinInfo& join )
12021202
QTreeWidgetItem* joinItem = new QTreeWidgetItem();
12031203

12041204
QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( join.joinLayerId ) );
1205-
if( !joinLayer )
1205+
if ( !joinLayer )
12061206
{
12071207
return;
12081208
}
@@ -1222,7 +1222,7 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( QgsVectorJoinInfo& join )
12221222
void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
12231223
{
12241224
QTreeWidgetItem* currentJoinItem = mJoinTreeWidget->currentItem();
1225-
if( !layer || !currentJoinItem )
1225+
if ( !layer || !currentJoinItem )
12261226
{
12271227
return;
12281228
}

0 commit comments

Comments
 (0)