projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session/View: Save triggers in a list and use it
[pulseview.git]
/
pv
/
devices
/
file.cpp
diff --git
a/pv/devices/file.cpp
b/pv/devices/file.cpp
index f8ec998d8b7310749ac5e201979750af71f3581f..dc64246a9dbcefb1e600e80c12f8916487908779 100644
(file)
--- a/
pv/devices/file.cpp
+++ b/
pv/devices/file.cpp
@@
-14,28
+14,29
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <boost/filesystem.hpp>
#include "file.hpp"
*/
#include <boost/filesystem.hpp>
#include "file.hpp"
+using std::string;
+
namespace pv {
namespace devices {
namespace pv {
namespace devices {
-File::File(const st
d::st
ring &file_name) :
+File::File(const string &file_name) :
file_name_(file_name)
{
}
file_name_(file_name)
{
}
-st
d::st
ring File::full_name() const
+string File::full_name() const
{
return file_name_;
}
{
return file_name_;
}
-st
d::st
ring File::display_name(const DeviceManager&) const
+string File::display_name(const DeviceManager&) const
{
return boost::filesystem::path(file_name_).filename().string();
}
{
return boost::filesystem::path(file_name_).filename().string();
}