X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=13282cda25e458b6b624de563f09e1fc6668a6b5;hp=17bc719130a5ef49eb9c2acdfc60c4696593a93f;hb=bb19aac49414cc772a2a1e52730cbb2ca24b425c;hpb=2ad82c2e40b6865481733913a2c32735602f63c4

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 17bc719..13282cd 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -14,18 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <algorithm>
+#include <cassert>
 
-#include <assert.h>
-
-#include <QtGui>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLineEdit>
+#include <QtGui>
 
 #include "popup.hpp"
 
@@ -67,14 +65,14 @@ void Popup::set_position(const QPoint point, Position pos)
 		MarginWidth + ((pos == Top) ? ArrowLength : 0));
 }
 
-bool Popup::eventFilter(QObject *obj, QEvent *evt)
+bool Popup::eventFilter(QObject *obj, QEvent *event)
 {
 	QKeyEvent *keyEvent;
 
 	(void)obj;
 
-	if (evt->type() == QEvent::KeyPress) {
-		keyEvent = static_cast<QKeyEvent*>(evt);
+	if (event->type() == QEvent::KeyPress) {
+		keyEvent = static_cast<QKeyEvent*>(event);
 		if (keyEvent->key() == Qt::Key_Enter ||
 		    keyEvent->key() == Qt::Key_Return) {
 			close();
@@ -121,7 +119,7 @@ bool Popup::space_for_arrow() const
 	case Bottom:
 		if (point_.y() > y())
 			return false;
-		return true;		
+		return true;
 
 	case Left:
 		if (point_.x() < (x() + width()))
@@ -142,7 +140,7 @@ QPolygon Popup::arrow_polygon() const
 	QPolygon poly;
 
 	const QPoint p = mapFromGlobal(point_);
-	const int l = ArrowLength + ArrowOverlap; 
+	const int l = ArrowLength + ArrowOverlap;
 
 	switch (pos_) {
 	case Right:
@@ -170,7 +168,7 @@ QPolygon Popup::arrow_polygon() const
 	case Left:
 		poly << QPoint(p.x() - l, p.y() + l);
 		break;
-		
+
 	case Top:
 		poly << QPoint(p.x() + l, p.y() - l);
 		break;
@@ -291,13 +289,13 @@ void Popup::resizeEvent(QResizeEvent*)
 	setMask(popup_region());
 }
 
-void Popup::mouseReleaseEvent(QMouseEvent *e)
+void Popup::mouseReleaseEvent(QMouseEvent *event)
 {
-	assert(e);
+	assert(event);
 
 	// We need our own out-of-bounds click handler because QWidget counts
 	// the drop-shadow region as inside the widget
-	if (!bubble_rect().contains(e->pos()))
+	if (!bubble_rect().contains(event->pos()))
 		close();
 }