Merge branch 'maint'

author: Tom Rondeau <tom@trondeau.com> 2014-07-07 12:20:09 -0400
committer: Tom Rondeau <tom@trondeau.com> 2014-07-07 12:20:09 -0400
commit: bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch)
tree: 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gnuradio-runtime
parent: 3f469513b94ac992138360caca7e1b53f82214ae (diff)
parent: 597b93798a804cde1783d6d2ab53b348d57c44cd (diff)
65 files changed, 257 insertions, 257 deletions
diff --git a/gnuradio-runtime/ctrlport.conf.example b/gnuradio-runtime/ctrlport.conf.example
index 51d9e934f2..dc61673ea5 100644
--- a/gnuradio-runtime/ctrlport.conf.example
+++ b/gnuradio-runtime/ctrlport.conf.example
@@ -1,5 +1,5 @@
 ## Use this to create an endpoint used to export ControlPort.
-## 
+##
 ## A typical configuation would be to specify using a particular
 ## interface (determined from the IP address) and port number:
 ##
@@ -14,7 +14,7 @@
 ## ICE to use all available interfaces:
 ##
 ##    ControlPort.Endpoints=tcp -h *
-## 
+##
 ## Using 'default' for the host will use what 'hostname' resolves to.
 ##
 ## For more details:
diff --git a/gnuradio-runtime/examples/mp-sched/affinity_set.py b/gnuradio-runtime/examples/mp-sched/affinity_set.py
index 4d28a04174..15d2233b6a 100755
--- a/gnuradio-runtime/examples/mp-sched/affinity_set.py
+++ b/gnuradio-runtime/examples/mp-sched/affinity_set.py
@@ -35,7 +35,7 @@ class affinity_set(gr.top_block):
 
 	self.filter_filt_0.set_processor_affinity([0,])
 	self.filter_filt_1.set_processor_affinity([0,1])
-		
+
 	##################################################
 	# Connections
 	##################################################
@@ -55,7 +55,7 @@ if __name__ == '__main__':
     (options, args) = parser.parse_args()
     tb = affinity_set()
     tb.start()
-	
+
     while(1):
         ret = raw_input('Enter a new Core # or Press Enter to quit: ')
 	if(len(ret) == 0):
diff --git a/gnuradio-runtime/gr_log_default.conf b/gnuradio-runtime/gr_log_default.conf
index 79c2d91e94..f2c17a00f1 100644
--- a/gnuradio-runtime/gr_log_default.conf
+++ b/gnuradio-runtime/gr_log_default.conf
@@ -1,18 +1,18 @@
-/* 
+/*
  * Copyright 2006,2010,2011 Free Software Foundation, Inc.
- * 
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -22,7 +22,7 @@
 log4j.rootCategory=EMERG,A1
 log4j.category.gr_log=DEBUG,A2
 log4j.category.gr_log_debug=NOTSET,A3
-              
+
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 log4j.appender.A1.target=System.out
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h
index b336cb86f7..41568c8ab3 100644
--- a/gnuradio-runtime/include/gnuradio/block_detail.h
+++ b/gnuradio-runtime/include/gnuradio/block_detail.h
@@ -229,7 +229,7 @@ namespace gr {
     float pc_work_time_var();
 
     float pc_work_time_total();
- 
+
     tpb_detail d_tpb;	// used by thread-per-block scheduler
     int d_produce_or;
 
@@ -261,7 +261,7 @@ namespace gr {
     float d_var_work_time;
     float d_total_work_time;
     float d_pc_counter;
-  
+
     block_detail(unsigned int ninputs, unsigned int noutputs);
 
     friend struct tpb_detail;
diff --git a/gnuradio-runtime/include/gnuradio/fxpt_vco.h b/gnuradio-runtime/include/gnuradio/fxpt_vco.h
index cbc204c1b8..28560db905 100644
--- a/gnuradio-runtime/include/gnuradio/fxpt_vco.h
+++ b/gnuradio-runtime/include/gnuradio/fxpt_vco.h
@@ -50,7 +50,7 @@ namespace gr {
       d_phase += fxpt::float_to_fixed(delta_phase);
     }
 
-    float get_phase() const { 
+    float get_phase() const {
       return fxpt::fixed_to_float(d_phase);
     }
 
diff --git a/gnuradio-runtime/include/gnuradio/ice_application_base.h b/gnuradio-runtime/include/gnuradio/ice_application_base.h
index 1cb60fbf96..126327151a 100644
--- a/gnuradio-runtime/include/gnuradio/ice_application_base.h
+++ b/gnuradio-runtime/include/gnuradio/ice_application_base.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -43,14 +43,14 @@ namespace {
   static const unsigned int ICEAPPLICATION_ACTIVATION_TIMEOUT_MS(600);
 };
 
-class GR_RUNTIME_API ice_application_common : public Ice::Application 
+class GR_RUNTIME_API ice_application_common : public Ice::Application
 {
  public:
   template<typename TserverBase, typename TserverClass> friend class ice_application_base;
   static boost::shared_ptr<ice_application_common> Instance();
   ~ice_application_common() {;}
   static int d_reacquire_attributes;
-  
+
  protected:
   static bool d_main_called;
   static bool d_have_ice_config;
@@ -67,34 +67,34 @@ public:
   boost::shared_ptr<ice_application_common> d_application;
   ice_application_base(TserverClass* _this);
   ~ice_application_base() {;}
-    
+
   static TserverBase* i();
   static const std::vector<std::string> endpoints();
-    
+
 protected:
   bool have_ice_config() { return d_application->d_have_ice_config; }
   void set_endpoint(const std::string& endpoint) { d_application->d_endpointStr = endpoint;}
-  
+
   //this one is the key... overwrite in templated/inherited variants
   virtual TserverBase* i_impl() = 0;
 
-  //tools for the i_impl... 
+  //tools for the i_impl...
   //tell it when it has to resync with the communicator
   virtual bool reacquire_sync();
   virtual void sync_reacquire();
 
   static TserverClass* d_this;
-    
+
   int d_reacquire;
   //static int d_reacquire_attributes;
-    
+
 private:
   void starticeexample();
-    
+
   bool application_started();
-    
+
   int run(int, char*[]);
-    
+
   static void kickoff();
 };
 
@@ -106,7 +106,7 @@ TserverClass* ice_application_base<TserverBase, TserverClass>::d_this(0);
 
 template<typename TserverBase, typename TserverClass>
 ice_application_base<TserverBase, TserverClass>::ice_application_base(TserverClass* _this)
-  : d_reacquire(0) 
+  : d_reacquire(0)
 {
   //d_reacquire_attributes = 0;
   d_this = _this;
@@ -123,13 +123,13 @@ void ice_application_base<TserverBase, TserverClass>::starticeexample()
 
   if(conffile.size() > 0) {
     std::stringstream iceconf;
-    ice_application_common::d_have_ice_config = true; 
+    ice_application_common::d_have_ice_config = true;
     ice_application_common::d_main_called = true;
     iceconf << conffile;
     d_application->main(0, argv, iceconf.str().c_str());
   }
   else {
-    ice_application_common::d_have_ice_config = false; 
+    ice_application_common::d_have_ice_config = false;
     ice_application_common::d_main_called = true;
     d_application->main(0, argv);
   }
@@ -139,17 +139,17 @@ template<typename TserverBase, typename TserverClass>
 void ice_application_base<TserverBase, TserverClass>::kickoff()
 {
   static bool run_once = false;
-  
+
   //if(!d_this->application_started()) {
   if(!run_once) {
     ++d_this->d_application->d_reacquire_attributes;
-    
+
     ice_application_common::d_thread = boost::shared_ptr<boost::thread>
       (new boost::thread(boost::bind(&ice_application_base::starticeexample, d_this)));
-  
+
     ::timespec timer_ts, rem_ts;
     timer_ts.tv_sec = 0; timer_ts.tv_nsec = ICEAPPLICATION_ACTIVATION_TIMEOUT_MS*1000;
-  
+
     int iter = 0;
     while(!d_this->application_started()) {
       #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
@@ -164,10 +164,10 @@ void ice_application_base<TserverBase, TserverClass>::kickoff()
 	break;
       }
     }
-    
+
     run_once = true;
   }
-  
+
   return;
 }
 
@@ -195,20 +195,20 @@ template<typename TserverBase, typename TserverClass>
 TserverBase* ice_application_base<TserverBase, TserverClass>::i()
 {
   //printf("indacall\n");
-  
+
   assert(d_this != 0);
   if(!d_this->application_started()) {
     //printf("anotherkickoff\n");
     kickoff();
   }
   //printf("donekickedoff\n");
-  
+
   /*else if(!d_proxy) {
     d_proxy = d_this->i_impl();
     assert(d_proxy != 0);
     }*/
 
