From e1fd88db9b7edc13a90b5c81263d062ebcf2932b Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 18:09:38 -0800
Subject: qtgui plots static const fixes:

Initialize static data members in the cpp file:
http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.12

For the WaterfallDisplayPlot, rather than bringing the initialization into the cpp file,
the numbers seemed far more fitting as an enum given that they are by nature.
This removed the symbol declaration from the cpp file, so its actually simpler.
---
 gr-qtgui/src/lib/WaterfallDisplayPlot.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'gr-qtgui/src/lib/WaterfallDisplayPlot.h')

diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.h b/gr-qtgui/src/lib/WaterfallDisplayPlot.h
index a5ccaec40..5f55e91c0 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.h
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.h
@@ -39,11 +39,13 @@ public:
   const QColor GetUserDefinedLowIntensityColor()const;
   const QColor GetUserDefinedHighIntensityColor()const;
 
-  static const int INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0;
-  static const int INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1;
-  static const int INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2;
-  static const int INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3;
-  static const int INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4;
+  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
+  };
 
 public slots:
   void resizeSlot( QSize *s );
-- 
cgit