From 6609ca81d2b7b0cb514b678d0ec2fc07e5ebe366 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Wed, 19 Mar 2014 08:16:33 +0100
Subject: [PATCH] rename removeMessage to discardMessage, complete SIP

---
 python/gui/qgsmaptool.sip               | 8 ++++++++
 src/app/nodetool/qgsmaptoolnodetool.cpp | 4 ++--
 src/app/qgsmaptooladdpart.cpp           | 2 +-
 src/app/qgsmaptooldeletepart.cpp        | 2 +-
 src/app/qgsmaptooldeletering.cpp        | 2 +-
 src/gui/qgsmaptool.h                    | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/python/gui/qgsmaptool.sip b/python/gui/qgsmaptool.sip
index bb3b79b8975..e7e04fef8e9 100644
--- a/python/gui/qgsmaptool.sip
+++ b/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
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
index b9134a79c96..13b3a8f6ba6 100644
--- a/src/app/nodetool/qgsmaptoolnodetool.cpp
+++ b/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 );
diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp
index f03092a46d2..c1ee1f53b03 100644
--- a/src/app/qgsmaptooladdpart.cpp
+++ b/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 );
diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
index 23cabe853cb..0cb54b7013f 100644
--- a/src/app/qgsmaptooldeletepart.cpp
+++ b/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;
 
diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
index 708452fa2a1..b4efb378ba6 100644
--- a/src/app/qgsmaptooldeletering.cpp
+++ b/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;
 
diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
index 505ccfb5821..5923922b21b 100644
--- a/src/gui/qgsmaptool.h
+++ b/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: