projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Add and use inclusive/exclusive sample count variant
[pulseview.git]
/
pv
/
data
/
decode
/
row.cpp
diff --git
a/pv/data/decode/row.cpp
b/pv/data/decode/row.cpp
index e36051c36f3947cd3fbb26e3f3750a3b83a31749..1266b8436e1e09934b92418b62e5a6ebc42e7728 100644
(file)
--- a/
pv/data/decode/row.cpp
+++ b/
pv/data/decode/row.cpp
@@
-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/>.
*/
#include "row.hpp"
*/
#include "row.hpp"
@@
-27,8
+26,8
@@
namespace data {
namespace decode {
Row::Row() :
namespace decode {
Row::Row() :
- decoder_(
NULL
),
- row_(
NULL
)
+ decoder_(
nullptr
),
+ row_(
nullptr
)
{
}
{
}
@@
-52,8
+51,8
@@
const QString Row::title() const
{
if (decoder_ && decoder_->name && row_ && row_->desc)
return QString("%1: %2")
{
if (decoder_ && decoder_->name && row_ && row_->desc)
return QString("%1: %2")
- .arg(QString::fromUtf8(decoder_->name)
)
-
.arg(
QString::fromUtf8(row_->desc));
+ .arg(QString::fromUtf8(decoder_->name)
,
+
QString::fromUtf8(row_->desc));
if (decoder_ && decoder_->name)
return QString::fromUtf8(decoder_->name);
if (row_ && row_->desc)
if (decoder_ && decoder_->name)
return QString::fromUtf8(decoder_->name);
if (row_ && row_->desc)
@@
-67,6
+66,6
@@
bool Row::operator<(const Row &other) const
(decoder_ == other.decoder_ && row_ < other.row_);
}
(decoder_ == other.decoder_ && row_ < other.row_);
}
-}
//
decode
-}
//
data
-}
//
pv
+}
// namespace
decode
+}
// namespace
data
+}
// namespace
pv