X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.hpp;h=21f88e90947f038a01f675a7483584ccc90ff776;hp=f840e83f3133e8ab7ad8e29bd4c0106daa75f874;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=3cc9ad7b867853315473df611612c562d562ed8a

diff --git a/pv/popups/deviceoptions.hpp b/pv/popups/deviceoptions.hpp
index f840e83..21f88e9 100644
--- a/pv/popups/deviceoptions.hpp
+++ b/pv/popups/deviceoptions.hpp
@@ -14,12 +14,11 @@
  * 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_POPUPS_DEVICEOPTIONS_H
-#define PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#ifndef PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP
+#define PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP
 
 #include <QGroupBox>
 #include <QVBoxLayout>
@@ -27,6 +26,8 @@
 #include <pv/binding/device.hpp>
 #include <pv/widgets/popup.hpp>
 
+using std::shared_ptr;
+
 namespace sigrok {
 	class Device;
 }
@@ -39,13 +40,12 @@ class DeviceOptions : public pv::widgets::Popup
 	Q_OBJECT
 
 public:
-	DeviceOptions(std::shared_ptr<sigrok::Device> device,
-		QWidget *parent);
+	DeviceOptions(shared_ptr<sigrok::Device> device, QWidget *parent);
 
 	pv::binding::Device& binding();
 
 private:
-	std::shared_ptr<sigrok::Device> device_;
+	shared_ptr<sigrok::Device> device_;
 
 	QVBoxLayout layout_;
 
@@ -55,4 +55,4 @@ private:
 } // namespace popups
 } // namespace pv
 
-#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP