projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch segment storage from single vector to vector of arrays
[pulseview.git]
/
pv
/
view
/
header.hpp
diff --git
a/pv/view/header.hpp
b/pv/view/header.hpp
index 91612b956bb7c1d893f46d7145fcd5043b9aed93..f8462c288bb9cee53eecff4cbb3c9902105ba907 100644
(file)
--- a/
pv/view/header.hpp
+++ b/
pv/view/header.hpp
@@
-14,12
+14,11
@@
* 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_VIEW_HEADER_HPP
-#define PULSEVIEW_PV_VIEW_HEADER_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_HEADER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_HEADER_HPP
#include <list>
#include <memory>
#include <list>
#include <memory>
@@
-28,9
+27,10
@@
#include "marginwidget.hpp"
namespace pv {
#include "marginwidget.hpp"
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-class
Row
Item;
+class
TraceTree
Item;
class View;
class ViewItem;
class View;
class ViewItem;
@@
-63,7
+63,7
@@
private:
/**
* Gets the row items.
*/
/**
* Gets the row items.
*/
- std::vector< std::shared_ptr<
pv::view::
ViewItem> > items();
+ std::vector< std::shared_ptr<ViewItem> > items();
/**
* Gets the first view item which has a label that contains @c pt .
/**
* Gets the first view item which has a label that contains @c pt .
@@
-71,8
+71,7
@@
private:
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
- std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
- const QPoint &pt);
+ std::shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt);
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
@@
-80,7
+79,7
@@
private:
private:
void contextMenuEvent(QContextMenuEvent *event);
private:
void contextMenuEvent(QContextMenuEvent *event);
- void keyPressEvent(QKeyEvent *e);
+ void keyPressEvent(QKeyEvent *e
vent
);
private Q_SLOTS:
void on_group();
private Q_SLOTS:
void on_group();
@@
-88,7
+87,8
@@
private Q_SLOTS:
void on_ungroup();
};
void on_ungroup();
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_HEADER_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_HEADER_HPP