X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fcolourbutton.cpp;h=01a22b67d165b85a48298aa3a45b5294fc64d612;hp=cf930f65a5f945cc4dcbd794e99565bf8df06d9a;hb=bb19aac49414cc772a2a1e52730cbb2ca24b425c;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/widgets/colourbutton.cpp b/pv/widgets/colourbutton.cpp
index cf930f6..01a22b6 100644
--- a/pv/widgets/colourbutton.cpp
+++ b/pv/widgets/colourbutton.cpp
@@ -14,13 +14,12 @@
  * 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/>.
  */
 
-#include "colourbutton.h"
+#include "colourbutton.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include <QApplication>
 #include <QPainter>
@@ -58,13 +57,11 @@ void ColourButton::set_colour(QColor colour)
 
 	for (unsigned int r = 0; r < rows; r++)
 		for (unsigned int c = 0; c < cols; c++)
-			if (popup_.well_array().cellBrush(r, c).color() ==
-				colour)
-			{
+			if (popup_.well_array().cellBrush(r, c).color() == colour) {
 				popup_.well_array().setSelected(r, c);
 				popup_.well_array().setCurrent(r, c);
 				return;
-			}	
+			}
 }
 
 void ColourButton::set_palette(const QColor *const palette)
@@ -92,9 +89,9 @@ void ColourButton::on_selected(int row, int col)
 	selected(cur_colour_);
 }
 
-void ColourButton::paintEvent(QPaintEvent *e)
+void ColourButton::paintEvent(QPaintEvent *event)
 {
-	QPushButton::paintEvent(e);
+	QPushButton::paintEvent(event);
 
 	QPainter p(this);
 
@@ -105,5 +102,5 @@ void ColourButton::paintEvent(QPaintEvent *e)
 	p.drawRect(r);
 }
 
-} // widgets
-} // pv
+}  // namespace widgets
+}  // namespace pv