X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fannotation.cpp;h=7c720430e9d6cf7e6a688fd6c138cad2cd90589b;hp=9b07efbc5f2844724fb91cbcd1dc18149e8dce60;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
index 9b07efb..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 <http://www.gnu.org/licenses/>.
  */
 
 extern "C" {
@@ -25,7 +24,9 @@ extern "C" {
 #include <cassert>
 #include <vector>
 
-#include "annotation.h"
+#include "annotation.hpp"
+
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -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<QString>& Annotation::annotations() const
+const vector<QString>& Annotation::annotations() const
 {
 	return annotations_;
 }