Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index f6ec4ac78d7d142a486d2347287bd4693816ca5c..712244a9df8cc9a4399d80217ac413467abd0f5d 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.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 <extdef.h>
@@ -29,11 +28,13 @@
 
 using namespace Qt;
 
+using std::function;
 using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const float Ruler::RulerHeight = 2.5f; // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
@@ -70,7 +71,7 @@ QSize Ruler::sizeHint() const
 QSize Ruler::extended_size_hint() const
 {
        QRectF max_rect;
-       std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
+       vector< shared_ptr<TimeItem> > items(view_.time_items());
        for (auto &i : items)
                max_rect = max_rect.united(i->label_rect(QRect()));
        return QSize(0, sizeHint().height() - max_rect.top() / 2 +
@@ -193,7 +194,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
        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)
 {
        TickPositions tp;
 
@@ -271,5 +272,6 @@ void Ruler::resizeEvent(QResizeEvent*)
        invalidate_tick_position_cache();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv