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

diff --git a/pv/popups/deviceoptions.hpp b/pv/popups/deviceoptions.hpp
index d43ab60..0ad0f5a 100644
--- a/pv/popups/deviceoptions.hpp
+++ b/pv/popups/deviceoptions.hpp
@@ -14,17 +14,16 @@
  * 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>
 
 namespace sigrok {
@@ -42,17 +41,17 @@ public:
 	DeviceOptions(std::shared_ptr<sigrok::Device> device,
 		QWidget *parent);
 
-	pv::prop::binding::DeviceOptions& binding();
+	pv::binding::Device& binding();
 
 private:
 	std::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