projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes for Qt5 Windows/mingw/MXE support.
[pulseview.git]
/
pv
/
data
/
logic.hpp
diff --git
a/pv/data/logic.hpp
b/pv/data/logic.hpp
index 9adc9750bc8aa874849067c5eece2a6e939e4a8c..6e5749a31ee86daac20bf38f2b963a66ed69ebb3 100644
(file)
--- a/
pv/data/logic.hpp
+++ b/
pv/data/logic.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_DATA_LOGIC_H
-#define PULSEVIEW_PV_DATA_LOGIC_H
+#ifndef PULSEVIEW_PV_DATA_LOGIC_H
PP
+#define PULSEVIEW_PV_DATA_LOGIC_H
PP
#include "signaldata.hpp"
#include "signaldata.hpp"
@@
-35,7
+34,7
@@
class Logic : public SignalData
public:
Logic(unsigned int num_channels);
public:
Logic(unsigned int num_channels);
-
int get_
num_channels() const;
+
unsigned int
num_channels() const;
void push_segment(
std::shared_ptr<LogicSegment> &segment);
void push_segment(
std::shared_ptr<LogicSegment> &segment);
@@
-47,7
+46,7
@@
public:
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
private:
const unsigned int num_channels_;
private:
const unsigned int num_channels_;
@@
-57,4
+56,4
@@
private:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_LOGIC_H
+#endif // PULSEVIEW_PV_DATA_LOGIC_H
PP