projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed Name and Colour dialogs from context menu
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index aff8c4c427498e54c6eb00dc94dfc05e4c3e4169..01f057fec47c2fbcf80575ccd622e35348dca304 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_
VIEW_
SIGNAL_H
+#define PULSEVIEW_PV_
VIEW_
SIGNAL_H
#include <QComboBox>
#include <QWidgetAction>
#include <QComboBox>
#include <QWidgetAction>
@@
-46,8
+46,6
@@
protected:
Signal(pv::SigSession &session, const sr_probe *const probe);
public:
Signal(pv::SigSession &session, const sr_probe *const probe);
public:
- virtual void init_context_bar_actions(QWidget *parent);
-
/**
* Sets the name of the signal.
*/
/**
* Sets the name of the signal.
*/
@@
-60,16
+58,11
@@
public:
const sr_probe* probe() const;
const sr_probe* probe() const;
-private:
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-private slots:
- void on_text_changed(const QString &text);
-
protected:
const sr_probe *const _probe;
protected:
const sr_probe *const _probe;
- QWidgetAction *_name_action;
QComboBox *_name_widget;
bool _updating_name_widget;
};
QComboBox *_name_widget;
bool _updating_name_widget;
};
@@
-77,4
+70,4
@@
protected:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_
VIEW_
SIGNAL_H