[QGIS Commit] r12710 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-01-08 14:25:30 -0500 (Fri, 08 Jan 2010)
New Revision: 12710

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/app/qgsidentifyresults.cpp
Log:
fix runtime warning

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-01-08 16:30:10 UTC (rev 12709)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-01-08 19:25:30 UTC (rev 12710)
@@ -1840,9 +1840,9 @@
 
   // 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()
@@ -6067,3 +6067,13 @@
 
   runPythonString( expr );
 }
+
+void QgisApp::writeProject( QDomDocument &doc )
+{
+  projectChanged( doc );
+}
+
+void QgisApp::readProject( const QDomDocument &doc )
+{
+  projectChanged( doc );
+}

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2010-01-08 16:30:10 UTC (rev 12709)
+++ trunk/qgis/src/app/qgisapp.h	2010-01-08 19:25:30 UTC (rev 12710)
@@ -386,6 +386,12 @@
     /**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)
@@ -647,9 +653,6 @@
 
     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) */
@@ -1049,6 +1052,9 @@
 
     //! Persistent GPS toolbox
     QgsGPSInformationWidget * mpGpsWidget;
+
+    //! project changed
+    void projectChanged( const QDomDocument & );
 };
 
 #endif

Modified: trunk/qgis/src/app/qgsidentifyresults.cpp
===================================================================
--- trunk/qgis/src/app/qgsidentifyresults.cpp	2010-01-08 16:30:10 UTC (rev 12709)
+++ trunk/qgis/src/app/qgsidentifyresults.cpp	2010-01-08 19:25:30 UTC (rev 12710)
@@ -293,7 +293,8 @@
 // (saves the current window size/position)
 void QgsIdentifyResults::close()
 {
-  clearRubberbands();
+  clear(); 
+
   delete mActionPopup;
   mActionPopup = 0;