projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move trace view files
[pulseview.git]
/
pv
/
popups
/
deviceoptions.hpp
diff --git
a/pv/popups/deviceoptions.hpp
b/pv/popups/deviceoptions.hpp
index e358932a9f9bec74e88d2f756f6021452a78e4d4..21f88e90947f038a01f675a7483584ccc90ff776 100644
(file)
--- a/
pv/popups/deviceoptions.hpp
+++ b/
pv/popups/deviceoptions.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_POPUPS_DEVICEOPTIONS_HPP
*/
#ifndef PULSEVIEW_PV_POPUPS_DEVICEOPTIONS_HPP
@@
-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,12
@@
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();
private:
pv::binding::Device& binding();
private:
- s
td::s
hared_ptr<sigrok::Device> device_;
+ shared_ptr<sigrok::Device> device_;
QVBoxLayout layout_;
QVBoxLayout layout_;