X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=6d211c9887e2d3c4d20b794d97ec91ec53bd0da6;hp=52701380787e8845dd7830955e526dabdd86a93b;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=1db1bdd6079178e218b3b1b0bd3e30efdf3e1690

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 52701380..6d211c98 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -14,20 +14,18 @@
  * 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 <assert.h>
+#include <cassert>
 
 #include <QtGui>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLineEdit>
 
-#include "popup.h"
+#include "popup.hpp"
 
 using std::max;
 using std::min;
@@ -41,41 +39,40 @@ const unsigned int Popup::MarginWidth = 6;
 
 Popup::Popup(QWidget *parent) :
 	QWidget(parent, Qt::Popup | Qt::FramelessWindowHint),
-	_point(),
-	_pos(Left)
+	point_(),
+	pos_(Left)
 {
 }
 
 const QPoint& Popup::point() const
 {
-	return _point;
+	return point_;
 }
 
 Popup::Position Popup::position() const
 {
-	return _pos;
+	return pos_;
 }
 
 void Popup::set_position(const QPoint point, Position pos)
 {
-	_point = point, _pos = pos;
+	point_ = point, pos_ = pos;
 
 	setContentsMargins(
 		MarginWidth + ((pos == Right) ? ArrowLength : 0),
 		MarginWidth + ((pos == Bottom) ? ArrowLength : 0),
 		MarginWidth + ((pos == Left) ? ArrowLength : 0),
 		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();
@@ -113,24 +110,24 @@ void Popup::show()
 bool Popup::space_for_arrow() const
 {
 	// Check if there is room for the arrow
-	switch (_pos) {
+	switch (pos_) {
 	case Right:
-		if (_point.x() > x())
+		if (point_.x() > x())
 			return false;
 		return true;
 
 	case Bottom:
-		if (_point.y() > y())
+		if (point_.y() > y())
 			return false;
-		return true;		
+		return true;
 
 	case Left:
-		if (_point.x() < (x() + width()))
+		if (point_.x() < (x() + width()))
 			return false;
 		return true;
 
 	case Top:
-		if (_point.y() < (y() + height()))
+		if (point_.y() < (y() + height()))
 			return false;
 		return true;
 	}
@@ -142,11 +139,10 @@ QPolygon Popup::arrow_polygon() const
 {
 	QPolygon poly;
 
-	const QPoint p = mapFromGlobal(_point);
+	const QPoint p = mapFromGlobal(point_);
 	const int l = ArrowLength + ArrowOverlap; 
 
-	switch (_pos)
-        {
+	switch (pos_) {
 	case Right:
 		poly << QPoint(p.x() + l, p.y() - l);
 		break;
@@ -155,7 +151,7 @@ QPolygon Popup::arrow_polygon() const
 		poly << QPoint(p.x() - l, p.y() + l);
 		break;
 
-        case Left:
+	case Left:
 	case Top:
 		poly << QPoint(p.x() - l, p.y() - l);
 		break;
@@ -163,17 +159,16 @@ QPolygon Popup::arrow_polygon() const
 
 	poly << p;
 
-	switch (_pos)
-        {
+	switch (pos_) {
 	case Right:
 	case Bottom:
 		poly << QPoint(p.x() + l, p.y() + l);
 		break;
 
-        case Left:
+	case Left:
 		poly << QPoint(p.x() - l, p.y() + l);
 		break;
-		
+
 	case Top:
 		poly << QPoint(p.x() + l, p.y() - l);
 		break;
@@ -190,11 +185,11 @@ QRegion Popup::arrow_region() const
 QRect Popup::bubble_rect() const
 {
 	return QRect(
-		QPoint((_pos == Right) ? ArrowLength : 0,
-			(_pos == Bottom) ? ArrowLength : 0),
-		QSize(width() - ((_pos == Left || _pos == Right) ?
+		QPoint((pos_ == Right) ? ArrowLength : 0,
+			(pos_ == Bottom) ? ArrowLength : 0),
+		QSize(width() - ((pos_ == Left || pos_ == Right) ?
 				ArrowLength : 0),
-			height() - ((_pos == Top || _pos == Bottom) ?
+			height() - ((pos_ == Top || pos_ == Bottom) ?
 				ArrowLength : 0)));
 }
 
@@ -229,19 +224,19 @@ void Popup::reposition_widget()
 	QPoint o;
 
 	const QRect screen_rect = QApplication::desktop()->availableGeometry(
-		QApplication::desktop()->screenNumber(_point));
+		QApplication::desktop()->screenNumber(point_));
 
-	if (_pos == Right || _pos == Left)
+	if (pos_ == Right || pos_ == Left)
 		o.ry() = -height() / 2;
 	else
 		o.rx() = -width() / 2;
 
-	if (_pos == Left)
+	if (pos_ == Left)
 		o.rx() = -width();
-	else if(_pos == Top)
+	else if (pos_ == Top)
 		o.ry() = -height();
 
-	o += _point;
+	o += point_;
 	move(max(min(o.x(), screen_rect.right() - width()),
 			screen_rect.left()),
 		max(min(o.y(), screen_rect.bottom() - height()),
@@ -280,7 +275,7 @@ void Popup::paintEvent(QPaintEvent*)
 
 	const QRegion a(arrow_region());
 	const QRegion arrow_outline = a.subtracted(
-		a.translated(ArrowOffsets[_pos]));
+		a.translated(ArrowOffsets[pos_]));
 
 	painter.setClipRegion(bubble_outline.subtracted(a).united(
 		arrow_outline));
@@ -294,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();
 }
 
@@ -311,4 +306,3 @@ void Popup::showEvent(QShowEvent*)
 
 } // namespace widgets
 } // namespace pv
-