[Commit-gnuradio] [gnuradio] 04/04: qtgui: moving stuff around to avoid swig and Python.h warnings.

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 49f69ee8d41fd4de62ce05630c38edabdfea8518
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 18 14:22:04 2014 -0400

    qtgui: moving stuff around to avoid swig and Python.h warnings.
---
 gr-qtgui/include/gnuradio/qtgui/form_menus.h       |  1 -
 gr-qtgui/include/gnuradio/qtgui/number_sink.h      |  8 +------
 .../include/gnuradio/qtgui/numberdisplayform.h     |  1 -
 gr-qtgui/include/gnuradio/qtgui/qtgui_types.h      | 25 ++++++++++++++++------
 gr-qtgui/swig/qtgui_swig.i                         | 21 ++++++++++++++++++
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h 
b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
index cbd01e6..1b26d28 100644
--- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h
+++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
@@ -32,7 +32,6 @@
 #include <gnuradio/filter/firdes.h>
 #include <gnuradio/qtgui/qtgui_types.h>
 #include <gnuradio/qtgui/trigger_mode.h>
-#include <gnuradio/qtgui/number_sink.h>
 
 class LineColorMenu: public QMenu
 {
diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h 
b/gr-qtgui/include/gnuradio/qtgui/number_sink.h
index 7c7b865..a34eab3 100644
--- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h
+++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h
@@ -29,19 +29,13 @@
 
 #include <gnuradio/qtgui/api.h>
 #include <gnuradio/qtgui/trigger_mode.h>
+#include <gnuradio/qtgui/qtgui_types.h>
 #include <gnuradio/sync_block.h>
 #include <qapplication.h>
 
 namespace gr {
   namespace qtgui {
 
-    enum graph_t {
-      NUM_GRAPH_NONE = 0,
-      NUM_GRAPH_HORIZ,
-      NUM_GRAPH_VERT,
-    };
-
-
     /*!
      * \brief A graphical sink to display numerical values of input streams.
      * \ingroup instrumentation_blk
diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h 
b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
index b752ad3..c33f9b4 100644
--- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h
@@ -24,7 +24,6 @@
 #define NUMBER_DISPLAY_FORM_H
 
 #include <gnuradio/qtgui/spectrumUpdateEvents.h>
-#include <gnuradio/qtgui/number_sink.h>
 #include <gnuradio/qtgui/form_menus.h>
 #include <QtGui/QtGui>
 #include <qwt_thermo.h>
diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h 
b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
index f71ab9e..cde5254 100644
--- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
+++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
@@ -75,16 +75,16 @@ public:
     _zeroTime = 0;
     _secondsPerLine = 1.0;
   }
-  
+
   virtual ~TimeScaleData()
-  {    
+  {
   }
 
   virtual gr::high_res_timer_type getZeroTime() const
   {
     return _zeroTime;
   }
-  
+
   virtual void setZeroTime(const gr::high_res_timer_type newTime)
   {
     _zeroTime = newTime - gr::high_res_timer_epoch();
@@ -100,13 +100,13 @@ public:
     return _secondsPerLine;
   }
 
-  
+
 protected:
-  
+
 private:
   gr::high_res_timer_type _zeroTime;
   double _secondsPerLine;
-  
+
 };
 
 /***********************************************************************
@@ -136,6 +136,19 @@ private:
 
 };
 
+namespace gr {
+  namespace qtgui {
+
+    enum graph_t {
+      NUM_GRAPH_NONE = 0,
+      NUM_GRAPH_HORIZ,
+      NUM_GRAPH_VERT,
+    };
+
+  } /* namespace qtgui */
+} /* namespace gr */
+
+
 enum{
   INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0,
   INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1,
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i
index a6e64b0..b753a66 100644
--- a/gr-qtgui/swig/qtgui_swig.i
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -28,6 +28,27 @@
 //load generated python docstrings
 %include "qtgui_swig_doc.i"
 
+namespace gr {
+  namespace qtgui {
+
+    enum graph_t {
+      NUM_GRAPH_NONE = 0,
+      NUM_GRAPH_HORIZ,
+      NUM_GRAPH_VERT,
+    };
+
+  } /* namespace qtgui */
+} /* namespace gr */
+
+
+enum{
+  INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0,
+  INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1,
+  INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2,
+  INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3,
+  INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4
+};
+
 %include "gnuradio/qtgui/trigger_mode.h"
 
 // So we understand the firdes window types