X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fdeviceoptions.hpp;h=52b2c5a585dae74e10041033076f54b0bd57bee7;hp=d43ab607b4a48746afc9aa973e4ec0b8a0ef26af;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/popups/deviceoptions.hpp b/pv/popups/deviceoptions.hpp
index d43ab60..52b2c5a 100644
--- a/pv/popups/deviceoptions.hpp
+++ b/pv/popups/deviceoptions.hpp
@@ -14,19 +14,20 @@
  * 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>
 
-#include <pv/prop/binding/deviceoptions.hpp>
+#include <pv/binding/device.hpp>
 #include <pv/widgets/popup.hpp>
 
+using std::shared_ptr;
+
 namespace sigrok {
 	class Device;
 }
@@ -39,20 +40,21 @@ 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();
 
-	pv::prop::binding::DeviceOptions& binding();
+	virtual void show();
 
 private:
-	std::shared_ptr<sigrok::Device> device_;
+	shared_ptr<sigrok::Device> device_;
 
 	QVBoxLayout layout_;
 
-	pv::prop::binding::DeviceOptions binding_;
+	pv::binding::Device binding_;
 };
 
 } // namespace popups
 } // namespace pv
 
-#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP