X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Ffile.cpp;h=dc64246a9dbcefb1e600e80c12f8916487908779;hp=5e1cb859d45073a1c63eb33d3b97be4ef22e09e3;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=2ad82c2e40b6865481733913a2c32735602f63c4 diff --git a/pv/devices/file.cpp b/pv/devices/file.cpp index 5e1cb85..dc64246 100644 --- a/pv/devices/file.cpp +++ b/pv/devices/file.cpp @@ -14,30 +14,31 @@ * 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 . */ #include #include "file.hpp" +using std::string; + namespace pv { namespace devices { -File::File(const std::string &file_name) : +File::File(const string &file_name) : file_name_(file_name) { } -std::string File::full_name() const +string File::full_name() const { - return boost::filesystem::path(file_name_).filename().string(); + return file_name_; } -std::string File::display_name(const DeviceManager&) const +string File::display_name(const DeviceManager&) const { - return File::full_name(); + return boost::filesystem::path(file_name_).filename().string(); } } // namespace devices