Skip to content

Commit

Permalink
fix runtime warning
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@12710 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jan 8, 2010
1 parent d87067b commit 502ca0a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
14 changes: 12 additions & 2 deletions src/app/qgisapp.cpp
Expand Up @@ -1840,9 +1840,9 @@ void QgisApp::setupConnections()

// Monitor change of project path
connect( QgsProject::instance(), SIGNAL( readProject( const QDomDocument & ) ),
this, SLOT( projectChanged( const QDomDocument & ) ) );
this, SLOT( readProject( const QDomDocument & ) ) );
connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument & ) ),
this, SLOT( projectChanged( const QDomDocument & ) ) );
this, SLOT( writeProject( QDomDocument & ) ) );
}

void QgisApp::createCanvas()
Expand Down Expand Up @@ -6067,3 +6067,13 @@ void QgisApp::projectChanged( const QDomDocument &doc )

runPythonString( expr );
}

void QgisApp::writeProject( QDomDocument &doc )
{
projectChanged( doc );
}

void QgisApp::readProject( const QDomDocument &doc )
{
projectChanged( doc );
}
12 changes: 9 additions & 3 deletions src/app/qgisapp.h
Expand Up @@ -386,6 +386,12 @@ class QgisApp : public QMainWindow
/**Deletes the selected attributes for the currently selected vector layer*/
void deleteSelected( QgsMapLayer *layer = 0 );

//! project was written
void writeProject( QDomDocument & );

//! project was read
void readProject( const QDomDocument & );

protected:

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

void showStyleManagerV2();

//! project changed
void projectChanged( const QDomDocument & );

signals:
/** emitted when a key is pressed and we want non widget sublasses to be able
to pick up on this (e.g. maplayer) */
Expand Down Expand Up @@ -1049,6 +1052,9 @@ class QgisApp : public QMainWindow

//! Persistent GPS toolbox
QgsGPSInformationWidget * mpGpsWidget;

//! project changed
void projectChanged( const QDomDocument & );
};

#endif
3 changes: 2 additions & 1 deletion src/app/qgsidentifyresults.cpp
Expand Up @@ -293,7 +293,8 @@ void QgsIdentifyResults::show()
// (saves the current window size/position)
void QgsIdentifyResults::close()
{
clearRubberbands();
clear();

delete mActionPopup;
mActionPopup = 0;

Expand Down

0 comments on commit 502ca0a

Please sign in to comment.