Avoid some clazy detaching temporary warnings

qgis · Oct 26, 2015 · f7f659b · f7f659b
1 parent ad45f32
commit f7f659b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -2114,8 +2114,9 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
 
         QFileInfo fi( outputFilePath );
         // build the world file name
+        QString outputSuffix = fi.suffix();
         QString worldFileName = fi.absolutePath() + "/" + fi.baseName() + "."
-                                + fi.suffix()[0] + fi.suffix()[fi.suffix().size()-1] + "w";
+                                + outputSuffix.at( 0 ) + outputSuffix.at( fi.suffix().size() - 1 ) + "w";
 
         writeWorldFile( worldFileName, a, b, c, d, e, f );
       }
@@ -2334,8 +2335,9 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
 
           QFileInfo fi( imageFilename );
           // build the world file name
+          QString outputSuffix = fi.suffix();
           QString worldFileName = fi.absolutePath() + "/" + fi.baseName() + "."
-                                  + fi.suffix()[0] + fi.suffix()[fi.suffix().size()-1] + "w";
+                                  + outputSuffix.at( 0 ) + outputSuffix.at( fi.suffix().size() - 1 ) + "w";
 
           writeWorldFile( worldFileName, a, b, c, d, e, f );
         }
@@ -2998,8 +3000,8 @@ void QgsComposer::on_mActionSaveAsTemplate_triggered()
   QSettings settings;
   QString lastSaveDir = settings.value( "UI/lastComposerTemplateDir", "" ).toString();
 #ifdef Q_OS_MAC
-    mQgis->activateWindow();
-    this->raise();
+  mQgis->activateWindow();
+  this->raise();
 #endif
   QString saveFileName = QFileDialog::getSaveFileName(
                            this,

diff --git a/tests/src/core/testqgsspatialindex.cpp b/tests/src/core/testqgsspatialindex.cpp
@@ -102,7 +102,7 @@ class TestQgsSpatialIndex : public QObject
       QVERIFY( indexCopy.refs() == 2 );
 
       // do a modification
-      QgsFeature f2( _pointFeatures()[1] );
+      QgsFeature f2( _pointFeatures().at( 1 ) );
       indexCopy.deleteFeature( f2 );
 
       // check that the index is not shared anymore