main window: Prefer the user specified device in new sessions

[pulseview.git] / pv / widgets / colourbutton.hpp

diff --git a/pv/widgets/colourbutton.hpp b/pv/widgets/colourbutton.hpp
index 86e8e98fab6c6f2c7372f7bcd180f2513dbeb7a7..9dbb2b27e2076baca4bbf77de14fcce1a8ec49c0 100644 (file)
--- a/pv/widgets/colourbutton.hpp
+++ b/pv/widgets/colourbutton.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_WIDGETS_COLOURBUTTON_HPP
@@ -47,7 +46,7 @@ public:
        void set_palette(const QColor *const palette);
 
 private:
-       void paintEvent(QPaintEvent *e);
+       void paintEvent(QPaintEvent *event);
 
 private Q_SLOTS:
        void on_clicked(bool);
@@ -62,7 +61,7 @@ private:
        QColor cur_colour_;
 };
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_WIDGETS_COLOURBUTTON_HPP