rename removeMessage to discardMessage, complete SIP

python/gui/qgsmaptool.sip

@@ -111,6 +111,14 @@ class QgsMapTool : QObject
     */
     QString toolName();
 
+  signals:
+    //! emit a message
+    void emitMessage( QString message );
+    void emitMessage( QString message, QgsMessageBar::MessageLevel );
+
+    //! emit signal to clear previous message
+    void discardMessage();
+
   protected:
 
     //! constructor takes map canvas as a parameter

src/app/nodetool/qgsmaptoolnodetool.cpp

@@ -367,7 +367,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
     }
 
     // remove previous warning
-    emit removeMessage();
+    emit discardMessage();
 
     mSelectedFeature = new QgsSelectedFeature( snapResults[0].snappedAtGeometry, vlayer, mCanvas );
     connect( QgisApp::instance()->legend(), SIGNAL( currentLayerChanged( QgsMapLayer* ) ), this, SLOT( currentLayerChanged( QgsMapLayer* ) ) );
@@ -378,7 +378,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
   else
   {
     // remove previous warning
-    emit removeMessage();
+    emit discardMessage();
 
     QgsVectorLayer *vlayer = mSelectedFeature->vlayer();
     Q_ASSERT( vlayer );

src/app/qgsmaptooladdpart.cpp

@@ -155,7 +155,7 @@ void QgsMapToolAddPart::canvasReleaseEvent( QMouseEvent * e )
     case 0:
     {
       // remove previous message
-      emit removeMessage();
+      emit discardMessage();
 
       //add points to other features to keep topology up-to-date
       int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );

src/app/qgsmaptooldeletepart.cpp

@@ -53,7 +53,7 @@ void QgsMapToolDeletePart::canvasPressEvent( QMouseEvent *e )
   if ( mRecentSnappingResults.size() > 0 )
   {
     // remove previous warning
-    emit removeMessage();
+    emit discardMessage();
 
     QgsPoint markerPoint = mRecentSnappingResults.begin()->snappedVertex;
 

src/app/qgsmaptooldeletering.cpp

@@ -55,7 +55,7 @@ void QgsMapToolDeleteRing::canvasPressEvent( QMouseEvent *e )
   if ( mRecentSnappingResults.size() > 0 )
   {
     // remove previous warning
-    emit removeMessage();
+    emit discardMessage();
 
     QgsPoint markerPoint = mRecentSnappingResults.begin()->snappedVertex;
 

src/gui/qgsmaptool.h

@@ -135,7 +135,7 @@ class GUI_EXPORT QgsMapTool : public QObject
     void emitMessage( QString message, QgsMessageBar::MessageLevel );
 
     //! emit signal to clear previous message
-    void removeMessage();
+    void discardMessage();
 
   protected: