projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GlobalSettings: Enable mouse hover marker by default
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index ce97ba80895959d8cf4241e2989e1af99116be28..914c58783ee3693b87ed6b7c2a3232c0eb119a62 100644
(file)
--- a/
pv/dialogs/connect.hpp
+++ b/
pv/dialogs/connect.hpp
@@
-14,8
+14,7
@@
* 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_CONNECT_HPP
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
@@
-30,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;
}
@@
-45,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 {
@@
-61,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();
@@
-93,7
+94,7
@@
private:
QWidget *tcp_config_;
QLineEdit *tcp_host_;
QSpinBox *tcp_port_;
QWidget *tcp_config_;
QLineEdit *tcp_host_;
QSpinBox *tcp_port_;
- QC
heckBox *tcp_use_vxi
_;
+ QC
omboBox *tcp_protocol
_;
QPushButton scan_button_;
QListWidget device_list_;
QPushButton scan_button_;
QListWidget device_list_;