Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / trace.hpp

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 9f0ecd44c2a54ca82706775887db0e453792c6fa..62588a16ce07577aa873b9d48ff477e2aa73c9bf 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.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_TRACE_HPP
@@ -27,12 +26,14 @@
 #include <QRect>
 #include <QString>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "tracetreeitem.hpp"
 
 #include "pv/data/signalbase.hpp"
 
+using std::shared_ptr;
+
 class QFormLayout;
 
 namespace pv {
@@ -56,7 +57,7 @@ private:
        static const QColor DarkGrayBGColour;
 
 protected:
-       Trace(std::shared_ptr<data::SignalBase> channel);
+       Trace(shared_ptr<data::SignalBase> channel);
 
 public:
        /**
@@ -128,7 +129,7 @@ private Q_SLOTS:
        void on_colouredit_changed(const QColor &colour);
 
 protected:
-       std::shared_ptr<data::SignalBase> base_;
+       shared_ptr<data::SignalBase> base_;
        bool coloured_bg_, coloured_bg_state_;
 
 private: