Fix clazy qfileinfo-exists warnings

nyalldawson · nyalldawson · commit f2672151c2bb · 2016-10-22T22:46:14.000+10:00
From the clazy docs:

Finds places using QFileInfo("foo").exists() instead of the faster
version QFileInfo::exists("foo"). According to Qt's docs: "Using
this function is faster than using QFileInfo(file).exists() for
file system access."
diff --git a/src/app/openstreetmap/qgsosmimportdialog.cpp b/src/app/openstreetmap/qgsosmimportdialog.cpp
@@ -84,7 +84,7 @@ void QgsOSMImportDialog::dbFileNameChanged( const QString& fileName )
 void QgsOSMImportDialog::onOK()
 {
   // output file exists?
-  if ( QFileInfo( editDbFileName->text() ).exists() )
+  if ( QFileInfo::exists( editDbFileName->text() ) )
   {
     int res = QMessageBox::question( this, tr( "OpenStreetMap import" ), tr( "Output database file exists already. Overwrite?" ), QMessageBox::Yes | QMessageBox::No );
     if ( res != QMessageBox::Yes )
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1765,7 +1765,7 @@ void QgisApp::createActions()
   mActionReportaBug->setShortcut( QString() );
 #endif
 
-  mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() );
+  mActionHelpContents->setEnabled( QFileInfo::exists( QgsApplication::pkgDataPath() + "/doc/index.html" ) );
 
   connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
   connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
@@ -9185,7 +9185,7 @@ void QgisApp::helpContents()
 
 void QgisApp::apiDocumentation()
 {
-  if ( QFileInfo( QgsApplication::pkgDataPath() + "/doc/api/index.html" ).exists() )
+  if ( QFileInfo::exists( QgsApplication::pkgDataPath() + "/doc/api/index.html" ) )
   {
     openURL( "api/index.html" );
   }
diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp
@@ -209,7 +209,7 @@ QString QgsHandleBadLayers::filename( int row )
 
 void QgsHandleBadLayers::setFilename( int row, const QString& filename )
 {
-  if ( !QFileInfo( filename ).exists() )
+  if ( !QFileInfo::exists( filename ) )
     return;
 
   QString type = mLayerList->item( row, 1 )->text();
diff --git a/src/core/gps/qgsgpsdetector.cpp b/src/core/gps/qgsgpsdetector.cpp
@@ -48,7 +48,7 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()
   {
     for ( int i = 0; i < 10; ++i )
     {
-      if ( QFileInfo( linuxDev.arg( i ) ).exists() )
+      if ( QFileInfo::exists( linuxDev.arg( i ) ) )
       {
         devs << QPair<QString, QString>( linuxDev.arg( i ), linuxDev.arg( i ) );
       }
diff --git a/src/gui/qgscodeeditorpython.cpp b/src/gui/qgscodeeditorpython.cpp
@@ -74,7 +74,7 @@ void QgsCodeEditorPython::setSciLexerPython()
   }
   else if ( mAPISFilesList.length() == 1 && mAPISFilesList[0].right( 3 ) == "pap" )
   {
-    if ( !QFileInfo( mAPISFilesList[0] ).exists() )
+    if ( !QFileInfo::exists( mAPISFilesList[0] ) )
     {
       QgsDebugMsg( QString( "The apis file %1 not found" ).arg( mAPISFilesList.at( 0 ) ) );
       return;
@@ -86,7 +86,7 @@ void QgsCodeEditorPython::setSciLexerPython()
   {
     for ( int i = 0; i < mAPISFilesList.size(); i++ )
     {
-      if ( !QFileInfo( mAPISFilesList[i] ).exists() )
+      if ( !QFileInfo::exists( mAPISFilesList[i] ) )
       {
         QgsDebugMsg( QString( "The apis file %1 was not found" ).arg( mAPISFilesList.at( i ) ) );
         return;
diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp
@@ -308,7 +308,7 @@ QString QgsProjectionSelector::selectedProj4String()
   if ( srsId.toLong() >= USER_CRS_START_ID )
   {
     databaseFileName = QgsApplication::qgisUserDbFilePath();
-    if ( !QFileInfo( databaseFileName ).exists() ) //its unlikely that this condition will ever be reached
+    if ( !QFileInfo::exists( databaseFileName ) ) //its unlikely that this condition will ever be reached
       return QString();
   }
   else //must be a system projection then
@@ -372,7 +372,7 @@ QString QgsProjectionSelector::getSelectedExpression( const QString& expression
   if ( lvi->text( QGIS_CRS_ID_COLUMN ).toLong() >= USER_CRS_START_ID )
   {
     databaseFileName = QgsApplication::qgisUserDbFilePath();
-    if ( !QFileInfo( databaseFileName ).exists() )
+    if ( !QFileInfo::exists( databaseFileName ) )
     {
       return QString();
     }
@@ -483,7 +483,7 @@ void QgsProjectionSelector::loadUserCrsList( QSet<QString> *crsFilter )
   // if it doesnt exist we copy it in from the global resources dir
 
   //return straight away if the user has not created any custom projections
-  if ( !QFileInfo( databaseFileName ).exists() )
+  if ( !QFileInfo::exists( databaseFileName ) )
   {
     QgsDebugMsg( "Users qgis.db not found...skipping" );
     mUserProjListDone = true;
@@ -566,7 +566,7 @@ void QgsProjectionSelector::loadCrsList( QSet<QString> *crsFilter )
   //read only filesystem because otherwise sqlite will try
   //to create the db file on the fly
 
-  if ( !QFileInfo( mSrsDatabaseFileName ).exists() )
+  if ( !QFileInfo::exists( mSrsDatabaseFileName ) )
   {
     mProjListDone = true;
     return;
@@ -888,7 +888,7 @@ long QgsProjectionSelector::getLargestCrsIdMatch( const QString& theSql )
 
   //check the db is available
   QString databaseFileName = QgsApplication::qgisUserDbFilePath();
-  if ( QFileInfo( databaseFileName ).exists() ) //only bother trying to open if the file exists
+  if ( QFileInfo::exists( databaseFileName ) ) //only bother trying to open if the file exists
   {
     result = sqlite3_open_v2( databaseFileName.toUtf8().data(), &database, SQLITE_OPEN_READONLY, nullptr );
     if ( result )
diff --git a/src/gui/symbology-ng/qgssymbollayerwidget.cpp b/src/gui/symbology-ng/qgssymbollayerwidget.cpp
@@ -2036,7 +2036,7 @@ void QgsSvgMarkerSymbolLayerWidget::on_mFileToolButton_clicked()
 
 void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_textEdited( const QString& text )
 {
-  if ( !QFileInfo( text ).exists() )
+  if ( !QFileInfo::exists( text ) )
   {
     return;
   }
@@ -2047,7 +2047,7 @@ void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_textEdited( const QString&
 
 void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_editingFinished()
 {
-  if ( !QFileInfo( mFileLineEdit->text() ).exists() )
+  if ( !QFileInfo::exists( mFileLineEdit->text() ) )
   {
     QUrl url( mFileLineEdit->text() );
     if ( !url.isValid() )
diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
@@ -670,7 +670,7 @@ bool QgsDelimitedTextSourceSelect::validate()
   {
     message = tr( "Please select an input file" );
   }
-  else if ( ! QFileInfo( txtFilePath->text() ).exists() )
+  else if ( ! QFileInfo::exists( txtFilePath->text() ) )
   {
     message = tr( "File %1 does not exist" ).arg( txtFilePath->text() );
   }
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -759,7 +759,7 @@ void QgsGrass::setMapsetSearchPathWatcher()
 
   QString searchFilePath = getDefaultMapsetPath() + "/SEARCH_PATH";
 
-  if ( QFileInfo( searchFilePath ).exists() )
+  if ( QFileInfo::exists( searchFilePath ) )
   {
     QgsDebugMsg( "add watcher on SEARCH_PATH file " + searchFilePath );
     mMapsetSearchPathWatcher->addPath( searchFilePath );
@@ -781,7 +781,7 @@ void QgsGrass::onSearchPathFileChanged( const QString & path )
   {
     // changed or removed
     loadMapsetSearchPath();
-    if ( !QFileInfo( searchFilePath ).exists() ) // removed
+    if ( !QFileInfo::exists( searchFilePath ) ) // removed
     {
       // reset watcher to mapset
       setMapsetSearchPathWatcher();
@@ -790,7 +790,7 @@ void QgsGrass::onSearchPathFileChanged( const QString & path )
   else
   {
     // mapset directory changed
-    if ( QFileInfo( searchFilePath ).exists() ) // search path file added
+    if ( QFileInfo::exists( searchFilePath ) ) // search path file added
     {
       loadMapsetSearchPath();
       setMapsetSearchPathWatcher();
diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp
@@ -804,7 +804,7 @@ bool QgsGrassExternal::import()
     QString cmd = QgsGrass::gisbase() + "/bin/r.external";
     QStringList arguments;
 
-    if ( QFileInfo( mSource ).exists() )
+    if ( QFileInfo::exists( mSource ) )
     {
       arguments << "input=" + mSource;
     }
diff --git a/src/providers/grass/qgsgrassvectormap.cpp b/src/providers/grass/qgsgrassvectormap.cpp
@@ -504,7 +504,7 @@ bool QgsGrassVectorMap::mapOutdated()
   {
     // If the cidx file has been deleted, the map is currently being modified
     // by an external tool. Do not update until the cidx file has been recreated.
-    if ( !QFileInfo( dp + "/cidx" ).exists() )
+    if ( !QFileInfo::exists( dp + "/cidx" ) )
     {
       QgsDebugMsg( "The map is being modified and is unavailable : " + mGrassObject.toString() );
       return false;
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -298,7 +298,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
   if ( suffix == "dbf" )
   {
     QString pathShp = thePath.left( thePath.count() - 4 ) + ".shp";
-    if ( QFileInfo( pathShp ).exists() )
+    if ( QFileInfo::exists( pathShp ) )
       return nullptr;
   }
 
diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp
@@ -374,7 +374,7 @@ void TestQgsWcsPublicServers::test()
         QString myPath = myVersionDirPath + '/' + myCoverage.identifier;
         QString myLogPath = myPath + ".log";
 
-        if ( QFileInfo( myLogPath ).exists() && !mForce )
+        if ( QFileInfo::exists( myLogPath ) && !mForce )
         {
           //QMap<QString, QString> log = readLog( myLogPath );
           //if ( !log.value( "identifier" ).isEmpty() && log.value( "error" ).isEmpty() ) continue;

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void QgsOSMImportDialog::dbFileNameChanged( const QString& fileName )`
`84`	`84`	`void QgsOSMImportDialog::onOK()`
`85`	`85`	`{`
`86`	`86`	`// output file exists?`
`87`		`- if ( QFileInfo( editDbFileName->text() ).exists() )`
	`87`	`+ if ( QFileInfo::exists( editDbFileName->text() ) )`
`88`	`88`	`{`
`89`	`89`	`int res = QMessageBox::question( this, tr( "OpenStreetMap import" ), tr( "Output database file exists already. Overwrite?" ), QMessageBox::Yes \| QMessageBox::No );`
`90`	`90`	`if ( res != QMessageBox::Yes )`
Original file line number	Diff line number	Diff line change
`@@ -1765,7 +1765,7 @@ void QgisApp::createActions()`
`1765`	`1765`	`mActionReportaBug->setShortcut( QString() );`
`1766`	`1766`	`#endif`
`1767`	`1767`
`1768`		`- mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() );`
	`1768`	`+ mActionHelpContents->setEnabled( QFileInfo::exists( QgsApplication::pkgDataPath() + "/doc/index.html" ) );`
`1769`	`1769`
`1770`	`1770`	`connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );`
`1771`	`1771`	`connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );`
`@@ -9185,7 +9185,7 @@ void QgisApp::helpContents()`
`9185`	`9185`
`9186`	`9186`	`void QgisApp::apiDocumentation()`
`9187`	`9187`	`{`
`9188`		`- if ( QFileInfo( QgsApplication::pkgDataPath() + "/doc/api/index.html" ).exists() )`
	`9188`	`+ if ( QFileInfo::exists( QgsApplication::pkgDataPath() + "/doc/api/index.html" ) )`
`9189`	`9189`	`{`
`9190`	`9190`	`openURL( "api/index.html" );`
`9191`	`9191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ QString QgsHandleBadLayers::filename( int row )`
`209`	`209`
`210`	`210`	`void QgsHandleBadLayers::setFilename( int row, const QString& filename )`
`211`	`211`	`{`
`212`		`- if ( !QFileInfo( filename ).exists() )`
	`212`	`+ if ( !QFileInfo::exists( filename ) )`
`213`	`213`	`return;`
`214`	`214`
`215`	`215`	`QString type = mLayerList->item( row, 1 )->text();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()`
`48`	`48`	`{`
`49`	`49`	`for ( int i = 0; i < 10; ++i )`
`50`	`50`	`{`
`51`		`- if ( QFileInfo( linuxDev.arg( i ) ).exists() )`
	`51`	`+ if ( QFileInfo::exists( linuxDev.arg( i ) ) )`
`52`	`52`	`{`
`53`	`53`	`devs << QPair<QString, QString>( linuxDev.arg( i ), linuxDev.arg( i ) );`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void QgsCodeEditorPython::setSciLexerPython()`
`74`	`74`	`}`
`75`	`75`	`else if ( mAPISFilesList.length() == 1 && mAPISFilesList[0].right( 3 ) == "pap" )`
`76`	`76`	`{`
`77`		`- if ( !QFileInfo( mAPISFilesList[0] ).exists() )`
	`77`	`+ if ( !QFileInfo::exists( mAPISFilesList[0] ) )`
`78`	`78`	`{`
`79`	`79`	`QgsDebugMsg( QString( "The apis file %1 not found" ).arg( mAPISFilesList.at( 0 ) ) );`
`80`	`80`	`return;`
`@@ -86,7 +86,7 @@ void QgsCodeEditorPython::setSciLexerPython()`
`86`	`86`	`{`
`87`	`87`	`for ( int i = 0; i < mAPISFilesList.size(); i++ )`
`88`	`88`	`{`
`89`		`- if ( !QFileInfo( mAPISFilesList[i] ).exists() )`
	`89`	`+ if ( !QFileInfo::exists( mAPISFilesList[i] ) )`
`90`	`90`	`{`
`91`	`91`	`QgsDebugMsg( QString( "The apis file %1 was not found" ).arg( mAPISFilesList.at( i ) ) );`
`92`	`92`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ QString QgsProjectionSelector::selectedProj4String()`
`308`	`308`	`if ( srsId.toLong() >= USER_CRS_START_ID )`
`309`	`309`	`{`
`310`	`310`	`databaseFileName = QgsApplication::qgisUserDbFilePath();`
`311`		`- if ( !QFileInfo( databaseFileName ).exists() ) //its unlikely that this condition will ever be reached`
	`311`	`+ if ( !QFileInfo::exists( databaseFileName ) ) //its unlikely that this condition will ever be reached`
`312`	`312`	`return QString();`
`313`	`313`	`}`
`314`	`314`	`else //must be a system projection then`
`@@ -372,7 +372,7 @@ QString QgsProjectionSelector::getSelectedExpression( const QString& expression`
`372`	`372`	`if ( lvi->text( QGIS_CRS_ID_COLUMN ).toLong() >= USER_CRS_START_ID )`
`373`	`373`	`{`
`374`	`374`	`databaseFileName = QgsApplication::qgisUserDbFilePath();`
`375`		`- if ( !QFileInfo( databaseFileName ).exists() )`
	`375`	`+ if ( !QFileInfo::exists( databaseFileName ) )`
`376`	`376`	`{`
`377`	`377`	`return QString();`
`378`	`378`	`}`
`@@ -483,7 +483,7 @@ void QgsProjectionSelector::loadUserCrsList( QSet<QString> *crsFilter )`
`483`	`483`	`// if it doesnt exist we copy it in from the global resources dir`
`484`	`484`
`485`	`485`	`//return straight away if the user has not created any custom projections`
`486`		`- if ( !QFileInfo( databaseFileName ).exists() )`
	`486`	`+ if ( !QFileInfo::exists( databaseFileName ) )`
`487`	`487`	`{`
`488`	`488`	`QgsDebugMsg( "Users qgis.db not found...skipping" );`
`489`	`489`	`mUserProjListDone = true;`
`@@ -566,7 +566,7 @@ void QgsProjectionSelector::loadCrsList( QSet<QString> *crsFilter )`
`566`	`566`	`//read only filesystem because otherwise sqlite will try`
`567`	`567`	`//to create the db file on the fly`
`568`	`568`
`569`		`- if ( !QFileInfo( mSrsDatabaseFileName ).exists() )`
	`569`	`+ if ( !QFileInfo::exists( mSrsDatabaseFileName ) )`
`570`	`570`	`{`
`571`	`571`	`mProjListDone = true;`
`572`	`572`	`return;`
`@@ -888,7 +888,7 @@ long QgsProjectionSelector::getLargestCrsIdMatch( const QString& theSql )`
`888`	`888`
`889`	`889`	`//check the db is available`
`890`	`890`	`QString databaseFileName = QgsApplication::qgisUserDbFilePath();`
`891`		`- if ( QFileInfo( databaseFileName ).exists() ) //only bother trying to open if the file exists`
	`891`	`+ if ( QFileInfo::exists( databaseFileName ) ) //only bother trying to open if the file exists`
`892`	`892`	`{`
`893`	`893`	`result = sqlite3_open_v2( databaseFileName.toUtf8().data(), &database, SQLITE_OPEN_READONLY, nullptr );`
`894`	`894`	`if ( result )`
Original file line number	Diff line number	Diff line change
`@@ -2036,7 +2036,7 @@ void QgsSvgMarkerSymbolLayerWidget::on_mFileToolButton_clicked()`
`2036`	`2036`
`2037`	`2037`	`void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_textEdited( const QString& text )`
`2038`	`2038`	`{`
`2039`		`- if ( !QFileInfo( text ).exists() )`
	`2039`	`+ if ( !QFileInfo::exists( text ) )`
`2040`	`2040`	`{`
`2041`	`2041`	`return;`
`2042`	`2042`	`}`
`@@ -2047,7 +2047,7 @@ void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_textEdited( const QString&`
`2047`	`2047`
`2048`	`2048`	`void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_editingFinished()`
`2049`	`2049`	`{`
`2050`		`- if ( !QFileInfo( mFileLineEdit->text() ).exists() )`
	`2050`	`+ if ( !QFileInfo::exists( mFileLineEdit->text() ) )`
`2051`	`2051`	`{`
`2052`	`2052`	`QUrl url( mFileLineEdit->text() );`
`2053`	`2053`	`if ( !url.isValid() )`
Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ bool QgsDelimitedTextSourceSelect::validate()`
`670`	`670`	`{`
`671`	`671`	`message = tr( "Please select an input file" );`
`672`	`672`	`}`
`673`		`- else if ( ! QFileInfo( txtFilePath->text() ).exists() )`
	`673`	`+ else if ( ! QFileInfo::exists( txtFilePath->text() ) )`
`674`	`674`	`{`
`675`	`675`	`message = tr( "File %1 does not exist" ).arg( txtFilePath->text() );`
`676`	`676`	`}`
Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ void QgsGrass::setMapsetSearchPathWatcher()`
`759`	`759`
`760`	`760`	`QString searchFilePath = getDefaultMapsetPath() + "/SEARCH_PATH";`
`761`	`761`
`762`		`- if ( QFileInfo( searchFilePath ).exists() )`
	`762`	`+ if ( QFileInfo::exists( searchFilePath ) )`
`763`	`763`	`{`
`764`	`764`	`QgsDebugMsg( "add watcher on SEARCH_PATH file " + searchFilePath );`
`765`	`765`	`mMapsetSearchPathWatcher->addPath( searchFilePath );`
`@@ -781,7 +781,7 @@ void QgsGrass::onSearchPathFileChanged( const QString & path )`
`781`	`781`	`{`
`782`	`782`	`// changed or removed`
`783`	`783`	`loadMapsetSearchPath();`
`784`		`- if ( !QFileInfo( searchFilePath ).exists() ) // removed`
	`784`	`+ if ( !QFileInfo::exists( searchFilePath ) ) // removed`
`785`	`785`	`{`
`786`	`786`	`// reset watcher to mapset`
`787`	`787`	`setMapsetSearchPathWatcher();`
`@@ -790,7 +790,7 @@ void QgsGrass::onSearchPathFileChanged( const QString & path )`
`790`	`790`	`else`
`791`	`791`	`{`
`792`	`792`	`// mapset directory changed`
`793`		`- if ( QFileInfo( searchFilePath ).exists() ) // search path file added`
	`793`	`+ if ( QFileInfo::exists( searchFilePath ) ) // search path file added`
`794`	`794`	`{`
`795`	`795`	`loadMapsetSearchPath();`
`796`	`796`	`setMapsetSearchPathWatcher();`
Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,7 @@ bool QgsGrassExternal::import()`
`804`	`804`	`QString cmd = QgsGrass::gisbase() + "/bin/r.external";`
`805`	`805`	`QStringList arguments;`
`806`	`806`
`807`		`- if ( QFileInfo( mSource ).exists() )`
	`807`	`+ if ( QFileInfo::exists( mSource ) )`
`808`	`808`	`{`
`809`	`809`	`arguments << "input=" + mSource;`
`810`	`810`	`}`