Skip to content
Permalink
Browse files

rename removeMessage to discardMessage, complete SIP

  • Loading branch information
3nids committed Mar 19, 2014
1 parent 59a6663 commit 6609ca81d2b7b0cb514b678d0ec2fc07e5ebe366
@@ -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
@@ -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 );
@@ -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 );
@@ -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;

@@ -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;

@@ -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:

0 comments on commit 6609ca8

Please sign in to comment.
You can’t perform that action at this time.