Skip to content

Commit 59a6663

Browse files
committed
rename displayMessage to emitMessage in QgsMapTool
1 parent ab920ba commit 59a6663

6 files changed

+10
-10
lines changed

src/app/nodetool/qgsmaptoolnodetool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QMouseEvent * e )
362362

363363
if ( snapResults.size() < 1 )
364364
{
365-
emit displayMessage( tr( "could not snap to a segment on the current layer." ) );
365+
emit emitMessage( tr( "could not snap to a segment on the current layer." ) );
366366
return;
367367
}
368368

src/app/qgsmaptooladdpart.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void QgsMapToolAddPart::canvasReleaseEvent( QMouseEvent * e )
6262

6363
if ( !selectionErrorMsg.isEmpty() )
6464
{
65-
emit displayMessage( tr( "Could not add part. %1" ).arg( selectionErrorMsg ) , QgsMessageBar::WARNING );
65+
emit emitMessage( tr( "Could not add part. %1" ).arg( selectionErrorMsg ) , QgsMessageBar::WARNING );
6666
stopCapturing();
6767
return;
6868
}
@@ -101,7 +101,7 @@ void QgsMapToolAddPart::canvasReleaseEvent( QMouseEvent * e )
101101
else if ( error == 2 )
102102
{
103103
//problem with coordinate transformation
104-
emit displayMessage( tr( "Coordinate transform error. Cannot transform the point to the layers coordinate system" ) , QgsMessageBar::WARNING );
104+
emit emitMessage( tr( "Coordinate transform error. Cannot transform the point to the layers coordinate system" ) , QgsMessageBar::WARNING );
105105
return;
106106
}
107107

@@ -195,6 +195,6 @@ void QgsMapToolAddPart::canvasReleaseEvent( QMouseEvent * e )
195195
break;
196196
}
197197

198-
emit displayMessage( errorMessage , QgsMessageBar::WARNING );
198+
emit emitMessage( errorMessage , QgsMessageBar::WARNING );
199199
vlayer->destroyEditCommand();
200200
}

src/app/qgsmaptooldeletepart.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void QgsMapToolDeletePart::canvasPressEvent( QMouseEvent *e )
6464
}
6565
else
6666
{
67-
emit displayMessage( tr( "could not snap to a part on the current layer." ) );
67+
emit emitMessage( tr( "could not snap to a part on the current layer." ) );
6868
}
6969
}
7070

src/app/qgsmaptooldeletering.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void QgsMapToolDeleteRing::canvasPressEvent( QMouseEvent *e )
6666
}
6767
else
6868
{
69-
emit displayMessage( tr( "could not snap to a ring on the current layer." ) );
69+
emit emitMessage( tr( "could not snap to a ring on the current layer." ) );
7070
}
7171
}
7272

src/app/qgsmaptooledit.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ int QgsMapToolEdit::addTopologicalPoints( const QList<QgsPoint>& geom )
133133

134134
void QgsMapToolEdit::notifyNotVectorLayer()
135135
{
136-
emit displayMessage( tr( "No active vector layer" ) );
136+
emit emitMessage( tr( "No active vector layer" ) );
137137
}
138138

139139
void QgsMapToolEdit::notifyNotEditableLayer()
140140
{
141-
emit displayMessage( tr( "Layer not editable" ) );
141+
emit emitMessage( tr( "Layer not editable" ) );
142142
}

src/gui/qgsmaptool.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ class GUI_EXPORT QgsMapTool : public QObject
131131

132132
signals:
133133
//! emit a message
134-
void displayMessage( QString message );
135-
void displayMessage( QString message, QgsMessageBar::MessageLevel );
134+
void emitMessage( QString message );
135+
void emitMessage( QString message, QgsMessageBar::MessageLevel );
136136

137137
//! emit signal to clear previous message
138138
void removeMessage();

0 commit comments

Comments
 (0)