projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1024 by changing decode channel assigment to PDs
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 6287edce70f60fccd12ee13313cbeb0b6e7671d7..7c720430e9d6cf7e6a688fd6c138cad2cd90589b 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.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/>.
*/
extern "C" {
*/
extern "C" {
@@
-27,6
+26,8
@@
extern "C" {
#include "annotation.hpp"
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
@@
-43,7
+44,7
@@
Annotation::Annotation(const srd_proto_data *const pdata) :
format_ = pda->ann_class;
const char *const *annotations = (char**)pda->ann_text;
format_ = pda->ann_class;
const char *const *annotations = (char**)pda->ann_text;
- while(*annotations) {
+ while
(*annotations) {
annotations_.push_back(QString::fromUtf8(*annotations));
annotations++;
}
annotations_.push_back(QString::fromUtf8(*annotations));
annotations++;
}
@@
-64,7
+65,7
@@
int Annotation::format() const
return format_;
}
return format_;
}
-const
std::
vector<QString>& Annotation::annotations() const
+const vector<QString>& Annotation::annotations() const
{
return annotations_;
}
{
return annotations_;
}