X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fruler.cpp;h=712244a9df8cc9a4399d80217ac413467abd0f5d;hb=fdfd5b3e246a4d4a8bcf7dbb25a6179cc86c9569;hp=a8d25fc9df6a2ee4dfa5c3cfcfe9b9035e5c9b3a;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a8d25fc..712244a 100644
--- 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 .
*/
#include
@@ -29,6 +28,7 @@
using namespace Qt;
+using std::function;
using std::shared_ptr;
using std::vector;
@@ -71,7 +71,7 @@ QSize Ruler::sizeHint() const
QSize Ruler::extended_size_hint() const
{
QRectF max_rect;
- std::vector< std::shared_ptr > items(view_.time_items());
+ vector< shared_ptr > 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 +
@@ -194,7 +194,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
const pv::util::Timestamp& offset,
const double scale,
const int width,
- std::function format_function)
+ function format_function)
{
TickPositions tp;