X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.hpp;h=40ba52ea59ada1e232a08a6bfe95f4432c347d94;hp=35081cdedd006fd561a31ccb1991ea69c5300d21;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/signal.hpp b/pv/view/signal.hpp
index 35081cd..40ba52e 100644
--- a/pv/view/signal.hpp
+++ b/pv/view/signal.hpp
@@ -14,8 +14,7 @@
  * 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_TRACEVIEW_SIGNAL_HPP
@@ -26,12 +25,14 @@
 #include <QComboBox>
 #include <QWidgetAction>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "signalscalehandle.hpp"
 #include "trace.hpp"
 #include "viewitemowner.hpp"
 
+using std::shared_ptr;
+
 namespace pv {
 
 class Session;
@@ -49,8 +50,7 @@ class Signal : public Trace, public ViewItemOwner
 	Q_OBJECT
 
 protected:
-	Signal(pv::Session &session,
-		std::shared_ptr<data::SignalBase> channel);
+	Signal(pv::Session &session, shared_ptr<data::SignalBase> channel);
 
 public:
 	/**
@@ -58,14 +58,14 @@ public:
 	 */
 	virtual void set_name(QString name);
 
-	virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
+	virtual shared_ptr<pv::data::SignalData> data() const = 0;
 
 	/**
 	 * Returns true if the trace is visible and enabled.
 	 */
 	bool enabled() const;
 
-	std::shared_ptr<data::SignalBase> base() const;
+	shared_ptr<data::SignalBase> base() const;
 
 	virtual void save_settings(QSettings &settings) const;
 
@@ -76,7 +76,7 @@ public:
 	 */
 	const item_list& child_items() const;
 
-	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+	void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -110,7 +110,7 @@ protected Q_SLOTS:
 protected:
 	pv::Session &session_;
 
-	const std::shared_ptr<SignalScaleHandle> scale_handle_;
+	const shared_ptr<SignalScaleHandle> scale_handle_;
 	const item_list items_;
 
 	QComboBox *name_widget_;