X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitem.hpp;h=d1dd67ccfc7bcbb2ca464f432a770025e1af3af9;hp=56e1d73cbf2831e6785e009361a8e6ad28b0e338;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/tracetreeitem.hpp b/pv/view/tracetreeitem.hpp
index 56e1d73..d1dd67c 100644
--- a/pv/view/tracetreeitem.hpp
+++ b/pv/view/tracetreeitem.hpp
@@ -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/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
@@ -27,6 +26,9 @@
 
 #include "rowitem.hpp"
 
+using std::enable_shared_from_this;
+using std::pair;
+
 namespace pv {
 namespace views {
 namespace TraceView {
@@ -34,7 +36,7 @@ namespace TraceView {
 class TraceTreeItemOwner;
 
 class TraceTreeItem : public RowItem,
-	public std::enable_shared_from_this<TraceTreeItem>
+	public enable_shared_from_this<TraceTreeItem>
 {
 	Q_OBJECT
 	Q_PROPERTY(int visual_v_offset
@@ -123,7 +125,7 @@ public:
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
 	 */
-	virtual std::pair<int, int> v_extents() const = 0;
+	virtual pair<int, int> v_extents() const = 0;
 
 protected:
 	TraceTreeItemOwner *owner_;