X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Ffilter.h;h=ca6e67b0314e405d91bbfbf8711bd2353a37f78e;hp=492f93dd2030be17cb72402801a4f2556fe1ce04;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hpb=e36dfad3f0818b4c3457fbe7277faa6f4ca28dfe diff --git a/include/filter.h b/include/filter.h index 492f93d..ca6e67b 100644 --- a/include/filter.h +++ b/include/filter.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: filter.h,v 1.20 2000/08/19 22:59:06 kevin Exp $ +** $Id: filter.h,v 1.22 2000/12/16 06:12:47 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -37,8 +37,6 @@ #include #endif -#include - // CLASS IDENTIFICATION // SignalFilter A filter used to process signals @@ -79,10 +77,10 @@ class SignalFilter { { return m_adFilter; } bool fail(void) const {return m_fail;} - const string& failMessage(void) const {return m_failMessage;} + const std::string& failMessage(void) const {return m_failMessage;} - const string& nameFilter(void) const { return m_nameFilter;} - const string& nameDomain(void) const { return m_nameDomain;} + const std::string& nameFilter(void) const { return m_nameFilter;} + const std::string& nameDomain(void) const { return m_nameDomain;} const int idFilter(void) const { return m_idFilter;} const int idDomain(void) const { return m_idDomain;} @@ -127,13 +125,13 @@ class SignalFilter { double m_dFilterMax; double* m_adFilter; - string m_nameFilter; - string m_nameDomain; + std::string m_nameFilter; + std::string m_nameDomain; int m_idFilter; int m_idDomain; bool m_fail; - string m_failMessage; + std::string m_failMessage; static const char* s_aszFilterName[]; static const char* s_aszFilterTitle[];