X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=8849ee3fed2beb4b7fe8e9ba1fcfd445412c41df;hp=1977d05340fb0b63db4d87340148edc3baf478c4;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=2ad82c2e40b6865481733913a2c32735602f63c4

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 1977d053..8849ee3f 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.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 "header.hpp"
@@ -49,7 +48,8 @@ using std::stable_sort;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int Header::Padding = 12;
 const int Header::BaselineOffset = 5;
@@ -153,15 +153,15 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 	menu->exec(event->globalPos());
 }
 
-void Header::keyPressEvent(QKeyEvent *e)
+void Header::keyPressEvent(QKeyEvent *event)
 {
-	assert(e);
+	assert(event);
 
-	MarginWidget::keyPressEvent(e);
+	MarginWidget::keyPressEvent(event);
 
-	if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+	if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier)
 		on_group();
-	else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
+	else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier)
 		on_ungroup();
 }
 
@@ -218,5 +218,6 @@ void Header::on_ungroup()
 	} while (restart);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv