projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Minor consistency fixes.
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index e14972abd47150824dec6d811596df855bcec014..d9cf0a53cfc689b3142b64ae4d078b2a3b0ed7fc 100644
(file)
--- a/
pv/dialogs/connect.hpp
+++ b/
pv/dialogs/connect.hpp
@@
-29,11
+29,13
@@
#include <QFormLayout>
#include <QHBoxLayout>
#include <QLineEdit>
#include <QFormLayout>
#include <QHBoxLayout>
#include <QLineEdit>
-#include <QSpinBox>
#include <QListWidget>
#include <QPushButton>
#include <QListWidget>
#include <QPushButton>
+#include <QSpinBox>
#include <QVBoxLayout>
#include <QVBoxLayout>
+using std::shared_ptr;
+
namespace sigrok {
class Driver;
}
namespace sigrok {
class Driver;
}
@@
-44,8
+46,8
@@
class HardwareDevice;
}
}
}
}
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<sigrok::Driver>);
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<pv::devices::HardwareDevice>);
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Driver>);
+Q_DECLARE_METATYPE(shared_ptr<pv::devices::HardwareDevice>);
namespace pv {
namespace pv {
@@
-60,12
+62,12
@@
class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- s
td::s
hared_ptr<devices::HardwareDevice> get_selected_device() const;
+ shared_ptr<devices::HardwareDevice> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
- void populate_serials(s
td::s
hared_ptr<sigrok::Driver> driver);
+ void populate_serials(shared_ptr<sigrok::Driver> driver);
void unset_connection();
void unset_connection();