projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove non-functional remains of the scale drag handle
[pulseview.git]
/
pv
/
devices
/
file.cpp
diff --git
a/pv/devices/file.cpp
b/pv/devices/file.cpp
index 91f2d5d62d20e44da4b01e82027df2a6b6ee198b..dc64246a9dbcefb1e600e80c12f8916487908779 100644
(file)
--- a/
pv/devices/file.cpp
+++ b/
pv/devices/file.cpp
@@
-14,27
+14,31
@@
* 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 std::string &file_name) :
- file_name_(file_name) {
+File::File(const string &file_name) :
+ file_name_(file_name)
+{
}
}
-std::string File::full_name() const {
- return boost::filesystem::path(file_name_).filename().string();
+string File::full_name() const
+{
+ return file_name_;
}
}
-std::string File::display_name(const DeviceManager&) const {
- return File::full_name();
+string File::display_name(const DeviceManager&) const
+{
+ return boost::filesystem::path(file_name_).filename().string();
}
} // namespace devices
}
} // namespace devices