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

diff --git a/pv/view/tracetreeitemowner.hpp b/pv/view/tracetreeitemowner.hpp
index b5f1a3a..92aae37 100644
--- a/pv/view/tracetreeitemowner.hpp
+++ b/pv/view/tracetreeitemowner.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_TRACETREEITEMOWNER_HPP
@@ -24,6 +23,10 @@
 #include "viewitemowner.hpp"
 #include "tracetreeitem.hpp"
 
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 
 class Session;
@@ -72,7 +75,7 @@ public:
 	/**
 	 * Returns a list of row items owned by this object.
 	 */
-	std::vector< std::shared_ptr<TraceTreeItem> >
+	vector< shared_ptr<TraceTreeItem> >
 	trace_tree_child_items() const;
 
 	/**
@@ -83,12 +86,12 @@ public:
 	/**
 	 * Adds a child item to this object.
 	 */
-	void add_child_item(std::shared_ptr<TraceTreeItem> item);
+	void add_child_item(shared_ptr<TraceTreeItem> item);
 
 	/**
 	 * Removes a child item from this object.
 	 */
-	void remove_child_item(std::shared_ptr<TraceTreeItem> item);
+	void remove_child_item(shared_ptr<TraceTreeItem> item);
 
 	virtual void restack_items();
 
@@ -96,7 +99,7 @@ public:
 	 * Computes the vertical extents of the contents of this row item owner.
 	 * @return A pair containing the minimum and maximum y-values.
 	 */
-	std::pair<int, int> v_extents() const;
+	pair<int, int> v_extents() const;
 
 	/*
 	 * Reassigns background color states to all its children, thereby