-  return d_this->i_impl(); 
+  return d_this->i_impl();
 }
 
 /*template<typename TserverBase, typename TserverClass>
diff --git a/gnuradio-runtime/include/gnuradio/ice_server_template.h b/gnuradio-runtime/include/gnuradio/ice_server_template.h
index 45c1756a48..5e77d29265 100644
--- a/gnuradio-runtime/include/gnuradio/ice_server_template.h
+++ b/gnuradio-runtime/include/gnuradio/ice_server_template.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -35,7 +35,7 @@ public:
 		      const std::string& contolPortName,
 		      const std::string& endpointName);
   ~ice_server_template();
-    
+
 protected:
   //virtual bool application_started();
   TserverBase* i_impl();
@@ -50,10 +50,10 @@ private:
 
 template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
 ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::ice_server_template
-    (TImplClass* _this, const std::string& controlPortName, const std::string& endpointName) 
+    (TImplClass* _this, const std::string& controlPortName, const std::string& endpointName)
   : ice_application_base<TserverBase, TImplClass>(_this),
     d_iceserver(0),
-    d_contolPortName(controlPortName), 
+    d_contolPortName(controlPortName),
     d_endpointName(endpointName)
 {;}
 
@@ -69,7 +69,7 @@ ice_server_template<TserverBase, TserverClass,TImplClass, TIceClass>::~ice_serve
 
 template<typename TserverBase, typename TserverClass, typename TImplClass, typename TIceClass>
 TserverBase* ice_server_template<TserverBase, TserverClass, TImplClass, TIceClass>::i_impl()
-{ 
+{
   if(ice_application_base<TserverBase, TImplClass>::d_this->reacquire_sync()) {
     d_adapter = (ice_application_base<TserverBase, TImplClass>::d_this->have_ice_config()) ?
       ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->createObjectAdapter(d_contolPortName) :
@@ -77,7 +77,7 @@ TserverBase* ice_server_template<TserverBase, TserverClass, TImplClass, TIceClas
 
     TserverClass* server_ice(new TserverClass());
     TIceClass obj(server_ice);
-  
+
     Ice::Identity id(ice_application_base<TserverBase, TImplClass>::d_this->d_this->d_application->communicator()->stringToIdentity(d_endpointName));
     d_adapter->add(obj, id);
     d_adapter->activate();
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
index 6ad6c40b08..42b300a574 100644
--- a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
@@ -99,7 +99,7 @@ namespace gr {
     /*!
      * \brief send message to msg_accepter
      *
-     * \param accepter is the target of the send. 
+     * \param accepter is the target of the send.
      *        aprecond: pmt::is_msg_accepter(accepter)
      * \param which_port A pmt symbol describing the port by name.
      * \param msg is the message to send.  It's usually a pmt tuple.
diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h
index 758320fc6a..046db9b204 100644
--- a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h
+++ b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h
@@ -45,7 +45,7 @@ namespace gr {
     };
 
     typedef boost::shared_ptr<msg_producer> msg_producer_sptr;
-    
+
   } /* namespace messages */
 } /* namespace gr */
 
diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h
index 709ca0e732..989aed1d00 100644
--- a/gnuradio-runtime/include/gnuradio/pycallback_object.h
+++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -32,7 +32,7 @@ enum pyport_t {
   PYPORT_FLOAT
 };
 
