X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fdevice.hpp;h=fd78960c153f50917eb08fca0745e54186c104f2;hp=acc772ecc5eaab8aed2ccc746f0e9911cc42590b;hb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36;hpb=4d6c6ea3e6b069787c270d4911083dae05eae4c6

diff --git a/pv/devices/device.hpp b/pv/devices/device.hpp
index acc772ec..fd78960c 100644
--- a/pv/devices/device.hpp
+++ b/pv/devices/device.hpp
@@ -14,8 +14,7 @@
  * 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/>.
  */
 
 #ifndef PULSEVIEW_PV_DEVICES_DEVICE_HPP
@@ -24,6 +23,9 @@
 #include <memory>
 #include <string>
 
+using std::shared_ptr;
+using std::string;
+
 namespace sigrok {
 class ConfigKey;
 class Device;
@@ -39,14 +41,14 @@ namespace devices {
 class Device
 {
 protected:
-	Device();
+	Device() = default;
 
 public:
 	virtual ~Device();
 
-	std::shared_ptr<sigrok::Session> session() const;
+	shared_ptr<sigrok::Session> session() const;
 
-	std::shared_ptr<sigrok::Device> device() const;
+	shared_ptr<sigrok::Device> device() const;
 
 	template<typename T>
 	T read_config(const sigrok::ConfigKey *key, const T default_value = 0);
@@ -54,14 +56,14 @@ public:
 	/**
 	 * Builds the full name. It only contains all the fields.
 	 */
-	virtual std::string full_name() const = 0;
+	virtual string full_name() const = 0;
 
 	/**
 	 * Builds the display name. It only contains fields as required.
 	 * @param device_manager a reference to the device manager is needed
 	 * so that other similarly titled devices can be detected.
 	 */
-	virtual std::string display_name(
+	virtual string display_name(
 		const DeviceManager &device_manager) const = 0;
 
 	virtual void open() = 0;
@@ -75,8 +77,8 @@ public:
 	virtual void stop();
 
 protected:
-	std::shared_ptr<sigrok::Session> session_;
-	std::shared_ptr<sigrok::Device> device_;
+	shared_ptr<sigrok::Session> session_;
+	shared_ptr<sigrok::Device> device_;
 };
 
 } // namespace devices