[Commit-gnuradio] r7127 - gnuradio/branches/developers/jcorgan/t127/usrpdb/src

[jcorgan]

Author: jcorgan
Date: 2007-12-12 08:53:44 -0700 (Wed, 12 Dec 2007)
New Revision: 7127

Added:
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.i
Removed:
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.i
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrp_hwa.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrp_hwa.h
Modified:
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/Makefile.am
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i
Log:
Rename to consistent naming scheme.

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/Makefile.am    
2007-12-12 15:19:20 UTC (rev 7126)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/Makefile.am    
2007-12-12 15:53:44 UTC (rev 7127)
@@ -33,7 +33,7 @@
 
 LOCAL_IFILES =                                 \
        $(top_srcdir)/usrpdb/src/usrpdb.i \
-       $(top_srcdir)/usrpdb/src/qa_hwa.i
+       $(top_srcdir)/usrpdb/src/usrpdb_qa_hwa.i
 
 REMOTE_IFILES =                                \
        $(top_srcdir)/gnuradio-core/src/lib/swig/shared_ptr.i
@@ -54,8 +54,8 @@
 lib_LTLIBRARIES = libusrpdb.la
 
 libusrpdb_la_SOURCES =                 \
-       qa_hwa.cc                       \
-       usrp_hwa.cc
+       usrpdb_qa_hwa.cc                \
+       usrpdb_hwa.cc
 
 ourlib_LTLIBRARIES = _usrpdb.la
 
@@ -72,8 +72,8 @@
 _usrpdb_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 grinclude_HEADERS =                    \
-       usrp_hwa.h                      \
-       qa_hwa.h
+       usrpdb_hwa.h                    \
+       usrpdb_qa_hwa.h
 
 swiginclude_HEADERS =                  \
        $(LOCAL_IFILES)

Deleted: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.cc

Deleted: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.h

Deleted: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.i

Deleted: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrp_hwa.cc

Deleted: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrp_hwa.h

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i       
2007-12-12 15:19:20 UTC (rev 7126)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i       
2007-12-12 15:53:44 UTC (rev 7127)
@@ -23,4 +23,4 @@
 %feature("autodoc", "1");
 %include <shared_ptr.i>
 
-%include "qa_hwa.i"
+%include "usrpdb_qa_hwa.i"

Copied: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.cc 
(from rev 7126, 
gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrp_hwa.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.cc          
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.cc  
2007-12-12 15:53:44 UTC (rev 7127)
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <usrpdb_hwa.h>
+
+usrpdb_hwa::usrpdb_hwa()
+{
+}
+
+usrpdb_hwa::~usrpdb_hwa()
+{
+}

Copied: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h (from 
rev 7126, gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrp_hwa.h)
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h           
                (rev 0)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h   
2007-12-12 15:53:44 UTC (rev 7127)
@@ -0,0 +1,34 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_USRPDB_HWA_H
+#define INCLUDED_USRPDB_HWA_H
+
+class usrpdb_hwa 
+{
+public:
+  usrpdb_hwa();
+
+  virtual ~usrpdb_hwa() = 0;
+};
+
+#endif /* INCLUDED_USRPDB_HWA_H */

Copied: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.cc 
(from rev 7126, gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.cc)
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.cc       
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.cc       
2007-12-12 15:53:44 UTC (rev 7127)
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <usrpdb_qa_hwa.h>
+
+usrpdb_qa_hwa_sptr usrpdb_make_qa_hwa()
+{
+  return usrpdb_qa_hwa_sptr(new usrpdb_qa_hwa());
+}
+
+usrpdb_qa_hwa::usrpdb_qa_hwa()
+{
+}
+
+usrpdb_qa_hwa::~usrpdb_qa_hwa()
+{
+}

Copied: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.h 
(from rev 7126, gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.h)
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.h        
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.h        
2007-12-12 15:53:44 UTC (rev 7127)
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_USRPDB_QA_HWA_H
+#define INCLUDED_USRPDB_QA_HWA_H
+
+#include <usrpdb_hwa.h>
+#include <boost/shared_ptr.hpp>
+
+class usrpdb_qa_hwa;
+typedef boost::shared_ptr<usrpdb_qa_hwa> usrpdb_qa_hwa_sptr;
+
+usrpdb_qa_hwa_sptr usrpdb_make_qa_hwa();
+
+class usrpdb_qa_hwa : usrpdb_hwa
+{
+  usrpdb_qa_hwa();
+
+  friend usrpdb_qa_hwa_sptr usrpdb_make_qa_hwa();
+  
+public:
+
+  int foo() const { return 42; }
+  ~usrpdb_qa_hwa();
+};
+
+#endif /* INCLUDED_USRPDB_QA_HWA_H */

Copied: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.i 
(from rev 7126, gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_hwa.i)
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.i        
                        (rev 0)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_qa_hwa.i        
2007-12-12 15:53:44 UTC (rev 7127)
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+%{
+#include <usrpdb_qa_hwa.h>
+%}
+
+class usrpdb_qa_hwa;
+typedef boost::shared_ptr<usrpdb_qa_hwa> usrpdb_qa_hwa_sptr;
+%template(usrpdb_qa_hwa_sptr) boost::shared_ptr<usrpdb_qa_hwa>;
+%rename(qa_hwa) usrpdb_make_qa_hwa;
+%ignore qa_hwa;
+
+usrpdb_qa_hwa_sptr usrpdb_make_qa_hwa();
+
+class usrpdb_qa_hwa
+{
+protected:
+  usrpdb_qa_hwa();
+
+public:
+  int foo() const { return 42; }
+  ~usrpdb_qa_hwa();
+};