X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=ad91cd12f8c5df760058f121e0c2c30302efd43e;hb=12ea3616767553ee0a615f14bbcb8ec614589e34;hp=7c2dd9b0d7b17c1d698bf36bd7a8db8181ea13ec;hpb=83d8efb578f191554509161e8a555fbe9475b1f6;p=pulseview.git
diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 7c2dd9b..ad91cd1 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 .
*/
#include "header.hpp"
@@ -39,6 +38,8 @@
#include
using boost::make_filter_iterator;
+
+using std::count_if;
using std::dynamic_pointer_cast;
using std::max;
using std::make_pair;
@@ -49,7 +50,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;
@@ -115,8 +117,7 @@ void Header::paintEvent(QPaintEvent*)
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- for (const shared_ptr r : items)
- {
+ for (const shared_ptr r : items) {
assert(r);
const bool highlight = !item_dragging_ &&
@@ -139,8 +140,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
const vector< shared_ptr > items(
view_.list_by_type());
- if (std::count_if(items.begin(), items.end(), item_selected) > 1)
- {
+ if (count_if(items.begin(), items.end(), item_selected) > 1) {
menu->addSeparator();
QAction *const group = new QAction(tr("Group"), this);
@@ -154,15 +154,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();
}
@@ -179,7 +179,7 @@ void Header::on_group()
shared_ptr group(new TraceGroup());
shared_ptr mouse_down_item(
- std::dynamic_pointer_cast(mouse_down_item_));
+ dynamic_pointer_cast(mouse_down_item_));
shared_ptr focus_item(
mouse_down_item ? mouse_down_item : selected_items.front());
@@ -219,5 +219,6 @@ void Header::on_ungroup()
} while (restart);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv