projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecoderSelector: Avoid non-standard variable type.
[pulseview.git]
/
pv
/
popups
/
deviceoptions.hpp
diff --git
a/pv/popups/deviceoptions.hpp
b/pv/popups/deviceoptions.hpp
index f840e83f3133e8ab7ad8e29bd4c0106daa75f874..52b2c5a585dae74e10041033076f54b0bd57bee7 100644
(file)
--- 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
* 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>
@@
-27,6
+26,8
@@
#include <pv/binding/device.hpp>
#include <pv/widgets/popup.hpp>
#include <pv/binding/device.hpp>
#include <pv/widgets/popup.hpp>
+using std::shared_ptr;
+
namespace sigrok {
class Device;
}
namespace sigrok {
class Device;
}
@@
-39,13
+40,14
@@
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::binding::Device& binding();
+ virtual void show();
+
private:
private:
- s
td::s
hared_ptr<sigrok::Device> device_;
+ shared_ptr<sigrok::Device> device_;
QVBoxLayout layout_;
QVBoxLayout layout_;
@@
-55,4
+57,4
@@
private:
} // namespace popups
} // namespace pv
} // namespace popups
} // namespace pv
-#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
+#endif // PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_H
PP