X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=7c720430e9d6cf7e6a688fd6c138cad2cd90589b;hb=407c9ebeb13200fb7f28a33cab00e996c018f8dc;hp=6287edce70f60fccd12ee13313cbeb0b6e7671d7;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 6287edc..7c72043 100644
--- 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
- * 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 .
*/
extern "C" {
@@ -27,6 +26,8 @@ extern "C" {
#include "annotation.hpp"
+using std::vector;
+
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;
- while(*annotations) {
+ while (*annotations) {
annotations_.push_back(QString::fromUtf8(*annotations));
annotations++;
}
@@ -64,7 +65,7 @@ int Annotation::format() const
return format_;
}
-const std::vector& Annotation::annotations() const
+const vector& Annotation::annotations() const
{
return annotations_;
}