Use alphabetical order for #includes.

[pulseview.git] / pv / view / header.cpp

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index bfb75532aa58ad7508db13b1243ce051613e131c..e2ccfedc4e4d53cdb68d8897edaa1ec7f1622b24 100644 (file)
--- 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"
@@ -24,8 +23,8 @@
 #include "signal.hpp"
 #include "tracegroup.hpp"
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 
 #include <boost/iterator/filter_iterator.hpp>
 
@@ -39,17 +38,16 @@
 #include <pv/widgets/popup.hpp>
 
 using boost::make_filter_iterator;
+
+using std::count_if;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::make_pair;
-using std::min;
-using std::pair;
 using std::shared_ptr;
 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;
@@ -105,18 +103,16 @@ void Header::paintEvent(QPaintEvent*)
        // would be clipped away.
        const QRect rect(0, 0, width() - BaselineOffset, height());
 
-       vector< shared_ptr<TraceTreeItem> > items(
-               view_.list_by_type<TraceTreeItem>());
+       vector< shared_ptr<RowItem> > items(view_.list_by_type<RowItem>());
 
        stable_sort(items.begin(), items.end(),
-               [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
-                       return a->visual_v_offset() < b->visual_v_offset(); });
+               [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+                       return a->point(QRect()).y() < b->point(QRect()).y(); });
 
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
 
-       for (const shared_ptr<TraceTreeItem> r : items)
-       {
+       for (const shared_ptr<RowItem> r : items) {
                assert(r);
 
                const bool highlight = !item_dragging_ &&
@@ -139,8 +135,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
        const vector< shared_ptr<TraceTreeItem> > items(
                view_.list_by_type<TraceTreeItem>());
-       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 +149,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 +174,7 @@ void Header::on_group()
 
        shared_ptr<TraceGroup> group(new TraceGroup());
        shared_ptr<TraceTreeItem> mouse_down_item(
-               std::dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
+               dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
        shared_ptr<TraceTreeItem> focus_item(
                mouse_down_item ? mouse_down_item : selected_items.front());
 
@@ -219,5 +214,6 @@ void Header::on_ungroup()
        } while (restart);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv