X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fpopup.cpp;h=f9713b18c7163c6bf58672fa6743707dce5cc839;hp=47280d1ff6ddd892116228f41ccac17088a78dae;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 47280d1..f9713b1 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -14,8 +14,7 @@
  * 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>
@@ -27,7 +26,7 @@
 #include <QDesktopWidget>
 #include <QLineEdit>
 
-#include "popup.h"
+#include "popup.hpp"
 
 using std::max;
 using std::min;
@@ -65,17 +64,16 @@ void Popup::set_position(const QPoint point, Position pos)
 		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();
@@ -145,8 +143,7 @@ QPolygon Popup::arrow_polygon() const
 	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 +152,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,14 +160,13 @@ 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;
 		
@@ -238,7 +234,7 @@ void Popup::reposition_widget()
 
 	if (pos_ == Left)
 		o.rx() = -width();
-	else if(pos_ == Top)
+	else if (pos_ == Top)
 		o.ry() = -height();
 
 	o += point_;
@@ -294,13 +290,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 +307,3 @@ void Popup::showEvent(QShowEvent*)
 
 } // namespace widgets
 } // namespace pv
-