-class Instance 
+class Instance
 {
 public:
   static boost::shared_ptr<ice_application_common> get_application()
@@ -51,8 +51,8 @@ int pycallback_object_count = 500;
 template <class myType> class pmt_assist
 {
 public:
-  static pmt::pmt_t make(myType _val) 
-  { 
+  static pmt::pmt_t make(myType _val)
+  {
     return pmt::mp(_val);
   }
 };
@@ -67,7 +67,7 @@ pmt::pmt_t pmt_assist<std::vector<float> >::make(std::vector<float> _val)
 template<>
 pmt::pmt_t pmt_assist<std::vector<gr_complex> >::make(std::vector<gr_complex> _val)
 {
-  return pmt::init_c32vector(_val.size(), &_val[0]); 
+  return pmt::init_c32vector(_val.size(), &_val[0]);
 }
 
 template <class myType> class pycallback_object
@@ -165,31 +165,31 @@ private:
 
 // template specialization conversion functions
 // get data out of the PyObject and into the real world
-template<> 
+template<>
 std::string pycallback_object<std::string>::pyCast(PyObject* obj)
 {
   return std::string(PyString_AsString(obj));
 }
 
-template<> 
+template<>
 double pycallback_object<double>::pyCast(PyObject* obj)
 {
   return PyFloat_AsDouble(obj);
 }
 
-template<> 
+template<>
 float pycallback_object<float>::pyCast(PyObject* obj)
 {
   return (float)PyFloat_AsDouble(obj);
 }
 
-template<> 
+template<>
 int pycallback_object<int>::pyCast(PyObject* obj)
 {
   return PyInt_AsLong(obj);
 }
 
-template<> 
+template<>
 std::vector<float> pycallback_object<std::vector<float> >::pyCast(PyObject* obj)
 {
   int size = PyObject_Size(obj);
@@ -200,14 +200,14 @@ std::vector<float> pycallback_object<std::vector<float> >::pyCast(PyObject* obj)
   return rval;
 }
 
-template<> 
+template<>
 std::vector<gr_complex> pycallback_object<std::vector<gr_complex> >::pyCast(PyObject* obj)
 {
   int size = PyObject_Size(obj);
   std::vector<gr_complex> rval(size);
   for(int i=0; i<size; i++){ rval[i] = \
       gr_complex((float)PyComplex_RealAsDouble(PyList_GetItem(obj, i)),
-		 (float)PyComplex_ImagAsDouble(PyList_GetItem(obj, i))); 
+		 (float)PyComplex_ImagAsDouble(PyList_GetItem(obj, i)));
   }
   return rval;
 }
diff --git a/gnuradio-runtime/include/gnuradio/realtime.h b/gnuradio-runtime/include/gnuradio/realtime.h
index b07caf6b21..bd912e2983 100644
--- a/gnuradio-runtime/include/gnuradio/realtime.h
+++ b/gnuradio-runtime/include/gnuradio/realtime.h
@@ -27,7 +27,7 @@
 #include <gnuradio/realtime_impl.h>
 
 namespace gr {
-  
+
   /*!
    * \brief If possible, enable high-priority "real time" scheduling.
    * \ingroup misc
diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager.h b/gnuradio-runtime/include/gnuradio/rpcmanager.h
index 12cf279406..5635572a8b 100644
--- a/gnuradio-runtime/include/gnuradio/rpcmanager.h
+++ b/gnuradio-runtime/include/gnuradio/rpcmanager.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -45,7 +45,7 @@ class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
     rpcserver_booter_register_helper() {
       rpcmanager::register_booter(new T());
     }
-	
+
     //TODO: unregister
   };
 
diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h
index 60425c4a15..16ff956b01 100644
--- a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h
+++ b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
index e592f4cdfb..8b2c52890b 100644
--- a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
+++ b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_ice.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -28,7 +28,7 @@
 
 namespace rpcpmtconverter
 {
-  pmt::pmt_t to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c);	
+  pmt::pmt_t to_pmt(const GNURadio::KnobPtr& knob, const Ice::Current& c);
   GNURadio::KnobPtr from_pmt(const pmt::pmt_t& knob, const Ice::Current& c);
 }
 
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
index cc19d7ff48..98aae92b90 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_base.h
index e2a1f6ef24..af0b9e762d 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_base.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_base.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
index aac9ef8de6..bf95c60165 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h
index 682944dada..127ceaa88d 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_base.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
index 11095ac433..9c64095bb0 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_ice.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h
index c1c3d46a42..260c7f06b5 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_ice.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -62,7 +62,7 @@ private:
   QueryCallbackMap_t d_getcallbackmap;
 
   template<typename T, typename TMap> struct set_f
-    : public std::unary_function<T,void> 
+    : public std::unary_function<T,void>
   {
     set_f(const Ice::Current& _c, TMap& _setcallbackmap, const priv_lvl_t& _cur_priv) :
       c(_c), d_setcallbackmap(_setcallbackmap), cur_priv(_cur_priv)
@@ -98,7 +98,7 @@ private:
 	  const priv_lvl_t& _cur_priv, GNURadio::KnobMap& _outknobs) :
       c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs)
     {}
-    
+
     void operator()(const T& p)
     {
       QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(p));
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_selector.h b/gnuradio-runtime/include/gnuradio/rpcserver_selector.h
index fa63c9a2dc..f45e919b0b 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_selector.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_selector.h
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/include/gnuradio/tags.h b/gnuradio-runtime/include/gnuradio/tags.h
index 0bd7b8537f..4e63d77755 100644
--- a/gnuradio-runtime/include/gnuradio/tags.h
+++ b/gnuradio-runtime/include/gnuradio/tags.h
@@ -27,7 +27,7 @@
 #include <pmt/pmt.h>
 
 namespace gr {
-  
+
   struct GR_RUNTIME_API tag_t
   {
     //! the item \p tag occurred at (as a uint64_t)
diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h
index f646ab65f6..a58d172867 100644
--- a/gnuradio-runtime/include/gnuradio/thread/thread.h
+++ b/gnuradio-runtime/include/gnuradio/thread/thread.h
@@ -141,11 +141,11 @@ namespace gr {
     /*! \brief get current thread priority for a given thread ID
      */
     GR_RUNTIME_API int thread_priority(gr_thread_t thread);
-    
+
     /*! \brief set current thread priority for a given thread ID
      */
     GR_RUNTIME_API int set_thread_priority(gr_thread_t thread, int priority);
-    
+
     GR_RUNTIME_API void set_thread_name(gr_thread_t thread,
                                         std::string name);
 
diff --git a/gnuradio-runtime/lib/block_detail.cc b/gnuradio-runtime/lib/block_detail.cc
index 896e621a39..77c457cf7f 100644
--- a/gnuradio-runtime/lib/block_detail.cc
+++ b/gnuradio-runtime/lib/block_detail.cc
@@ -44,7 +44,7 @@ namespace gr {
       d_input(ninputs), d_output(noutputs),
       d_done(false),
       d_ins_noutput_items(0),
-      d_avg_noutput_items(0), 
+      d_avg_noutput_items(0),
       d_var_noutput_items(0),
       d_ins_nproduced(0),
       d_avg_nproduced(0),
@@ -240,7 +240,7 @@ namespace gr {
     }
   }
 
-  int 
+  int
   block_detail::thread_priority(){
     if(threaded) {
       return gr::thread::thread_priority(thread);
@@ -248,7 +248,7 @@ namespace gr {
     return -1;
   }
 
-  int 
+  int
   block_detail::set_thread_priority(int priority){
     if(threaded) {
       return gr::thread::set_thread_priority(thread,priority);
@@ -317,7 +317,7 @@ namespace gr {
 	gr::thread::scoped_lock guard(*d_input[i]->mutex());
         float pfull = static_cast<float>(d_input[i]->items_available()) /
           static_cast<float>(d_input[i]->max_possible_items_available());
-      
+
         d = pfull - d_avg_input_buffers_full[i];
         d_ins_input_buffers_full[i] = pfull;
         d_avg_input_buffers_full[i] = d_avg_input_buffers_full[i] + d/d_pc_counter;
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc
index 9be8eaa48d..ded1324fa3 100644
--- a/gnuradio-runtime/lib/block_executor.cc
+++ b/gnuradio-runtime/lib/block_executor.cc
@@ -193,14 +193,14 @@ namespace gr {
     int new_alignment = 0;
     int alignment_state = -1;
     double rrate;
-    
+
     block        *m = d_block.get();
     block_detail *d = m->detail().get();
 
     LOG(*d_log << std::endl << m);
 
     max_noutput_items = round_down(d_max_noutput_items, m->output_multiple());
-    
+
     if(d->done()){
       assert(0);
       return DONE;
@@ -237,7 +237,7 @@ namespace gr {
       d_output_items.resize (0);
       d_start_nitems_read.resize(d->ninputs());
       LOG(*d_log << " sink\n");
-      
+
       max_items_avail = 0;
       for(int i = 0; i < d->ninputs (); i++) {
         {
@@ -432,7 +432,7 @@ namespace gr {
       if(d_use_pc)
         d->start_perf_counters();
 #endif /* GR_PERFORMANCE_COUNTERS */
-    
+
       // Do the actual work of the block
       int n = m->general_work(noutput_items, d_ninput_items,
                               d_input_items, d_output_items);
diff --git a/gnuradio-runtime/lib/block_gateway_impl.cc b/gnuradio-runtime/lib/block_gateway_impl.cc
index 13f4326d7e..535e4f74ca 100644
--- a/gnuradio-runtime/lib/block_gateway_impl.cc
+++ b/gnuradio-runtime/lib/block_gateway_impl.cc
@@ -30,7 +30,7 @@ namespace gr {
    * Helper routines
    **********************************************************************/
   template <typename OutType, typename InType>
-  void 
+  void
   copy_pointers(OutType &out, const InType &in)
   {
     out.resize(in.size());
diff --git a/gnuradio-runtime/lib/circular_file.cc b/gnuradio-runtime/lib/circular_file.cc
index 4d7d06082a..9cef419426 100644
--- a/gnuradio-runtime/lib/circular_file.cc
+++ b/gnuradio-runtime/lib/circular_file.cc
@@ -184,7 +184,7 @@ namespace gr {
     int buffer_current = d_header[HD_BUFFER_CURRENT];
     int buffer_size = d_header[HD_BUFFER_SIZE];
     int total = 0;
-    
+
     nbytes = std::min(nbytes, buffer_size - d_bytes_read);
 
     while(nbytes > 0) {
diff --git a/gnuradio-runtime/lib/constants.cc.in b/gnuradio-runtime/lib/constants.cc.in
index 7173c60792..c174091d5f 100644
--- a/gnuradio-runtime/lib/constants.cc.in
+++ b/gnuradio-runtime/lib/constants.cc.in
@@ -62,18 +62,18 @@ namespace gr {
   c_compiler()
   {
     return "@cmake_c_compiler_version@";
-  }    
+  }
 
   const std::string
   cxx_compiler()
   {
     return "@cmake_cxx_compiler_version@";
-  }    
+  }
 
   const std::string
   compiler_flags()
   {
     return "@COMPILER_INFO@";
-  }    
+  }
 
 } /* namespace gr */
diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt
index c05a82bf4f..bd46659eb2 100644
--- a/gnuradio-runtime/lib/controlport/CMakeLists.txt
+++ b/gnuradio-runtime/lib/controlport/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND gnuradio_runtime_sources
 )
 
 # Append generated file in build directory
-list(APPEND gnuradio_runtime_sources 
+list(APPEND gnuradio_runtime_sources
     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp
 )
 
diff --git a/gnuradio-runtime/lib/controlport/ICE_LICENSE b/gnuradio-runtime/lib/controlport/ICE_LICENSE
index 43ea7572d9..51ab60d453 100644
--- a/gnuradio-runtime/lib/controlport/ICE_LICENSE
+++ b/gnuradio-runtime/lib/controlport/ICE_LICENSE
@@ -12,43 +12,43 @@ details.
 You should have received a copy of the GNU General Public License version
 2 along with this program; if not, see http://www.gnu.org/licenses.
 
-Linking Ice statically or dynamically with other software (such as a 
-library, module or application) is making a combined work based on Ice. 
+Linking Ice statically or dynamically with other software (such as a
+library, module or application) is making a combined work based on Ice.
 Thus, the terms and conditions of the GNU General Public License version
 2 cover this combined work.
 
-If such software can only be used together with Ice, then not only the 
+If such software can only be used together with Ice, then not only the
 combined work but the software itself is a work derived from Ice and as
-such shall be licensed under the terms of the GNU General Public License 
-version 2. This includes the situation where Ice is only being used 
+such shall be licensed under the terms of the GNU General Public License
+version 2. This includes the situation where Ice is only being used
 through an abstraction layer.
 
 As a special exception to the above, ZeroC grants to the contributors for
-the following projects the permission to license their Ice-based software 
-under the terms of the GNU Lesser General Public License (LGPL) version 
+the following projects the permission to license their Ice-based software
+under the terms of the GNU Lesser General Public License (LGPL) version
 2.1 or of the BSD license:
 
  - Orca Robotics (http://orca-robotics.sourceforge.net)
- 
+
  - Mumble (http://mumble.sourceforge.net)
 
-This exception does not extend to the parts of Ice used by these 
+This exception does not extend to the parts of Ice used by these
 projects, or to any other derived work: as a whole, any work based on Ice
 shall be licensed under the terms and conditions of the GNU General
 Public License version 2.
 
 You may also combine Ice with any software not derived from Ice, provided
-the license of such software is compatible with the GNU General Public 
+the license of such software is compatible with the GNU General Public
 License version 2. In addition, as a special exception, ZeroC grants you
 permission to combine Ice with:
- 
+
  - the OpenSSL library, or with a modified version of the OpenSSL library
    that uses the same license as OpenSSL
 
  - any library not derived from Ice and licensed under the terms of
-   the Apache License, version 2.0 
-   (http://www.apache.org/licenses/LICENSE-2.0.html) 
+   the Apache License, version 2.0
+   (http://www.apache.org/licenses/LICENSE-2.0.html)
 
-If you modify this copy of Ice, you may extend any of the exceptions 
-provided above to your version of Ice, but you are not obligated to 
+If you modify this copy of Ice, you may extend any of the exceptions
+provided above to your version of Ice, but you are not obligated to
 do so.
diff --git a/gnuradio-runtime/lib/controlport/frontend.ice b/gnuradio-runtime/lib/controlport/frontend.ice
index 50d056df72..e4d346dba0 100644
--- a/gnuradio-runtime/lib/controlport/frontend.ice
+++ b/gnuradio-runtime/lib/controlport/frontend.ice
@@ -28,10 +28,10 @@ module GNURadio {
         // primitive types
 		dictionary<string, string>	StrStrDict;
         dictionary<string, string>  TunerArgs;
-		struct F32Range 
+		struct F32Range
         {
-          float min; 
-          float max; 
+          float min;
+          float max;
         };
 
         // exception types
@@ -111,7 +111,7 @@ module GNURadio {
 
         sequence<Tuner*>   TunerSeq;
         sequence<Channel*> ChannelSeq;
-    
+
         interface Channelizer extends AbstractReceiver {
             idempotent ChannelizerStatus status();
             idempotent Tuner*       getTuner();
@@ -131,7 +131,7 @@ module GNURadio {
         };
 
     };
-    
+
     module Booter {
         dictionary<string, string>      WaveformArgs;
         exception WaveformRunningError {
diff --git a/gnuradio-runtime/lib/controlport/gnuradio.ice b/gnuradio-runtime/lib/controlport/gnuradio.ice
index 3d6101087a..01db91b7be 100644
--- a/gnuradio-runtime/lib/controlport/gnuradio.ice
+++ b/gnuradio-runtime/lib/controlport/gnuradio.ice
@@ -42,23 +42,23 @@ class KnobL extends Knob { long   value; };
 class KnobS extends Knob { string value; };
 class KnobZ extends Knob { complex value; };
 
-sequence<bool>   VectorB; sequence<byte>   VectorC; 
+sequence<bool>   VectorB; sequence<byte>   VectorC;
 sequence<int>    VectorI; sequence<float>  VectorF;
 sequence<double> VectorD; sequence<string> VectorS;
 sequence<long> 	 VectorL; sequence<short>  VectorT;
 
-class KnobVecB extends Knob { VectorB value; }; 
-class KnobVecC extends Knob { VectorC value; }; 
-class KnobVecI extends Knob { VectorI value; }; 
-class KnobVecT extends Knob { VectorT value; }; 
-class KnobVecF extends Knob { VectorF value; }; 
-class KnobVecD extends Knob { VectorD value; }; 
-class KnobVecL extends Knob { VectorL value; }; 
-class KnobVecS extends Knob { VectorS value; }; 
+class KnobVecB extends Knob { VectorB value; };
+class KnobVecC extends Knob { VectorC value; };
+class KnobVecI extends Knob { VectorI value; };
+class KnobVecT extends Knob { VectorT value; };
+class KnobVecF extends Knob { VectorF value; };
+class KnobVecD extends Knob { VectorD value; };
+class KnobVecL extends Knob { VectorL value; };
+class KnobVecS extends Knob { VectorS value; };
 
-enum KnobType { KNOBBOOL, 	KNOBCHAR, 	KNOBINT, 	KNOBFLOAT, 
-		KNOBDOUBLE, 	KNOBSTRING, 	KNOBLONG, 	KNOBVECBOOL, 
-		KNOBVECCHAR, 	KNOBVECINT,	KNOBVECFLOAT, 	KNOBVECDOUBLE, 
+enum KnobType { KNOBBOOL, 	KNOBCHAR, 	KNOBINT, 	KNOBFLOAT,
+		KNOBDOUBLE, 	KNOBSTRING, 	KNOBLONG, 	KNOBVECBOOL,
+		KNOBVECCHAR, 	KNOBVECINT,	KNOBVECFLOAT, 	KNOBVECDOUBLE,
 		KNOBVECSTRING, 	KNOBVECLONG,    KNOBSHORT};
 
 const int DISPNULL = 0x0000;
@@ -69,7 +69,7 @@ const int DISPSPEC = 0x0008;
 const int DISPRAST = 0x0010;
 const int DISPOPTCPLX    = 0x0100;
 const int DISPOPTLOG     = 0x0200;
-const int DISPOPTSTEM    = 0x0400; 
+const int DISPOPTSTEM    = 0x0400;
 const int DISPOPTSTRIP   = 0x0800;
 const int DISPOPTSCATTER = 0x1000;
 
diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc
index 59ec518960..0c7bc135be 100644
--- a/gnuradio-runtime/lib/controlport/rpcmanager.cc
+++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc
@@ -42,7 +42,7 @@ rpcmanager::get()
 {
   if(aggregator_registered) {
     return aggregator.get();
-  } 
+  }
   else if(booter_registered) {
     return boot;
   }
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
index e86306910d..201dfb3929 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_aggregator.cc
@@ -25,7 +25,7 @@
 rpcserver_booter_aggregator::rpcserver_booter_aggregator() :
   d_type(std::string("aggregator")), server(new rpcserver_aggregator())
 {;}
- 
+
 rpcserver_booter_aggregator::~rpcserver_booter_aggregator()
 {;}
 
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
index cffa268a6d..f60a218747 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_booter_ice.cc
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
index 5409f5e931..cba6be578e 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_ice.cc
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
@@ -55,7 +55,7 @@ rpcserver_ice::registerConfigureCallback(const std::string &id,
 
   if(DEBUG)
     std::cout << "rpcserver_ice registering set: " << id << std::endl;
- 
+
   d_setcallbackmap.insert(ConfigureCallbackMap_t::value_type(id, callback));
 }
 
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
index 697ec497b1..d515e78963 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
@@ -36,5 +36,5 @@ bool rpcmanager::make_aggregator(false);
 #endif
 
 #ifdef RPCSERVER_XMLRPC
-  #error TODO XMLRPC 
+  #error TODO XMLRPC
 #endif
diff --git a/gnuradio-runtime/lib/flat_flowgraph.h b/gnuradio-runtime/lib/flat_flowgraph.h
index f740299fa7..6c299ee5f9 100644
--- a/gnuradio-runtime/lib/flat_flowgraph.h
+++ b/gnuradio-runtime/lib/flat_flowgraph.h
@@ -48,7 +48,7 @@ namespace gr {
 
     // Wire list of gr::block together in new flat_flowgraph
     void setup_connections();
-  
+
     // Merge applicable connections from existing flat flowgraph
     void merge_connections(flat_flowgraph_sptr sfg);
 
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
index 1f5f5b0738..ad8fc87122 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -154,7 +154,7 @@ namespace gr {
   {
     if(HIER_BLOCK2_DETAIL_DEBUG)
       std::cout << "connecting message port..." << std::endl;
-    
+
     // register the subscription
     // this is done later...
     //  src->message_port_sub(srcport, pmt::cons(dst->alias_pmt(), dstport));
@@ -591,7 +591,7 @@ namespace gr {
       // propogate non hier connections through
       if(normal_connection){
         sfg->connect( q->src(), q->dst() );
-      } 
+      }
     }
 
     for(std::vector<std::pair<msg_endpoint, bool> >::iterator it = resolved_endpoints.begin();
@@ -610,7 +610,7 @@ namespace gr {
       }
     }
     */
-    
+
     // Construct unique list of blocks used either in edges, inputs,
     // outputs, or by themselves.  I still hate STL.
     basic_block_vector_t blocks; // unique list of used blocks
diff --git a/gnuradio-runtime/lib/math/qa_sincos.cc b/gnuradio-runtime/lib/math/qa_sincos.cc
index 7def8a9bb8..a6234d19d6 100644
--- a/gnuradio-runtime/lib/math/qa_sincos.cc
+++ b/gnuradio-runtime/lib/math/qa_sincos.cc
@@ -35,14 +35,14 @@ qa_sincos::t1()
   static const unsigned int N = 1000;
   double c_sin, c_cos;
   double gr_sin, gr_cos;
-  
+
   for(unsigned i = 0; i < N; i++) {
     double x = i/100.0;
     c_sin = sin(x);
     c_cos = cos(x);
-    
+
     gr::sincos(x, &gr_sin, &gr_cos);
-    
+
     CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
   }
@@ -54,14 +54,14 @@ qa_sincos::t2()
   static const unsigned int N = 1000;
   float c_sin, c_cos;
   float gr_sin, gr_cos;
-  
+
   for(unsigned i = 0; i < N; i++) {
     float x = i/100.0;
     c_sin = sinf(x);
     c_cos = cosf(x);
-    
+
     gr::sincosf(x, &gr_sin, &gr_cos);
-    
+
     CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
   }
diff --git a/gnuradio-runtime/lib/math/qa_sincos.h b/gnuradio-runtime/lib/math/qa_sincos.h
index c54b75f97f..9fec5958c0 100644
--- a/gnuradio-runtime/lib/math/qa_sincos.h
+++ b/gnuradio-runtime/lib/math/qa_sincos.h
@@ -32,7 +32,7 @@ class qa_sincos : public CppUnit::TestCase
   CPPUNIT_TEST(t1);
   CPPUNIT_TEST(t2);
   CPPUNIT_TEST_SUITE_END();
-  
+
 private:
   void t1();
   void t2();
diff --git a/gnuradio-runtime/lib/messages/msg_queue.cc b/gnuradio-runtime/lib/messages/msg_queue.cc
index 6db2d2daa2..321b229358 100644
--- a/gnuradio-runtime/lib/messages/msg_queue.cc
+++ b/gnuradio-runtime/lib/messages/msg_queue.cc
@@ -98,6 +98,6 @@ namespace gr {
       while(delete_head_nowait() != pmt::pmt_t())
         ;
     }
-    
+
   } /* namespace messages */
 } /* namespace gr */
diff --git a/gnuradio-runtime/lib/msg_handler.cc b/gnuradio-runtime/lib/msg_handler.cc
index 32d14eb715..f23b424e1a 100644
--- a/gnuradio-runtime/lib/msg_handler.cc
+++ b/gnuradio-runtime/lib/msg_handler.cc
@@ -27,7 +27,7 @@
 #include <gnuradio/msg_handler.h>
 
 namespace gr {
-  
+
   msg_handler::~msg_handler()
   {
   }
diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
index fc5763aed4..5cc2005ca7 100644
--- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
@@ -276,14 +276,14 @@ serialize(pmt_t obj, std::streambuf &sb)
   }
 
   if(is_number(obj)) {
-    
+
     if(is_uint64(obj)) {
         uint64_t i = to_uint64(obj);
         ok = serialize_untagged_u8(PST_UINT64, sb);
         ok &= serialize_untagged_u64(i, sb);
         return ok;
     }
-    else { 
+    else {
       if(is_integer(obj)) {
 	long i = to_long(obj);
 	if(sizeof(long) > 4) {
@@ -581,7 +581,7 @@ deserialize(std::streambuf &sb)
       goto error;
     return make_rectangular( r,i );
     }
-    
+
   case PST_TUPLE:
     {
     pmt_t tuple;
@@ -614,7 +614,7 @@ deserialize(std::streambuf &sb)
 
       if(!deserialize_untagged_u32(&nitems, sb))
 	goto error;
-      
+
       deserialize_untagged_u8(&npad, sb);
       for(size_t i = 0; i < npad; i++)
 	deserialize_untagged_u8(&u8, sb);
diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
index bfe71fbe5a..2f46b014db 100644
--- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
+++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc
@@ -478,7 +478,7 @@ qa_pmt_prims::test_any()
 
 // ------------------------------------------------------------------------
 
-class qa_pmt_msg_accepter_nop : public gr::messages::msg_accepter 
+class qa_pmt_msg_accepter_nop : public gr::messages::msg_accepter
 {
 public:
   qa_pmt_msg_accepter_nop(){};
@@ -496,7 +496,7 @@ qa_pmt_prims::test_msg_accepter()
   boost::any a0;
   a0 = std::string("Hello!");
   pmt::pmt_t p0 = pmt::make_any(a0);
-  
+
   gr::messages::msg_accepter_sptr ma0 =                                 \
     gr::messages::msg_accepter_sptr(new qa_pmt_msg_accepter_nop());
   pmt::pmt_t p1 = pmt::make_msg_accepter(ma0);
diff --git a/gnuradio-runtime/lib/qa_logger.cc b/gnuradio-runtime/lib/qa_logger.cc
index b147b36da1..904893cc4d 100644
--- a/gnuradio-runtime/lib/qa_logger.cc
+++ b/gnuradio-runtime/lib/qa_logger.cc
@@ -1,18 +1,18 @@
 /*
  * Copyright 2012 Free Software Foundation, Inc.
- * 
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gnuradio-runtime/lib/qa_logger.h b/gnuradio-runtime/lib/qa_logger.h
index 35f7f1f6c4..2e237eebf8 100644
--- a/gnuradio-runtime/lib/qa_logger.h
+++ b/gnuradio-runtime/lib/qa_logger.h
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
  * Copyright 2012 Free Software Foundation, Inc.
- * 
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Example Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Example Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Example Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -31,7 +31,7 @@
 class qa_logger : public CppUnit::TestCase
 {
 public:
-  CPPUNIT_TEST_SUITE(qa_logger); 
+  CPPUNIT_TEST_SUITE(qa_logger);
   CPPUNIT_TEST(t1);
   CPPUNIT_TEST_SUITE_END();
 
diff --git a/gnuradio-runtime/lib/realtime.cc b/gnuradio-runtime/lib/realtime.cc
index 99deff5b52..603e97a2f1 100644
--- a/gnuradio-runtime/lib/realtime.cc
+++ b/gnuradio-runtime/lib/realtime.cc
@@ -27,7 +27,7 @@
 #include <gnuradio/realtime.h>
 
 namespace gr {
-  
+
   rt_status_t
   enable_realtime_scheduling()
   {
diff --git a/gnuradio-runtime/lib/scheduler_tpb.cc b/gnuradio-runtime/lib/scheduler_tpb.cc
index 2fe9e10f6a..0319a43a88 100644
--- a/gnuradio-runtime/lib/scheduler_tpb.cc
+++ b/gnuradio-runtime/lib/scheduler_tpb.cc
@@ -29,7 +29,7 @@
 #include <sstream>
 
 namespace gr {
-  
+
   class tpb_container
   {
     block_sptr d_block;
@@ -56,7 +56,7 @@ namespace gr {
     : scheduler(ffg, max_noutput_items)
   {
     int block_max_noutput_items;
-    
+
     // Get a topologically sorted vector of all the blocks in use.
     // Being topologically sorted probably isn't going to matter, but
     // there's a non-zero chance it might help...
@@ -84,7 +84,7 @@ namespace gr {
       else {
         block_max_noutput_items = max_noutput_items;
       }
-    
+
       d_threads.create_thread(
 	    gr::thread::thread_body_wrapper<tpb_container>
             (tpb_container(blocks[i], block_max_noutput_items),
diff --git a/gnuradio-runtime/lib/test.cc b/gnuradio-runtime/lib/test.cc
index 775dc2bde4..37da40e641 100644
--- a/gnuradio-runtime/lib/test.cc
+++ b/gnuradio-runtime/lib/test.cc
@@ -51,10 +51,10 @@ namespace gr {
              unsigned int sizeof_input_item,
              int min_outputs, int max_outputs,
              unsigned int sizeof_output_item,
-             unsigned int history, 
+             unsigned int history,
              unsigned int output_multiple,
              double relative_rate,
-             bool fixed_rate, 
+             bool fixed_rate,
              consume_type_t cons_type, produce_type_t prod_type)
   : block (name,
            io_signature::make(min_inputs, max_inputs, sizeof_input_item),
diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h
index cbe42f94e8..24266ab977 100644
--- a/gnuradio-runtime/lib/test.h
+++ b/gnuradio-runtime/lib/test.h
@@ -129,7 +129,7 @@ namespace gr {
      * returns true.  Generally speaking, you don't need to override
      * this.
      */
-    int fixed_rate_ninput_to_noutput(int ninput) { 
+    int fixed_rate_ninput_to_noutput(int ninput) {
       return (int)((double)ninput/relative_rate());
     }
 
diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc
index 8c59b6df74..e393ae5438 100644
--- a/gnuradio-runtime/lib/thread/thread.cc
+++ b/gnuradio-runtime/lib/thread/thread.cc
@@ -124,20 +124,20 @@ namespace gr {
     set_thread_name(gr_thread_t thread, std::string name)
     {
       const DWORD SET_THREAD_NAME_EXCEPTION = 0x406D1388;
-      
+
       DWORD dwThreadId = GetThreadId(thread);
       if (dwThreadId == 0)
         return;
-      
+
       if (name.empty())
         name = boost::str(boost::format("thread %lu") % dwThreadId);
-      
+
       THREADNAME_INFO info;
       info.dwType = 0x1000;
       info.szName = name.c_str();
       info.dwThreadID = dwThreadId;
       info.dwFlags = 0;
-      
+
       __try
       {
         RaiseException(SET_THREAD_NAME_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
@@ -221,7 +221,7 @@ namespace gr {
       param.sched_priority = priority;
       return pthread_setschedparam(thread, policy, &param);
     }
-    
+
     void
     set_thread_name(gr_thread_t thread, std::string name)
     {
@@ -334,18 +334,18 @@ namespace gr {
       param.sched_priority = priority;
       return pthread_setschedparam(thread, policy, &param);
     }
-    
+
     void
     set_thread_name(gr_thread_t thread, std::string name)
     {
       if (thread != pthread_self()) // Naming another thread is not supported
         return;
-      
+
       if (name.empty())
         name = boost::str(boost::format("thread %llu") % ((unsigned long long)thread));
-      
+
       const int max_len = 16; // Maximum accepted by PR_SET_NAME
-      
+
       if ((int)name.size() > max_len) // Shorten the name if necessary by taking as many characters from the front
       {                               // so that the unique_id can still fit on the end
         int i = name.size() - 1;
@@ -356,10 +356,10 @@ namespace gr {
           if ((n == 0) && (s != "0"))
             break;
         }
-        
+
         name = name.substr(0, std::max(0, max_len - ((int)name.size() - (i + 1)))) + name.substr(i + 1);
       }
-      
+
       prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
     }
 
diff --git a/gnuradio-runtime/lib/vmcircbuf.cc b/gnuradio-runtime/lib/vmcircbuf.cc
index ff5093d5c4..d17ed72c43 100644
--- a/gnuradio-runtime/lib/vmcircbuf.cc
+++ b/gnuradio-runtime/lib/vmcircbuf.cc
@@ -184,7 +184,7 @@ namespace gr {
     }
     return buf.c_str();
   }
-  
+
   static bool
   test_a_bunch(vmcircbuf_factory *factory, int n, int size, int *start_ptr, bool verbose)
   {
diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
index 4d8741807b..27ad4f3829 100644
--- a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc
@@ -64,24 +64,24 @@ namespace gr {
     // Attempt to allocate buffers (handle bad_alloc errors)
     int attempts_remain(MAX_SYSV_SHM_ATTEMPTS);
     while(attempts_remain-- > 0){
-    
+
         int shmid_guard = -1;
         int shmid1 = -1;
         int shmid2 = -1;
-    
+
         // We use this as a guard page.  We'll map it read-only on both ends of the buffer.
         // Ideally we'd map it no access, but I don't think that's possible with SysV
         if((shmid_guard = shmget(IPC_PRIVATE, pagesize, IPC_CREAT | 0400)) == -1) {
           perror("gr::vmcircbuf_sysv_shm: shmget (0)");
           continue;
         }
-    
+
         if((shmid2 = shmget(IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 0700)) == -1) {
           perror("gr::vmcircbuf_sysv_shm: shmget(1)");
           shmctl(shmid_guard, IPC_RMID, 0);
           continue;
         }
-    
+
         if((shmid1 = shmget(IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1) {
           perror("gr::vmcircbuf_sysv_shm: shmget (2)");
           shmctl(shmid_guard, IPC_RMID, 0);
@@ -148,7 +148,7 @@ namespace gr {
 
         shmctl(shmid1, IPC_RMID, 0);
         shmctl(shmid_guard, IPC_RMID, 0);
-    
+
         // Now remember the important stuff
         d_base = (char*)first_copy + pagesize;
         d_size = size;
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
index d1b27e50a7..80806341ea 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2012 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GNU Radio
-# 
+#
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
@@ -97,6 +97,6 @@ GR_PYTHON_INSTALL(
     ${CMAKE_CURRENT_SOURCE_DIR}/gr-perf-monitorx
     ${CMAKE_CURRENT_SOURCE_DIR}/gr-ctrlport-curses
     DESTINATION ${GR_RUNTIME_DIR}
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE 
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     COMPONENT "runtime_python"
 )
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
index 78b83c2411..661705d613 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
@@ -184,7 +184,7 @@ class GrDataPlotParent(gr.top_block, QtGui.QWidget):
                     data[n] = [data[n],]
                 data[n] = self.data_to_complex(data[n])
                 self.src[n].set_data(data[n])
-            
+
 
 
 class GrDataPlotterC(GrDataPlotParent):
@@ -236,7 +236,7 @@ class GrDataPlotterF(GrDataPlotParent):
                                 self._name, self._ncons)
         snk.enable_autoscale(True)
         return snk
-    
+
     def get_vecsource(self):
         return blocks.vector_source_f([])
 
@@ -246,7 +246,7 @@ class GrDataPlotterF(GrDataPlotParent):
 
     def set_line_label(self, n, name):
         self.snk.set_line_label(n, self.knobnames[n])
-            
+
 
 class GrDataPlotterConst(GrDataPlotParent):
     def __init__(self, name, rate, pmin=None, pmax=None, stripchart=False):
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py b/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
index 4657482c3e..87998f7911 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
@@ -64,7 +64,7 @@ class IceRadioClient(Ice.Application):
         if self.useglacier:
 	  gstring = ginst + "/router -t:tcp -h " + ghost + " -p " + gport
 	  print "GLACIER: {0}".format(gstring)
-	  
+
 	  setrouter = Glacier2.RouterPrx.checkedCast(self.communicator().stringToProxy(gstring))
 	  self.communicator().setDefaultRouter(setrouter)
           defaultRouter = self.communicator().getDefaultRouter()
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
index 031c3b424e..cfb30ce850 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
@@ -1,18 +1,18 @@
 #
 # Copyright 2012 Free Software Foundation, Inc.
-# 
+#
 # This file is part of GNU Radio
-# 
+#
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
index 1bee3b1a1e..f40c87a6d8 100755
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
@@ -43,7 +43,7 @@ class modem_monitor(threading.Thread):
     def __del__(self):
         rx.close()
 
-    def run(self):                
+    def run(self):
         while self.running:
             time.sleep(0.5)
 
@@ -80,7 +80,7 @@ class modem_window(threading.Thread):
         self.ssel = 0
         self.start()
         #self.updateGUI()
-        
+
         # input loop
         while(self.running):
             self.getInput()
@@ -239,7 +239,7 @@ class monitor_gui:
                     self.updateGUI()
                 except:
                     pass
-        
+
     def shutdown(self):
         curses.endwin()
         os._exit(0)
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
index 56cb2f3696..76dd2e5bc1 100755
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
@@ -53,7 +53,7 @@ class MAINWindow(QtGui.QMainWindow):
         return Qtgui.QSize(800,600)
 
     def __init__(self, radio, port, interface):
-        
+
         super(MAINWindow, self).__init__()
         self.updateRate = 1000;
         self.conns = []
@@ -195,11 +195,11 @@ class MAINWindow(QtGui.QMainWindow):
             else:
                 self.newPlotC(tag, uid, title, pmin, pmax,
                               log, strip, stem)
-            
+
         elif(disp & gr.DISPXY):
             scatter = disp & gr.DISPOPTSCATTER
             self.newPlotConst(tag, uid, title, pmin, pmax, scatter)
-            
+
         elif(disp & gr.DISPPSD):
             if(disp & gr.DISPOPTCPLX == 0):
                 self.newPlotPsdF(tag, uid, title)
@@ -215,7 +215,7 @@ class MAINWindow(QtGui.QMainWindow):
         knobprop = self.knobprops[tree.uid][tag]
         disp = knobprop.display
         iscomplex = (disp & gr.DISPOPTCPLX) or (disp & gr.DISPXY)
-        
+
         if(disp != gr.DISPNULL):
             data = "PlotData:::{0}:::{1}".format(tag, iscomplex)
         else:
@@ -268,8 +268,8 @@ class MAINWindow(QtGui.QMainWindow):
         plot = GrDataPlotterConst(tag, 32e6, pmin, pmax, stripchart)
         plot.scatter(scatter)
         self.createPlot(plot, uid, title)
-    
-    def newPlotF(self, tag, uid, title="", pmin=None, pmax=None, 
+
+    def newPlotF(self, tag, uid, title="", pmin=None, pmax=None,
                  logy=False, stripchart=False, stem=False):
         plot = GrDataPlotterF(tag, 32e6, pmin, pmax, stripchart)
         plot.semilogy(logy)
@@ -461,7 +461,7 @@ class ConInfoDialog(QtGui.QDialog):
         super(ConInfoDialog, self).__init__(parent)
 
         self.gridLayout = QtGui.QGridLayout(self)
-        
+
 
         self.host = QtGui.QLineEdit(self);
         self.port = QtGui.QLineEdit(self);
@@ -515,7 +515,7 @@ class UpdaterWindow(QtGui.QDialog):
             self.buttonlayout = QtGui.QHBoxLayout()
             self.buttonlayout.addWidget(self.cancelButton)
             self.layout.addLayout(self.buttonlayout)
- 
+
         else: # we have a set function
             self.textInput = QtGui.QLineEdit()
             self.layout.addWidget(self.textInput)
@@ -535,7 +535,7 @@ class UpdaterWindow(QtGui.QDialog):
             self.applyButton.connect(self.applyButton, QtCore.SIGNAL('clicked()'), self._apply)
             self.setButton.connect(self.setButton, QtCore.SIGNAL('clicked()'), self._set)
             self.cancelButton.connect(self.cancelButton, QtCore.SIGNAL('clicked()'), self.reject)
- 
+
             self.is_num = ((type(self.sv.value)==float) or (type(self.sv.value)==int))
             if(self.is_num):
                 self.sliderlayout = QtGui.QHBoxLayout()
@@ -548,7 +548,7 @@ class UpdaterWindow(QtGui.QDialog):
 
                 self.steps = 10000
                 self.valspan = self.props.max.value - self.props.min.value
-            
+
                 self.slider.setRange(0, 10000)
                 self._set_slider_value(self.sv.value)
 
@@ -566,10 +566,10 @@ class UpdaterWindow(QtGui.QDialog):
 
         # set layout and go...
         self.setLayout(self.layout)
-            
+
     def _set_slider_value(self, val):
         self.slider.setValue(self.steps*(val-self.props.min.value)/self.valspan)
-             
+
     def _slide(self):
         val = (self.slider.value()*self.valspan + self.props.min.value)/float(self.steps)
         self.textInput.setText(str(val))
@@ -611,7 +611,7 @@ class MForm(QtGui.QWidget):
             ft = time.time();
             latency = ft-st;
             self.parent.statusBar().showMessage("Current GNU Radio Control Port Query Latency: %f ms"%(latency*1000))
-            
+
         except Exception, e:
             sys.stderr.write("ctrlport-monitor: radio.get threw exception ({0}).\n".format(e))
             if(type(self.parent) is MAINWindow):
@@ -626,7 +626,7 @@ class MForm(QtGui.QWidget):
                     for plot in self.parent.plots[self.uid]:
                         if plot.qwidget() == p.widget():
                             remove.append(p)
-                
+
                 # Clean up local references to these
                 self.parent.conns.remove(self.parent.conns[self.uid])
                 self.parent.plots.remove(self.parent.plots[self.uid])
@@ -642,7 +642,7 @@ class MForm(QtGui.QWidget):
             return
 
         tableitems = knobs.keys()
-            
+
         #UPDATE TABLE:
         try:
             self.table.updateItems(knobs, self.knobprops)
@@ -666,7 +666,7 @@ class MForm(QtGui.QWidget):
             else:
                 self.radio = None
                 return
-        
+
         self.uid = uid
         self.parent = parent
         self.horizontalLayout = QtGui.QVBoxLayout(self)
@@ -680,7 +680,7 @@ class MForm(QtGui.QWidget):
         self.constupdatediv = 0
         self.tableupdatediv = 0
         plotsize=250
-            
+
         # make table
         self.table = GrDataPlotterValueTable(uid, self, 0, 0, 400, 200)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
@@ -692,12 +692,12 @@ class MForm(QtGui.QWidget):
         # add things to layouts
         self.horizontalLayout.addWidget(self.table.treeWidget)
 
-        # set up timer   
+        # set up timer
         self.connect(self.timer, QtCore.SIGNAL('timeout()'), self.update)
         self.updateRate = updateRate;
         self.timer.start(self.updateRate)
 
-        # set up context menu .. 
+        # set up context menu ..
         self.table.treeWidget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.table.treeWidget.customContextMenuRequested.connect(self.openMenu)
 
@@ -710,13 +710,13 @@ class MForm(QtGui.QWidget):
         self.connect(self.table.treeWidget,
                      QtCore.SIGNAL('itemPressed(QTreeWidgetItem*, int)'),
                      self.parent.startDrag)
-        
+
     def openMenu(self, pos):
         index = self.table.treeWidget.selectedIndexes()
         item = self.table.treeWidget.itemFromIndex(index[0])
         itemname = str(item.text(0))
         self.parent.propertiesMenu(itemname, self.radio, self.uid)
-        
+
 
 def get_minmax(p):
     pmin = p.min.value
@@ -733,7 +733,7 @@ def get_minmax(p):
         pmin = struct.unpack('b', pmin)[0]
     if(type(pmax) == str):
         pmax = struct.unpack('b', pmax)[0]
-        
+
     if pmin == []:
         pmin = None
     else:
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
index f2c01691a1..612eb66063 100755
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
@@ -38,7 +38,7 @@ class MAINWindow(QtGui.QMainWindow):
         return QtGui.QSize(800,600)
 
     def __init__(self, radio, port, interface):
-        
+
         super(MAINWindow, self).__init__()
         self.conns = []
         self.plots = []
@@ -223,7 +223,7 @@ class ConInfoDialog(QtGui.QDialog):
         super(ConInfoDialog, self).__init__(parent)
 
         self.gridLayout = QtGui.QGridLayout(self)
-        
+
 
         self.host = QtGui.QLineEdit(self);
         self.port = QtGui.QLineEdit(self);
@@ -270,13 +270,13 @@ class UpdaterWindow(QtGui.QDialog):
         self.buttonlayout = QtGui.QHBoxLayout()
         self.buttonlayout.addWidget(self.cancelButton)
         self.layout.addLayout(self.buttonlayout)
- 
+
         # set layout and go...
         self.setLayout(self.layout)
-            
+
     def _set_slider_value(self, val):
         self.slider.setValue(self.steps*(val-self.props.min.value)/self.valspan)
-             
+
     def _slide(self):
         val = (self.slider.value()*self.valspan + self.props.min.value)/float(self.steps)
         self.textInput.setText(str(val))
@@ -368,7 +368,7 @@ class MForm(QtGui.QWidget):
             latency = ft-st
             self.parent.statusBar().showMessage("Current GNU Radio Control Port Query Latency: %f ms"%\
                                                     (latency*1000))
-            
+
         except Exception, e:
             sys.stderr.write("ctrlport-monitor: radio.get threw exception ({0}).\n".format(e))
             if(type(self.parent) is MAINWindow):
@@ -383,7 +383,7 @@ class MForm(QtGui.QWidget):
                     for plot in self.parent.plots[self.uid]:
                         if plot.qwidget() == p.widget():
                             remove.append(p)
-                
+
                 # Clean up local references to these
                 self.parent.conns.remove(self.parent.conns[self.uid])
                 self.parent.plots.remove(self.parent.plots[self.uid])
@@ -397,13 +397,13 @@ class MForm(QtGui.QWidget):
             else:
                 sys.exit(1)
             return
-            
+
         #UPDATE TABLE:
         self.updateItems(knobs)
 
         #UPDATE PLOTS
         self.parent.update(knobs, self.uid)
-    
+
     def updateItems(self, knobs):
         for b in self.block_dict:
             if(knobs[b[0]].ice_id.im_class == GNURadio.KnobVecF):
@@ -424,7 +424,7 @@ class MForm(QtGui.QWidget):
             else:
                 self.radio = None
                 return
-        
+
         self.uid = uid
         self.parent = parent
         self.layout = QtGui.QGridLayout(self)
@@ -500,7 +500,7 @@ class MForm(QtGui.QWidget):
             for col, block in enumerate(blockrow):
                 if(block == ''):
                     continue
-                
+
                 bgroup = QtGui.QGroupBox(block)
                 playout = QtGui.QFormLayout()
                 bgroup.setLayout(playout)
@@ -539,7 +539,7 @@ class MForm(QtGui.QWidget):
                     bufflayout = QtGui.QFormLayout()
                     buffgroup.setLayout(bufflayout)
                     self.layout.addWidget(buffgroup, row, 2*col+1)
-                
+
                     i = int(block.split(":")[1])
                     name = output_name(blockname)
                     obuff = knobs[name].value
@@ -550,7 +550,7 @@ class MForm(QtGui.QWidget):
                         self.block_dict.append((name, newobuff, i))
                         bufflayout.addRow("Out Buffer {0}".format(i),
                                           newobuff)
-                
+
                 if blockname in blocks or blockname in sinks:
                     item = self.layout.itemAtPosition(row, 2*col-1)
                     if(item):
@@ -561,7 +561,7 @@ class MForm(QtGui.QWidget):
                         bufflayout = QtGui.QFormLayout()
                         buffgroup.setLayout(bufflayout)
                         self.layout.addWidget(buffgroup, row, 2*col-1)
-                
+
                     i = int(block.split(":")[1])
                     name = input_name(blockname)
                     ibuff = knobs[name].value[i]
@@ -582,7 +582,7 @@ class MForm(QtGui.QWidget):
         item = self.table.treeWidget.itemFromIndex(index[0])
         itemname = str(item.text(0))
         self.parent.propertiesMenu(itemname, self.radio, self.uid)
-        
+
 
 class MyClient(IceRadioClient):
     def __init__(self):
diff --git a/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
index 489b6ab255..b7c5ac2fe1 100644
--- a/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
+++ b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
@@ -27,10 +27,10 @@ import sys
 
 def tcp_connect_or_die(sock_addr):
     """
-    
+
     Args:
         sock_addr: (host, port) to connect to (tuple)
-    
+
     Returns:
         : socket or exits
     """
@@ -45,10 +45,10 @@ def tcp_connect_or_die(sock_addr):
 
 def udp_connect_or_die(sock_addr):
     """
-    
+
     Args:
         sock_addr: (host, port) to connect to (tuple)
-    
+
     Returns:
         : socket or exits
     """
diff --git a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
index 39cfc05dd6..e63ade1843 100755
--- a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
+++ b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py
@@ -30,7 +30,7 @@ class test_pmt_to_python(unittest.TestCase):
         b = pmt.from_double(123765)
         self.assertEqual(pmt.to_python(b), 123765)
         t = pmt.to_pmt(range(5))
-    
+
     def test_numpy_to_uvector_and_reverse(self):
         import numpy as np
         N = 100
diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt
index f6f63b4384..06ccc751be 100644
--- a/gnuradio-runtime/swig/CMakeLists.txt
+++ b/gnuradio-runtime/swig/CMakeLists.txt
@@ -40,11 +40,11 @@ set(GR_SWIG_LIBRARIES
 )
 
 ###############################################################
-#    Build pmt swig 
+#    Build pmt swig
 ###############################################################
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/pmt 
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/pmt
   ${CMAKE_CURRENT_BINARY_DIR}/../include/pmt)
 list(APPEND GR_SWIG_TARGET_DEPS pmt_generated)
 GR_SWIG_MAKE(pmt_swig pmt_swig.i)
@@ -58,7 +58,7 @@ GR_SWIG_INSTALL(
 add_custom_target(pmt_swig DEPENDS ${SWIG_MODULE_pmt_swig_REAL_NAME})
 
 ###############################################################
-#    Build gnuradio-runtime swig 
+#    Build gnuradio-runtime swig
 ###############################################################
 
 # Only use if log4cpp is installed
diff --git a/gnuradio-runtime/swig/buffer.i b/gnuradio-runtime/swig/buffer.i
index 44bd4887a8..9a1ab21776 100644
--- a/gnuradio-runtime/swig/buffer.i
+++ b/gnuradio-runtime/swig/buffer.i
@@ -26,7 +26,7 @@ typedef boost::shared_ptr<gr::buffer> gr::buffer_sptr;
 %rename(buffer) gr::make_buffer;
 %ignore gr::buffer;
 
-gr::buffer_sptr 
+gr::buffer_sptr
 gr::make_buffer (int nitems, size_t sizeof_item, gr::block_sptr link);
 
 class gr::buffer_reader;
author	Tom Rondeau <tom@trondeau.com>	2014-07-07 12:20:09 -0400
committer	Tom Rondeau <tom@trondeau.com>	2014-07-07 12:20:09 -0400
commit	bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch)
tree	712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gnuradio-runtime
parent	3f469513b94ac992138360caca7e1b53f82214ae (diff)
parent	597b93798a804cde1783d6d2ab53b348d57c44cd (diff)