From b213ef0991a13af0c74ffe5c54382c5c455c5496 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 15 Oct 2013 11:57:29 +0100
Subject: [PATCH 1/1] Added missing includes and defintions

---
 pv/data/decoder.cpp           | 2 ++
 pv/data/decoder.h             | 3 +++
 pv/view/decode/annotation.cpp | 3 ++-
 pv/view/decodesignal.cpp      | 3 +++
 pv/view/logicsignal.cpp       | 3 +++
 pv/view/ruler.cpp             | 1 +
 pv/view/signal.cpp            | 2 ++
 pv/view/timemarker.cpp        | 1 +
 pv/view/trace.cpp             | 3 +++
 pv/view/trace.h               | 2 ++
 pv/widgets/colourbutton.cpp   | 5 +++++
 pv/widgets/colourbutton.h     | 2 ++
 pv/widgets/popup.cpp          | 2 ++
 13 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 5907f649..65fc8fff 100644
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -22,6 +22,8 @@
 
 #include <boost/thread/thread.hpp>
 
+#include <QDebug>
+
 #include "decoder.h"
 
 #include <pv/data/logic.h>
diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index 5a4b4a99..93d8fa6a 100644
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -30,9 +30,12 @@
 
 #include <QObject>
 
+#include <glib.h>
+
 struct srd_decoder;
 struct srd_decoder_inst;
 struct srd_probe;
+struct srd_proto_data;
 struct srd_session;
 
 namespace pv {
diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 94f1fff5..339b46af 100644
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -26,11 +26,12 @@ extern "C" {
 
 #include <algorithm>
 
+#include <boost/foreach.hpp>
+
 #include <QPainter>
 
 #include "annotation.h"
 
-using namespace boost;
 using namespace std;
 
 namespace pv {
diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index 1e9f2582..32307e9c 100644
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -24,7 +24,10 @@ extern "C" {
 
 #include <extdef.h>
 
+#include <boost/foreach.hpp>
+
 #include <QAction>
+#include <QMenu>
 
 #include "decodesignal.h"
 
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index a9484817..31b8f0a2 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -22,6 +22,9 @@
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #include "logicsignal.h"
 #include "view.h"
 
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ad7082e6..a9a8452d 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -30,6 +30,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index d031b27a..1f00477a 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,6 +24,8 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
 
 #include "signal.h"
 #include "view.h"
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 4c3645b4..5935fb3b 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -22,6 +22,7 @@
 
 #include "view.h"
 
+#include <QFormLayout>
 #include <QPainter>
 
 #include <pv/widgets/popup.h>
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 19fea812..ffbab063 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,6 +23,9 @@
 #include <assert.h>
 #include <math.h>
 
+#include <QFormLayout>
+#include <QLineEdit>
+
 #include "trace.h"
 #include "tracepalette.h"
 #include "view.h"
diff --git a/pv/view/trace.h b/pv/view/trace.h
index ca4040d2..85d137bc 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -31,6 +31,8 @@
 
 #include "selectableitem.h"
 
+class QFormLayout;
+
 namespace pv {
 
 class SigSession;
diff --git a/pv/widgets/colourbutton.cpp b/pv/widgets/colourbutton.cpp
index c0cd7f28..fd417c11 100644
--- a/pv/widgets/colourbutton.cpp
+++ b/pv/widgets/colourbutton.cpp
@@ -20,6 +20,11 @@
 
 #include "colourbutton.h"
 
+#include <assert.h>
+
+#include <QApplication>
+#include <QPainter>
+
 namespace pv {
 namespace widgets {
 
diff --git a/pv/widgets/colourbutton.h b/pv/widgets/colourbutton.h
index 22f6bdbc..45a3ffff 100644
--- a/pv/widgets/colourbutton.h
+++ b/pv/widgets/colourbutton.h
@@ -21,6 +21,8 @@
 #ifndef PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
 #define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
 
+#include <QPushButton>
+
 #include "colourpopup.h"
 
 namespace pv {
diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 399f5e28..ec6e60c4 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -20,6 +20,8 @@
 
 #include <algorithm>
 
+#include <assert.h>
+
 #include <QtGui>
 
 #include "popup.h"
-- 
2.30.2