projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Add missing check for glib.
[pulseview.git]
/
pv
/
view
/
marginwidget.hpp
diff --git
a/pv/view/marginwidget.hpp
b/pv/view/marginwidget.hpp
index 455aaf970aed35c734269ebd08ba03f8d6edf74a..ebe8cfc08b780ce06f3d4697d1ef277f6d2100c7 100644
(file)
--- a/
pv/view/marginwidget.hpp
+++ b/
pv/view/marginwidget.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_MARGINWIDGET_HPP
*/
#ifndef PULSEVIEW_PV_MARGINWIDGET_HPP
@@
-27,8
+26,11
@@
#include "viewwidget.hpp"
#include "viewwidget.hpp"
+using std::shared_ptr;
+
namespace pv {
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class ViewItem;
class ViewItem;
@@
-37,7
+39,7
@@
class MarginWidget : public ViewWidget
Q_OBJECT
public:
Q_OBJECT
public:
- MarginWidget(
pv::view::
View &parent);
+ MarginWidget(View &parent);
/**
* The extended area that the margin widget would like to be sized to.
/**
* The extended area that the margin widget would like to be sized to.
@@
-51,14
+53,13
@@
protected:
* Indicates the event an a view item has been clicked.
* @param item the view item that has been clicked.
*/
* Indicates the event an a view item has been clicked.
* @param item the view item that has been clicked.
*/
- virtual void item_clicked(
- const std::shared_ptr<pv::view::ViewItem> &item);
+ virtual void item_clicked(const shared_ptr<ViewItem> &item);
/**
* Shows the popup of a the specified @c ViewItem .
* @param item The item to show the popup for.
*/
/**
* Shows the popup of a the specified @c ViewItem .
* @param item The item to show the popup for.
*/
- void show_popup(const s
td::s
hared_ptr<ViewItem> &item);
+ void show_popup(const shared_ptr<ViewItem> &item);
protected:
virtual void contextMenuEvent(QContextMenuEvent *event);
protected:
virtual void contextMenuEvent(QContextMenuEvent *event);
@@
-66,7
+67,8
@@
protected:
virtual void keyPressEvent(QKeyEvent *event);
};
virtual void keyPressEvent(QKeyEvent *event);
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
#endif // PULSEVIEW_PV_MARGINWIDGET_HPP
} // namespace pv
#endif // PULSEVIEW_PV_MARGINWIDGET_HPP