projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Don't do a QUIET search for libsigrokcxx
[pulseview.git]
/
pv
/
popups
/
deviceoptions.hpp
diff --git
a/pv/popups/deviceoptions.hpp
b/pv/popups/deviceoptions.hpp
index d43ab607b4a48746afc9aa973e4ec0b8a0ef26af..52b2c5a585dae74e10041033076f54b0bd57bee7 100644
(file)
--- 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
* 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_H
PP
+#define PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
PP
#include <QGroupBox>
#include <QVBoxLayout>
#include <QGroupBox>
#include <QVBoxLayout>
-#include <pv/
prop/binding/deviceoptions
.hpp>
+#include <pv/
binding/device
.hpp>
#include <pv/widgets/popup.hpp>
#include <pv/widgets/popup.hpp>
+using std::shared_ptr;
+
namespace sigrok {
class Device;
}
namespace sigrok {
class Device;
}
@@
-39,20
+40,21
@@
class DeviceOptions : public pv::widgets::Popup
Q_OBJECT
public:
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:
private:
- s
td::s
hared_ptr<sigrok::Device> device_;
+ shared_ptr<sigrok::Device> device_;
QVBoxLayout layout_;
QVBoxLayout layout_;
- pv::
prop::binding::DeviceOptions
binding_;
+ pv::
binding::Device
binding_;
};
} // namespace popups
} // namespace pv
};
} // namespace popups
} // namespace pv
-#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
PP