[QGIS Commit] r14025 - branches/table_join_branch/src/app

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-08-07 19:34:00 +0000 (Sat, 07 Aug 2010)
New Revision: 14025

Modified:
   branches/table_join_branch/src/app/qgsvectorlayerproperties.cpp
Log:
Fix for typo and prepare commit script

Modified: branches/table_join_branch/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- branches/table_join_branch/src/app/qgsvectorlayerproperties.cpp	2010-08-07 16:39:13 UTC (rev 14024)
+++ branches/table_join_branch/src/app/qgsvectorlayerproperties.cpp	2010-08-07 19:34:00 UTC (rev 14025)
@@ -135,11 +135,11 @@
   connect( sliderTransparency, SIGNAL( valueChanged( int ) ), this, SLOT( sliderTransparency_valueChanged( int ) ) );
 
   //insert existing join info
-   QList< QgsVectorJoinInfo > joins = layer->vectorJoins();
-   for( int i = 0; i < joins.size(); ++i )
-   {
-      addJoinToTreeWidget( joins[i] );
-   }
+  QList< QgsVectorJoinInfo > joins = layer->vectorJoins();
+  for ( int i = 0; i < joins.size(); ++i )
+  {
+    addJoinToTreeWidget( joins[i] );
+  }
 
   //for each overlay plugin create a new tab
   int position;
@@ -803,41 +803,41 @@
 
   QString xMin, yMin, xMax, yMax;
   double changeoverValue = 99999; // The 'largest' 5 digit number
-  if (fabs(myExtent.xMinimum()) > changeoverValue)
-    {
-      xMin = QString("%1").arg(myExtent.xMinimum(), 0, 'f', 2);
-    }
+  if ( fabs( myExtent.xMinimum() ) > changeoverValue )
+  {
+    xMin = QString( "%1" ).arg( myExtent.xMinimum(), 0, 'f', 2 );
+  }
   else
-    {
-      xMin = QString("%1").arg(myExtent.xMinimum());
-    }
+  {
+    xMin = QString( "%1" ).arg( myExtent.xMinimum() );
+  }
 
-  if (fabs(myExtent.yMinimum()) > changeoverValue)
-    {
-      yMin = QString("%1").arg(myExtent.yMinimum(), 0, 'f', 2);
-    }
+  if ( fabs( myExtent.yMinimum() ) > changeoverValue )
+  {
+    yMin = QString( "%1" ).arg( myExtent.yMinimum(), 0, 'f', 2 );
+  }
   else
-    {
-      yMin = QString("%1").arg(myExtent.yMinimum());
-    }
+  {
+    yMin = QString( "%1" ).arg( myExtent.yMinimum() );
+  }
 
-  if (fabs(myExtent.xMaximum()) > changeoverValue)
-    {
-      xMax = QString("%1").arg(myExtent.xMaximum(), 0, 'f', 2);
-    }
+  if ( fabs( myExtent.xMaximum() ) > changeoverValue )
+  {
+    xMax = QString( "%1" ).arg( myExtent.xMaximum(), 0, 'f', 2 );
+  }
   else
-    {
-      xMax = QString("%1").arg(myExtent.xMaximum());
-    }
+  {
+    xMax = QString( "%1" ).arg( myExtent.xMaximum() );
+  }
 
-  if (fabs(myExtent.yMaximum()) > changeoverValue)
-    {
-      yMax = QString("%1").arg(myExtent.yMaximum(), 0, 'f', 2);
-    }
+  if ( fabs( myExtent.yMaximum() ) > changeoverValue )
+  {
+    yMax = QString( "%1" ).arg( myExtent.yMaximum(), 0, 'f', 2 );
+  }
   else
-    {
-      yMax = QString("%1").arg(myExtent.yMaximum());
-    }
+  {
+    yMax = QString( "%1" ).arg( myExtent.yMaximum() );
+  }
 
   myMetadata += tr( "In layer spatial reference system units : " )
                 + tr( "xMin,yMin %1,%2 : xMax,yMax %3,%4" )
@@ -1172,19 +1172,19 @@
 void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
 {
   QgsAddJoinDialog d( layer );
-  if( d.exec() == QDialog::QDialog::Accepted )
+  if ( d.exec() == QDialog::Accepted )
   {
     QgsVectorJoinInfo info;
     info.targetField = d.targetField();
     info.joinLayerId = d.joinedLayerId();
     info.joinField = d.joinField();
-    if( layer )
+    if ( layer )
     {
       //create attribute index if possible. Todo: ask user if this should be done (e.g. in QgsAddJoinDialog)
-      if( d.createAttributeIndex() )
+      if ( d.createAttributeIndex() )
       {
         QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );
-        if( joinLayer )
+        if ( joinLayer )
         {
           joinLayer->dataProvider()->createAttributeIndex( info.joinField );
         }
@@ -1202,7 +1202,7 @@
   QTreeWidgetItem* joinItem = new QTreeWidgetItem();
 
   QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( join.joinLayerId ) );
-  if( !joinLayer )
+  if ( !joinLayer )
   {
     return;
   }
@@ -1222,7 +1222,7 @@
 void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
 {
   QTreeWidgetItem* currentJoinItem = mJoinTreeWidget->currentItem();
-  if( !layer || !currentJoinItem )
+  if ( !layer || !currentJoinItem )
   {
     return;
   }