Fix indentation - issue #20337

dwadler · nyalldawson · commit ba81a2ee137c · 2018-11-20T11:03:55.000+11:00
Hopefully this is correct.
I'm not having much luck getting prepare-commit.sh or astyle.sh to run on Windows.
diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp
@@ -222,14 +222,14 @@ QSqlDatabase QgsDb2Provider::getDatabase( const QString &connInfo, QString &errM
         QSqlDatabase::removeDatabase( connectionName );
       }, Qt::DirectConnection );
     }
-	}
+  }
   else  /* if existing database connection */
   {
     QgsDebugMsg( QStringLiteral( "found existing connection, use the existing one" ) );
     db = QSqlDatabase::database( threadSafeConnectionName );
   }
-  locker.unlock();  
-  
+  locker.unlock();
+
   db.setHostName( host );
   db.setPort( port.toInt() );
   bool connected = false;
diff --git a/src/providers/db2/qgsdb2provider.h b/src/providers/db2/qgsdb2provider.h
@@ -124,8 +124,8 @@ class QgsDb2Provider : public QgsVectorDataProvider
        * Returns a thread-safe connection name for use with QSqlDatabase
        */
     static QString dbConnectionName( const QString &name );
-	
-    static QMutex sMutex;	
+
+    static QMutex sMutex;
 
     QgsFields mAttributeFields; //fields
     QMap<int, QVariant> mDefaultValues;

Original file line number	Diff line number	Diff line change
`@@ -222,14 +222,14 @@ QSqlDatabase QgsDb2Provider::getDatabase( const QString &connInfo, QString &errM`
`222`	`222`	`QSqlDatabase::removeDatabase( connectionName );`
`223`	`223`	`}, Qt::DirectConnection );`
`224`	`224`	`}`
`225`		`- }`
	`225`	`+ }`
`226`	`226`	`else /* if existing database connection */`
`227`	`227`	`{`
`228`	`228`	`QgsDebugMsg( QStringLiteral( "found existing connection, use the existing one" ) );`
`229`	`229`	`db = QSqlDatabase::database( threadSafeConnectionName );`
`230`	`230`	`}`
`231`		`- locker.unlock();`
`232`		`-`
	`231`	`+ locker.unlock();`
	`232`	`+`
`233`	`233`	`db.setHostName( host );`
`234`	`234`	`db.setPort( port.toInt() );`
`235`	`235`	`bool connected = false;`