Skip to content
Permalink
Browse files

Avoid some clazy detaching temporary warnings

  • Loading branch information
nyalldawson committed Oct 26, 2015
1 parent ad45f32 commit f7f659be0be3c69de90867c4186369a6235c6a16
Showing with 7 additions and 5 deletions.
  1. +6 −4 src/app/composer/qgscomposer.cpp
  2. +1 −1 tests/src/core/testqgsspatialindex.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,
@@ -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

0 comments on commit f7f659b

Please sign in to comment.