Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / view / signal.cpp

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 8dd329e0f7fd947c08717068e58dd4999307c827..065715aa7a996fd0c01f7aaf3763788a95f0658e 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -14,13 +14,12 @@
  * 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 St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
 
-#include <assert.h>
+#include <cassert>
 #include <cmath>
 
 #include <QApplication>
@@ -40,7 +39,8 @@ using std::shared_ptr;
 using std::make_shared;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const char *const ChannelNames[] = {
        "CLK",
@@ -60,7 +60,7 @@ const char *const ChannelNames[] = {
 };
 
 Signal::Signal(pv::Session &session,
-       std::shared_ptr<data::SignalBase> channel) :
+       shared_ptr<data::SignalBase> channel) :
        Trace(channel),
        session_(session),
        scale_handle_(make_shared<SignalScaleHandle>(*this)),
@@ -91,6 +91,16 @@ shared_ptr<data::SignalBase> Signal::base() const
        return base_;
 }
 
+void Signal::save_settings(QSettings &settings) const
+{
+       (void)settings;
+}
+
+void Signal::restore_settings(QSettings &settings)
+{
+       (void)settings;
+}
+
 const ViewItemOwner::item_list& Signal::child_items() const
 {
        return items_;
@@ -173,5 +183,6 @@ void Signal::on_enabled_changed(bool enabled)
                owner_->extents_changed(true, true);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv