volk: Cleaning up naming from old libvector to volk.

4 files changed, 17 insertions, 17 deletions

diff --git a/volk/python/__init__.py b/volk/python/__init__.py
index 6513a31dd..7239e7e23 100644
--- a/volk/python/__init__.py
+++ b/volk/python/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -38,12 +38,12 @@ if _RTLD_GLOBAL != 0:
 # ----------------------------------------------------------------
 
 
-# import swig generated symbols into the libvector namespace
-from libvector_swig import *
+# import swig generated symbols into the volk namespace
+from volk_swig import *
 
 # import any pure python here
-# from libvector_foo import bar
-# from libvector_baz import *
+# from volk_foo import bar
+# from volk_baz import *
 
 
 # ----------------------------------------------------------------
diff --git a/volk/python/qa_square.py b/volk/python/qa_square.py
index 1ee56411f..53f0433ca 100755
--- a/volk/python/qa_square.py
+++ b/volk/python/qa_square.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2008 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,9 +21,9 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import libvector_swig as libvector
+import volk_swig as volk
 
-class qa_libvector(gr_unittest.TestCase):
+class qa_volk(gr_unittest.TestCase):
 
     def setUp(self):
         self.tb = gr.top_block()
@@ -35,7 +35,7 @@ class qa_libvector(gr_unittest.TestCase):
         src_data = (-3, 4, -5.5, 2, 3)
         expected_result = (9, 16, 30.25, 4, 9)
         src = gr.vector_source_f(src_data)
-        sqr = libvector.square_ff()
+        sqr = volk.square_ff()
         dst = gr.vector_sink_f()
         self.tb.connect(src, sqr)
         self.tb.connect(sqr, dst)
diff --git a/volk/python/libvector.i b/volk/python/volk.i
index 598c20a2a..ea3a037ba 100644
--- a/volk/python/libvector.i
+++ b/volk/python/volk.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -38,10 +38,10 @@
 %{
 
 // The .h files
-#include <libvector/libvector_square_ff.h>
+#include <volk/volk_square_ff.h>
 
 %}
 
 // The .i files
-%include <libvector_square_ff.i>
+%include <volk_square_ff.i>
 
diff --git a/volk/python/libvector_square_ff.i b/volk/python/volk_square_ff.i
index a1c547cc7..1d485bd7e 100644
--- a/volk/python/libvector_square_ff.i
+++ b/volk/python/volk_square_ff.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,12 +26,12 @@
  * This does some behind-the-scenes magic so we can
  * access gr_example_square_ff from python as howto.square_ff
  */
-GR_SWIG_BLOCK_MAGIC(libvector,square_ff);
+GR_SWIG_BLOCK_MAGIC(volk,square_ff);
 
-libvector_square_ff_sptr libvector_make_square_ff ();
+volk_square_ff_sptr volk_make_square_ff ();
 
-class libvector_square_ff : public gr_sync_block
+class volk_square_ff : public gr_sync_block
 {
 private:
-  libvector_square_ff();
+  volk_square_ff();
 };