projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
org.sigrok.PulseView.appdata.xml: Add <mimetype> tag.
[pulseview.git]
/
pv
/
view
/
tracegroup.hpp
diff --git
a/pv/view/tracegroup.hpp
b/pv/view/tracegroup.hpp
index badddf7d396ae6e3ff005e756ca03603b96f5034..b00d5bf5a06faf3ed131ecc2805f3ce13ee07736 100644
(file)
--- a/
pv/view/tracegroup.hpp
+++ b/
pv/view/tracegroup.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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_TRACEGROUP_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
@@
-24,6
+23,8
@@
#include "tracetreeitem.hpp"
#include "tracetreeitemowner.hpp"
#include "tracetreeitem.hpp"
#include "tracetreeitemowner.hpp"
+using std::pair;
+
namespace pv {
namespace views {
namespace TraceView {
namespace pv {
namespace views {
namespace TraceView {
@@
-73,7
+74,7
@@
public:
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
-
std::
pair<int, int> v_extents() const;
+ pair<int, int> v_extents() const;
/**
* Paints the signal label.
/**
* Paints the signal label.