projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Ctrl-Q and Ctrl-W shortcuts.
[pulseview.git]
/
pv
/
data
/
decode
/
row.cpp
diff --git
a/pv/data/decode/row.cpp
b/pv/data/decode/row.cpp
index 8e3a6512f8b55119f38219333165a686e98d62f9..43ef91e6fc4ad39736e6a555f2582acfecaf95cb 100644
(file)
--- a/
pv/data/decode/row.cpp
+++ b/
pv/data/decode/row.cpp
@@
-14,11
+14,10
@@
* 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.h"
+#include "row.h
pp
"
#include <libsigrokdecode/libsigrokdecode.h>
#include <libsigrokdecode/libsigrokdecode.h>
@@
-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)