Skip to content

Commit 3b89436

Browse files
author
jef
committed
fix runtime warning
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12710 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7cb2d09 commit 3b89436

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

src/app/qgisapp.cpp

+12-2
Original file line numberDiff line numberDiff line change
@@ -1840,9 +1840,9 @@ void QgisApp::setupConnections()
18401840

18411841
// Monitor change of project path
18421842
connect( QgsProject::instance(), SIGNAL( readProject( const QDomDocument & ) ),
1843-
this, SLOT( projectChanged( const QDomDocument & ) ) );
1843+
this, SLOT( readProject( const QDomDocument & ) ) );
18441844
connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument & ) ),
1845-
this, SLOT( projectChanged( const QDomDocument & ) ) );
1845+
this, SLOT( writeProject( QDomDocument & ) ) );
18461846
}
18471847

18481848
void QgisApp::createCanvas()
@@ -6067,3 +6067,13 @@ void QgisApp::projectChanged( const QDomDocument &doc )
60676067

60686068
runPythonString( expr );
60696069
}
6070+
6071+
void QgisApp::writeProject( QDomDocument &doc )
6072+
{
6073+
projectChanged( doc );
6074+
}
6075+
6076+
void QgisApp::readProject( const QDomDocument &doc )
6077+
{
6078+
projectChanged( doc );
6079+
}

src/app/qgisapp.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,12 @@ class QgisApp : public QMainWindow
386386
/**Deletes the selected attributes for the currently selected vector layer*/
387387
void deleteSelected( QgsMapLayer *layer = 0 );
388388

389+
//! project was written
390+
void writeProject( QDomDocument & );
391+
392+
//! project was read
393+
void readProject( const QDomDocument & );
394+
389395
protected:
390396

391397
//! Handle state changes (WindowTitleChange)
@@ -647,9 +653,6 @@ class QgisApp : public QMainWindow
647653

648654
void showStyleManagerV2();
649655

650-
//! project changed
651-
void projectChanged( const QDomDocument & );
652-
653656
signals:
654657
/** emitted when a key is pressed and we want non widget sublasses to be able
655658
to pick up on this (e.g. maplayer) */
@@ -1049,6 +1052,9 @@ class QgisApp : public QMainWindow
10491052

10501053
//! Persistent GPS toolbox
10511054
QgsGPSInformationWidget * mpGpsWidget;
1055+
1056+
//! project changed
1057+
void projectChanged( const QDomDocument & );
10521058
};
10531059

10541060
#endif

src/app/qgsidentifyresults.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,8 @@ void QgsIdentifyResults::show()
293293
// (saves the current window size/position)
294294
void QgsIdentifyResults::close()
295295
{
296-
clearRubberbands();
296+
clear();
297+
297298
delete mActionPopup;
298299
mActionPopup = 0;
299300

0 commit comments

Comments
 (0)