Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / ruler.hpp

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index aabbe486cd8a93f8d3b986a26150aee4f40f739c..1efd8737c9c938fb568bdf0948a8b9f5c0bc62d8 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -14,12 +14,11 @@
  * 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/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_RULER_HPP
-#define PULSEVIEW_PV_VIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
 
 #include <functional>
 #include <memory>
@@ -29,6 +28,11 @@
 #include "marginwidget.hpp"
 #include <pv/util.hpp>
 
+using std::function;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace RulerTest {
 struct tick_position_test_0;
 struct tick_position_test_1;
@@ -36,7 +40,8 @@ struct tick_position_test_2;
 }
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class TimeItem;
 class ViewItem;
@@ -50,7 +55,6 @@ class Ruler : public MarginWidget
        friend struct RulerTest::tick_position_test_2;
 
 private:
-
        /// Height of the ruler in multipes of the text height
        static const float RulerHeight;
 
@@ -109,7 +113,7 @@ private:
        /**
         * Gets the time items.
         */
-       std::vector< std::shared_ptr<pv::view::ViewItem> > items() override;
+       vector< shared_ptr<ViewItem> > items() override;
 
        /**
         * Gets the first view item which has a label that contains @c pt .
@@ -117,12 +121,11 @@ private:
         * @return the view item that has been found, or and empty
         *   @c shared_ptr if no item was found.
         */
-       std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
-               const QPoint &pt) override;
+       shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt) override;
 
        void paintEvent(QPaintEvent *event) override;
 
-       void mouseDoubleClickEvent(QMouseEvent *e) override;
+       void mouseDoubleClickEvent(QMouseEvent *event) override;
 
        /**
         * Draw a hover arrow under the cursor position.
@@ -135,8 +138,8 @@ private:
 
        struct TickPositions
        {
-               std::vector<std::pair<double, QString>> major;
-               std::vector<double> minor;
+               vector<pair<double, QString>> major;
+               vector<double> minor;
        };
 
        /**
@@ -162,7 +165,7 @@ private:
                const pv::util::Timestamp& offset,
                const double scale,
                const int width,
-               std::function<QString(const pv::util::Timestamp&)> format_function);
+               function<QString(const pv::util::Timestamp&)> format_function);
 
 protected:
        void resizeEvent(QResizeEvent*) override;
@@ -174,7 +177,8 @@ private Q_SLOTS:
        void invalidate_tick_position_cache();
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP