projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1132 by passing segment IDs, not segment instances
[pulseview.git]
/
pv
/
widgets
/
colourbutton.hpp
diff --git
a/pv/widgets/colourbutton.hpp
b/pv/widgets/colourbutton.hpp
index d7f019a6c55ab96dcd2dbc90f6e72af1310c1918..9dbb2b27e2076baca4bbf77de14fcce1a8ec49c0 100644
(file)
--- a/
pv/widgets/colourbutton.hpp
+++ b/
pv/widgets/colourbutton.hpp
@@
-14,12
+14,11
@@
* 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_WIDGETS_COLOURBUTTON_H
-#define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
+#ifndef PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
PP
+#define PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
PP
#include <QPushButton>
#include <QPushButton>
@@
-47,7
+46,7
@@
public:
void set_palette(const QColor *const palette);
private:
void set_palette(const QColor *const palette);
private:
- void paintEvent(QPaintEvent *e);
+ void paintEvent(QPaintEvent *e
vent
);
private Q_SLOTS:
void on_clicked(bool);
private Q_SLOTS:
void on_clicked(bool);
@@
-62,7
+61,7
@@
private:
QColor cur_colour_;
};
QColor cur_colour_;
};
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv
-#endif // PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
+#endif // PULSEVIEW_PV_WIDGETS_COLOURBUTTON_H
PP