projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use nullptr in a few places.
[pulseview.git]
/
pv
/
views
/
viewbase.hpp
diff --git
a/pv/views/viewbase.hpp
b/pv/views/viewbase.hpp
index 1ac847562cd4462ebe0872d46732106f1b3dd49c..c4ac059d0c169bfa24f7eb6fc9b950b7ee558852 100644
(file)
--- a/
pv/views/viewbase.hpp
+++ b/
pv/views/viewbase.hpp
@@
-15,8
+15,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_VIEWS_VIEWBASE_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_VIEWBASE_HPP
@@
-33,6
+32,8
@@
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/util.hpp>
+using std::shared_ptr;
+
namespace pv {
class Session;
namespace pv {
class Session;
@@
-53,7
+54,7
@@
class ViewBase : public QWidget {
Q_OBJECT
public:
Q_OBJECT
public:
- explicit ViewBase(Session &session,
QWidget *parent = 0
);
+ explicit ViewBase(Session &session,
bool is_main_view=false, QWidget *parent = nullptr
);
Session& session();
const Session& session() const;
Session& session();
const Session& session() const;
@@
-63,9
+64,9
@@
public:
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
- virtual void add_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ virtual void add_decode_signal(shared_ptr<data::SignalBase> signalbase);
- virtual void remove_decode_signal(s
td::s
hared_ptr<data::SignalBase> signalbase);
+ virtual void remove_decode_signal(shared_ptr<data::SignalBase> signalbase);
#endif
virtual void save_settings(QSettings &settings) const;
#endif
virtual void save_settings(QSettings &settings) const;
@@
-81,6
+82,8
@@
public Q_SLOTS:
protected:
Session &session_;
protected:
Session &session_;
+ const bool is_main_view_;
+
util::TimeUnit time_unit_;
};
util::TimeUnit time_unit_;
};