projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use redundant void argument.
[pulseview.git]
/
pv
/
view
/
logicsignal.hpp
diff --git
a/pv/view/logicsignal.hpp
b/pv/view/logicsignal.hpp
index 14eeed4baf82bbd272e390c46468d8e30d9b1dd8..e000a3cdf9b676536b451f25874833b1d776c9aa 100644
(file)
--- a/
pv/view/logicsignal.hpp
+++ b/
pv/view/logicsignal.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_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_LOGICSIGNAL_HPP
#include <QCache>
#include <QCache>
@@
-44,7
+43,8
@@
namespace data {
class Logic;
}
class Logic;
}
-namespace view {
+namespace views {
+namespace TraceView {
class LogicSignal : public Signal
{
class LogicSignal : public Signal
{
@@
-66,8
+66,7
@@
private:
public:
LogicSignal(pv::Session &session,
std::shared_ptr<devices::Device> device,
public:
LogicSignal(pv::Session &session,
std::shared_ptr<devices::Device> device,
- std::shared_ptr<data::SignalBase> base,
- std::shared_ptr<pv::data::Logic> data);
+ std::shared_ptr<data::SignalBase> base);
virtual ~LogicSignal() = default;
virtual ~LogicSignal() = default;
@@
-75,8
+74,6
@@
public:
std::shared_ptr<pv::data::Logic> logic_data() const;
std::shared_ptr<pv::data::Logic> logic_data() const;
- void set_logic_data(std::shared_ptr<pv::data::Logic> data);
-
/**
* 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.
@@
-134,7
+131,6
@@
private:
int signal_height_;
std::shared_ptr<pv::devices::Device> device_;
int signal_height_;
std::shared_ptr<pv::devices::Device> device_;
- std::shared_ptr<pv::data::Logic> data_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
@@
-149,7
+145,8
@@
private:
static QCache<QString, const QPixmap> pixmap_cache_;
};
static QCache<QString, const QPixmap> pixmap_cache_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_LOGICSIGNAL_HPP